Remove netcoreapp3.1, Core beta 2 (#335)

* net6.0 * Core beta2, package versions * Workflow file
Particular · May 16, 2022 · 49a94be · 49a94be
1 parent f639ba3
commit 49a94be
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,10 +31,6 @@ jobs:
         uses: actions/setup-dotnet@v2.1.0
         with:
           dotnet-version: 6.0.x
-      - name: Setup .NET Core 3.1 runtime
-        uses: actions/setup-dotnet@v2.1.0
-        with:
-          dotnet-version: 3.1.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages

diff --git a/src/NServiceBus.Callback.Testing.Tests/NServiceBus.Callback.Testing.Tests.csproj b/src/NServiceBus.Callback.Testing.Tests/NServiceBus.Callback.Testing.Tests.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,10 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.3.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="1.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="NServiceBus" Version="8.0.0-beta.1" />
-    <PackageReference Include="NServiceBus.Testing" Version="8.0.0-beta.1" />
+    <PackageReference Include="NServiceBus" Version="8.0.0-beta.2" />
+    <PackageReference Include="NServiceBus.Testing" Version="8.0.0-beta.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="Particular.Approvals" Version="0.3.0" />

diff --git a/src/NServiceBus.Callbacks.AcceptanceTests/.editorconfig b/src/NServiceBus.Callbacks.AcceptanceTests/.editorconfig
@@ -8,3 +8,6 @@ dotnet_diagnostic.PS0018.severity = suggestion
 
 # Justification: Tests don't support cancellation and don't need to forward IMessageHandlerContext.CancellationToken
 dotnet_diagnostic.NSB0002.severity = suggestion
+
+# Tests don't support cancellation
+dotnet_diagnostic.PS0013.severity = suggestion
diff --git a/src/NServiceBus.Callbacks.AcceptanceTests/DefaultServer.cs b/src/NServiceBus.Callbacks.AcceptanceTests/DefaultServer.cs
@@ -19,7 +19,7 @@ public DefaultServer(List<Type> typesToInclude)
             this.typesToInclude = typesToInclude;
         }
 
-        public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Action<EndpointConfiguration> configurationBuilderCustomization)
+        public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func<EndpointConfiguration, Task> configurationBuilderCustomization)
         {
             var types = endpointConfiguration.GetTypesScopedByTestClass();
 
@@ -42,9 +42,9 @@ public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor,
 
             configuration.RegisterComponentsAndInheritanceHierarchy(runDescriptor);
 
-            configurationBuilderCustomization(configuration);
+            await configurationBuilderCustomization(configuration);
 
-            return Task.FromResult(configuration);
+            return configuration;
         }
 
         List<Type> typesToInclude;

diff --git a/src/NServiceBus.Callbacks.AcceptanceTests/NServiceBus.Callbacks.AcceptanceTests.csproj b/src/NServiceBus.Callbacks.AcceptanceTests/NServiceBus.Callbacks.AcceptanceTests.csproj
@@ -1,18 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.Callbacks\NServiceBus.Callbacks.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.3.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="1.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.0.0-beta.1" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.0.0-beta.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>

diff --git a/src/NServiceBus.Callbacks.Testing/NServiceBus.Callbacks.Testing.csproj b/src/NServiceBus.Callbacks.Testing/NServiceBus.Callbacks.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Testing" Version="[8.0.0-beta.1, 9.0.0)" />
+    <PackageReference Include="NServiceBus.Testing" Version="[8.0.0-beta.3, 9.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="2.1.0" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/NServiceBus.Callbacks.Tests/NServiceBus.Callbacks.Tests.csproj b/src/NServiceBus.Callbacks.Tests/NServiceBus.Callbacks.Tests.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.3.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="1.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="NServiceBus" Version="8.0.0-beta.1" />
+    <PackageReference Include="NServiceBus" Version="8.0.0-beta.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="Particular.Approvals" Version="0.3.0" />

diff --git a/src/NServiceBus.Callbacks/IncomingContextExtensions.cs b/src/NServiceBus.Callbacks/IncomingContextExtensions.cs
@@ -34,7 +34,9 @@ static class IncomingContextExtensions
                 return null;
             }
 
+#pragma warning disable IDE0004 // Remove Unnecessary Cast - Requires C# 9 or above
             return lookup.TryRemove(correlationId, out RequestResponseStateLookup.State state) ? (RequestResponseStateLookup.State?)state : null;
+#pragma warning restore IDE0004 // Remove Unnecessary Cast
         }
 
         static string GetCorrelationId(this IMessageProcessingContext context)

diff --git a/src/NServiceBus.Callbacks/NServiceBus.Callbacks.csproj b/src/NServiceBus.Callbacks/NServiceBus.Callbacks.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
     <Description>NServiceBus Callbacks</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="[8.0.0-beta.1, 9.0.0)" />
+    <PackageReference Include="NServiceBus" Version="[8.0.0-beta.2, 9.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="2.1.0" PrivateAssets="All" />
   </ItemGroup>