Skip to content

Commit 41acfe9

Browse files
author
Edward Thomson
committed
nuget: use the magic win7-x64 and win7-x86 RIDs
Apparently net451 RIDs must be `win7-x64` and `win7-x86`, even though we support other flavors. No, this is not documented anywhere.
1 parent 3e325a5 commit 41acfe9

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

UpdateLibgit2ToSha.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ Push-Location $libgit2Directory
9999
<EmbeddedResource Include="`$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
100100
</ItemGroup>
101101
<ItemGroup>
102-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win-x64\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win-x64\native\$binaryFilename.dll">
102+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.dll">
103103
<Link>lib\win32\x64\$binaryFilename.dll</Link>
104104
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
105105
</None>
106-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win-x64\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win-x64\native\$binaryFilename.pdb">
106+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.pdb">
107107
<Link>lib\win32\x64\$binaryFilename.pdb</Link>
108108
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
109109
</None>
110-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win-x86\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win-x86\native\$binaryFilename.dll">
110+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.dll">
111111
<Link>lib\win32\x86\$binaryFilename.dll</Link>
112112
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113113
</None>
114-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win-x86\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win-x86\native\$binaryFilename.pdb">
114+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.pdb">
115115
<Link>lib\win32\x86\$binaryFilename.pdb</Link>
116116
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117117
</None>

build.libgit2.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Set-StrictMode -Version Latest
2020

2121
$projectDirectory = Split-Path $MyInvocation.MyCommand.Path
2222
$libgit2Directory = Join-Path $projectDirectory "libgit2"
23-
$x86Directory = Join-Path $projectDirectory "nuget.package\runtimes\win-x86\native"
24-
$x64Directory = Join-Path $projectDirectory "nuget.package\runtimes\win-x64\native"
23+
$x86Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x86\native"
24+
$x64Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x64\native"
2525
$hashFile = Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt"
2626
$sha = Get-Content $hashFile
2727

nuget.package/NativeBinaries.nuspec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>LibGit2Sharp.NativeBinaries</id>
5-
<version>0.0.0</version>
5+
<version>1.0.155</version>
66
<authors>LibGit2Sharp contributors</authors>
77
<owners>nulltoken</owners>
88
<licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
99
<projectUrl>https://github.com/libgit2/libgit2sharp.nativebinaries</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/libgit2/libgit2sharp/master/square-logo.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Native binaries for LibGit2Sharp</description>
13+
<dependencies>
14+
<group targetFramework=".NETStandard1.0" />
15+
</dependencies>
1316
</metadata>
1417
</package>

0 commit comments

Comments
 (0)