Publish crossgen2 as a .zip/tar.gz file (#34623)

- For consumption in dotnet-docker repo

diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets
index 52af95e..20b134d 100644 (file)
--- a/src/installer/Directory.Build.targets
+++ b/src/installer/Directory.Build.targets
@@ -158,6 +158,7 @@
       <CombinedCompressedFile>dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension)</CombinedCompressedFile>
       <HostFxrCompressedFile>dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension)</HostFxrCompressedFile>
       <NetHostCompressedFile>dotnet-nethost-$(AppHostVersion)-$(PackageTargetRid)$(CompressedFileExtension)</NetHostCompressedFile>
+      <Crossgen2CompressedFile>dotnet-crossgen2-$(ProductMoniker)$(CompressedFileExtension)</Crossgen2CompressedFile>
       <SharedFrameworkCompressedFile>dotnet-runtime-internal-$(ProductMoniker)$(CompressedFileExtension)</SharedFrameworkCompressedFile>
       <SharedFrameworkSymbolsCompressedFile>dotnet-runtime-symbols-$(ProductMoniker)$(CompressedFileExtension)</SharedFrameworkSymbolsCompressedFile>
 

diff --git a/src/installer/pkg/packaging/Directory.Build.props b/src/installer/pkg/packaging/Directory.Build.props
index 3c0a82a..61f4f4d 100644 (file)
--- a/src/installer/pkg/packaging/Directory.Build.props
+++ b/src/installer/pkg/packaging/Directory.Build.props
@@ -14,6 +14,7 @@
     <SharedFrameworkPublishRoot>$(IntermediateOutputRootPath)sharedFx/</SharedFrameworkPublishRoot>
     <CombinedPublishRoot>$(IntermediateOutputRootPath)combined-framework-host/</CombinedPublishRoot>
     <NetHostPublishRoot>$(IntermediateOutputRootPath)nethost/</NetHostPublishRoot>
+    <Crossgen2PublishRoot>$(IntermediateOutputRootPath)crossgen2/</Crossgen2PublishRoot>
   </PropertyGroup>
 
 </Project>

diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj
index 29abbe0..cfe1bdf 100644 (file)
--- a/src/installer/pkg/packaging/installers.proj
+++ b/src/installer/pkg/packaging/installers.proj
@@ -81,6 +81,7 @@
       <OutDirs Include="$(HostFxrPublishRoot)" />
       <OutDirs Include="$(SharedFrameworkPublishRoot)" />
       <OutDirs Include="$(NetHostPublishRoot)" />
+      <OutDirs Include="$(Crossgen2PublishRoot)" />
     </ItemGroup>
 
     <RemoveDir Directories="@(OutDirs)" />
@@ -113,6 +114,15 @@
     </ItemGroup>
     <Copy Sourcefiles="@(SharedFxFiles)"
           DestinationFolder="$(SharedFrameworkPublishRoot)shared/%(SharedFxFiles.RecursiveDir)" />
+    
+    <!-- copy crossgen2 -->
+    <ItemGroup>
+      <Crossgen2Files Include="$(CoreCLRCrossgen2Dir)\*" />
+      <Crossgen2Files Include="$(RepoRoot)THIRD-PARTY-NOTICES.TXT" />
+      <Crossgen2Files Include="$(RepoRoot)LICENSE.TXT" />
+    </ItemGroup>
+    <Copy Sourcefiles="@(Crossgen2Files)"
+          DestinationFolder="$(Crossgen2PublishRoot)%(Crossgen2Files.RecursiveDir)" />
 
     <!-- Copy nethost -->
     <PropertyGroup>
@@ -198,6 +208,11 @@
         OverwriteDestination="true" />
 
     <ZipFileCreateFromDirectory
+        SourceDirectory="$(Crossgen2PublishRoot)"
+        DestinationArchive="$(AssetOutputPath)$(Crossgen2CompressedFile)"
+        OverwriteDestination="true" />
+
+    <ZipFileCreateFromDirectory
         SourceDirectory="$(SharedFrameworkPublishRoot)"
         DestinationArchive="$(AssetOutputPath)$(SharedFrameworkCompressedFile)"
         OverwriteDestination="true" />
@@ -222,6 +237,9 @@
     <Exec Command="tar -C $(NetHostPublishRoot) -czf $(AssetOutputPath)$(NetHostCompressedFile) ."
           IgnoreExitCode="true"
           IgnoreStandardErrorWarningFormat="true" />
+    <Exec Command="tar -C $(Crossgen2PublishRoot) -czf $(AssetOutputPath)$(Crossgen2CompressedFile) ."
+          IgnoreExitCode="true"
+          IgnoreStandardErrorWarningFormat="true" />
     <Exec Command="tar -C $(SharedFrameworkPublishRoot) -czf $(AssetOutputPath)$(SharedFrameworkCompressedFile) ."
           IgnoreExitCode="true"
           IgnoreStandardErrorWarningFormat="true" />
@@ -231,6 +249,7 @@
     <Error Condition="!Exists('$(AssetOutputPath)$(CombinedCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(CombinedCompressedFile)" />
     <Error Condition="!Exists('$(AssetOutputPath)$(HostFxrCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(HostFxrCompressedFile)" />
     <Error Condition="!Exists('$(AssetOutputPath)$(NetHostCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(NetHostCompressedFile)" />
+    <Error Condition="!Exists('$(AssetOutputPath)$(Crossgen2CompressedFile)')" Message="Unable to create $(AssetOutputPath)$(Crossgen2CompressedFile)" />
     <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(SharedFrameworkCompressedFile)" />
     <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)" />
   </Target>