Add .NET 8 and drop .NET 7 (#96)

SwissLife-OSS · Jul 10, 2024 · a60c5cd · a60c5cd
1 parent d3a353e
commit a60c5cd
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 34 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           dotnet-version: |
             6
-            7
+            8
       - name: Build, Test and Sonar
         uses: swisslife-oss/actions/pull-request@main
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           dotnet-version: |
             6
-            7
+            8
       - name: Restore tools
         run: dotnet tool restore
       - name: Build, Test and Sonar

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -26,12 +26,12 @@
     <PackageVersion  Include="System.Text.Json" Version="7.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
-    <PackageVersion  Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageVersion  Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-    <PackageVersion  Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageVersion  Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
+    <PackageVersion  Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageVersion  Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageVersion  Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion  Include="Microsoft.Extensions.Logging" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/samples/Context/DataAccess/DataAccess.csproj b/samples/Context/DataAccess/DataAccess.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>SimpleBlog.DataAccess</AssemblyName>
     <RootNamespace>SimpleBlog.DataAccess</RootNamespace>
     <IsPackable>false</IsPackable>

diff --git a/samples/Context/Domain/Domain.csproj b/samples/Context/Domain/Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>SimpleBlog.Domain</AssemblyName>
     <RootNamespace>SimpleBlog.Domain</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -17,4 +17,4 @@
     <ProjectReference Include="..\Models\Models.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/samples/Context/Host/Host.csproj b/samples/Context/Host/Host.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>fbbac7be-63d2-4849-8dc4-31492a2367a2</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>

diff --git a/samples/Context/Host/Startup.cs b/samples/Context/Host/Startup.cs
@@ -34,7 +34,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             }
 
             app.UseOpenApi();
-            app.UseSwaggerUi3();
+            app.UseSwaggerUi();
 
             app.UseHttpsRedirection();
 

diff --git a/samples/Context/Models/Models.csproj b/samples/Context/Models/Models.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>SimpleBlog.Models</AssemblyName>
     <RootNamespace>SimpleBlog.Models</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-</Project>
+</Project>
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-    <PackageVersion Include="NSwag.AspNetCore" Version="13.18.0" />
+    <PackageVersion Include="NSwag.AspNetCore" Version="14.0.8" />
     <PackageVersion Include="MongoDB.Extensions.Migration" Version="1.4.0" />
   </ItemGroup>
 

diff --git a/src/Context.Tests/Context.Tests.csproj b/src/Context.Tests/Context.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(CCTestProjectProps)" Condition="Exists('$(CCTestProjectProps)')" />
-  
-  <PropertyGroup>    
+
+  <PropertyGroup>
     <AssemblyName>MongoDB.Extensions.Context.Tests</AssemblyName>
     <RootNamespace>MongoDB.Extensions.Context.Tests</RootNamespace>
   </PropertyGroup>
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <Compile Remove="IsExternalInit.cs" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <Compile Remove="IsExternalInit.cs" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <Compile Remove="IsExternalInit.cs" Condition="'$(TargetFramework)' == 'net8.0'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Context.Tests/MongoCollectionBuilderTests.cs b/src/Context.Tests/MongoCollectionBuilderTests.cs
@@ -126,7 +126,7 @@ public void AddBsonClassMap_AddNewBsonClassMapSeveralTimes_BsonClassMapIsRegiste
         public void AddBsonClassMap_AddNewBsonClassMapWithoutParameter_BsonClassMapIsRegistered()
         {
             // Arrange
-            var mongoCollectionBuilder = 
+            var mongoCollectionBuilder =
                 new MongoCollectionBuilder<ItemWithoutSpecificClassMap>(_mongoDatabase);
 
             // Act
@@ -157,7 +157,7 @@ public void WithMongoCollectionSettings_ChangeCollectionSettings_MongoCollection
         {
             // Arrange
             var mongoCollectionBuilder = new MongoCollectionBuilder<Order>(_mongoDatabase);
-            
+
             // Act
             mongoCollectionBuilder.WithCollectionSettings(mongoCollectionSettings =>
             {
@@ -230,7 +230,7 @@ public void WithMongoCollectionConfiguration_ChangeCollectionConfiguration_Mongo
 
             IMongoCollection<Order> result = mongoCollectionBuilder.Build();
 
-            // 
+            //
             List<BsonDocument> indexes = result.Indexes.List().ToList();
             Assert.Equal("_id_", indexes.First().GetElement("name").Value.ToString());
             Assert.Equal("Name_1", indexes.Last().GetElement("name").Value.ToString(), ignoreCase: true);

diff --git a/src/Context/IMongoCollectionBuilder.cs b/src/Context/IMongoCollectionBuilder.cs
@@ -8,13 +8,13 @@ public interface IMongoCollectionBuilder<TDocument>
     {
         IMongoCollectionBuilder<TDocument> WithCollectionName(string collectionName);
 
-        IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>() 
+        IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>()
             where TMapDocument : class;
 
         IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>(
-            Action<BsonClassMap<TMapDocument>> bsonClassMapAction) 
+            Action<BsonClassMap<TMapDocument>> bsonClassMapAction)
             where TMapDocument : class;
-        
+
         IMongoCollectionBuilder<TDocument> WithCollectionSettings(
             Action<MongoCollectionSettings> collectionSettings);
 

diff --git a/src/Context/Internal/MongoCollectionBuilder.cs b/src/Context/Internal/MongoCollectionBuilder.cs
@@ -38,16 +38,16 @@ public IMongoCollectionBuilder<TDocument> WithCollectionName(string collectionNa
         public IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>(
             Action<BsonClassMap<TMapDocument>> bsonClassMapAction) where TMapDocument : class
         {
-            _classMapActions.Add(() => 
+            _classMapActions.Add(() =>
                 RegisterClassMapSync<TMapDocument>(bsonClassMapAction));
 
             return this;
         }
 
-        public IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>() 
+        public IMongoCollectionBuilder<TDocument> AddBsonClassMap<TMapDocument>()
             where TMapDocument : class
         {
-            _classMapActions.Add(() => 
+            _classMapActions.Add(() =>
                 RegisterClassMapSync<TMapDocument>());
 
             return this;
@@ -72,7 +72,7 @@ public IMongoCollectionBuilder<TDocument> WithCollectionConfiguration(
         internal IMongoCollection<TDocument> Build()
         {
             _classMapActions.ForEach(action => action());
-            
+
             IMongoCollection<TDocument> mongoCollection = GetMongoCollection();
 
             _collectionConfigurations.ForEach(configuration => configuration(mongoCollection));

diff --git a/src/Dependencies.props b/src/Dependencies.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Framework Versions">
-    <TestProjectTargetFrameworks>net6.0;net7.0</TestProjectTargetFrameworks>
-    <ResourceProjectTargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</ResourceProjectTargetFrameworks>
+    <TestProjectTargetFrameworks>net6.0;net8.0</TestProjectTargetFrameworks>
+    <ResourceProjectTargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</ResourceProjectTargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/Migration.Tests/Migration.Tests.csproj b/src/Migration.Tests/Migration.Tests.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <AssemblyName>Migration.Tests</AssemblyName>
     <RootNamespace>Migration.Tests</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Migration/Migration.csproj b/src/Migration/Migration.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>MongoDB.Extensions.Migration</AssemblyName>
     <RootNamespace>MongoDB.Extensions.Migration</RootNamespace>
     <PackageId>MongoDB.Extensions.Migration</PackageId>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ jobs: @@
             with:
               dotnet-version: |
           - name: Build, Test and Sonar
             uses: swisslife-oss/actions/pull-request@main
             with:
@@ Expand Down @@