Skip to content

Update project to support .NET 6.0 alongside .NET 8.0 and .NET 10 #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
torosent merged 3 commits into from
Nov 24, 2025
+36 −24
Merged

Update project to support .NET 6.0 alongside .NET 8.0 and .NET 10 #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53f3c96
Update project to support .NET 6.0 alongside .NET 8.0 and .NET 10, an…
torosent Nov 24, 2025
9f655e3
Update tests
torosent Nov 24, 2025
b3e660c
Refactor project files to target .NET 10.0 exclusively, removing supp…
torosent Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions eng/templates/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/Client/AzureManaged/Client.AzureManaged.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<PackageDescription>Azure Managed extensions for the Durable Task Framework client.</PackageDescription>
<EnableStyleCop>true</EnableStyleCop>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ScheduledTasks/ScheduledTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<PackageDescription>Durable Task Scheduled Tasks Client</PackageDescription>
<EnableStyleCop>true</EnableStyleCop>
<VersionSuffix>preview.1</VersionSuffix>
Expand Down
2 changes: 1 addition & 1 deletion src/Worker/AzureManaged/Worker.AzureManaged.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<PackageDescription>Azure Managed extensions for the Durable Task Framework worker.</PackageDescription>
<EnableStyleCop>true</EnableStyleCop>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Abstractions.Tests/Abstractions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage for .NET 6.0 and .NET 8.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Analyzers.Tests/Analyzers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage for .NET 6.0 and .NET 8.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Benchmarks/Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change removes multi-targeting from the benchmarks project, limiting benchmark comparisons to only .NET 10.0. This contradicts the PR's stated goal of adding .NET 6.0 support.

To align with the PR's goal and enable performance comparisons across all supported frameworks, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
<OutputType>Exe</OutputType>
<AssemblyName>Benchmarks</AssemblyName>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage. The source project src/Client/AzureManaged/Client.AzureManaged.csproj is being updated to target net6.0;net8.0;net10.0, but this test project now only targets .NET 10.0.

To align with the PR's goal and ensure comprehensive test coverage, this should be:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Client/Core.Tests/Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage for .NET 6.0 and .NET 8.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Client/Grpc.Tests/Client.Grpc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0;net48</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage. The original configuration tested against .NET 6.0, .NET 8.0, .NET 10.0, and .NET Framework 4.8, but now only targets .NET 10.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0;net48</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0;net48</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...t/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage for .NET 6.0 and .NET 8.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Generators.Tests/Generators.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage. The original configuration tested against both .NET 8.0 and .NET 10.0.

To align with the PR's goal and ensure comprehensive test coverage, this should be:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
16 changes: 11 additions & 5 deletions test/Generators.Tests/Utils/CSharpSourceGeneratorVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -16,11 +18,7 @@ public class Test : CSharpSourceGeneratorTest<TSourceGenerator, DefaultVerifier>
{
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;
Expand Down Expand Up @@ -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"));
}
}
}
2 changes: 1 addition & 1 deletion test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage for .NET 6.0 and .NET 8.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/InProcessTestHost.Tests/InProcessTestHost.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage. The source project src/InProcessTestHost/InProcessTestHost.csproj targets net6.0;net8.0;net10.0, but this test project now only targets .NET 10.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
2 changes: 1 addition & 1 deletion test/ScheduledTasks.Tests/ScheduledTasks.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage. The source project src/ScheduledTasks/ScheduledTasks.csproj is being updated to target net6.0;net8.0;net10.0, but this test project now only targets .NET 10.0.

To align with the PR's goal and ensure comprehensive test coverage, this should be:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage. The source project src/Client/AzureManaged/Client.AzureManaged.csproj is being updated to target net6.0;net8.0;net10.0, but this test project now only targets .NET 10.0.

To align with the PR's goal and ensure comprehensive test coverage, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/TestHelpers/TestHelpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0;netstandard2.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change removes multi-targeting support from the test helpers project, which will impact all tests that depend on it. The original configuration supported .NET 6.0, .NET 8.0, .NET 10.0, and .NET Standard 2.0.

To align with the PR's goal and maintain compatibility across all frameworks, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0;netstandard2.0</TargetFrameworks>

Removing multi-targeting from a shared test helper project will force all dependent test projects to use only .NET 10.0, reducing test coverage.

Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0;netstandard2.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal and removes test coverage. The source project src/Worker/AzureManaged/Worker.AzureManaged.csproj is being updated to target net6.0;net8.0;net10.0, but this test project now only targets .NET 10.0, removing test coverage for .NET 6.0 and .NET 8.0.

To align with the PR's goal and the source project's targets, this should be:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Worker/Core.Tests/Worker.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal. The PR description indicates adding .NET 6.0 support, but this change removes multi-targeting and only targets .NET 10.0, effectively removing test coverage for .NET 6.0 and .NET 8.0.

To align with the PR's goal, this should remain:

<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

This ensures the tests run against all supported frameworks.

Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net10.0;net48</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>

Copilot AI Nov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change contradicts the PR's stated goal. The PR description indicates adding .NET 6.0 support, but this change removes multi-targeting and only targets .NET 10.0, effectively removing support for .NET 8.0, .NET 6.0, and .NET Framework 4.8.

To align with the PR's goal, this should be:

<TargetFrameworks>net6.0;net8.0;net10.0;net48</TargetFrameworks>

This ensures the tests run against all supported frameworks, including the newly added .NET 6.0.

Suggested change
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0;net10.0;net48</TargetFrameworks>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

<ItemGroup>
Expand Down
Loading