chore: add net8.0 support

build/ci-build.yml

@@ -41,10 +41,16 @@ stages:
           - template: 'nuget/determine-pr-version.yml@templates'
             parameters:
               manualTriggerVersion: ${{ parameters['Package.Version.ManualTrigger'] }}
+          - task: UseDotNet@2
+            displayName: 'Import .NET SDK ($(DotNet.Sdk.VersionBC))'
+            inputs:
+              packageType: 'sdk'
+              version: '$(DotNet.Sdk.VersionBC)'
           - template: 'build/build-solution.yml@templates'
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               versionSuffix: '$(packageVersion)'
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
           - task: CopyFiles@2
             displayName: 'Copy build artifacts'
             inputs:
@@ -71,10 +77,16 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
+          - task: UseDotNet@2
+            displayName: 'Import .NET SDK ($(DotNet.Sdk.VersionBC))'
+            inputs:
+              packageType: 'sdk'
+              version: '$(DotNet.Sdk.VersionBC)'
           - template: test/run-unit-tests.yml@templates
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               projectName: '$(Project).Tests.Unit'
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
 
   - stage: IntegrationTests
     displayName: Integration Tests
@@ -91,11 +103,18 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
+          - task: UseDotNet@2
+            displayName: 'Import .NET SDK ($(DotNet.Sdk.VersionBC))'
+            inputs:
+              packageType: 'sdk'
+              version: '$(DotNet.Sdk.VersionBC)'
           - template: test/run-integration-tests.yml@templates
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               projectName: '$(Project).Tests.Integration'
               category: 'Integration'
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
+
 
   - stage: ReleaseToMyget
     displayName: 'Release to MyGet'

build/nuget-release.yml

@@ -29,10 +29,16 @@ stages:
         pool:
           vmImage: '$(Vm.Image)'
         steps:
+          - task: UseDotNet@2
+            displayName: 'Import .NET SDK ($(DotNet.Sdk.VersionBC))'
+            inputs:
+              packageType: 'sdk'
+              version: '$(DotNet.Sdk.VersionBC)'
           - template: build/build-solution.yml@templates
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               version: $(Build.BuildNumber)
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
           - task: CopyFiles@2
             displayName: 'Copy build artifacts'
             inputs:
@@ -59,10 +65,17 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
+          - task: UseDotNet@2
+            displayName: 'Import .NET SDK ($(DotNet.Sdk.VersionBC))'
+            inputs:
+              packageType: 'sdk'
+              version: '$(DotNet.Sdk.VersionBC)'
           - template: test/run-unit-tests.yml@templates
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               projectName: '$(Project).Tests.Unit'
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
+
 
   - stage: IntegrationTests
     displayName: Integration Tests
@@ -79,10 +92,16 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
+          - task: UseDotNet@2
+            displayName: 'Import .NET SDK ($(DotNet.Sdk.VersionBC))'
+            inputs:
+              packageType: 'sdk'
+              version: '$(DotNet.Sdk.VersionBC)'
           - template: test/run-integration-tests.yml@templates
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'
               projectName: '$(Project).Tests.Integration'
+              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
 
   - stage: Release
     displayName: 'Release to NuGet.org'

build/variables/build.yml

@@ -1,4 +1,7 @@
 variables:
-  DotNet.Sdk.Version: '6.0.100'
+  DotNet.Sdk.Version: '8.0.x'
+  # Backwards compatible .NET SDK version
+  DotNet.Sdk.VersionBC: '6.0.100'
+  DotNet.Sdk.IncludePreviewVersions: false
   Project: 'Arcus.Testing'
   Vm.Image: 'ubuntu-latest'

src/Arcus.Testing.Logging/Arcus.Testing.Logging.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <Description>Provides logging capabilities during Arcus testing</Description>
@@ -25,17 +25,16 @@
     <None Include="..\..\docs\static\img\icon.png" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Guard.Net" Version="2.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
-    <PackageReference Include="Guard.Net" Version="1.2.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Guard.Net" Version="3.0.0" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="xunit.abstractions" Version="2.0.1" />
   </ItemGroup>

src/Arcus.Testing.Messaging.Pumps.EventHubs/Arcus.Testing.Messaging.Pumps.EventHubs.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <Description>Provides messaging capabilities during Arcus testing</Description>
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Messaging.Pumps.EventHubs" Version="[1.3.0,2.0.0)" />
+    <PackageReference Include="Arcus.Messaging.Pumps.EventHubs" Version="[2.0.0,3.0.0)" />
   </ItemGroup>
 
 </Project>

src/Arcus.Testing.Messaging.Pumps.EventHubs/TestEventHubsMessagePump.cs

@@ -45,6 +45,11 @@ public TestEventHubsMessagePump(
             _logger = logger;
         }
 
+        /// <summary>
+        /// Gets the unique ID to identify this message pump.
+        /// </summary>
+        public string JobId { get; } = Guid.NewGuid().ToString();
+
         /// <summary>
         /// Triggered when the application host is ready to start the service.
         /// </summary>
@@ -58,7 +63,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             {
                 try
                 {
-                    var messageContext = AzureEventHubsMessageContext.CreateFrom(data, "arcus.testing.servicebus.windows.net", "$Default", "arcus.testing");
+                    var messageContext = AzureEventHubsMessageContext.CreateFrom(data, "arcus.testing.servicebus.windows.net", "$Default", "arcus.testing", JobId);
                     MessageCorrelationInfo correlationInfo = data.GetCorrelationInfo();
 
                     await _messageRouter.RouteMessageAsync(data, messageContext, correlationInfo, cancellationToken);

src/Arcus.Testing.Messaging.Pumps.ServiceBus/Arcus.Testing.Messaging.Pumps.ServiceBus.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <Description>Provides messaging capabilities during Arcus testing</Description>
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[1.3.0,2.0.0)" />
+    <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="[2.0.0,3.0.0)" />
   </ItemGroup>
 
 </Project>

src/Arcus.Testing.Messaging.Pumps.ServiceBus/TestServiceBusMessagePump.cs

@@ -8,7 +8,6 @@
 using Arcus.Messaging.Pumps.Abstractions;
 using Azure.Messaging.ServiceBus;
 using GuardNet;
-using Microsoft.Azure.ServiceBus;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 

src/Arcus.Testing.Security.Providers.InMemory/Arcus.Testing.Security.Providers.InMemory.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
     <Authors>Arcus</Authors>
     <Company>Arcus</Company>
     <Description>Provides security capabilities during Arcus testing</Description>
@@ -25,18 +25,17 @@
     <None Include="..\..\docs\static\img\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Guard.Net" Version="2.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
-    <PackageReference Include="Guard.Net" Version="1.2.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Security.Core" Version="[1.9.0,2.0.0)" />
+    <PackageReference Include="Guard.Net" Version="3.0.0" />
+    <PackageReference Include="Arcus.Security.Core" Version="[2.0.0,3.0.0)" />
   </ItemGroup>
 
 </Project>

src/Arcus.Testing.Tests.Integration/Arcus.Testing.Tests.Integration.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Guard.Net" Version="2.0.0" />
+    <PackageReference Include="Guard.Net" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />

src/Arcus.Testing.Tests.Unit/Arcus.Testing.Tests.Unit.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Arcus.Security.Core" Version="2.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="3.0.0" />
     <PackageReference Include="Bogus" Version="29.0.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />