Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …

…merge/release/8.0.3xx-to-release/8.0.4xx
dotnet · Jul 8, 2024 · 1093aee · 1093aee
2 parents 2d53dd4 + 4f75e80
commit 1093aee
Show file tree

Hide file tree

Showing 224 changed files with 4,251 additions and 1,648 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -3,7 +3,7 @@ trigger:
   branches:
     include:
     - main
-    - release/8.0.3xx
+    - release/8.0.4xx
     - internal/release/*
     - exp/*
 
@@ -117,7 +117,7 @@ extends:
           enableInternalSources: true
           platform:
             name: 'Managed'
-            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
+            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:

diff --git a/.vsts-pr.yml b/.vsts-pr.yml
@@ -3,7 +3,7 @@ trigger:
   branches:
     include:
     - main
-    - release/8.0.3xx
+    - release/8.0.4xx
     - internal/release/*
     - exp/*
 
@@ -90,7 +90,7 @@ stages:
       enableInternalSources: true
       platform:
         name: 'Managed'
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
+        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:

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,14 +10,7 @@
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)"/>
-    <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
-    <PackageVersion Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
-    <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
-    <PackageVersion Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
-    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildPackageVersion)" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion)" />
@@ -42,7 +35,6 @@
     <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)" />
@@ -110,4 +102,36 @@
     <PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
     <PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>
   </ItemGroup>
+
+  <!-- Use different versions of Microsoft.Build.* depending on whether the output will be used in
+       .NET Framework (VS) or only in the .NET SDK.
+
+       Note: This is not abstracted in Versions.props because source-only
+       modes will import a version override file after Versions.props. -->
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(TargetFramework)' != 'net472'">
+    <!-- MSBuild-y stuff that runs in the CLI can always reference the latest MSBuild since
+         that is what will be packaged with the .NET SDK. -->
+    <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" />
+    <!-- Localization is the same between source-only and regular modes. Always taken from latest. Duplicated between the itemgroups for clarity. -->
+    <PackageVersion Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftBuildPackageVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
+    <!-- MSBuild-y stuff that runs in VS/MSBuild.exe should reference the lagging minimum version so
+         it works in that slightly-older Visual Studio. -->
+    <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildMinimumVersion)" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildMinimumVersion)" />
+    <!-- Localization is the same between source-only and regular modes. Always taken from latest. Duplicated between the itemgroups for clarity. -->
+    <PackageVersion Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildMinimumVersion)" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildMinimumVersion)" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildMinimumVersion)" />
+    <PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftNETStringToolsPackageVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/NuGet.config b/NuGet.config
@@ -6,24 +6,21 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-pub-dotnet-format-d237e17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-d237e17-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-d237e17-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-d237e17-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-d237e17-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-d237e17-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-d237e17-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-32b81fa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-32b81fa7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-32b81fa-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-32b81fa7-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-32b81fa-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-32b81fa7-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-32b81fa-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-32b81fa7-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-0c86109" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-0c861097/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-411e499" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-411e4990/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
@@ -35,6 +35,7 @@
 
     <!-- (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.Extensions.DependencyInjection.Abstractions/8.0.*" />
     <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
     <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
     <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />
@@ -44,5 +45,8 @@
     <UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
     <UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
     <UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
+
+    <!-- Transitive dependencies from roslyn -->
+    <UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
   </IgnorePatterns>
 </UsageData>