From 893b5b7d6823b2d249e196ec63fcdee3fd9d9d59 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 19 Jan 2022 10:53:30 -0800 Subject: [PATCH 1/2] Switch to 1ES pools for official builds --- .vsts-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d6512fdd7..cc77830a0 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -46,6 +46,13 @@ stages: - stage: build jobs: - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals build.windows.10.amd64.vs2019.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals build.windows.10.amd64.vs2019 steps: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration @@ -371,8 +378,6 @@ stages: - Source_Build_Managed - Source_Build_Create_Tarball publishUsingPipelines: true - pool: - vmImage: vs2017-win2016 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml From 58ce3d55ed49a394cc7509e55aa0de17a7a9da05 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 21 Jan 2022 16:34:35 -0800 Subject: [PATCH 2/2] Preview 2 branding --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 57641d976..14d3fce8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,8 +10,8 @@ 1 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - alpha - 1 + preview + 2 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor)