From 0546efebfd03799f28667449fd6f9aa25e958463 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 5 Jul 2022 19:52:35 -0700
Subject: [PATCH] Update branding to 6.0.8 (#42583)
* Update branding to 6.0.8
* release/6.0] Give up on Build.Server.Amd64.VS2019.BT.Open
- `cherry-pick` part of 0394ac7baa9c
- was "Try out 1es images (#41400)"
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
---
.azure/pipelines/jobs/default-build.yml | 7 +------
eng/Versions.props | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 9aac31c5b31..f3eb0197a61 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -108,12 +108,7 @@ jobs:
${{ if eq(parameters.agentOs, 'Windows') }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
- ${{ if ne(parameters.isTestingJob, true) }}:
- # Visual Studio Build Tools
- demands: ImageOverride -equals Build.Server.Amd64.VS2019.BT.Open
- ${{ if eq(parameters.isTestingJob, true) }}:
- # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
- demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
+ demands: ImageOverride -equals 1es-windows-2019-open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
diff --git a/eng/Versions.props b/eng/Versions.props
index 3754e8634b0..920606899b5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,8 +8,8 @@
<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
- <AspNetCorePatchVersion>7</AspNetCorePatchVersion>
- <ValidateBaseline>true</ValidateBaseline>
+ <AspNetCorePatchVersion>8</AspNetCorePatchVersion>
+ <ValidateBaseline>false</ValidateBaseline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
--
GitLab