From 0cebc4ca98c43e23e22d301f242c31117c5ff0d2 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 21 Jan 2026 12:33:22 -0800 Subject: [PATCH 01/21] Update SDK --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 0f75e8a6f..fa8b53441 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.405", + "version": "8.0.413", "rollForward": "major" } } From 81bd2fef0842a21ca23f2e229e93bb657de828a6 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 23 Jan 2026 12:23:58 -0800 Subject: [PATCH 02/21] Try this --- azure-pipelines-public.yml | 39 ++++++++++++++++++++++++++------- azure-pipelines.yml | 3 +++ eng/templates/default-build.yml | 4 ---- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml index 7089d6acb..a1bb9c379 100644 --- a/azure-pipelines-public.yml +++ b/azure-pipelines-public.yml @@ -23,11 +23,34 @@ variables: trigger: [main] pr: ['*'] -stages: -- stage: build - displayName: Build - jobs: - - template: /eng/templates/default-build.yml - parameters: - ReleaseBuildTarget: ${{ parameters.ReleaseBuildTarget }} - OtherBuildTarget: ${{ parameters.OtherBuildTarget }} +resources: + repositories: + # Repo: 1ESPipelineTemplates/1ESPipelineTemplates + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + sdl: + policheck: + enabled: true + tsa: + enabled: true + prefast: + msBuildVersion: '17.8.3' + enabled: true + pool: + name: NetCore-Svc-Public + image: windows.vs2019.amd64.open + os: windows + stages: + - stage: build + displayName: Build + jobs: + - template: /eng/templates/default-build.yml@self + parameters: + ReleaseBuildTarget: ${{ parameters.ReleaseBuildTarget }} + OtherBuildTarget: ${{ parameters.OtherBuildTarget }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6f110512d..0a6b95e22 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,6 +39,9 @@ extends: enabled: true tsa: enabled: true + prefast: + msBuildVersion: '17.8.3' + enabled: true pool: name: NetCore1ESPool-Svc-Internal image: 1es-windows-2019 diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 7000a4dad..0caf9f06a 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -5,10 +5,6 @@ parameters: jobs: - job: build displayName: Build - ${{ if eq(variables['System.TeamProject'], 'public') }}: - pool: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open timeoutInMinutes: 30 strategy: From bf03f28e0574fcef3cacfc8ed92e6096f9f1ac8a Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 23 Jan 2026 16:04:01 -0800 Subject: [PATCH 03/21] Revert "Try this" This reverts commit 81bd2fef0842a21ca23f2e229e93bb657de828a6. --- azure-pipelines-public.yml | 39 +++++++-------------------------- azure-pipelines.yml | 3 --- eng/templates/default-build.yml | 4 ++++ 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml index a1bb9c379..7089d6acb 100644 --- a/azure-pipelines-public.yml +++ b/azure-pipelines-public.yml @@ -23,34 +23,11 @@ variables: trigger: [main] pr: ['*'] -resources: - repositories: - # Repo: 1ESPipelineTemplates/1ESPipelineTemplates - - repository: 1esPipelines - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release - -extends: - template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines - parameters: - sdl: - policheck: - enabled: true - tsa: - enabled: true - prefast: - msBuildVersion: '17.8.3' - enabled: true - pool: - name: NetCore-Svc-Public - image: windows.vs2019.amd64.open - os: windows - stages: - - stage: build - displayName: Build - jobs: - - template: /eng/templates/default-build.yml@self - parameters: - ReleaseBuildTarget: ${{ parameters.ReleaseBuildTarget }} - OtherBuildTarget: ${{ parameters.OtherBuildTarget }} +stages: +- stage: build + displayName: Build + jobs: + - template: /eng/templates/default-build.yml + parameters: + ReleaseBuildTarget: ${{ parameters.ReleaseBuildTarget }} + OtherBuildTarget: ${{ parameters.OtherBuildTarget }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0a6b95e22..6f110512d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,9 +39,6 @@ extends: enabled: true tsa: enabled: true - prefast: - msBuildVersion: '17.8.3' - enabled: true pool: name: NetCore1ESPool-Svc-Internal image: 1es-windows-2019 diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 0caf9f06a..7000a4dad 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -5,6 +5,10 @@ parameters: jobs: - job: build displayName: Build + ${{ if eq(variables['System.TeamProject'], 'public') }}: + pool: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open timeoutInMinutes: 30 strategy: From c8b7208e6a55f2bc05f5dbe3c64ceabdc9d34726 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 23 Jan 2026 16:04:37 -0800 Subject: [PATCH 04/21] What if this works --- eng/templates/default-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 7000a4dad..808480be5 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -8,7 +8,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: ImageOverride -equals 1es-windows-2019 timeoutInMinutes: 30 strategy: From fc0049cfd044aaf1a77c00f97dec06fd31b4bacb Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 23 Jan 2026 16:08:20 -0800 Subject: [PATCH 05/21] Ok --- eng/templates/default-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 808480be5..31843650f 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -7,7 +7,7 @@ jobs: displayName: Build ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: - name: NetCore-Svc-Public + name: NetCore-Public demands: ImageOverride -equals 1es-windows-2019 timeoutInMinutes: 30 From e7573bd10228dd2e980f6bb8819ad503e2a9dcd5 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 23 Jan 2026 16:09:38 -0800 Subject: [PATCH 06/21] Whoops --- eng/templates/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 31843650f..910f0cb4e 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -7,8 +7,8 @@ jobs: displayName: Build ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: - name: NetCore-Public - demands: ImageOverride -equals 1es-windows-2019 + name: NetCore-Svc-Public + demands: ImageOverride -equals 1es-windows-2019-open timeoutInMinutes: 30 strategy: From 3e7500a74bcea8a65116adbaac80db192c8e4f4b Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 23 Jan 2026 16:16:44 -0800 Subject: [PATCH 07/21] 22 --- eng/templates/default-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 910f0cb4e..fc85cafc5 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -8,7 +8,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: NetCore-Svc-Public - demands: ImageOverride -equals 1es-windows-2019-open + demands: ImageOverride -equals 1es-windows-2022-open timeoutInMinutes: 30 strategy: From 41adea17333c0b197b90733176171eed47e48956 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 17 Feb 2026 10:28:50 -0800 Subject: [PATCH 08/21] Update build agent demands for public project --- eng/templates/default-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index fc85cafc5..7000a4dad 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -8,7 +8,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: NetCore-Svc-Public - demands: ImageOverride -equals 1es-windows-2022-open + demands: ImageOverride -equals windows.vs2019.amd64.open timeoutInMinutes: 30 strategy: From 827e123a4226c24443038e24845aa73839a883b5 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Mar 2026 13:06:59 -0700 Subject: [PATCH 09/21] Update build demands in default-build.yml --- eng/templates/default-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 7000a4dad..b76d242c3 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -8,7 +8,9 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: + - ImageOverride -equals windows.vs2019.amd64.open + - ImageVersionOverride -equals 2026.0304.014948 timeoutInMinutes: 30 strategy: From 0c3efa6d2556a312cb7523e4919d706ecf96ebc5 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Mar 2026 13:08:18 -0700 Subject: [PATCH 10/21] Modify Azure pipeline image settings Updated image configuration with demands for specific versions. --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6f110512d..7beae0fc6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,7 +41,9 @@ extends: enabled: true pool: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2019 + demands: + - ImageOverride -equals windows.vs2019.amd64 + - ImageVersionOverride -equals 2026.0304.014948 os: windows stages: - stage: build From 0aefa36830ded1b970cf4c68b9d61b3b6fc2e9ff Mon Sep 17 00:00:00 2001 From: wigodbe Date: Tue, 10 Mar 2026 13:40:54 -0700 Subject: [PATCH 11/21] 17.8.3 --- build.cmd | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index 5802269fe..b1d12ca29 100644 --- a/build.cmd +++ b/build.cmd @@ -37,10 +37,10 @@ if not DEFINED InstallDir ( goto BuildFail ) -REM Find a 64bit MSBuild and add it to path. Require v17.4 or later due to our .NET SDK choice. +REM Find a 64bit MSBuild and add it to path. Require v17.8.3 or later due to our .NET SDK choice. REM Check for VS2022 first. set InstallDir= -for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17.4 -latest -prerelease -products * ^ +for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17.8.3 -latest -prerelease -products * ^ -requires Microsoft.Component.MSBuild ^ -property installationPath`) do ( set "InstallDir=%%i" @@ -52,6 +52,29 @@ if DEFINED InstallDir ( goto FoundMSBuild ) +REM VS2022 with MSBuild v17.8.3+ not found. Check for standalone MSBuild SDK. +set "StandaloneSdkBase=C:\msbuild-standalone\sdk" +set "StandaloneMSBuildDir=" +if exist "%StandaloneSdkBase%" ( + for /f "delims=" %%d in ('dir /b /ad /o-n "%StandaloneSdkBase%"') do ( + if exist "%StandaloneSdkBase%\%%d\MSBuild.exe" ( + set "StandaloneMSBuildDir=%StandaloneSdkBase%\%%d" + goto CheckStandaloneVersion + ) + ) +) +goto SkipStandalone + +:CheckStandaloneVersion +for /f "usebackq tokens=*" %%v in (`"%StandaloneMSBuildDir%\MSBuild.exe" -nologo -version`) do set "MSBuildVer=%%v" +PowerShell -NoProfile -NoLogo -Command "if ([version]'%MSBuildVer%' -ge [version]'17.8.3') { exit 0 } else { exit 1 }" +if not errorlevel 1 ( + set "PATH=%StandaloneMSBuildDir%;%PATH%" + goto FoundMSBuild +) + +:SkipStandalone + REM Otherwise find or install an xcopy-able MSBuild. echo "Could not find a VS2022 installation with the necessary components (MSBuild). Falling back..." From d4ddb18e6ffc0fcbd1ece7f40473d09f440d1cd0 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Tue, 10 Mar 2026 13:54:25 -0700 Subject: [PATCH 12/21] Debug prints --- build.cmd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.cmd b/build.cmd index b1d12ca29..79ac164e3 100644 --- a/build.cmd +++ b/build.cmd @@ -55,8 +55,10 @@ if DEFINED InstallDir ( REM VS2022 with MSBuild v17.8.3+ not found. Check for standalone MSBuild SDK. set "StandaloneSdkBase=C:\msbuild-standalone\sdk" set "StandaloneMSBuildDir=" +echo "Looking in msbuild-standalone dir" if exist "%StandaloneSdkBase%" ( for /f "delims=" %%d in ('dir /b /ad /o-n "%StandaloneSdkBase%"') do ( + echo "Looking in %StandaloneSdkBase%\%%d\MSBuild.exe" if exist "%StandaloneSdkBase%\%%d\MSBuild.exe" ( set "StandaloneMSBuildDir=%StandaloneSdkBase%\%%d" goto CheckStandaloneVersion @@ -66,6 +68,7 @@ if exist "%StandaloneSdkBase%" ( goto SkipStandalone :CheckStandaloneVersion +echo "Checking standalone version" for /f "usebackq tokens=*" %%v in (`"%StandaloneMSBuildDir%\MSBuild.exe" -nologo -version`) do set "MSBuildVer=%%v" PowerShell -NoProfile -NoLogo -Command "if ([version]'%MSBuildVer%' -ge [version]'17.8.3') { exit 0 } else { exit 1 }" if not errorlevel 1 ( From eed6c1075f056ac58af0e0a6d02e0f523247f3b7 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Tue, 10 Mar 2026 14:06:16 -0700 Subject: [PATCH 13/21] .dll --- build.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.cmd b/build.cmd index 79ac164e3..2bc0486f8 100644 --- a/build.cmd +++ b/build.cmd @@ -58,8 +58,8 @@ set "StandaloneMSBuildDir=" echo "Looking in msbuild-standalone dir" if exist "%StandaloneSdkBase%" ( for /f "delims=" %%d in ('dir /b /ad /o-n "%StandaloneSdkBase%"') do ( - echo "Looking in %StandaloneSdkBase%\%%d\MSBuild.exe" - if exist "%StandaloneSdkBase%\%%d\MSBuild.exe" ( + echo "Looking in %StandaloneSdkBase%\%%d\MSBuild.dll" + if exist "%StandaloneSdkBase%\%%d\MSBuild.dll" ( set "StandaloneMSBuildDir=%StandaloneSdkBase%\%%d" goto CheckStandaloneVersion ) @@ -69,7 +69,7 @@ goto SkipStandalone :CheckStandaloneVersion echo "Checking standalone version" -for /f "usebackq tokens=*" %%v in (`"%StandaloneMSBuildDir%\MSBuild.exe" -nologo -version`) do set "MSBuildVer=%%v" +for /f "usebackq tokens=*" %%v in (`"%StandaloneMSBuildDir%\MSBuild.dll" -nologo -version`) do set "MSBuildVer=%%v" PowerShell -NoProfile -NoLogo -Command "if ([version]'%MSBuildVer%' -ge [version]'17.8.3') { exit 0 } else { exit 1 }" if not errorlevel 1 ( set "PATH=%StandaloneMSBuildDir%;%PATH%" From c999149707cec23df339c78bb96b961828aff0cc Mon Sep 17 00:00:00 2001 From: wigodbe Date: Tue, 10 Mar 2026 14:22:18 -0700 Subject: [PATCH 14/21] Fixup --- build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index 2bc0486f8..d207c9763 100644 --- a/build.cmd +++ b/build.cmd @@ -69,7 +69,7 @@ goto SkipStandalone :CheckStandaloneVersion echo "Checking standalone version" -for /f "usebackq tokens=*" %%v in (`"%StandaloneMSBuildDir%\MSBuild.dll" -nologo -version`) do set "MSBuildVer=%%v" +for /f "usebackq tokens=*" %%v in (`dotnet exec "%StandaloneMSBuildDir%\MSBuild.dll" -nologo -version`) do set "MSBuildVer=%%v" PowerShell -NoProfile -NoLogo -Command "if ([version]'%MSBuildVer%' -ge [version]'17.8.3') { exit 0 } else { exit 1 }" if not errorlevel 1 ( set "PATH=%StandaloneMSBuildDir%;%PATH%" From 421495bd8ebeeda9b8aebc16f0d48097948a9686 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 13 Mar 2026 11:17:16 -0700 Subject: [PATCH 15/21] Get newer msbuild --- build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index d207c9763..b6d145dff 100644 --- a/build.cmd +++ b/build.cmd @@ -81,7 +81,7 @@ if not errorlevel 1 ( REM Otherwise find or install an xcopy-able MSBuild. echo "Could not find a VS2022 installation with the necessary components (MSBuild). Falling back..." -set "MSBuildVersion=17.4.1" +set "MSBuildVersion=17.8.5" set "Command=[System.Threading.Thread]::CurrentThread.CurrentCulture = ''" set "Command=%Command%; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''" set "Command=%Command%; try { & '%~dp0eng\GetXCopyMSBuild.ps1' %MSBuildVersion%; exit $LASTEXITCODE }" From af3709500933472250d653ff286b3888c51f1a2d Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 13 Mar 2026 11:43:10 -0700 Subject: [PATCH 16/21] net8 for tests --- test/Microsoft.TestCommon/Microsoft.TestCommon.csproj | 2 +- .../System.Net.Http.Formatting.ns1_3.Test.csproj | 2 +- .../System.Net.Http.Formatting.ns2_0.Test.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj b/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj index d22704250..f371bab19 100644 --- a/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj +++ b/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj @@ -1,7 +1,7 @@  - net462;netcoreapp2.1;net6.0 + net462;netcoreapp2.1;net8.0 $(Configurations);CodeAnalysis $(DefineConstants);Testing_NetStandard1_3 diff --git a/test/System.Net.Http.Formatting.ns1_3.Test/System.Net.Http.Formatting.ns1_3.Test.csproj b/test/System.Net.Http.Formatting.ns1_3.Test/System.Net.Http.Formatting.ns1_3.Test.csproj index cfd42c053..74c763d46 100644 --- a/test/System.Net.Http.Formatting.ns1_3.Test/System.Net.Http.Formatting.ns1_3.Test.csproj +++ b/test/System.Net.Http.Formatting.ns1_3.Test/System.Net.Http.Formatting.ns1_3.Test.csproj @@ -1,7 +1,7 @@  - net462;netcoreapp2.1;net6.0 + net462;netcoreapp2.1;net8.0 System.Net.Http ..\..\bin\$(Configuration)\Test\ns1_3\ $(Configurations);CodeAnalysis diff --git a/test/System.Net.Http.Formatting.ns2_0.Test/System.Net.Http.Formatting.ns2_0.Test.csproj b/test/System.Net.Http.Formatting.ns2_0.Test/System.Net.Http.Formatting.ns2_0.Test.csproj index 8c7958b39..31a0b9548 100644 --- a/test/System.Net.Http.Formatting.ns2_0.Test/System.Net.Http.Formatting.ns2_0.Test.csproj +++ b/test/System.Net.Http.Formatting.ns2_0.Test/System.Net.Http.Formatting.ns2_0.Test.csproj @@ -1,7 +1,7 @@  - net462;netcoreapp2.1;net6.0 + net462;netcoreapp2.1;net8.0 System.Net.Http ..\..\bin\$(Configuration)\Test\ns2_0\ $(Configurations);CodeAnalysis From 0c3792bd9f27cc8431c6255da19eea908760e959 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 13 Mar 2026 12:03:56 -0700 Subject: [PATCH 17/21] Fix test --- .../ByteRangeStreamContentTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/System.Net.Http.Formatting.Test/ByteRangeStreamContentTest.cs b/test/System.Net.Http.Formatting.Test/ByteRangeStreamContentTest.cs index 410fc2b24..7dbed8f7d 100644 --- a/test/System.Net.Http.Formatting.Test/ByteRangeStreamContentTest.cs +++ b/test/System.Net.Http.Formatting.Test/ByteRangeStreamContentTest.cs @@ -127,7 +127,8 @@ public void Ctor_ThrowsOnNullMediaTypeString() range: range, mediaType: (String)null, bufferSize: 128), - "mediaType"); + "mediaType", + allowDerivedExceptions: true); } [Fact] From 825f02cb4a46ed8adab211df67f63b954ea03bd1 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 13 Mar 2026 12:41:04 -0700 Subject: [PATCH 18/21] Simplify demands in default-build.yml --- eng/templates/default-build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index b76d242c3..7000a4dad 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -8,9 +8,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: NetCore-Svc-Public - demands: - - ImageOverride -equals windows.vs2019.amd64.open - - ImageVersionOverride -equals 2026.0304.014948 + demands: ImageOverride -equals windows.vs2019.amd64.open timeoutInMinutes: 30 strategy: From 495ec6295c250b7f632d78edcc9e4b1e42467c2e Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 13 Mar 2026 12:41:37 -0700 Subject: [PATCH 19/21] Update demands for Azure Pipelines configuration --- azure-pipelines.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7beae0fc6..e7a67af82 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,9 +41,7 @@ extends: enabled: true pool: name: NetCore1ESPool-Svc-Internal - demands: - - ImageOverride -equals windows.vs2019.amd64 - - ImageVersionOverride -equals 2026.0304.014948 + demands: ImageOverride -equals windows.vs2019.amd64.open os: windows stages: - stage: build From f41be7dccd1a0eb9936010df22e0f4124d17734d Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 13 Mar 2026 13:07:05 -0700 Subject: [PATCH 20/21] Revert "Update demands for Azure Pipelines configuration" This reverts commit 495ec6295c250b7f632d78edcc9e4b1e42467c2e. --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e7a67af82..7beae0fc6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,7 +41,9 @@ extends: enabled: true pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: + - ImageOverride -equals windows.vs2019.amd64 + - ImageVersionOverride -equals 2026.0304.014948 os: windows stages: - stage: build From 92814f5dd4a62221f1e1d5a36bc7548168ccd675 Mon Sep 17 00:00:00 2001 From: wigodbe Date: Fri, 13 Mar 2026 13:07:15 -0700 Subject: [PATCH 21/21] Revert "Simplify demands in default-build.yml" This reverts commit 825f02cb4a46ed8adab211df67f63b954ea03bd1. --- eng/templates/default-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 7000a4dad..b76d242c3 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -8,7 +8,9 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: + - ImageOverride -equals windows.vs2019.amd64.open + - ImageVersionOverride -equals 2026.0304.014948 timeoutInMinutes: 30 strategy: