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

…into merge/release/8.0.1xx-to-release/8.0.3xx
dotnet · Dec 3, 2024 · 4e154a3 · 4e154a3
2 parents a13eb34 + f66a11f
commit 4e154a3
Show file tree

Hide file tree

Showing 35 changed files with 575 additions and 1,934 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
@@ -10,15 +10,20 @@
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-emsdk -->
+    <!--  End: Package sources from dotnet-emsdk -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <!--  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 -->
-    <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 -->
     <!--  End: Package sources from dotnet-runtime -->
-    <!--  Begin: Package sources from dotnet-sdk -->
-    <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--  Begin: Package sources from dotnet-sdk -->
+    <!--  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" />
@@ -32,7 +37,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.-->
@@ -45,6 +49,5 @@
     <!--  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,9 +11,22 @@
     -->
     <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 emsdk packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
+    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100/8.0.*" />
+
     <!-- 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.Configuration.ConfigurationManager/*8.0.0*" />
+    <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*8.0.0*" />
     <UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
+    <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
+    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -85,22 +85,22 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.111">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.307">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>f3835a7fb45497f53fc92ca7dd4a06793884b1cd</Sha>
+      <Sha>07eb260e98358c3a5597449dd32ee81112acb5e4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.111-servicing.24521.41">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.307-servicing.24521.40">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>f3835a7fb45497f53fc92ca7dd4a06793884b1cd</Sha>
+      <Sha>07eb260e98358c3a5597449dd32ee81112acb5e4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.111-servicing.24521.41">
+    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.307-servicing.24521.40">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>f3835a7fb45497f53fc92ca7dd4a06793884b1cd</Sha>
+      <Sha>07eb260e98358c3a5597449dd32ee81112acb5e4</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.111-servicing.24521.41">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.307-servicing.24521.40">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>f3835a7fb45497f53fc92ca7dd4a06793884b1cd</Sha>
+      <Sha>07eb260e98358c3a5597449dd32ee81112acb5e4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -110,18 +110,18 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23410.2">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.24059.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
+      <Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23410.2">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.24059.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
+      <Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.23410.2">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.24059.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
+      <Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.11-servicing.24521.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -132,41 +132,36 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
       <Sha>42a83a56d421ac71312453e53dbacc3d2ae6d432</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>fc5e9eda234e2b69aa479f4f83faddc31fdd4da7</Sha>
+      <Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>fc5e9eda234e2b69aa479f4f83faddc31fdd4da7</Sha>
+      <Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.8.0-release-23615-02" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24317-02" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>aa59400b11e1aeee2e8af48928dbd48748a8bef9</Sha>
+      <Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
       <SourceBuild RepoName="vstest" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24514.16" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24515.13" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
+      <Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.8.5" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>b5265ef370a651f8c3458110b804e5cbf869eeb5</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.5-preview-24055-02">
+    <Dependency Name="Microsoft.Build" Version="17.10.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>b5265ef370a651f8c3458110b804e5cbf869eeb5</Sha>
-      <SourceBuild RepoName="msbuild" ManagedOnly="true" />
+      <Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.8.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
-      <Sha>550277e0616e549446f03fda35d3e23dff75dc01</Sha>
+    <Dependency Name="NuGet.Build.Tasks" Version="6.10.2-rc.8" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>b42cb884109d8d33c956311f1a8c89a90be0c195</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@@ -177,16 +172,16 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
-      <Sha>48e42f59d64d84b404e904996a9ed61f2a17a569</Sha>
-      <SourceBuild RepoName="aspire" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.11-servicing.24511.5" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
+      <Sha>48e42f59d64d84b404e904996a9ed61f2a17a569</Sha>
+      <SourceBuild RepoName="aspire" ManagedOnly="true" />
+    </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.23463.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
       <Sha>5957c5c5f85f17c145e7fab4ece37ad6aafcded9</Sha>
@@ -219,26 +214,26 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24562.12">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24570.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>42652ca52cd5f9f637fef2b3ab6148805e3c5168</Sha>
+      <Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24562.12">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24570.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>42652ca52cd5f9f637fef2b3ab6148805e3c5168</Sha>
+      <Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24562.12">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24570.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>42652ca52cd5f9f637fef2b3ab6148805e3c5168</Sha>
+      <Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
+      <Sha>b65fa14c7799a84e7fc2384bf821720d8ab1873b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23578.2">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24306.1">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
+      <Sha>b65fa14c7799a84e7fc2384bf821720d8ab1873b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
       <Uri>https://github.com/dotnet/runtime</Uri>