From 918bc58273b25aee264ecb677a842ab5ca87eaae Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Tue, 8 Dec 2020 10:17:45 -0600
Subject: [PATCH 1/3] runtime: Disable building Crossgen2 pack

---
 ...0025-Disable-building-Crossgen2-pack.patch | 40 ++++++++++++++++
 ...Don-t-build-crossgen2-self-contained.patch | 46 -------------------
 2 files changed, 40 insertions(+), 46 deletions(-)
 create mode 100644 patches/runtime/0025-Disable-building-Crossgen2-pack.patch
 delete mode 100644 patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch

diff --git a/patches/runtime/0025-Disable-building-Crossgen2-pack.patch b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
new file mode 100644
index 0000000000..2e0da20edf
--- /dev/null
+++ b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
@@ -0,0 +1,40 @@
+From 3113a8a5880408a0bf99c294afc69a759bb031de Mon Sep 17 00:00:00 2001
+From: Davis Goodin <dagood@microsoft.com>
+Date: Tue, 8 Dec 2020 10:16:07 -0600
+Subject: [PATCH] Disable building Crossgen2 pack
+
+---
+ .../pkg/Microsoft.NETCore.App.Crossgen2.pkgproj | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+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
+index db13cdde514..71aee46af70 100644
+--- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
++++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
+@@ -10,6 +10,23 @@
+     <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
+   </PropertyGroup>
+ 
++  <!--
++    Building Crossgen2 from source has a few issues:
++
++    Self-contained packages bring down lots of prebuilts. We can disable
++    self-contained, but this only fixes this one problem, and it also makes the
++    source-built crossgen2 different from the Microsoft build and potentially
++    not work in the expected scenarios. See
++    https://github.com/dotnet/source-build/issues/1937
++
++    Even if we build it, there is no mechanism to distribute it in distro
++    packages. This is the same problem as runtime packs. See
++    https://github.com/dotnet/source-build/issues/1568
++  -->
++  <PropertyGroup>
++    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
++  </PropertyGroup>
++
+   <!--
+     Get installer properties, in particular for MSIs.
+     Consider porting to central infrastructure: https://github.com/dotnet/runtime/issues/1867
+-- 
+2.25.4
+
diff --git a/patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch b/patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch
deleted file mode 100644
index 2a5f9dbd8c..0000000000
--- a/patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 86c7842a7723258ef1016ff44785f66b16668bd1 Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Mon, 19 Oct 2020 18:59:36 +0000
-Subject: [PATCH] Don't build crossgen2 self-contained
-
-When self-contained is true, Crossgen2 attemts to download
-Microsoft.NETCore.App.Runtime.linux-x64 with a version matching
-the SDK version of the SDK from global.json
----
- .../projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-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
-index 7ae30c5..db13cdd 100644
---- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
-+++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
-@@ -68,7 +68,7 @@
-             Targets="Restore"
-             Properties="
-             Configuration=$(RuntimeConfiguration);
--            SelfContained=true;
-+            SelfContained=false;
-             RuntimeIdentifier=$(PackageRID)">
-     <Output TaskParameter="TargetOutputs" ItemName="Crossgen2File" />
-     </MSBuild>
-@@ -79,7 +79,7 @@
-             Configuration=$(RuntimeConfiguration);
-             GenerateDependencyFile=true;
-             IncludeFileVersionsInDependencyFile=false;
--            SelfContained=true;
-+            SelfContained=false;
-             RemoveLongNameDac=true;
-             RuntimeGraphPath=$(LiveRuntimeIdentifierGraphPath);
-             RuntimeIdentifier=$(PackageRID)">
-@@ -90,7 +90,7 @@
-       <File Include="@(Crossgen2File)">
-         <TargetPath>tools</TargetPath>
-       </File>
--      <!-- 
-+      <!--
-         System.Private.CoreLib's R2R pdb ends up in two locations (CoreCLR and the depproj output).
-         Remove them here and let the symbol file location infra find exactly one.
-       -->
--- 
-1.8.3.1
-

From 6f233254d55b5e22db7257de754d59ca34d2f50e Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Tue, 8 Dec 2020 10:38:14 -0600
Subject: [PATCH 2/3] Clarify patch comments

---
 ...0025-Disable-building-Crossgen2-pack.patch | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/patches/runtime/0025-Disable-building-Crossgen2-pack.patch b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
index 2e0da20edf..108a99b583 100644
--- a/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
+++ b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
@@ -1,6 +1,6 @@
-From 3113a8a5880408a0bf99c294afc69a759bb031de Mon Sep 17 00:00:00 2001
+From 37592dbc531b43a4366aa9988bc155db8e560d32 Mon Sep 17 00:00:00 2001
 From: Davis Goodin <dagood@microsoft.com>
-Date: Tue, 8 Dec 2020 10:16:07 -0600
+Date: Tue, 8 Dec 2020 10:36:54 -0600
 Subject: [PATCH] Disable building Crossgen2 pack
 
 ---
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable building Crossgen2 pack
  1 file changed, 17 insertions(+)
 
 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
-index db13cdde514..71aee46af70 100644
+index d652108a181..7a5313e5cc4 100644
 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
 +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
 @@ -10,6 +10,23 @@
@@ -16,16 +16,16 @@ index db13cdde514..71aee46af70 100644
    </PropertyGroup>
  
 +  <!--
-+    Building Crossgen2 from source has a few issues:
++    Building the Crossgen2 pack from source has a few issues:
 +
-+    Self-contained packages bring down lots of prebuilts. We can disable
-+    self-contained, but this only fixes this one problem, and it also makes the
-+    source-built crossgen2 different from the Microsoft build and potentially
-+    not work in the expected scenarios. See
-+    https://github.com/dotnet/source-build/issues/1937
++    Self-contained packages like this one bring down lots of prebuilts. We can disable
++    self-contained, but this only fixes this some prebuilts, not all. See
++    https://github.com/dotnet/source-build/issues/1937. Also, disabling self-contained makes the
++    source-built Crossgen2 pack different from the Microsoft build's and potentially not work in the
++    expected scenarios.
 +
-+    Even if we build it, there is no mechanism to distribute it in distro
-+    packages. This is the same problem as runtime packs. See
++    Even if we managed to build it without prebuilts, there is no mechanism to distribute the
++    Crossgen2 pack in distro packages. This is the same problem as runtime packs. See
 +    https://github.com/dotnet/source-build/issues/1568
 +  -->
 +  <PropertyGroup>

From ab6abde1f287679b21a70b7800e408c5bd0711c2 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Tue, 8 Dec 2020 10:49:58 -0600
Subject: [PATCH 3/3] Use SkipBuild, not ExcludeFromSourceBuild

---
 patches/runtime/0025-Disable-building-Crossgen2-pack.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/runtime/0025-Disable-building-Crossgen2-pack.patch b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
index 108a99b583..e4468f37ec 100644
--- a/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
+++ b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
@@ -1,4 +1,4 @@
-From 37592dbc531b43a4366aa9988bc155db8e560d32 Mon Sep 17 00:00:00 2001
+From 1fbaac491061d31b31d5e07490ef9011f01550b7 Mon Sep 17 00:00:00 2001
 From: Davis Goodin <dagood@microsoft.com>
 Date: Tue, 8 Dec 2020 10:36:54 -0600
 Subject: [PATCH] Disable building Crossgen2 pack
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable building Crossgen2 pack
  1 file changed, 17 insertions(+)
 
 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
-index d652108a181..7a5313e5cc4 100644
+index d652108a181..7db441d2bc8 100644
 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
 +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
 @@ -10,6 +10,23 @@
@@ -29,7 +29,7 @@ index d652108a181..7a5313e5cc4 100644
 +    https://github.com/dotnet/source-build/issues/1568
 +  -->
 +  <PropertyGroup>
-+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
++    <SkipBuild>true</SkipBuild>
 +  </PropertyGroup>
 +
    <!--