From 91eadbbb70c4404c196f8830c47c0d5cd0702ca2 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Tue, 6 Sep 2022 14:16:57 -0700
Subject: [PATCH] Update branding to 6.0.10 (#43777)
* Update branding to 6.0.10
* Update public pool names
Co-authored-by: Alex Perovich <alperovi@microsoft.com>
---
.azure/pipelines/jobs/default-build.yml | 4 ++--
eng/Versions.props | 4 ++--
eng/common/templates/job/source-build.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 2908d5bb869..b81b7a8ba1b 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -100,14 +100,14 @@ jobs:
vmImage: ubuntu-18.04
${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore1ESPool-Svc-Public
+ name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if eq(parameters.agentOs, 'Windows') }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore1ESPool-Svc-Public
+ name: NetCore-Svc-Public
demands: ImageOverride -equals 1es-windows-2019-open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
diff --git a/eng/Versions.props b/eng/Versions.props
index a321496f4d2..7a7434cce6f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,8 +8,8 @@
<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
- <AspNetCorePatchVersion>9</AspNetCorePatchVersion>
- <ValidateBaseline>true</ValidateBaseline>
+ <AspNetCorePatchVersion>10</AspNetCorePatchVersion>
+ <ValidateBaseline>false</ValidateBaseline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index 5cd5325d7b4..88f6f75a622 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -46,7 +46,7 @@ jobs:
# source-build builds run in Docker, including the default managed platform.
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore1ESPool-Public
+ name: NetCore-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
--
GitLab