Merge branch 'release/6.0.2xx' into main

src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml

@@ -39,10 +39,12 @@ jobs:
         _BuildArch: x64
         _Container: ${{ parameters.fedora33Container }}
         _RunOnline: true
-      Fedora33-Offline:
-        _BuildArch: x64
-        _Container: ${{ parameters.fedora33Container }}
-        _RunOnline: false
+      # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499
+      ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        Fedora33-Offline:
+          _BuildArch: x64
+          _Container: ${{ parameters.fedora33Container }}
+          _RunOnline: false
   timeoutInMinutes: 240
   workspace:
     clean: all

src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Rainer Sigwald <raines@microsoft.com>
-Date: Fri, 3 Dec 2021 14:24:03 -0600
-Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118)
-
-This package is only super relevant at PR-build time so it should
-be fine to drop it from source-build scenarios. Fixes #7115.
-
-Patch created from https://github.com/dotnet/msbuild/pull/7118
----
- src/Directory.Build.targets | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
-index 2a840bfd7..bff6cc905 100644
---- a/src/Directory.Build.targets
-+++ b/src/Directory.Build.targets
-@@ -85,7 +85,7 @@
- 
-   <ItemGroup Condition="'$(GenerateReferenceAssemblySource)' == 'true'">
-     <!-- Ensure API stability for shipping packages -->
--    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" />
-+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" Condition="'$(DotNetBuildFromSource)' != 'true'" />
- 
-     <AdditionalFiles Include="PublicAPI/$(PublicApiTfm)/PublicAPI.Shipped.txt" />
-     <AdditionalFiles Include="PublicAPI/$(PublicApiTfm)/PublicAPI.Unshipped.txt" />

src/redist/targets/GenerateLayout.targets

@@ -463,9 +463,13 @@
   </Target>
 
   <Target Name="CopyIncludedWorkloadManifestFile" >
+
     <ItemGroup>
-      <WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.WorkloadManifestId)', '').ToLower())" />
+      <WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.Identity)', '').ToLower())" />
     </ItemGroup>
+
+    <Error Text="No workload manifest content found." Condition="'@(WorkloadManifestFilesContent->Count())' == '0'" />
+
     <WriteLinesToFile File="$(SdkOutputDirectory)IncludedWorkloadManifests.txt"
                       Lines="@(WorkloadManifestFilesContent)"
                       Overwrite="true" />