From 0cebc4ca98c43e23e22d301f242c31117c5ff0d2 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 21 Jan 2026 12:33:22 -0800 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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: