From fb23c69bbeebc40e050acf0deb94dd73a39272ce Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (.NET)" Date: Fri, 10 Apr 2026 21:48:06 -0700 Subject: [PATCH 1/5] Use source-build-assets repo --- eng/Version.Details.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2108c207f..061d69eb8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,10 +2,10 @@ - - https://github.com/dotnet/source-build-reference-packages - 6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb - + + https://github.com/dotnet/source-build-assets + e726d9647b47c6635533d8eebfc2992749128d7e + @@ -26,4 +26,4 @@ - + \ No newline at end of file From 224a8124789f85e3e0231b62e2d444e143934f4e Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (.NET)" Date: Fri, 24 Apr 2026 16:32:31 -0700 Subject: [PATCH 2/5] Update ubuntu images --- eng/common/templates-official/job/source-build.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f983033bb0..4217d6d8b1 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -54,7 +54,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index c0ff472b69..c48f95d93d 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -54,11 +54,11 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} From 4129c17bb43bc089fb8f9bf6196b9dfa4aa48597 Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (.NET)" Date: Sat, 25 Apr 2026 09:37:57 -0700 Subject: [PATCH 3/5] Update arcade --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 061d69eb8a..9c8b73b1d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + db87887481d4110c09a1004191002482fdd7e4f2 diff --git a/global.json b/global.json index 4dc2a0f91c..bc9af5a8b6 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24321.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24359.3" } } From d5be00ac236e25351ed88b8be8e257ed44a16a60 Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (.NET)" Date: Mon, 27 Apr 2026 08:21:02 -0700 Subject: [PATCH 4/5] Update ubuntu images --- .vsts-ci-official.yml | 2 +- .vsts-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci-official.yml b/.vsts-ci-official.yml index 036fa36050..c3eb481834 100644 --- a/.vsts-ci-official.yml +++ b/.vsts-ci-official.yml @@ -118,7 +118,7 @@ extends: displayName: Ubuntu pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals 1es-ubuntu-2004 + demands: ImageOverride -equals 1es-ubuntu-2204 os: linux strategy: matrix: diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 26061cae6e..e3fb65652f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -80,7 +80,7 @@ stages: displayName: Ubuntu pool: name: NetCore-Svc-Public - demands: ImageOverride -equals 1es-ubuntu-2004-open + demands: ImageOverride -equals 1es-ubuntu-2204-open strategy: matrix: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: From 058be6a134599800f85f7c0b021752b2de8f57d8 Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (.NET)" Date: Mon, 27 Apr 2026 09:47:21 -0700 Subject: [PATCH 5/5] Update ubuntu deps list --- .vsts-ci-official.yml | 2 +- .vsts-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci-official.yml b/.vsts-ci-official.yml index c3eb481834..8138dfd864 100644 --- a/.vsts-ci-official.yml +++ b/.vsts-ci-official.yml @@ -137,7 +137,7 @@ extends: sudo apt-add-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-9 main" sudo apt-get update - bash: | - sudo apt-get install cmake clang-9 libicu66 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev + sudo apt-get install cmake clang-9 libicu70 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e3fb65652f..cc37837db5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -98,7 +98,7 @@ stages: sudo apt-add-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-9 main" sudo apt-get update - bash: | - sudo apt-get install cmake clang-9 libicu66 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev + sudo apt-get install cmake clang-9 libicu70 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine