Skip to content

Commit 5f97755

Browse files
authored
Remove portable prebuilts: disable building Crossgen2 pack (#1945)
1 parent 50a6b4d commit 5f97755

File tree

2 files changed

+40
-46
lines changed

2 files changed

+40
-46
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 1fbaac491061d31b31d5e07490ef9011f01550b7 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <[email protected]>
3+
Date: Tue, 8 Dec 2020 10:36:54 -0600
4+
Subject: [PATCH] Disable building Crossgen2 pack
5+
6+
---
7+
.../pkg/Microsoft.NETCore.App.Crossgen2.pkgproj | 17 +++++++++++++++++
8+
1 file changed, 17 insertions(+)
9+
10+
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
11+
index d652108a181..7db441d2bc8 100644
12+
--- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
13+
+++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
14+
@@ -10,6 +10,23 @@
15+
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
16+
</PropertyGroup>
17+
18+
+ <!--
19+
+ Building the Crossgen2 pack from source has a few issues:
20+
+
21+
+ Self-contained packages like this one bring down lots of prebuilts. We can disable
22+
+ self-contained, but this only fixes this some prebuilts, not all. See
23+
+ https://github.com/dotnet/source-build/issues/1937. Also, disabling self-contained makes the
24+
+ source-built Crossgen2 pack different from the Microsoft build's and potentially not work in the
25+
+ expected scenarios.
26+
+
27+
+ Even if we managed to build it without prebuilts, there is no mechanism to distribute the
28+
+ Crossgen2 pack in distro packages. This is the same problem as runtime packs. See
29+
+ https://github.com/dotnet/source-build/issues/1568
30+
+ -->
31+
+ <PropertyGroup>
32+
+ <SkipBuild>true</SkipBuild>
33+
+ </PropertyGroup>
34+
+
35+
<!--
36+
Get installer properties, in particular for MSIs.
37+
Consider porting to central infrastructure: https://github.com/dotnet/runtime/issues/1867
38+
--
39+
2.25.4
40+

patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)