more wip

RocketSurgeonsGuild · Apr 18, 2024 · b0af7be · b0af7be
1 parent 00a288f
commit b0af7be
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -91,16 +91,16 @@
     <PackageVersion Include="Polly" Version="8.3.1" />
     <PackageVersion Include="StronglyTypedId" Version="1.0.0-beta07" />
     <PackageVersion Include="Rocket.Surgery.Build.Information" Version="3.3.11" />
-    <PackageVersion Include="Rocket.Surgery.Conventions" Version="14.0.0-next.11" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="14.0.0-next.11" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.Attributes" Version="14.0.0-next.11" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.CommandLine" Version="14.0.0-next.11" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.DependencyModel" Version="14.0.0-next.11" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.DryIoc" Version="14.0.0-next.11" />
+    <PackageVersion Include="Rocket.Surgery.Conventions" Version="14.0.0-next.12" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="14.0.0-next.12" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.Attributes" Version="14.0.0-next.12" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.CommandLine" Version="14.0.0-next.12" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.DependencyModel" Version="14.0.0-next.12" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.DryIoc" Version="14.0.0-next.12" />
     <PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="12.1.0" />
     <PackageVersion Include="Rocket.Surgery.Extensions" Version="12.1.0" />
-    <PackageVersion Include="Rocket.Surgery.Hosting" Version="14.0.0-next.11" />
-    <PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="14.0.0-next.11" />
+    <PackageVersion Include="Rocket.Surgery.Hosting" Version="14.0.0-next.12" />
+    <PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="14.0.0-next.12" />
     <PackageVersion Include="Scrutor" Version="4.2.2" />
     <PackageVersion Include="Serilog" Version="3.1.1" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />

diff --git a/sample/Sample.Restful/Program.cs b/sample/Sample.Restful/Program.cs
@@ -14,9 +14,8 @@
 using Serilog;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-var builder = await WebApplication
-                   .CreateBuilder(args)
-                   .LaunchWith(RocketBooster.For(Imports.Instance), b => b.Set(AssemblyLoadContext.Default));
+var builder =  WebApplication
+                   .CreateBuilder(args);
 
 builder.Services.AddControllers().AddControllersAsServices();
 builder.Services.AddHostedService<CustomHostedService>();
@@ -33,7 +32,8 @@
             )
         );
 
-var app = builder.Build();
+var app = await builder
+         .LaunchWith(RocketBooster.For(Imports.Instance), b => b.Set(AssemblyLoadContext.Default));
 app.UseProblemDetails();
 app.UseHttpsRedirection();
 
@@ -174,4 +174,4 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
         var v = options.Value.A;
         return Task.CompletedTask;
     }
-}
+}
diff --git a/test/Extensions.Tests/Mapping/AutoMapperProfile.cs b/test/Extensions.Tests/Mapping/AutoMapperProfile.cs
@@ -252,7 +252,7 @@ public class AutoMapperConventionTests
     public async Task ShouldRegisterAutoMapperTypes()
     {
         var conventionBuilder = new ConventionContextBuilder(new Dictionary<object, object>())
-                               .WithConventionsFrom(Imports.Instance)
+                               .UseConventionFactory(Imports.Instance)
                                .Set(AssemblyLoadContext.Default);
         var context = await ConventionContext.FromAsync(conventionBuilder);
         var types = context
@@ -322,4 +322,4 @@ public void Process(Source source, Destination destination, ResolutionContext co
             throw new NotImplementedException();
         }
     }
-}
+}