From 43f0034a7f199cb027029f03237ba24cc46ba057 Mon Sep 17 00:00:00 2001
From: Anton Lapounov <antonl@microsoft.com>
Date: Tue, 30 Jun 2020 22:16:37 -0700
Subject: [PATCH] Add native runtime components to Crossgen2 package. (#38600)

For Windows, add clrcompression.dll to the package. For Linux, add { libSystem.IO.Compression.Native.so, libSystem.Native.so, libSystem.Net.Security.Native.so, libSystem.Security.Cryptography.Native.OpenSsl.so } to the package and also remove the corresponding static libraries with the .a extension from crossgen2.deps.json.
---
 src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj  | 11 ++++++++++-
 .../pkg/Microsoft.NETCore.App.Crossgen2.pkgproj       |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj
index 05051a5cd6e62e..b1e2d5a25130e8 100644
--- a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj
@@ -100,8 +100,17 @@
 
   <Target Name="GenerateDepsJsonFile" Returns="$(ProjectDepsFilePath)" DependsOnTargets="GenerateBuildDependencyFile" />
 
-  <Target Name="RemoveLongNameDacFromDepsJson" AfterTargets="ResolveRuntimePackAssets" BeforeTargets="GenerateBuildDependencyFile" Condition="'$(RemoveLongNameDac)' == 'true'">
+  <Target Name="RemoveUnusedFilesFromDepsJson" AfterTargets="ResolveRuntimePackAssets" BeforeTargets="GenerateBuildDependencyFile">
+    <PropertyGroup>
+      <StaticLibraryFileExtension>.a</StaticLibraryFileExtension>
+      <StaticLibraryFileExtension Condition="'$(TargetOS)' == 'Windows_NT'">.lib</StaticLibraryFileExtension>
+    </PropertyGroup>
+
     <ItemGroup>
+      <RuntimePackAsset Remove="@(RuntimePackAsset)" Condition="'%(Extension)' == '$(StaticLibraryFileExtension)'" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(RemoveLongNameDac)' == 'true'">
       <RuntimePackAsset Remove="@(RuntimePackAsset)" Condition="$([System.String]::new('%(FileName)').StartsWith('mscordaccore_'))" />
     </ItemGroup>
   </Target>
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 93a1cbd56df057..db62497ef5c164 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
@@ -59,9 +59,12 @@
       <!-- Include the native and managed files from the Microsoft.NETCore.App shared framework -->
       <Crossgen2File Include="@(RuntimeFile)" Condition="'%(RuntimeFile.TargetPath)' == 'runtimes/$(PackageRID)/native'" />
       <Crossgen2File Include="@(RuntimeFile)" Condition="'%(RuntimeFile.TargetPath)' == 'runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)'" />
-      <!-- Include the native hosting layer  -->
+      <!-- Include the native hosting layer -->
       <Crossgen2File Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)" />
       <Crossgen2File Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)" />
+      <!-- Include native runtime components -->
+      <Crossgen2File Include="$(LibrariesNativeArtifactsPath)$(LibraryFilePrefix)*$(LibraryFileExtension)"
+        Exclude="$(LibrariesNativeArtifactsPath)$(LibraryFilePrefix)System.IO.Ports.Native$(LibraryFileExtension)" />
     </ItemGroup>
 
     <MSBuild Projects="$(CoreClrProjectRoot)src/tools/aot/crossgen2/crossgen2.csproj"