diff --git a/eng/templates/build.yml b/eng/templates/build.yml index a94d3aff..4b6112e0 100644 --- a/eng/templates/build.yml +++ b/eng/templates/build.yml @@ -31,6 +31,12 @@ jobs: packageType: 'sdk' version: '6.x' + - task: UseDotNet@2 + displayName: 'Install .NET 8 SDK' + inputs: + packageType: 'sdk' + version: '8.x' + - task: UseDotNet@2 displayName: 'Install .NET SDK (Build)' # This is needed for the build. inputs: diff --git a/src/Client/AzureManaged/Client.AzureManaged.csproj b/src/Client/AzureManaged/Client.AzureManaged.csproj index 78fa3ad5..7dd459f3 100644 --- a/src/Client/AzureManaged/Client.AzureManaged.csproj +++ b/src/Client/AzureManaged/Client.AzureManaged.csproj @@ -1,7 +1,7 @@  - net8.0;net10.0 + net6.0;net8.0;net10.0 Azure Managed extensions for the Durable Task Framework client. true diff --git a/src/ScheduledTasks/ScheduledTasks.csproj b/src/ScheduledTasks/ScheduledTasks.csproj index 5971a560..3126851b 100644 --- a/src/ScheduledTasks/ScheduledTasks.csproj +++ b/src/ScheduledTasks/ScheduledTasks.csproj @@ -1,7 +1,7 @@  - net8.0;net10.0 + net6.0;net8.0;net10.0 Durable Task Scheduled Tasks Client true preview.1 diff --git a/src/Worker/AzureManaged/Worker.AzureManaged.csproj b/src/Worker/AzureManaged/Worker.AzureManaged.csproj index 0eea5a5d..e433b192 100644 --- a/src/Worker/AzureManaged/Worker.AzureManaged.csproj +++ b/src/Worker/AzureManaged/Worker.AzureManaged.csproj @@ -1,7 +1,7 @@  - net8.0;net10.0 + net6.0;net8.0;net10.0 Azure Managed extensions for the Durable Task Framework worker. true diff --git a/test/Abstractions.Tests/Abstractions.Tests.csproj b/test/Abstractions.Tests/Abstractions.Tests.csproj index 1e10da3c..9e3b1ad5 100644 --- a/test/Abstractions.Tests/Abstractions.Tests.csproj +++ b/test/Abstractions.Tests/Abstractions.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net10.0 + net10.0 diff --git a/test/Analyzers.Tests/Analyzers.Tests.csproj b/test/Analyzers.Tests/Analyzers.Tests.csproj index e93d9c6d..4a8c8c4b 100644 --- a/test/Analyzers.Tests/Analyzers.Tests.csproj +++ b/test/Analyzers.Tests/Analyzers.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net10.0 + net10.0 diff --git a/test/Benchmarks/Benchmarks.csproj b/test/Benchmarks/Benchmarks.csproj index b7657682..3101371c 100644 --- a/test/Benchmarks/Benchmarks.csproj +++ b/test/Benchmarks/Benchmarks.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net10.0 + net10.0 Exe Benchmarks diff --git a/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj b/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj index 77928b51..ba569a77 100644 --- a/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj +++ b/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net10.0 + net10.0 diff --git a/test/Client/Core.Tests/Client.Tests.csproj b/test/Client/Core.Tests/Client.Tests.csproj index a8790ba5..3b416c26 100644 --- a/test/Client/Core.Tests/Client.Tests.csproj +++ b/test/Client/Core.Tests/Client.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net10.0 + net10.0 diff --git a/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj b/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj index 41c0667a..04a4f27a 100644 --- a/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj +++ b/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net10.0;net48 + net10.0 diff --git a/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj b/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj index c0899d09..8909324f 100644 --- a/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj +++ b/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net10.0 + net10.0 diff --git a/test/Generators.Tests/Generators.Tests.csproj b/test/Generators.Tests/Generators.Tests.csproj index 55aba3ea..61797770 100644 --- a/test/Generators.Tests/Generators.Tests.csproj +++ b/test/Generators.Tests/Generators.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net10.0 + net10.0 diff --git a/test/Generators.Tests/Utils/CSharpSourceGeneratorVerifier.cs b/test/Generators.Tests/Utils/CSharpSourceGeneratorVerifier.cs index 331ebd14..2e2cf883 100644 --- a/test/Generators.Tests/Utils/CSharpSourceGeneratorVerifier.cs +++ b/test/Generators.Tests/Utils/CSharpSourceGeneratorVerifier.cs @@ -1,7 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. +using System; using System.Collections.Immutable; +using System.IO; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Testing; @@ -16,11 +18,7 @@ public class Test : CSharpSourceGeneratorTest { public Test() { - // See https://www.nuget.org/packages/Microsoft.NETCore.App.Ref/8.0.22 - this.ReferenceAssemblies = new ReferenceAssemblies( - targetFramework: "net8.0", - referenceAssemblyPackage: new PackageIdentity("Microsoft.NETCore.App.Ref", "8.0.22"), - referenceAssemblyPath: Path.Combine("ref", "net8.0")); + this.ReferenceAssemblies = CreateReferenceAssembliesForTargetFramework(); } public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.CSharp9; @@ -48,5 +46,13 @@ protected override ParseOptions CreateParseOptions() { return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(this.LanguageVersion); } + + static ReferenceAssemblies CreateReferenceAssembliesForTargetFramework() + { + return new ReferenceAssemblies( + targetFramework: "net10.0", + referenceAssemblyPackage: new PackageIdentity("Microsoft.NETCore.App.Ref", "10.0.0"), + referenceAssemblyPath: Path.Combine("ref", "net10.0")); + } } } diff --git a/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj b/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj index 08ec22e1..f891cc73 100644 --- a/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj +++ b/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net10.0 + net10.0 diff --git a/test/InProcessTestHost.Tests/InProcessTestHost.Tests.csproj b/test/InProcessTestHost.Tests/InProcessTestHost.Tests.csproj index e2dbbe5e..96aa12ab 100644 --- a/test/InProcessTestHost.Tests/InProcessTestHost.Tests.csproj +++ b/test/InProcessTestHost.Tests/InProcessTestHost.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net10.0 + net10.0 enable enable diff --git a/test/ScheduledTasks.Tests/ScheduledTasks.Tests.csproj b/test/ScheduledTasks.Tests/ScheduledTasks.Tests.csproj index 3f788c51..c7aba768 100644 --- a/test/ScheduledTasks.Tests/ScheduledTasks.Tests.csproj +++ b/test/ScheduledTasks.Tests/ScheduledTasks.Tests.csproj @@ -2,7 +2,7 @@ - net8.0;net10.0 + net10.0 enable enable false diff --git a/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj b/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj index efd29a70..4599449b 100644 --- a/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj +++ b/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net10.0 + net10.0 diff --git a/test/TestHelpers/TestHelpers.csproj b/test/TestHelpers/TestHelpers.csproj index f522d518..f2a65e9d 100644 --- a/test/TestHelpers/TestHelpers.csproj +++ b/test/TestHelpers/TestHelpers.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net10.0;netstandard2.0 + net10.0 diff --git a/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj b/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj index fc933611..9aab6f15 100644 --- a/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj +++ b/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net10.0 + net10.0 diff --git a/test/Worker/Core.Tests/Worker.Tests.csproj b/test/Worker/Core.Tests/Worker.Tests.csproj index b0fcd6bc..59263571 100644 --- a/test/Worker/Core.Tests/Worker.Tests.csproj +++ b/test/Worker/Core.Tests/Worker.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net10.0 + net10.0 diff --git a/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj b/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj index 32d83f45..f17df96b 100644 --- a/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj +++ b/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net10.0;net48 + net10.0