Skip to content

Commit 3724520

Browse files
authored
linker: Remove apphost prebuilt usage (#1908)
1 parent 3a8e1e7 commit 3724520

File tree

1 file changed

+73
-0
lines changed

1 file changed

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

0 commit comments

Comments
 (0)