Skip to content

Commit d4eaaee

Browse files
authored
Remove apphost from roslyn-analyzers (#1932)
And update baselines.
1 parent 1de7bd4 commit d4eaaee

File tree

4 files changed

+56
-24
lines changed

4 files changed

+56
-24
lines changed

patches/roslyn-analyzers/0006-Disable-AppHost.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
From 69c78ae86d3e08c9d53031ed378d387f0e94ab7b Mon Sep 17 00:00:00 2001
2+
From: Omair Majid <[email protected]>
3+
Date: Fri, 20 Nov 2020 15:00:09 -0500
4+
Subject: [PATCH] Remove AppHosts from tools
5+
6+
The tool projects are building the apphost, but we always invoke the
7+
tool through `dotnet tool.dll` instead of the apphost (`tool`). Removing
8+
the apphost should have no effts.
9+
10+
Keeping the AppHosts introduces additional prebuilts for source build
11+
and it would be nice to not have to maintain this patch in source-build.
12+
See https://github.com/dotnet/source-build/issues/1905 for more details.
13+
---
14+
src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj | 1 +
15+
.../GenerateDocumentationAndConfigFiles.csproj | 1 +
16+
.../GenerateGlobalAnalyzerConfigs.csproj | 1 +
17+
3 files changed, 3 insertions(+)
18+
19+
diff --git a/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj b/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
20+
index 42b47952b..ba0a9612d 100644
21+
--- a/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
22+
+++ b/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
23+
@@ -3,5 +3,6 @@
24+
<OutputType>Exe</OutputType>
25+
<TargetFramework>netcoreapp3.1</TargetFramework>
26+
<NonShipping>true</NonShipping>
27+
+ <UseAppHost>false</UseAppHost>
28+
</PropertyGroup>
29+
</Project>
30+
diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
31+
index ab935cd15..0056792ae 100644
32+
--- a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
33+
+++ b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
34+
@@ -3,6 +3,7 @@
35+
<OutputType>Exe</OutputType>
36+
<TargetFramework>netcoreapp3.1</TargetFramework>
37+
<NonShipping>true</NonShipping>
38+
+ <UseAppHost>false</UseAppHost>
39+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
40+
<MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)</MicrosoftCodeAnalysisVersion>
41+
</PropertyGroup>
42+
diff --git a/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj b/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj
43+
index 9793af20a..c76df9dfd 100644
44+
--- a/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj
45+
+++ b/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj
46+
@@ -4,6 +4,7 @@
47+
<TargetFramework>netcoreapp3.1</TargetFramework>
48+
<NonShipping>true</NonShipping>
49+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
50+
+ <UseAppHost>false</UseAppHost>
51+
<MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)</MicrosoftCodeAnalysisVersion>
52+
</PropertyGroup>
53+
<ItemGroup>
54+
--
55+
2.28.0
56+

tools-local/prebuilt-baseline-offline.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.0" />
182182
<Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4" />
183183
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.0.3" />
184-
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.1.7" />
185184
<Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />
186185
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
187186
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />

tools-local/prebuilt-baseline-online.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
113113
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
114114
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.0.3" />
115-
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.1.7" />
116115
<Usage Id="Microsoft.NETCore.App.Ref" Version="3.0.0" />
117116
<Usage Id="Microsoft.NETCore.App.Ref" Version="3.1.0" />
118117
<Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />

0 commit comments

Comments
 (0)