From fc1b7e9109827021c2e563426ee6e4dc1e038c1c Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 13 Sep 2022 15:02:26 -0700
Subject: [PATCH 1/3] Update baselines et cetera - baselines regenerated -
enable baseline validation - update 3.1 site extension package version - move
to latest .NET SDK
---
eng/Baseline.Designer.props | 494 ++++++++++++++++++------------------
eng/Baseline.xml | 214 ++++++++--------
eng/Versions.props | 4 +-
global.json | 4 +-
4 files changed, 358 insertions(+), 358 deletions(-)
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 28042e9d0222..7272cd196587 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,28 +2,28 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
-
-
+
+
+
@@ -34,120 +34,120 @@
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
@@ -155,114 +155,114 @@
- 6.0.8
+ 6.0.9
-
-
+
+
-
-
+
+
-
-
+
+
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
-
-
-
+
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
-
+
+
@@ -270,81 +270,81 @@
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
@@ -352,58 +352,58 @@
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
@@ -411,71 +411,71 @@
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
-
+
-
-
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
@@ -491,195 +491,195 @@
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
-
+
- 6.0.8
+ 6.0.9
-
-
+
+
-
-
+
+
-
-
+
+
- 6.0.8
+ 6.0.9
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
-
-
-
+
+
+
+
- 6.0.8
+ 6.0.9
@@ -688,69 +688,69 @@
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
@@ -769,7 +769,7 @@
- 6.0.8
+ 6.0.9
@@ -788,7 +788,7 @@
- 6.0.8
+ 6.0.9
@@ -804,46 +804,46 @@
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
-
-
+
+
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
@@ -853,7 +853,7 @@
- 6.0.8
+ 6.0.9
@@ -862,79 +862,79 @@
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
-
+
-
+
-
+
-
+
-
+
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
@@ -943,7 +943,7 @@
-
+
@@ -951,17 +951,17 @@
-
+
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
@@ -979,13 +979,13 @@
- 6.0.8
+ 6.0.9
- 6.0.8
+ 6.0.9
-
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 549d55431ba9..5e40c7dfa06a 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,111 +4,111 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 2a9a304018b3..aca2c68baa7c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
6
0
10
- false
+ true
@@ -214,7 +214,7 @@
2.1.1
2.2.0
- 3.1.28-servicing-22364-2
+ 3.1.29-servicing-22418-8
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)
5.0.17-servicing-22215-7
diff --git a/global.json b/global.json
index 6509e31c6695..cd88f86491ae 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"sdk": {
- "version": "6.0.108"
+ "version": "6.0.109"
},
"tools": {
- "dotnet": "6.0.108",
+ "dotnet": "6.0.109",
"runtimes": {
"dotnet/x64": [
"2.1.30",
From dde3959c93b66e52a169e5a2f8527a441ccd4123 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 14 Sep 2022 10:34:27 -0700
Subject: [PATCH 2/3] [release/6.0] Stop building / testing on Ubuntu 18.04
(#43947)
- use 20.04 instead
---
.azure/pipelines/jobs/default-build.yml | 2 +-
eng/scripts/RunHelix.ps1 | 2 --
eng/targets/Helix.Common.props | 13 ++++++-------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index b81b7a8ba1b6..3dfabcd1ffe2 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -97,7 +97,7 @@ jobs:
vmImage: macOS-11
${{ if eq(parameters.agentOs, 'Linux') }}:
${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
- vmImage: ubuntu-18.04
+ vmImage: ubuntu-20.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: NetCore-Svc-Public
diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1
index ebe46bd6fcef..8716f8443855 100644
--- a/eng/scripts/RunHelix.ps1
+++ b/eng/scripts/RunHelix.ps1
@@ -11,9 +11,7 @@
Debian.11.Amd64.Open
Mariner
Redhat.7.Amd64.Open
- Ubuntu.1804.Amd64.Open
Ubuntu.2004.Amd64.Open
- OSX.1015.Amd64.Open
OSX.1100.Amd64.Open
Windows.10.Amd64.Server20H2.Open
Windows.11.Amd64.Client.Open
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index 2f615fd3a7dc..9566c1b8b5c4 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -1,11 +1,11 @@
- (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
- (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3
- (Fedora.34.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125
- (Mariner)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
- (Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652
+ (Alpine.314.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
+ (Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3
+ (Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125
+ (Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
+ (Debian.11.Arm64.Open)Ubuntu.2004.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652
@@ -20,7 +20,7 @@
-
+
@@ -29,7 +29,6 @@
-
From 23b687437426bdb64af30367b3997a86bbe410c2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 22:49:31 +0000
Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade
build 20220913.7 (#43983)
[release/6.0] Update dependencies from dotnet/arcade
---
NuGet.config | 4 ----
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 4 ++--
eng/common/templates/job/execute-sdl.yml | 2 +-
eng/common/templates/job/onelocbuild.yml | 2 +-
eng/common/templates/job/source-build.yml | 4 ++--
eng/common/templates/jobs/jobs.yml | 2 +-
eng/common/templates/post-build/post-build.yml | 8 ++++----
global.json | 4 ++--
9 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 63330d10bbf3..4b821f800992 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,10 +4,8 @@
-
-
@@ -27,10 +25,8 @@
-
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1a6340eb3138..391db802b3a0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -280,22 +280,22 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
f316191dbb5782d76ceb457018dcd80ff8ce8692
-
+
https://github.com/dotnet/arcade
- 41323ecb0b2312980381bfdbb75afd2dae2b266b
+ 2fbe602d12256bf82de53791ddcbb964c1541b4e
-
+
https://github.com/dotnet/arcade
- 41323ecb0b2312980381bfdbb75afd2dae2b266b
+ 2fbe602d12256bf82de53791ddcbb964c1541b4e
-
+
https://github.com/dotnet/arcade
- 41323ecb0b2312980381bfdbb75afd2dae2b266b
+ 2fbe602d12256bf82de53791ddcbb964c1541b4e
-
+
https://github.com/dotnet/arcade
- 41323ecb0b2312980381bfdbb75afd2dae2b266b
+ 2fbe602d12256bf82de53791ddcbb964c1541b4e
diff --git a/eng/Versions.props b/eng/Versions.props
index aca2c68baa7c..6f707b298f75 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -131,8 +131,8 @@
6.0.9
6.0.9
- 6.0.0-beta.22412.2
- 6.0.0-beta.22412.2
+ 6.0.0-beta.22463.7
+ 6.0.0-beta.22463.7