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

…into merge/release/8.0.1xx-to-release/8.0.3xx
dotnet · Oct 8, 2024 · 890d3f1 · 890d3f1
2 parents 8504b3d + 6d1bb6a
commit 890d3f1
Show file tree

Hide file tree

Showing 34 changed files with 609 additions and 1,956 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.23621.3",
+      "version": "1.1.0-beta.24306.1",
       "commands": [
         "darc"
       ]

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -31,7 +31,7 @@ variables:
     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)
-- template: /eng/common/templates/variables/pool-providers.yml
+- template: /eng/common/templates-official/variables/pool-providers.yml
 # Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning.
 - name: MicroBuildOutputFolderOverride
   value: $(Agent.TempDirectory)
@@ -56,7 +56,7 @@ extends:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
       centosStream8:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
-      debian11:
+      debian11Amd64:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
       fedora40:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
@@ -71,13 +71,6 @@ extends:
         name: $(DncEngInternalBuildPool)
         image: 1es-windows-2022
         os: windows
-      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-        componentgovernance:
-          ignoreDirectories: artifacts, .packages
-      # Temporary to workaround MicroBuild issues.
-      credscan:
-        enabled: false
-        justificationForDisabling: 'CredScan is failing on the MicroBuild signing plugin. "MicroBuild/Plugins/nuget.config" has changing content and thus cannot be baselined.'
     stages:
     - stage: Build
       jobs:
@@ -99,7 +92,7 @@ extends:
             targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration
             artifactName: buildConfiguration
 
-      # PR-only jobs
+        # PR-only jobs
       - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
         # Windows
         - template: eng/build.yml@self
@@ -142,7 +135,7 @@ extends:
           parameters:
             agentOs: Linux
             jobName: Build_Debian_11_Debug_x64
-            container: debian11
+            container: debian11Amd64
             buildConfiguration: Debug
             buildArchitecture: x64
             additionalBuildParameters: '/p:BuildSdkDeb=true'

diff --git a/.vsts-pr.yml b/.vsts-pr.yml
@@ -1,3 +1,5 @@
+# Pipeline: https://dev.azure.com/dnceng-public/public/_build?definitionId=20
+
 trigger:
   batch: true
   branches:
@@ -78,8 +80,8 @@ stages:
     - template: eng/build-pr.yml
       parameters:
         agentOs: Linux
-        jobName: Build_Fedora_36_Debug_x64
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36'
+        jobName: Build_Fedora_39_Debug_x64
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39'
         buildConfiguration: Debug
         buildArchitecture: x64
         linuxPortable: true

diff --git a/NuGet.config b/NuGet.config
@@ -6,6 +6,10 @@
   <packageSources>
     <clear />
     <!--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-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-emsdk-e92f92e-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-9/nuget/v3/index.json" />
@@ -18,28 +22,6 @@
     <add key="darc-pub-dotnet-emsdk-e92f92e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-2/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-emsdk-e92f92e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
-    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
-    <!--  End: Package sources from DotNet-msbuild-Trusted -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-08338fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-08338fca/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-runtime -->
-    <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-0ea3de9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-7/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-1/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-1526afd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-9/nuget/v3/index.json" />
@@ -51,7 +33,36 @@
     <add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-3/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-2/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-1/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-emsdk -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <!--  End: Package sources from DotNet-msbuild-Trusted -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-08338fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-08338fca/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--  Begin: Package sources from dotnet-sdk -->
+    <add key="darc-int-dotnet-sdk-148cecd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-21" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-21/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-20/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-19" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-19/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-18" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-18/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-17" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-17/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-15/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-14/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-13/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-12/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-11/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-10/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-148cecd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-148cecd4-1/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-sdk -->
     <!--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" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -65,7 +76,6 @@
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
     <add key="msbuild-prerelease-with-release-version" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ffc3fe3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
@@ -76,16 +86,26 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-08338fc" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-0ea3de9-1" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-2" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-3" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-4" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-5" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-6" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-7" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-8" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9-9" value="true" />
-    <add key="darc-int-dotnet-sdk-0ea3de9" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-1" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-10" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-11" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-12" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-13" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-14" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-15" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-17" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-18" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-19" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-2" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-20" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-21" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-3" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-4" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-5" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-6" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-8" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd-9" value="true" />
+    <add key="darc-int-dotnet-sdk-148cecd" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="true" />
@@ -98,9 +118,11 @@
     <add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-1526afd" value="true" />
+    <!--  Begin: Package sources from dotnet-sdk -->
+    <!--  End: Package sources from dotnet-sdk -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
-    <add key="darc-int-dotnet-tools-internal" value="true" />
   </disabledPackageSources>
 </configuration>
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
@@ -11,7 +11,13 @@
     -->
     <UsagePattern IdentityGlob="NuGet.*/*" />
 
+    <!-- These MSBuild packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
+    <UsagePattern IdentityGlob="Microsoft.Build*/17.10.4" />
+    <UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.4" />
+
     <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
+
+    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
   </IgnorePatterns>
 </UsageData>