Fix NuGet packages (#140)

* Linux NuGet package wasn't including the static libraries. * The non-RID-specific package had RID specific stuff in it.
dotnet · Oct 4, 2020 · 8e9e355 · 8e9e355
1 parent 985a8e6
commit 8e9e355
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.DotNet.ILCompiler.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.DotNet.ILCompiler.pkgproj
@@ -13,29 +13,18 @@
       <File Remove="@(RuntimeFile)" />
     </ItemGroup>
 
-    <ItemGroup>
-      <IlcCompilerFile Include="$(CoreCLRILCompilerDir)*" />
-      <IlcBuildTaskFile Include="$(CoreCLRILCompilerDir)netstandard\*" />
-      <FrameworkFile Include="@(RuntimeFile)" Condition="'%(RuntimeFile.TargetPath)' == 'runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)'" />
-      <AotSdkFile Include="$(CoreCLRAotSdkDir)*" />
-      <BuildIntegrationFile Include="$(CoreCLRBuildIntegrationDir)*" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <File Include="@(IlcCompilerFile)">
-        <TargetPath>tools</TargetPath>
-      </File>
-      <File Include="@(IlcBuildTaskFile)">
-        <TargetPath>tools/netstandard</TargetPath>
+    <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
+      <File Include="@(RuntimeFile)" Condition="'%(RuntimeFile.TargetPath)' == 'runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)'">
+        <TargetPath>framework</TargetPath>
       </File>
-      <File Include="@(FrameworkFile)">
+      <File Include="@(RuntimeFile)" Condition="'%(RuntimeFile.TargetPath)' == 'runtimes/$(PackageRID)/native' and '%(RuntimeFile.Extension)' == '.a'">
         <TargetPath>framework</TargetPath>
       </File>
-      <File Include="@(AotSdkFile)">
-        <TargetPath>sdk</TargetPath>
+      <File Include="$(CoreCLRILCompilerDir)*">
+        <TargetPath>tools</TargetPath>
       </File>
-      <File Include="@(BuildIntegrationFile)">
-        <TargetPath>build</TargetPath>
+      <File Include="$(CoreCLRAotSdkDir)*">
+        <TargetPath>sdk</TargetPath>
       </File>
       <File Include="$(CoreCLRArtifactsPath)\$(LibraryFilePrefix)clrjit$(LibraryFileExtension)">
         <TargetPath>tools\$(LibraryFilePrefix)clrjitilc$(LibraryFileExtension)</TargetPath>
@@ -45,6 +34,14 @@
       </File>
     </ItemGroup>
 
+    <ItemGroup>
+      <File Include="$(CoreCLRBuildIntegrationDir)*">
+        <TargetPath>build</TargetPath>
+      </File>
+      <File Include="$(CoreCLRILCompilerDir)netstandard\*">
+        <TargetPath>tools/netstandard</TargetPath>
+      </File>
+    </ItemGroup>
   </Target>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
@@ -101,8 +101,8 @@
     <ItemGroup Condition="'$(PackageRID)' != ''">
       <LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)" />
       <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="$([System.String]::new('runtimes/$(PackageRID)/native/%(LibrariesRuntimeFiles.NativeSubDirectory)%(RecursiveDir)').TrimEnd('/'))" />
-      <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" 
-          Condition="'%(LibrariesRuntimeFiles.Extension)' != '.a'"/>
+      <!-- dotnet/runtime filters out .a files - do not bring this diff over: https://github.com/dotnet/runtimelab/issues/106 -->
+      <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" />
     </ItemGroup>
 
     <ItemGroup>