Skip to content

Commit 071d744

Browse files
committed
Update UpdateLibgit2ToSha.ps1 with new RIDs
1 parent cae5a47 commit 071d744

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

UpdateLibgit2ToSha.ps1

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,19 @@ Push-Location $libgit2Directory
112112
<libgit2_filename>$binaryFilename</libgit2_filename>
113113
</PropertyGroup>
114114
<ItemGroup>
115-
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.dll">
115+
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\$binaryFilename.dll">
116116
<TargetPath>lib\win32\x64\$binaryFilename.dll</TargetPath>
117117
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
118118
</ContentWithTargetPath>
119-
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.pdb">
119+
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\$binaryFilename.pdb">
120120
<TargetPath>lib\win32\x64\$binaryFilename.pdb</TargetPath>
121121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
122122
</ContentWithTargetPath>
123-
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.dll">
123+
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\$binaryFilename.dll">
124124
<TargetPath>lib\win32\x86\$binaryFilename.dll</TargetPath>
125125
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126126
</ContentWithTargetPath>
127-
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.pdb">
127+
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\$binaryFilename.pdb">
128128
<TargetPath>lib\win32\x86\$binaryFilename.pdb</TargetPath>
129129
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
130130
</ContentWithTargetPath>
@@ -136,8 +136,16 @@ Push-Location $libgit2Directory
136136
<TargetPath>lib\linux-x64\lib$binaryFilename.so</TargetPath>
137137
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
138138
</ContentWithTargetPath>
139-
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\lib$binaryFilename.so">
140-
<TargetPath>lib\centos-x64\lib$binaryFilename.so</TargetPath>
139+
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\lib$binaryFilename.so">
140+
<TargetPath>lib\rhel-x64\lib$binaryFilename.so</TargetPath>
141+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
142+
</ContentWithTargetPath>
143+
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\lib$binaryFilename.so">
144+
<TargetPath>lib\fedora-x64\lib$binaryFilename.so</TargetPath>
145+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
146+
</ContentWithTargetPath>
147+
<ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\lib$binaryFilename.so">
148+
<TargetPath>lib\debian.9-x64\lib$binaryFilename.so</TargetPath>
141149
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
142150
</ContentWithTargetPath>
143151
<ContentWithTargetPath Include="`$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">

nuget.package/build/net461/LibGit2Sharp.NativeBinaries.props

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<libgit2_filename>git2-6311e88</libgit2_filename>
77
</PropertyGroup>
88
<ItemGroup>
9-
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-6311e88.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-6311e88.dll">
9+
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-6311e88.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-6311e88.dll">
1010
<TargetPath>lib\win32\x64\git2-6311e88.dll</TargetPath>
1111
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1212
</ContentWithTargetPath>
13-
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-6311e88.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-6311e88.pdb">
13+
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-6311e88.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-6311e88.pdb">
1414
<TargetPath>lib\win32\x64\git2-6311e88.pdb</TargetPath>
1515
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1616
</ContentWithTargetPath>
17-
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-6311e88.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-6311e88.dll">
17+
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-6311e88.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-6311e88.dll">
1818
<TargetPath>lib\win32\x86\git2-6311e88.dll</TargetPath>
1919
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2020
</ContentWithTargetPath>
21-
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-6311e88.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-6311e88.pdb">
21+
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-6311e88.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-6311e88.pdb">
2222
<TargetPath>lib\win32\x86\git2-6311e88.pdb</TargetPath>
2323
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2424
</ContentWithTargetPath>
@@ -30,8 +30,16 @@
3030
<TargetPath>lib\linux-x64\libgit2-6311e88.so</TargetPath>
3131
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3232
</ContentWithTargetPath>
33-
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\libgit2-6311e88.so">
34-
<TargetPath>lib\centos-x64\libgit2-6311e88.so</TargetPath>
33+
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\libgit2-6311e88.so">
34+
<TargetPath>lib\rhel-x64\libgit2-6311e88.so</TargetPath>
35+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
36+
</ContentWithTargetPath>
37+
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\libgit2-6311e88.so">
38+
<TargetPath>lib\fedora-x64\libgit2-6311e88.so</TargetPath>
39+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40+
</ContentWithTargetPath>
41+
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\libgit2-6311e88.so">
42+
<TargetPath>lib\debian.9-x64\libgit2-6311e88.so</TargetPath>
3543
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3644
</ContentWithTargetPath>
3745
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">

0 commit comments

Comments
 (0)