Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NuGet packages #140

Merged

Conversation

MichalStrehovsky
Copy link
Member

  • Linux NuGet package wasn't including the static libraries.
  • The non-RID-specific package had RID specific stuff in it.

Part of this is basically a revert of dotnet/runtime#41966. I got lost in trying to figure out what the .depsproj architecture is trying to achieve so I'm planning to just add this to the unification tech debt issue as we merge this.

* Linux NuGet package wasn't including the static libraries.
* The non-RID-specific package had RID specific stuff in it.
@MichalStrehovsky MichalStrehovsky added the area-NativeAOT-coreclr .NET runtime optimized for ahead of time compilation label Oct 2, 2020
@@ -101,8 +101,7 @@
<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'"/>
<ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a link to the unification tech debt issue?

@MichalStrehovsky MichalStrehovsky mentioned this pull request Oct 3, 2020
6 tasks
@MichalStrehovsky MichalStrehovsky merged commit 8e9e355 into dotnet:feature/NativeAOT Oct 4, 2020
@MichalStrehovsky MichalStrehovsky deleted the fixNuget branch October 4, 2020 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-NativeAOT-coreclr .NET runtime optimized for ahead of time compilation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants