Removed <PackageReference Include="Microsoft.AspNetCore.Http.Abstract…

…ions" Version="2.2.0" /> and therefor also applicationBuilder.UseOrganizationContext().
RegionOrebroLan · Nov 29, 2024 · f535ee2 · f535ee2
1 parent a1d7bcb
commit f535ee2
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 145 deletions.
diff --git a/.samples/.NET 6.0/Program.cs b/.samples/.NET 6.0/Program.cs
@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using RegionOrebroLan.Organization.Data.Builder.Extensions;
+using RegionOrebroLan.Organization.Data;
 using RegionOrebroLan.Organization.Data.DependencyInjection.Extensions;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -9,7 +9,11 @@
 
 var app = builder.Build();
 
-app.UseOrganizationContext();
+using(var scope = app.Services.CreateScope())
+{
+	scope.ServiceProvider.GetRequiredService<OrganizationContext>().Database.Migrate();
+}
+
 app.UseRouting();
 app.MapRazorPages();
 

diff --git a/.samples/.NET 8.0/Program.cs b/.samples/.NET 8.0/Program.cs
@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using RegionOrebroLan.Organization.Data.Builder.Extensions;
+using RegionOrebroLan.Organization.Data;
 using RegionOrebroLan.Organization.Data.DependencyInjection.Extensions;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -9,7 +9,11 @@
 
 var app = builder.Build();
 
-app.UseOrganizationContext();
+using(var scope = app.Services.CreateScope())
+{
+	scope.ServiceProvider.GetRequiredService<OrganizationContext>().Database.Migrate();
+}
+
 app.UseRouting();
 app.MapRazorPages();
 

diff --git a/.samples/.NET Core 3.1/Startup.cs b/.samples/.NET Core 3.1/Startup.cs
@@ -3,7 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using RegionOrebroLan.Organization.Data.Builder.Extensions;
+using RegionOrebroLan.Organization.Data;
 using RegionOrebroLan.Organization.Data.DependencyInjection.Extensions;
 
 namespace Application
@@ -24,7 +24,12 @@ public virtual void Configure(IApplicationBuilder app)
 				throw new ArgumentNullException(nameof(app));
 
 			app.UseDeveloperExceptionPage();
-			app.UseOrganizationContext();
+
+			using(var scope = app.ApplicationServices.CreateScope())
+			{
+				scope.ServiceProvider.GetRequiredService<OrganizationContext>().Database.Migrate();
+			}
+
 			app.UseRouting();
 			app.UseEndpoints(endpoints => { endpoints.MapRazorPages(); });
 		}

diff --git a/Source/Project/Builder/Extensions/ApplicationBuilderExtension.cs b/Source/Project/Builder/Extensions/ApplicationBuilderExtension.cs
diff --git a/Source/Project/Project.csproj b/Source/Project/Project.csproj
@@ -16,7 +16,6 @@
 		<VersionSuffix></VersionSuffix>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(PackageReferenceVersion)" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(PackageReferenceVersion)" />

diff --git a/Tests/Integration-tests/Builder/Extensions/ApplicationBuilderExtensionTest.cs b/Tests/Integration-tests/Builder/Extensions/ApplicationBuilderExtensionTest.cs
diff --git a/Tests/Integration-tests/OrganizationContextFactoryTest.cs b/Tests/Integration-tests/OrganizationContextFactoryTest.cs
@@ -8,7 +8,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using RegionOrebroLan.Organization.Data;
-using RegionOrebroLan.Organization.Data.Builder.Extensions;
 using RegionOrebroLan.Organization.Data.DependencyInjection.Extensions;
 
 namespace IntegrationTests
@@ -78,7 +77,11 @@ protected internal virtual async Task Create_Test(bool createTwice, IServiceColl
 			using(var serviceProvider = services.BuildServiceProvider())
 			{
 				var applicationBuilder = new ApplicationBuilder(serviceProvider);
-				applicationBuilder.UseOrganizationContext();
+
+				using(var scope = applicationBuilder.ApplicationServices.CreateScope())
+				{
+					await scope.ServiceProvider.GetRequiredService<OrganizationContext>().Database.MigrateAsync();
+				}
 
 				try
 				{