Merge pull request #12839 from dotnet-maestro-bot/merge/release/6.0.2xx-to-main

[automated] Merge branch 'release/6.0.2xx' => 'main'
This commit is contained in:
v-wuzhai 2021-12-16 22:57:35 -08:00 committed by GitHub
commit 6f39bd4bb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 27 deletions

View file

@ -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" />

View file

@ -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" />