From 304e61c3120b33b808a4a899571372480169968e Mon Sep 17 00:00:00 2001
From: Fadi Hanna <fadim@microsoft.com>
Date: Tue, 4 Feb 2020 12:32:32 -0800
Subject: [PATCH 1/2] Make Crossgen2 a self-contained package

---
 .../Microsoft.NETCore.Crossgen2.pkgproj       | 28 ------------
 ...me.Linux.Microsoft.NETCore.Crossgen2.props |  8 +---
 ...ndows_NT.Microsoft.NETCore.Crossgen2.props |  8 +---
 .../Microsoft.NETCore.App.Crossgen2.pkgproj   | 45 +------------------
 4 files changed, 3 insertions(+), 86 deletions(-)

diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
index f10cd210b84769..21c547be49b8ce 100644
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
@@ -10,32 +10,4 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
 
-  <PropertyGroup>
-    <!-- We're publishing crossgen2 in its own package as framework dependent application for now since we only have
-        two simple scenarios we want to support in the short term: win_x64 to win_x64 and linux_x64 to linux_x64 compilations.
-        Once we have more complex targets, especially cross-platform and cross-architecture, crossgen2 will become a self-contained package.
-    -->
-    <Crossgen2RuntimeConfigContents>
-{
-  "runtimeOptions": {
-    "tfm": "netcoreapp5.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "5.0.100-alpha1-015772"
-    }
-  }
-}
-    </Crossgen2RuntimeConfigContents>
-    <Crossgen2RuntimeConfigFile>$(ArtifactsObjDir)crossgen2\crossgen2.runtimeconfig.json</Crossgen2RuntimeConfigFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ArchitectureSpecificToolFile Include="$(Crossgen2RuntimeConfigFile)" />
-  </ItemGroup>
-    
-  <Target Name="WriteCrossgen2RuntimeConfig" BeforeTargets="GetPackageFiles">
-    <!-- Emit the runtime config json file that will be packaged with crossgen2 -->
-    <WriteLinesToFile File="$(Crossgen2RuntimeConfigFile)" Lines="$(Crossgen2RuntimeConfigContents)" Overwrite="true" WriteOnlyWhenDifferent="true" />
-  </Target>
-
 </Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
index 24e45ab5487d89..b653786eb8fc41 100644
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\ILCompiler*.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\Microsoft.DiaSymReader.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\System.CommandLine.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\libclrjitilc.so" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\libjitinterface.so" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\*" />
   </ItemGroup>
 </Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props
index 67cda65147049e..b653786eb8fc41 100644
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2.exe" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\ILCompiler*.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\Microsoft.DiaSymReader.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\System.CommandLine.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\clrjitilc.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\jitinterface.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\*" />
   </ItemGroup>
 </Project>
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 f41bb4f54f0611..1938be1e126cca 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
@@ -29,57 +29,14 @@
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
-  <PropertyGroup>
-    <Crossgen2RuntimeConfigFile>$(IntermediateOutputPath)crossgen2.runtimeconfig.json</Crossgen2RuntimeConfigFile>
-  </PropertyGroup>
-
   <ItemGroup>
-    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)crossgen2$(ExeSuffix)" />
-    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)crossgen2.dll" />
-    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)ILCompiler*.dll" />
-    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)Microsoft.DiaSymReader.dll" />
-    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)System.CommandLine.dll" />
-    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjitilc$(LibraryFileExtension)" />
-    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)jitinterface$(LibraryFileExtension)" />
-
-    <ArchitectureSpecificToolFile Include="$(Crossgen2RuntimeConfigFile)" />
+    <ArchitectureSpecificToolFile Include="$(CoreCLRCrossgen2Dir)*" />
 
     <File Include="@(ArchitectureSpecificToolFile)">
       <TargetPath>tools</TargetPath>
     </File>
   </ItemGroup>
 
-  <Target Name="WriteCrossgen2RuntimeConfig"
-          BeforeTargets="GetPackageFiles">
-    <PropertyGroup>
-      <!--
-        We're publishing crossgen2 in its own package as framework dependent application for now
-        since we only have two simple scenarios we want to support in the short term: win_x64 to
-        win_x64 and linux_x64 to linux_x64 compilations. Once we have more complex targets,
-        especially cross-platform and cross-architecture, crossgen2 will become a self-contained
-        package.
-      -->
-      <Crossgen2RuntimeConfigContents>
-{
-  "runtimeOptions": {
-    "tfm": "netcoreapp5.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "5.0.100-alpha1-015772"
-    }
-  }
-}
-      </Crossgen2RuntimeConfigContents>
-    </PropertyGroup>
-
-    <!-- Emit the runtime config json file that will be packaged with crossgen2 -->
-    <WriteLinesToFile
-      File="$(Crossgen2RuntimeConfigFile)"
-      Lines="$(Crossgen2RuntimeConfigContents)"
-      Overwrite="true"
-      WriteOnlyWhenDifferent="true" />
-  </Target>
-
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
 </Project>

From f51a4b118a5b8e4cee92848b5a9a98ee43f7e036 Mon Sep 17 00:00:00 2001
From: Fadi Hanna <fadim@microsoft.com>
Date: Tue, 4 Feb 2020 14:34:33 -0800
Subject: [PATCH 2/2] Deleting the crossgen2 packaging project from the coreclr
 sub-repo

The packaging project for the package we ship is under the installer sub-repo
---
 .../Microsoft.NETCore.Crossgen2.builds              |  9 ---------
 .../Microsoft.NETCore.Crossgen2.pkgproj             | 13 -------------
 .../runtime.Linux.Microsoft.NETCore.Crossgen2.props |  6 ------
 ...ime.Windows_NT.Microsoft.NETCore.Crossgen2.props |  6 ------
 src/coreclr/src/.nuget/descriptions.json            |  5 -----
 src/coreclr/src/.nuget/packages.builds              |  4 ----
 6 files changed, 43 deletions(-)
 delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.builds
 delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
 delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
 delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props

diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.builds b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.builds
deleted file mode 100644
index 85918b379eadaf..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.builds
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
-    <!-- identity project, runtime specific projects are included by props above -->
-    <Project Include="$(MSBuildProjectName).pkgproj" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(builds.targets))" />
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
deleted file mode 100644
index 21c547be49b8ce..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
-    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
-  </PropertyGroup>
-
-  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
deleted file mode 100644
index b653786eb8fc41..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\*" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props
deleted file mode 100644
index b653786eb8fc41..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\*" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/descriptions.json b/src/coreclr/src/.nuget/descriptions.json
index d55e8c78cb56f7..e019928e404eb9 100644
--- a/src/coreclr/src/.nuget/descriptions.json
+++ b/src/coreclr/src/.nuget/descriptions.json
@@ -43,10 +43,5 @@
         "Name": "Microsoft.NET.Sdk.IL",
         "Description": "Provides support for building IL projects.",
         "CommonTypes": [ ]
-    },
-    {
-        "Name": "Microsoft.NETCore.Crossgen2",
-        "Description": "The .NET Crossgen2 compiler.",
-        "CommonTypes": [ ]
     }
 ]
diff --git a/src/coreclr/src/.nuget/packages.builds b/src/coreclr/src/.nuget/packages.builds
index fa33f6a2a88eae..d76b76c9625872 100644
--- a/src/coreclr/src/.nuget/packages.builds
+++ b/src/coreclr/src/.nuget/packages.builds
@@ -21,10 +21,6 @@
     <ProjectReference Include="Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BuildArch)'=='x64' And ('$(__BuildOS)' == 'Windows_NT' Or '$(__BuildOS)' == 'Linux')">
-    <ProjectReference Include="Microsoft.NETCore.Crossgen2\Microsoft.NETCore.Crossgen2.builds" />
-  </ItemGroup>
-
   <!-- Generate a version.txt file we include in our packages
        The InitializeSourceControlInformationFromSourceControlManager is part of Microsoft.Build.Tasks.Git
        and is responsible for setting SourceRevisionId -->