Skip to content

Update libgit2 natives to 1.0.157 #1346

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

Merged
merged 1 commit into from
Aug 3, 2016
Merged

Conversation

ethomson
Copy link
Member

@ethomson ethomson commented Aug 3, 2016

Use the new nuget package layout for .NET Core compatibility with
native binaries.

@ethomson
Copy link
Member Author

ethomson commented Aug 3, 2016

Well, in what I'm sure will be SHOCKING NEWS, this has absolutely no effect for me when using a new-style (project.json based) project targeting .NET 4.5.1.

(Yay, nuget!)

@bording I think I've reached and surpassed both my limit of comprehension here and my patience with nuget. Any chance you can provide me with some of your wisdom?

@bording
Copy link
Member

bording commented Aug 3, 2016

I'm getting ready to go out of town for the rest of the week, and won't have access to a computer, but I'll definitely take a look at it when I get back.

@ethomson
Copy link
Member Author

ethomson commented Aug 3, 2016

<3

@ethomson ethomson force-pushed the ethomson/libgit2_update branch from d96e68f to dd0528b Compare August 3, 2016 15:41
Use the new nuget package layout for .NET Core compatibility with
native binaries.
@ethomson ethomson force-pushed the ethomson/libgit2_update branch from dd0528b to be4a386 Compare August 3, 2016 17:20
@ethomson ethomson changed the title Update libgit2 natives to 1.0.154 Update libgit2 natives to 1.0.157 Aug 3, 2016
@ethomson
Copy link
Member Author

ethomson commented Aug 3, 2016

Okay, it turns out that you can't use an RID of win-x64, for net45 you simply must use win7-x64 and win7-x86 regardless of what version of Windows you're actually on.

Don't try to understand, just let it wash over you.

In any case, we now produce a LibGit2Sharp.NativeBinaries package that has a layout of runtimes/{rid}/natives, which is compatible with a new-style MSBuild-less project.json world. On old-school .csproj based builds, we still run the .props which will take the binaries for the appropriate platform out of the NativeBinaries location and place it in a folder lib beneath the build target. (We do not emulate the runtimes/ strategy when we do the copy, because that would leave us liable to regress #1170 , instead we stick with lib).

I tested this with old style (.csproj) projects on a couple of platforms (Windows and Mono) and with new style (project.json) project on Windows.

I'm going to merge this so that I can build a proper nuget prerelease package and upload it.

@ethomson ethomson merged commit 7f9bf0d into master Aug 3, 2016
@bording
Copy link
Member

bording commented Aug 11, 2016

@ethomson Glad to see that you figured out the problem, despite the craziness around the RID usage. How did you manage to track it down to win-x64 vs. win7-x64 being the problem?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants