Skip to content

Commit 45a46f3

Browse files
Copilotguhetier
andauthored
Consolidate .NET SDK versions to 10.0.x across all GitHub workflows (#5847)
## Description Eight workflows install 2+ .NET SDK versions (combinations of 6.0.x, 8.0.x, 9.0.x alongside 10.0.x). All secondary versions are unnecessary — .NET 10 SDK resolves older targeting packs via NuGet, self-contained publishes bundle the runtime, and tools like CLOG/docfx support roll-forward. **Workflow changes** — remove secondary `dotnet-version` entries, keeping only `10.0.x`: - `check-clog.yml`: drop 8.0.x (CLOG already sets `DOTNET_ROLL_FORWARD=Major`) - `publish-docfx.yml`: drop 8.x (global tools roll forward natively) - `check-dotnet.yml`, `dotnet-test.yml`, `plugins.yml`: drop 6.0.x (SDK builds net6.0/netcoreapp3.1/netstandard targets via NuGet targeting packs) - `package-linux.yml`, `package-alpine-linux.yml`, `validate-linux-packages-reuse.yml`: drop 9.0.x (self-contained publish includes runtime in output) - `plugins.yml`: add `DOTNET_ROLL_FORWARD: LatestMajor` to the Package step so the `plugintool` global tool (which targets net6.0) runs on the .NET 10 runtime instead of requiring .NET 6 to be installed. **Project change:** - `src/cs/tool/MsQuicTool.csproj`: `net6.0` → `net10.0`. This is an internal test tool (not published), and `dotnet run` requires a matching runtime. The library `msquic.csproj` multi-targeting (net6.0/netstandard2.0/netstandard2.1) is unchanged. ## Testing All existing CI workflows cover these changes — they exercise the exact build/run paths affected. No new tests needed. ## Documentation No documentation impact. <!-- START COPILOT CODING AGENT TIPS --> --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: guhetier <15261469+guhetier@users.noreply.github.com>
1 parent 161c5ba commit 45a46f3

File tree

9 files changed

+12
-26
lines changed

9 files changed

+12
-26
lines changed

.github/workflows/check-clog.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ jobs:
2222
- name: Setup .NET
2323
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
2424
with:
25-
dotnet-version: |
26-
10.0.x
27-
8.0.x
25+
dotnet-version: 10.0.x
2826
- name: Checkout repository
2927
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
3028
- name: Prepare Machine

.github/workflows/check-dotnet.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ jobs:
2222
- name: Setup .NET
2323
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
2424
with:
25-
dotnet-version: |
26-
10.0.x
27-
6.0.x
25+
dotnet-version: 10.0.x
2826
- name: Checkout repository
2927
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
3028
- name: Prepare Machine

.github/workflows/dotnet-test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ jobs:
101101
path: artifacts
102102
- uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
103103
with:
104-
dotnet-version: |
105-
10.0.x
106-
6.0.x
104+
dotnet-version: 10.0.x
107105
- name: Run Lang Interop
108106
shell: pwsh
109107
run: scripts/DotNetTest.ps1 -Config Debug -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -DomainName "google.com"

.github/workflows/package-alpine-linux.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ jobs:
7272
path: artifacts
7373
- name: Set up QEMU
7474
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130
75-
- name: Set up .NET 9.0
75+
- name: Set up .NET
7676
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
7777
with:
78-
dotnet-version: |
79-
10.0.x
80-
${{ matrix.vec.dotnetVersion }}
78+
dotnet-version: 10.0.x
8179
- name: Build .NET QUIC Test Project (self-contained)
8280
run: |
8381
# Map arch to musl runtime identifier

.github/workflows/package-linux.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,7 @@ jobs:
153153
- name: Set up .NET
154154
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
155155
with:
156-
dotnet-version: |
157-
10.0.x
158-
9.0.x
156+
dotnet-version: 10.0.x
159157
- name: Build .NET QUIC Test Projects (Self-Contained)
160158
run: |
161159
# Map arch to runtime identifier

.github/workflows/plugins.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ jobs:
5353
- name: Setup .NET
5454
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
5555
with:
56-
dotnet-version: |
57-
10.0.x
58-
6.0.x
56+
dotnet-version: 10.0.x
5957
- name: Install Dependencies
6058
run: dotnet tool install --global Microsoft.Performance.Toolkit.Plugins.Cli --version 0.1.25-preview
6159
- name: Build
@@ -66,6 +64,8 @@ jobs:
6664
path: artifacts/bin/quictrace/${{ matrix.configuration }}
6765
- name: Package
6866
shell: pwsh
67+
env:
68+
DOTNET_ROLL_FORWARD: LatestMajor
6969
run: |
7070
$sourceDir = "src\plugins\trace\dll\bin\${{ matrix.configuration }}\netstandard2.1"
7171
$manifestPath = "$sourceDir/pluginManifest.json"

.github/workflows/publish-docfx.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ jobs:
3333
- name: Dotnet Setup
3434
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
3535
with:
36-
dotnet-version: |
37-
10.0.x
38-
8.x
36+
dotnet-version: 10.0.x
3937

4038
- run: dotnet tool update -g docfx
4139
- run: chmod +x ./scripts/prepare-docfx.ps1

.github/workflows/validate-linux-packages-reuse.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ jobs:
8989
- name: Setup .NET
9090
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
9191
with:
92-
dotnet-version: |
93-
10.0.x
94-
9.0
92+
dotnet-version: 10.0.x
9593

9694
- name: Build QuicHello
9795
run: |

src/cs/tool/MsQuicTool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<OutputType>Exe</OutputType>
9-
<TargetFramework>net6.0</TargetFramework>
9+
<TargetFramework>net10.0</TargetFramework>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
</PropertyGroup>
1212

0 commit comments

Comments
 (0)