Merge branch 'release/6.0.4xx' of https://github.com/dotnet/installer …

…into merge/release/6.0.1xx-to-release/6.0.4xx

.vsts-ci.yml

@@ -36,7 +36,7 @@ variables:
   value: ''
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - name: _InternalRuntimeDownloadArgs
-    value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
+    value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
       /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
       /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
 - name: DncEngPublicBuildPool
@@ -272,7 +272,7 @@ extends:
                   _TestArg: ''
                 Build_Linux_musl_Debug_x64:
                   _BuildConfig: Debug
-                  _DockerParameter: '--docker alpine.3.13'
+                  _DockerParameter: '--docker alpine.3.15'
                   _LinuxPortable: ''
                   _RuntimeIdentifier: '--runtime-id linux-musl-x64'
                   _BuildArchitecture: 'x64'
@@ -317,7 +317,7 @@ extends:
                   _TestArg: ''
                 Build_Linux_musl_Release_x64:
                   _BuildConfig: Release
-                  _DockerParameter: '--docker alpine.3.13'
+                  _DockerParameter: '--docker alpine.3.15'
                   _LinuxPortable: ''
                   _RuntimeIdentifier: '--runtime-id linux-musl-x64'
                   _BuildArchitecture: 'x64'
@@ -415,11 +415,6 @@ extends:
 
       - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self
 
-      - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-        - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self
-          parameters:
-            dependsOn: Source_Build_Create_Tarball
-
       - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
         - template: /eng/common/templates-official/job/publish-build-assets.yml@self
           parameters:
@@ -429,6 +424,8 @@ extends:
             - Darwin
             - Source_Build_Managed
             - Source_Build_Create_Tarball
+            - PGO_Linux
+            - PGO_Windows_NT
             publishUsingPipelines: true
             pool:
               name: $(DncEngInternalBuildPool)

.vsts-pr.yml

@@ -34,7 +34,7 @@ variables:
   value: ''
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - name: _InternalRuntimeDownloadArgs
-    value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
+    value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
       /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
       /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
 
@@ -228,7 +228,7 @@ stages:
               _TestArg: ''
             Build_Linux_musl_Debug_x64:
               _BuildConfig: Debug
-              _DockerParameter: '--docker alpine.3.13'
+              _DockerParameter: '--docker alpine.3.15'
               _LinuxPortable: ''
               _RuntimeIdentifier: '--runtime-id linux-musl-x64'
               _BuildArchitecture: 'x64'
@@ -273,7 +273,7 @@ stages:
               _TestArg: ''
             Build_Linux_musl_Release_x64:
               _BuildConfig: Release
-              _DockerParameter: '--docker alpine.3.13'
+              _DockerParameter: '--docker alpine.3.15'
               _LinuxPortable: ''
               _RuntimeIdentifier: '--runtime-id linux-musl-x64'
               _BuildArchitecture: 'x64'
@@ -367,11 +367,6 @@ stages:
 
   - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml
 
-  - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-    - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml
-      parameters:
-        dependsOn: Source_Build_Create_Tarball
-
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/common/templates/job/publish-build-assets.yml
       parameters:
@@ -381,6 +376,8 @@ stages:
           - Darwin
           - Source_Build_Managed
           - Source_Build_Create_Tarball
+          - PGO_Linux
+          - PGO_Windows_NT
         publishUsingPipelines: true
         pool:
           ${{ if eq(variables['System.TeamProject'], 'internal') }}:

NuGet.config

@@ -8,34 +8,21 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-827b960" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-827b960-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-827b960-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-827b960-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-c68eace" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c68eace-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c68eace-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c68eace-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-85d7107" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-85d71072/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-b357f86-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c-2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-1e5db13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-1e5db13-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-1e5db13-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-1e5db13-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-7de8a28" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-fc5b097-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-fc5b097-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-fc5b097-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -50,35 +37,23 @@
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <!-- Temporary feed for Xamarin workload manifest -->
     <add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
-    <!-- Remove after RTM. Working around lack of automated creation of isolated feeds for nuget client -->
-    <add key="darc-pub-nuget-nuget.client-078701b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-nuget-nuget.client-078701b/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-827b960-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-827b960-2" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-827b960-3" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-b357f86-2" value="true" />
     <add key="darc-int-dotnet-runtime-b357f86" value="true" />
+    <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-1e5db13-1" value="true" />
-    <add key="darc-int-dotnet-templating-1e5db13-2" value="true" />
-    <add key="darc-int-dotnet-templating-1e5db13-3" value="true" />
-    <add key="darc-int-dotnet-templating-1e5db13" value="true" />
+    <add key="darc-int-dotnet-templating-7de8a28" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-fc5b097-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-fc5b097-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-fc5b097-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
-    <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->