Add net7.0 targeting to test projects - release 7.8 branch (#6607)

* Add net7.0 targeting to test projects * Fix API approval test * .Net7 only Co-authored-by: Jo Palac <jpalac@users.noreply.github.com>
Particular · Dec 11, 2022 · 6b4d318 · 6b4d318
1 parent 8422d38
commit 6b4d318
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,6 +29,7 @@ jobs:
         uses: actions/setup-dotnet@v2.1.0
         with:
           dotnet-version: |
+            7.0.x
             6.0.x
             3.1.x
       - name: Build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v2.1.0
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x            
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages
@@ -36,4 +36,4 @@ jobs:
       - name: Deploy
         uses: Particular/push-octopus-package-action@v1.0.0
         with:
-          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
+          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
diff --git a/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj b/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/NServiceBus.AcceptanceTests/Sagas/When_handling_concurrent_messages.cs b/src/NServiceBus.AcceptanceTests/Sagas/When_handling_concurrent_messages.cs
@@ -86,10 +86,10 @@ public async Task Handle(StartMsg message, IMessageHandlerContext context)
 
                 public Task Handle(ContinueMsg message, IMessageHandlerContext context)
                 {
-                    this.Data.ContinueCount++;
-                    this.Data.CollectedIndexes += message.Index.ToString();
+                    Data.ContinueCount++;
+                    Data.CollectedIndexes += message.Index.ToString();
 
-                    if (this.Data.ContinueCount == 3)
+                    if (Data.ContinueCount == 3)
                     {
                         return context.SendLocal(new FinishMsg { OrderId = message.OrderId });
                     }
@@ -99,8 +99,8 @@ public Task Handle(ContinueMsg message, IMessageHandlerContext context)
 
                 public Task Handle(FinishMsg message, IMessageHandlerContext context)
                 {
-                    this.MarkAsComplete();
-                    testContext.SagaData = this.Data;
+                    MarkAsComplete();
+                    testContext.SagaData = Data;
                     return Task.FromResult(0);
                 }
 

diff --git a/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj b/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/src/NServiceBus.Core.Analyzer.Tests.Roslyn3/NServiceBus.Core.Analyzer.Tests.Roslyn3.csproj b/src/NServiceBus.Core.Analyzer.Tests.Roslyn3/NServiceBus.Core.Analyzer.Tests.Roslyn3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
     <DefineConstants>$(DefineConstants);ROSLYN3</DefineConstants>
   </PropertyGroup>

diff --git a/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj b/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
     <DefineConstants>$(DefineConstants);ROSLYN4</DefineConstants>
   </PropertyGroup>

diff --git a/...viceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.netstandard.approved.txt b/...viceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.netstandard.approved.txt
@@ -4,7 +4,7 @@
 [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute(@"NServiceBus.Hosting.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute(@"NServiceBus.InMemory.PersistenceTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
-[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.0", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.0", FrameworkDisplayName=".NET Standard 2.0")]
 namespace NServiceBus
 {
     public enum AddressMode

diff --git a/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/src/NServiceBus.Core/Persistence/InMemory/Gateway/InMemoryGatewayDeduplication.cs b/src/NServiceBus.Core/Persistence/InMemory/Gateway/InMemoryGatewayDeduplication.cs
@@ -22,10 +22,7 @@ public Task<bool> DeduplicateMessage(string clientId, DateTime timeReceived, Con
 
             // The design of the v1 gateway seam will only allow deduplicating scope commits.
             // This is fine since the gateway will always wrap the call in a transaction scope so this should always be true
-            if (Transaction.Current != null)
-            {
-                Transaction.Current.EnlistVolatile(new EnlistmentNotification(clientIdStorage, clientId), EnlistmentOptions.None);
-            }
+            Transaction.Current?.EnlistVolatile(new EnlistmentNotification(clientIdStorage, clientId), EnlistmentOptions.None);
 
             return TaskEx.TrueTask;
         }

diff --git a/src/NServiceBus.InMemory.PersistenceTests/NServiceBus.InMemory.PersistenceTests.csproj b/src/NServiceBus.InMemory.PersistenceTests/NServiceBus.InMemory.PersistenceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/...sistence.InMemory.AcceptanceTests/NServiceBus.Persistence.InMemory.AcceptanceTests.csproj b/...sistence.InMemory.AcceptanceTests/NServiceBus.Persistence.InMemory.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj b/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>