forked from dotnet/linker
/
0002-Remove-apphost-prebuilt-usage.patch
73 lines (66 loc) · 3.67 KB
/
0002-Remove-apphost-prebuilt-usage.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
From e2f6d8d0ff79a23433d205b9eb0c7526949bbe6b Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Fri, 20 Nov 2020 16:26:21 -0600
Subject: [PATCH] Remove apphost prebuilt usage
See https://github.com/dotnet/source-build/issues/1905
The analyzer project was being restored because it's part of the sln,
but not used. Remove it from the sln entirely.
The apphost being generated for Mono.Linker isn't included in repo
output during source-build, so stop producing it.
---
illink.sln | 15 ---------------
src/linker/Mono.Linker.csproj | 2 ++
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/illink.sln b/illink.sln
index 8dcca17c..cd216f65 100644
--- a/illink.sln
+++ b/illink.sln
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "src\ILLink.
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "analyzer", "analyzer", "{AA0569FB-73E9-4B42-9A19-714BB1229DAE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "analyzer", "src\analyzer\analyzer.csproj", "{96182221-C5C4-436D-9BE0-EC499F9BAF17}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C2969923-7BAA-4FE4-853C-F670B0D3C6C8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{03EB085F-3E2E-4A68-A7DF-951ADF59A0CC}"
@@ -51,18 +49,6 @@ Global
{A7A026C4-DEB4-4EF6-963E-17E7B98A6527}.Release|x64.Build.0 = Release|Any CPU
{A7A026C4-DEB4-4EF6-963E-17E7B98A6527}.Release|x86.ActiveCfg = Release|Any CPU
{A7A026C4-DEB4-4EF6-963E-17E7B98A6527}.Release|x86.Build.0 = Release|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|x64.ActiveCfg = Debug|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|x64.Build.0 = Debug|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|x86.ActiveCfg = Debug|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|x86.Build.0 = Debug|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Release|Any CPU.Build.0 = Release|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Release|x64.ActiveCfg = Release|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Release|x64.Build.0 = Release|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Release|x86.ActiveCfg = Release|Any CPU
- {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Release|x86.Build.0 = Release|Any CPU
{57BE47DF-DCDF-44EE-B77F-F8E8AD069076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{57BE47DF-DCDF-44EE-B77F-F8E8AD069076}.Debug|Any CPU.Build.0 = Debug|Any CPU
{57BE47DF-DCDF-44EE-B77F-F8E8AD069076}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -80,7 +66,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {96182221-C5C4-436D-9BE0-EC499F9BAF17} = {AA0569FB-73E9-4B42-9A19-714BB1229DAE}
{57BE47DF-DCDF-44EE-B77F-F8E8AD069076} = {03EB085F-3E2E-4A68-A7DF-951ADF59A0CC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj
index 20e60aca..de6ab385 100644
--- a/src/linker/Mono.Linker.csproj
+++ b/src/linker/Mono.Linker.csproj
@@ -2,6 +2,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
+ <!-- This apphost is not necessary for source-build. Remove it to avoid a prebuilt. See https://github.com/dotnet/source-build/issues/1905 -->
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
</PropertyGroup>
<PropertyGroup Condition="'$(MonoBuild)' == ''">
--
2.25.4