Update to dotnet7 and update of mongo driver library. (#68)

SwissLife-OSS · Nov 30, 2022 · d2c7b75 · d2c7b75
1 parent fa74173
commit d2c7b75
Show file tree

Hide file tree

Showing 19 changed files with 105 additions and 36 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/samples/Context/DataAccess/DataAccess.csproj b/samples/Context/DataAccess/DataAccess.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>SimpleBlog.DataAccess</AssemblyName>
     <RootNamespace>SimpleBlog.DataAccess</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Context/Domain/Domain.csproj b/samples/Context/Domain/Domain.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>SimpleBlog.Domain</AssemblyName>
     <RootNamespace>SimpleBlog.Domain</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>fbbac7be-63d2-4849-8dc4-31492a2367a2</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
-    <PackageReference Include="NSwag.AspNetCore" Version="13.15.3" />
-    <PackageReference Include="Squadron.Mongo" Version="0.13.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
+    <PackageReference Include="NSwag.AspNetCore" Version="13.18.0" />
+    <PackageReference Include="Squadron.Mongo" Version="0.17.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Context/Models/Models.csproj b/samples/Context/Models/Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>SimpleBlog.Models</AssemblyName>
     <RootNamespace>SimpleBlog.Models</RootNamespace>
     <IsPackable>false</IsPackable>

diff --git a/samples/Migration/Migration.csproj b/samples/Migration/Migration.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.15.1" />
-    <PackageReference Include="MongoDB.Extensions.Migration" Version="1.3.0-preview1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
+    <PackageReference Include="MongoDB.Extensions.Migration" Version="1.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Context.Tests/Context.Tests.csproj b/src/Context.Tests/Context.Tests.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <Compile Remove="IsExternalInit.cs" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <Compile Remove="IsExternalInit.cs" Condition="'$(TargetFramework)' == 'net7.0'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Context/Context.csproj b/src/Context/Context.csproj
@@ -8,10 +8,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
-    <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.1.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
+    <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.3.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />

diff --git a/src/Dependencies.props b/src/Dependencies.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Framework Versions">
-    <TestProjectTargetFrameworks>netcoreapp3.1;net5.0;net6.0</TestProjectTargetFrameworks>
-    <ResourceProjectTargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</ResourceProjectTargetFrameworks>
+    <TestProjectTargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TestProjectTargetFrameworks>
+    <ResourceProjectTargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.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</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Migration/Migration.csproj b/src/Migration/Migration.csproj
@@ -5,13 +5,13 @@
     <AssemblyName>MongoDB.Extensions.Migration</AssemblyName>
     <RootNamespace>MongoDB.Extensions.Migration</RootNamespace>
     <PackageId>MongoDB.Extensions.Migration</PackageId>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.15.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
   </ItemGroup>
 
 </Project>
diff --git a/..._/FilterDefinitionExtensionsTests.ToDefinitionString_DefinitionStringNoIdent_Success.snap b/..._/FilterDefinitionExtensionsTests.ToDefinitionString_DefinitionStringNoIdent_Success.snap
@@ -0,0 +1 @@
+{ "$set" : { "Name" : "Spain" } }
diff --git a/...FilterDefinitionExtensionsTests.ToDefinitionString_DefinitionStringWithIdent_Success.snap b/...FilterDefinitionExtensionsTests.ToDefinitionString_DefinitionStringWithIdent_Success.snap
@@ -0,0 +1,5 @@
+{
+  "$set" : {
+    "_id" : CSUUID("44752191-e10b-435a-a0e9-62e7f13d41cd")
+  }
+}
diff --git a/src/Prime.Extensions/Prime.Extensions.csproj b/src/Prime.Extensions/Prime.Extensions.csproj
@@ -8,8 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
-    <PackageReference Include="System.Text.Json" Version="6.0.6" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">

diff --git a/src/Session.Tests/MongoServerExtensionsTests.cs b/src/Session.Tests/MongoServerExtensionsTests.cs
@@ -8,13 +8,14 @@
 using Snapshooter.Xunit;
 using Squadron;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace MongoDB.Extensions.Session.Tests
 {
     public class MongoServerExtensionsTests : IClassFixture<MongoResource>
     {
         private readonly IMongoClient _mongoClient;
-
+        
         public MongoServerExtensionsTests(MongoResource mongoResource)
         {
             _mongoClient = mongoResource.Client;
@@ -39,6 +40,8 @@ public async Task GiveSession_WhenRefresh_ThanLastUseIsUpdated()
         {
             // Arrange
             IClientSessionHandle session = await _mongoClient.StartSessionAsync();
+            Guid sessionId = session.GetSessionId();
+
             List<ServerSession> serverSessionsFirst = await GetServerSessions();
 
             // Act
@@ -48,17 +51,19 @@ public async Task GiveSession_WhenRefresh_ThanLastUseIsUpdated()
 
             // Assert
             ServerSession sessionFirstUse = serverSessionsFirst
-                .First(s => s.Id == session.GetSessionId());
+                .First(s => s.Id == sessionId);
             ServerSession sessionSecondUse = serverSessionsSecond
-                .First(s => s.Id == session.GetSessionId());
+                .First(s => s.Id == sessionId);
             Assert.True(sessionSecondUse.LastUse > sessionFirstUse.LastUse);
         }
 
         [Fact]
         public async Task GiveSession_WhenNoRefresh_ThanLastUseIsSame()
-        {
+         {
             // Arrange
             IClientSessionHandle session = await _mongoClient.StartSessionAsync();
+            Guid sessionId = session.GetSessionId();
+
             List<ServerSession> serverSessionsFirst = await GetServerSessions();
 
             // Act
@@ -67,18 +72,19 @@ public async Task GiveSession_WhenNoRefresh_ThanLastUseIsSame()
 
             // Assert
             ServerSession sessionFirstUse = serverSessionsFirst
-                .First(s => s.Id == session.GetSessionId());
+                .First(s => s.Id == sessionId);
             ServerSession sessionSecondUse = serverSessionsSecond
-                .First(s => s.Id == session.GetSessionId());
-            Assert.True(sessionSecondUse.LastUse == sessionFirstUse.LastUse);
+                .First(s => s.Id == sessionId);
+
+            Assert.Equal(sessionSecondUse.LastUse, sessionFirstUse.LastUse);
         }
 
-        private Task<List<ServerSession>> GetServerSessions()
+        private async Task<List<ServerSession>> GetServerSessions()
         {
             var pipeline = PipelineDefinition<NoPipelineInput, ServerSession>
                 .Create("{ $listLocalSessions: { allUsers: true } }");
 
-            return _mongoClient
+            return await _mongoClient                
                 .GetDatabase("config")
                 .WithReadConcern(ReadConcern.Local)
                 .Aggregate(pipeline)

diff --git a/src/Session/Session.csproj b/src/Session/Session.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TestProject.props b/src/TestProject.props
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestProjectTargetFrameworks)</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/src/Transactions/MongoTransactionDatabase.cs b/src/Transactions/MongoTransactionDatabase.cs
@@ -213,6 +213,51 @@ public MongoTransactionDatabase(IMongoDatabase database)
                 .CreateViewAsync(session, viewName, viewOn, pipeline, options, cancellationToken);
         }
 
+        public void DropCollection(
+            string name,
+            DropCollectionOptions options,
+            CancellationToken cancellationToken = default)
+        {
+            if (TryGetSession(out IClientSessionHandle? session))
+            {
+                _database.DropCollection(session, name, options, cancellationToken);
+                return;
+            }
+
+            _database.DropCollection(name, options, cancellationToken);
+        }
+
+        public void DropCollection(
+            IClientSessionHandle session,
+            string name,
+            DropCollectionOptions options,
+            CancellationToken cancellationToken = default)
+        {
+            _database.DropCollectionAsync(session, name, options, cancellationToken);
+        }
+
+        public Task DropCollectionAsync(
+            string name,
+            DropCollectionOptions options,
+            CancellationToken cancellationToken = default)
+        {
+            if (TryGetSession(out IClientSessionHandle? session))
+            {
+                return _database.DropCollectionAsync(session, name, options, cancellationToken);
+            }
+
+            return _database.DropCollectionAsync(name, options, cancellationToken);
+        }
+
+        public Task DropCollectionAsync(
+            IClientSessionHandle session,
+            string name,
+            DropCollectionOptions options,
+            CancellationToken cancellationToken = default)
+        {
+            return _database.DropCollectionAsync(session, name, options, cancellationToken);
+        }
+
         public void DropCollection(string name, CancellationToken cancellationToken = default)
         {
             if (TryGetSession(out IClientSessionHandle? session))

diff --git a/src/Transactions/Transactions.csproj b/src/Transactions/Transactions.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
   </ItemGroup>
 
 </Project>