mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #13648 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main

Browse source 
[automated] Merge branch 'release/6.0.4xx' => 'main'
This commit is contained in:
v-wuzhai 2022-04-17 19:36:23 -07:00 committed by GitHub
commit e52cd659b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch Normal file
View file

@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Wed, 13 Apr 2022 21:30:39 +0000
Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build
Removes prebuilt.
Patch for https://github.com/dotnet/linker/pull/2742
---
src/linker/Mono.Linker.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj
index 391300aa..d276003e 100644
--- a/src/linker/Mono.Linker.csproj
+++ b/src/linker/Mono.Linker.csproj
@@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)">
+ <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>