Merge remote-tracking branch 'upstream/release/8.0.3xx' into merge/release/8.0.1xx-to-release/8.0.3xx

Author: nagilson

.vsts-ci.yml

@@ -3,7 +3,7 @@ trigger:
   branches:
     include:
     - main
-    - release/8.0.1xx
+    - release/8.0.3xx
     - internal/release/*
     - exp/*
 

.vsts-pr.yml

@@ -3,7 +3,7 @@ trigger:
   branches:
     include:
     - main
-    - release/8.0.1xx
+    - release/8.0.3xx
     - internal/release/*
     - exp/*
 

Directory.Build.props

@@ -16,7 +16,7 @@
 
     <!-- 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>net7.0</ResolverTargetFramework>
+    <ResolverTargetFramework>net8.0</ResolverTargetFramework>
     <!-- Source build does not need to worry about running on VS for Mac -->
     <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
 

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)" />
@@ -105,7 +107,7 @@
     <PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
     <PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
     <PackageVersion Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" />
-    <PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.0" />
+    <PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.1" />
     <PackageVersion Include="xunit" Version="$(XUnitVersion)" />
     <PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
     <PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>

NuGet.config

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />
@@ -15,23 +16,22 @@
     <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-format -->
-    <add key="darc-pub-dotnet-format-b252c60" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-9/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-b252c60-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-9/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-7bb270d-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  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-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
@@ -49,15 +49,7 @@
     <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-templating -->
-    <add key="darc-pub-dotnet-templating-450f4db" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-9/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-10/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-450f4db-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-23f53d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-23f53d9c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  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" />
@@ -71,6 +63,8 @@
     <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-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" />
@@ -96,7 +90,8 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
     <add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
-    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  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 -->
@@ -124,6 +119,8 @@
     <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-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,18 @@
     <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.Threading.Tasks.Dataflow/*8.0.0*" />
+    <UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
   </IgnorePatterns>
 </UsageData>