Pass libgit2 info via MSBuild properties instead of files

Author: bording

UpdateLibgit2ToSha.ps1

@@ -1,6 +1,6 @@
 <#
 .SYNOPSIS
-    Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.props with the new hash value.
+    Updates the libgit2 submodule to the specified commit and updates NativeBinaries.props with the new hash value.
 .PARAMETER sha
     Desired libgit2 version. This is run through `git rev-parse`, so branch names are okay too.
 #>
@@ -88,11 +88,23 @@ Push-Location $libgit2Directory
         $binaryFilename = "git2-" + $sha.Substring(0,7)
     }
 
-    sc -Encoding ASCII (Join-Path $projectDirectory "nuget.package\contentFiles\any\any\libgit2_hash.txt") $sha
-    sc -Encoding ASCII (Join-Path $projectDirectory "nuget.package\contentFiles\any\any\libgit2_filename.txt") $binaryFilename
-
     $buildProperties = @"
 <Project>
+  <PropertyGroup>
+    <libgit2_hash>$sha</libgit2_hash>
+    <libgit2_filename>$binaryFilename</libgit2_filename>
+  </PropertyGroup>
+</Project>
+"@
+
+    sc -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\LibGit2Sharp.NativeBinaries.props") $buildProperties
+
+    $net40BuildProperties = @"
+<Project>
+  <PropertyGroup>
+    <libgit2_hash>$sha</libgit2_hash>
+    <libgit2_filename>$binaryFilename</libgit2_filename>
+  </PropertyGroup>
   <ItemGroup>
     <ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.dll">
       <TargetPath>lib\win32\x64\$binaryFilename.dll</TargetPath>
@@ -126,7 +138,7 @@ Push-Location $libgit2Directory
 </Project>
 "@
 
-    sc -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\net40\LibGit2Sharp.NativeBinaries.props") $buildProperties
+    sc -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\net40\LibGit2Sharp.NativeBinaries.props") $net40BuildProperties
 
     $dllConfig = @"
 <configuration>

nuget.package/NativeBinaries.nuspec

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-    <metadata>
-        <id>LibGit2Sharp.NativeBinaries</id>
-        <version>1.0.155</version>
-        <authors>LibGit2Sharp contributors</authors>
-        <owners>nulltoken</owners>
-        <licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
-        <projectUrl>https://github.com/libgit2/libgit2sharp.nativebinaries</projectUrl>
-        <iconUrl>https://raw.githubusercontent.com/libgit2/libgit2sharp/master/square-logo.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Native binaries for LibGit2Sharp</description>
-        <contentFiles>
-            <files include="**/*" buildAction="EmbeddedResource" />
-        </contentFiles>
-    </metadata>
+  <metadata>
+    <id>LibGit2Sharp.NativeBinaries</id>
+    <version>1.0.155</version>
+    <authors>LibGit2Sharp contributors</authors>
+    <owners>nulltoken</owners>
+    <licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
+    <projectUrl>https://github.com/libgit2/libgit2sharp.nativebinaries</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/libgit2/libgit2sharp/master/square-logo.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Native binaries for LibGit2Sharp</description>
+  </metadata>
 </package>

nuget.package/build/LibGit2Sharp.NativeBinaries.props

@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <libgit2_hash>15e119375018fba121cf58e02a9f17fe22df0df8</libgit2_hash>
+    <libgit2_filename>git2-15e1193</libgit2_filename>
+  </PropertyGroup>
+</Project>

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

@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <libgit2_hash>15e119375018fba121cf58e02a9f17fe22df0df8</libgit2_hash>
+    <libgit2_filename>git2-15e1193</libgit2_filename>
+  </PropertyGroup>
   <ItemGroup>
     <ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-15e1193.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-15e1193.dll">
       <TargetPath>lib\win32\x64\git2-15e1193.dll</TargetPath>