From 6d11aab23c65c11ec66d49965e7bf729ec9ee9c7 Mon Sep 17 00:00:00 2001 From: "internalautomation[bot]" <85681268+internalautomation[bot]@users.noreply.github.com> Date: Tue, 13 Jan 2026 11:35:05 -0500 Subject: [PATCH 1/3] Updates for .NET 10 --- .github/workflows/ci.yml | 5 ++--- .github/workflows/release.yml | 4 ++-- global.json | 2 +- .../ServiceControl.Contracts.Tests.csproj | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fc4f10..c48c6ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,13 +31,12 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5.0.1 with: - dotnet-version: | - 8.0.x + global-json-file: global.json - name: Build run: dotnet build src --configuration Release - name: Upload packages if: matrix.name == 'Windows' - uses: actions/upload-artifact@v5.0.0 + uses: actions/upload-artifact@v6.0.0 with: name: NuGet packages path: nugets/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07ab34f..9ea420b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5.0.1 with: - dotnet-version: 7.0.x + global-json-file: global.json - name: Build run: dotnet build src --configuration Release - name: Sign NuGet packages @@ -31,7 +31,7 @@ jobs: client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }} certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }} - name: Publish artifacts - uses: actions/upload-artifact@v5.0.0 + uses: actions/upload-artifact@v6.0.0 with: name: nugets path: nugets/* diff --git a/global.json b/global.json index 2134ed9..f72210c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", + "version": "10.0.100", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/ServiceControl.Contracts.Tests/ServiceControl.Contracts.Tests.csproj b/src/ServiceControl.Contracts.Tests/ServiceControl.Contracts.Tests.csproj index ce4c0c2..efa9a0a 100644 --- a/src/ServiceControl.Contracts.Tests/ServiceControl.Contracts.Tests.csproj +++ b/src/ServiceControl.Contracts.Tests/ServiceControl.Contracts.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 From 5d8c9053e2742ff66b26e7cbfbfcefd2e6b656c8 Mon Sep 17 00:00:00 2001 From: "internalautomation[bot]" <85681268+internalautomation[bot]@users.noreply.github.com> Date: Fri, 16 Jan 2026 14:41:21 -0500 Subject: [PATCH 2/3] Updates for .NET 10 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index f72210c..859752a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100", + "version": "10.0.0", "rollForward": "latestFeature" } } \ No newline at end of file From 1ef3bc28761859aa854d5d6c096f831b4c47eb3e Mon Sep 17 00:00:00 2001 From: "internalautomation[bot]" <85681268+internalautomation[bot]@users.noreply.github.com> Date: Tue, 20 Jan 2026 13:34:39 -0500 Subject: [PATCH 3/3] Updates for .NET 10 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c48c6ad..3cb052d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5.0.1 + uses: actions/setup-dotnet@v5.1.0 with: global-json-file: global.json - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ea420b..d87e41c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5.0.1 + uses: actions/setup-dotnet@v5.1.0 with: global-json-file: global.json - name: Build