Merged PR 25936: Merge from public

dotnet · Sep 19, 2022 · 2de0f8b · 2de0f8b
2 parents 94b4eb7 + 0224e08
commit 2de0f8b
Show file tree

Hide file tree

Showing 13 changed files with 386 additions and 389 deletions.
diff --git 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/Baseline.Designer.props b/eng/Baseline.Designer.props
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -280,22 +280,22 @@
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
  <Sha>2768a7a7e73255a475206f30c4eb51f651b8cef8</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22412.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22463.7">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+ <Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22412.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22463.7">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+ <Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22412.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22463.7">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+ <Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22412.2">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22463.7">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+ <Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -9,7 +9,7 @@
  <AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
  <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
  <AspNetCorePatchVersion>10</AspNetCorePatchVersion>
- <ValidateBaseline>false</ValidateBaseline>
+ <ValidateBaseline>true</ValidateBaseline>
  <!--
  When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
  -->
@@ -131,8 +131,8 @@
  <MicrosoftEntityFrameworkCoreVersion>6.0.10</MicrosoftEntityFrameworkCoreVersion>
  <MicrosoftEntityFrameworkCoreDesignVersion>6.0.10</MicrosoftEntityFrameworkCoreDesignVersion>
  <!-- Packages from dotnet/arcade -->
- <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksInstallersVersion>
- <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksTemplatingVersion>
+ <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksInstallersVersion>
+ <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksTemplatingVersion>
  </PropertyGroup>
  <!--
 
@@ -214,7 +214,7 @@
  <!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
  <MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
  <MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
- <MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.28-servicing-22364-2</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
+ <MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.29-servicing-22418-8</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
  <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
  <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
  <MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>

diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
@@ -53,7 +53,7 @@ jobs:
  demands: Cmd
  # If it's not devdiv, it's dnceng
  ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals windows.vs2019.amd64
  steps:
  - checkout: self

diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
@@ -40,7 +40,7 @@ jobs:
  demands: Cmd
  # If it's not devdiv, it's dnceng
  ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals windows.vs2019.amd64
 
  variables:

diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
@@ -46,10 +46,10 @@ jobs:
  # source-build builds run in Docker, including the default managed platform.
  pool:
  ${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore-Public
+ name: NetCore-Svc-Public
  demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
  ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
  ${{ if ne(parameters.platform.pool, '') }}:
  pool: ${{ parameters.platform.pool }}

diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
@@ -89,7 +89,7 @@ jobs:
  demands: Cmd
  # If it's not devdiv, it's dnceng
  ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals windows.vs2019.amd64
 
  runAsPublic: ${{ parameters.runAsPublic }}

diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
@@ -100,7 +100,7 @@ stages:
  demands: Cmd
  # If it's not devdiv, it's dnceng
  ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals windows.vs2019.amd64
 
  steps:
@@ -137,7 +137,7 @@ stages:
  demands: Cmd
  # If it's not devdiv, it's dnceng
  ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals windows.vs2019.amd64
  steps:
  - template: setup-maestro-vars.yml
@@ -197,7 +197,7 @@ stages:
  demands: Cmd
  # If it's not devdiv, it's dnceng
  ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals windows.vs2019.amd64
  steps:
  - template: setup-maestro-vars.yml
@@ -254,7 +254,7 @@ stages:
  demands: Cmd
  # If it's not devdiv, it's dnceng
  ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
- name: NetCore1ESPool-Internal
+ name: NetCore1ESPool-Svc-Internal
  demands: ImageOverride -equals windows.vs2019.amd64
  steps:
  - template: setup-maestro-vars.yml

diff --git 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
@@ -1,11 +1,11 @@
 <Project>
  <!-- this file is shared between Helix.proj and .csproj files -->
  <PropertyGroup>
- <HelixQueueAlpine314>(Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19</HelixQueueAlpine314>
- <HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3</HelixQueueDebian11>
- <HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125</HelixQueueFedora34>
- <HelixQueueMariner>(Mariner)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620</HelixQueueMariner>
- <HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652</HelixQueueArmDebian11>
+ <HelixQueueAlpine314>(Alpine.314.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19</HelixQueueAlpine314>
+ <HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3</HelixQueueDebian11>
+ <HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125</HelixQueueFedora34>
+ <HelixQueueMariner>(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620</HelixQueueMariner>
+ <HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.2004.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652</HelixQueueArmDebian11>
  </PropertyGroup>
 
  <ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
@@ -20,7 +20,7 @@
 
  <!-- x64 PR(ci.yaml) required queues for internal and public cases -->
  <ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' != 'true'">
- <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
+ <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
  <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
  <HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
  </ItemGroup>
@@ -29,7 +29,6 @@
  <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
  <!-- Linux -->
  <HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
- <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
 
  <!-- Mac -->
  <HelixAvailableTargetQueue Include="OSX.1015.Amd64.Open" Platform="OSX" />

diff --git 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",
@@ -29,7 +29,7 @@
  },
  "msbuild-sdks": {
  "Yarn.MSBuild": "1.22.10",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22412.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22463.7"
  }
 }