Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into merge/release/8.0.1xx-to-release/8.0.3xx

Author: DonnaChen888

.vsts-ci.yml

@@ -3,7 +3,7 @@ trigger:
   branches:
     include:
     - main
-    - release/8.0.1xx
+    - release/8.0.3xx
     - internal/release/*
     - exp/*
 
@@ -115,12 +115,6 @@ extends:
               value: real
             - name: _Test
               value: ''
-      - template: /eng/common/templates-official/job/source-build.yml@self
-        parameters:
-          enableInternalSources: true
-          platform:
-            name: 'Managed'
-            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
       - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
         - template: /eng/build.yml@self
           parameters:
@@ -296,7 +290,6 @@ extends:
             publishAssetsImmediately: true
             dependsOn:
               - Windows_NT
-              - Source_Build_Managed
             pool:
               name: $(DncEngInternalBuildPool)
               image: 1es-windows-2022

.vsts-pr.yml

@@ -3,7 +3,7 @@ trigger:
   branches:
     include:
     - main
-    - release/8.0.1xx
+    - release/8.0.3xx
     - internal/release/*
     - exp/*
 
@@ -85,12 +85,6 @@ stages:
             ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
               _SignType: real
               _Test: ''
-  - template: /eng/common/templates/job/source-build.yml
-    parameters:
-      enableInternalSources: true
-      platform:
-        name: 'Managed'
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
   - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/build-pr.yml
       parameters:
@@ -177,7 +171,6 @@ stages:
         publishAssetsImmediately: true
         dependsOn:
           - Windows_NT
-          - Source_Build_Managed
         pool:
           name: $(DncEngInternalBuildPool)
           demands: ImageOverride -equals windows.vs2019.amd64

Directory.Build.props

@@ -14,8 +14,11 @@
     <SdkTargetFramework>net8.0</SdkTargetFramework>
     <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
 
-    <!-- VS for Mac is retired so no need to target a downlevel .NET for its resolver. -->
-    <ResolverTargetFramework>$(SdkTargetFramework)</ResolverTargetFramework>
+    <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers.  So the resolvers and dependencies
+         may target a lower version of .NET -->
+    <ResolverTargetFramework>net8.0</ResolverTargetFramework>
+    <!-- Source build does not need to worry about running on VS for Mac -->
+    <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
 
     <!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
          Microsoft.ApplicationInsights) -->

Directory.Packages.props

@@ -40,8 +40,10 @@
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
     <PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
     <PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
+    <PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
     <PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
     <PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
+    <PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftNETStringToolsPackageVersion)" />
     <PackageVersion Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="Microsoft.NETCore.Targets" Version="2.1.0" />
     <PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="$(MicrosoftTemplateEngineAuthoringTemplateVerifierVersion)" />
@@ -55,8 +57,8 @@
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
     <PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
     <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
     <PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
     <PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
     <PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />

NuGet.config

@@ -1,30 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-pub-dotnet-format-a9a546e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-a9a546e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-a9a546e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-a9a546e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-a9a546e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-c7e5d39-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-c7e5d39-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-c7e5d39-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-c7e5d39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-2a7a854" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2a7a854c/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-1d044e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1d044e35/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-2a3d0e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2a3d0e60/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-d3b5c6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d3b5c6c0/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--  Begin: Package sources from dotnet-winforms -->
+    <!--  End: Package sources from dotnet-winforms -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
@@ -49,14 +52,18 @@
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from dotnet-format -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
+    <!--  Begin: Package sources from dotnet-emsdk -->
+    <!--  End: Package sources from dotnet-emsdk -->
+    <!--  Begin: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <!--  Begin: Package sources from dotnet-winforms -->
+    <!--  End: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

documentation/general/workloads/README.md

@@ -20,3 +20,4 @@ Other documentation for workloads is in this repo:
 - [Grouping multiple packs into one MSI](https://github.com/dotnet/sdk/issues/21741)
 - [Handling workload assets across major .NET versions](cross-version-workloads.md)
 - [Workload Clean Command](workload-clean.md)
+- [Workload MSI Installation Tests](/src/Tests/dotnet-MsiInstallation.Tests/README.md)

eng/SourceBuildPrebuiltBaseline.xml

@@ -32,5 +32,19 @@
     <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
     <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
+
+    <!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
+         is only applicable to 8.0.1xx. -->
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Edge/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Orchestrator.RunnableProjects/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Utils/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
+    <UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
+    <UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
+    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
+    <UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
   </IgnorePatterns>
 </UsageData>