Merge remote-tracking branch 'upstream/release/6.0' into internal/rel…

…ease/6.0

NuGet.config

@@ -9,11 +9,8 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-1ec2e17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-wcf -->
-    <add key="darc-pub-dotnet-wcf-04c3656-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-04c3656e-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-wcf-04c3656" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-04c3656e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-wcf -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!--

eng/Version.Details.xml

@@ -18,77 +18,77 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21565.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>a35b36664af90a8e61f051ad06fb8039380b1526</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
       <Uri>https://github.com/microsoft/vstest</Uri>
@@ -210,9 +210,9 @@
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21522.3">
+    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21560.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
+      <Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

@@ -54,21 +54,21 @@
     <!-- SDK dependencies -->
     <MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21522.3</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21522.3</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21522.3</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21522.3</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21522.3</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21522.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21522.3</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21522.3</MicrosoftDotNetVersionToolsTasksVersion>
-    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21522.3</MicrosoftDotNetPackageTestingVersion>
+    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21560.2</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21560.2</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21560.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21560.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21565.3</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21560.2</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21560.2</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21560.2</MicrosoftDotNetPackageTestingVersion>
     <!-- NuGet dependencies -->
     <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
     <!-- Installer dependencies -->

eng/build.ps1

@@ -254,6 +254,10 @@ foreach ($argument in $PSBoundParameters.Keys)
 
 $failedBuilds = @()
 
+# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
+# The later changes are ignored when using the cache.
+$env:DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0
+
 if ($os -eq "Browser") {
   # override default arch for Browser, we only support wasm
   $arch = "wasm"

eng/build.sh

@@ -468,6 +468,10 @@ fi
 
 initDistroRid $os $arch $crossBuild $portableBuild
 
+# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
+# The later changes are ignored when using the cache.
+export DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0
+
 # URL-encode space (%20) to avoid quoting issues until the msbuild call in /eng/common/tools.sh.
 # In *proj files (XML docs), URL-encoded string are rendered in their decoded form.
 cmakeargs="${cmakeargs// /%20}"

eng/common/templates/job/execute-sdl.yml

@@ -62,7 +62,7 @@ jobs:
   pool:
     # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
     ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
-      name: Hosted VS2017
+      vmImage: windows-2019
     ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
       vmImage: windows-2019
   steps:

eng/common/templates/job/onelocbuild.yml

@@ -4,7 +4,7 @@ parameters:
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
 
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

eng/common/templates/job/source-index-stage1.yml

@@ -6,7 +6,7 @@ parameters:
   preSteps: []
   binlogPath: artifacts/log/Debug/Build.binlog
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
   condition: ''
   dependsOn: ''
 

eng/common/templates/jobs/jobs.yml

@@ -83,7 +83,7 @@ jobs:
         - ${{ if eq(parameters.enableSourceBuild, true) }}:
           - Source_Build_Complete
         pool:
-          vmImage: vs2017-win2016
+          vmImage: windows-2019
         runAsPublic: ${{ parameters.runAsPublic }}
         publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
         enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -96,4 +96,4 @@ jobs:
         dependsOn:
           - Asset_Registry_Publish
         pool:
-          vmImage: vs2017-win2016
+          vmImage: windows-2019

eng/packaging.targets

@@ -44,9 +44,9 @@
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</VersionPrefix>
     <_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
     <_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
-    <_AssemblyInTargetingPack Condition="'$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true'">true</_AssemblyInTargetingPack>
+    <_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
     <!-- Assembly version do not get updated in non-netfx ref pack assemblies. -->
-    <AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true' or '$(TargetFrameworkIdentifier)' == '.NETFramework'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
+    <AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnablePackageValidation)' == 'true'">

global.json

@@ -1,21 +1,21 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21430.12",
+    "version": "6.0.100",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "6.0.100-rc.1.21430.12"
+    "dotnet": "6.0.100"
   },
   "native-tools": {
     "cmake": "3.16.4",
     "python3": "3.7.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21522.3",
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21522.3",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21522.3",
-    "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21522.3",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21560.2",
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21560.2",
+    "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21560.2",
     "Microsoft.Build.NoTargets": "3.1.0",
     "Microsoft.Build.Traversal": "3.0.23",
     "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"

src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj

@@ -4,6 +4,7 @@
   <PropertyGroup>
     <PlatformPackageType>TargetingPack</PlatformPackageType>
     <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
+    <CreatePlatformManifest Condition="'$(PreReleaseVersionLabel)' == 'servicing'">false</CreatePlatformManifest>
     <ArchiveName>dotnet-targeting-pack</ArchiveName>
     <InstallerName>dotnet-targeting-pack</InstallerName>
     <OverridePackageId Condition="'$(PgoInstrument)' != ''">$(SharedFrameworkName).PGO</OverridePackageId>
@@ -19,4 +20,8 @@
       <FilesToPackage Include="@(Analyzer)" ExcludeFromValidation="true" TargetPath="analyzers/%(RecursiveDir)" />
     </ItemGroup>
   </Target>
+
+  <ItemGroup Condition="'$(CreatePlatformManifest)' == 'false'">
+    <FilesToPackage  Include="PlatformManifest.txt" TargetPath="data" GeneratedBuildFile="true" />
+  </ItemGroup>
 </Project>