WIP: Move NativeBinaries to a NuGet package

.gitignore

@@ -39,3 +39,7 @@ _ReSharper*/
 LibGit2Sharp/Core/UniqueIdentifier.cs
 
 !Lib/NativeBinaries/*/*.pdb
+
+# NuGet
+packages/
+*.nupkg

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +46,9 @@
     <DocumentationFile />
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LibGit2Dummy">
+      <HintPath>..\packages\LibGit2Sharp-LibGit2.0.0.7.0\lib\net40\NativeBinaries\dummy\LibGit2Dummy.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Lib\MoQ\Moq.dll</HintPath>
@@ -133,6 +138,9 @@
       <Name>LibGit2Sharp</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <NativeBinariesDirectory>$(MSBuildProjectDirectory)\..\Lib\NativeBinaries</NativeBinariesDirectory>
@@ -142,6 +150,21 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
+if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
+xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp-LibGit2.0.0.7.0\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
+if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
+xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp-LibGit2.0.0.7.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

LibGit2Sharp.Tests/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="LibGit2Sharp-LibGit2" version="0.0.7.0" targetFramework="net40" />
+</packages>

LibGit2Sharp/LibGit2Sharp.csproj

@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,6 +53,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LibGit2Dummy">
+      <HintPath>..\packages\LibGit2Sharp-LibGit2.0.0.7.0\lib\net40\NativeBinaries\dummy\LibGit2Dummy.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -337,12 +342,23 @@
   <ItemGroup>
     <EmbeddedResource Include="libgit2sharp_hash.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="UniqueIdentifier.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
+if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
+xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp-LibGit2.0.0.7.0\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
+if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
+xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp-LibGit2.0.0.7.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
+  </PropertyGroup>
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
@@ -351,4 +367,11 @@
     </CreateItem>
     <Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(OutputPath)NativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
   </Target>
-</Project>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+</Project>

LibGit2Sharp/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="LibGit2Sharp-LibGit2" version="0.0.7.0" targetFramework="net40" />
+</packages>

nuget.package/LibGit2Sharp-LibGit2.nuspec

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>LibGit2Sharp-LibGit2</id>
+    <version>0.18.1.0</version>
+    <authors>The LibGit2 Authors</authors>
+    <owners>nulltoken ethomson</owners>
+    <licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
+    <projectUrl>https://github.com/libgit2/libgit2/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>LibGit2</description>
+    <iconUrl>https://github.com/libgit2/libgit2sharp/raw/master/square-logo.png</iconUrl>
+    <tags>libgit2</tags>
+    <references>
+      <reference file="LibGit2Dummy.dll" />
+    </references>
+  </metadata>
+  <files>
+    <!-- This is a tragedy -->
+    <file src="..\Lib\NativeBinaries\dummy\*.dll" target="lib\net40\NativeBinaries" />
+    <file src="..\libgit2\build\x86\RelWithDebInfo\git*.dll" target="lib\net40\NativeBinaries\x86" />
+    <file src="..\libgit2\build\x86\RelWithDebInfo\git*.pdb" target="lib\net40\NativeBinaries\x86" />
+    <file src="..\libgit2\build\amd64\RelWithDebInfo\git*.dll" target="lib\net40\NativeBinaries\amd64" />
+    <file src="..\libgit2\build\amd64\RelWithDebInfo\git*.pdb" target="lib\net40\NativeBinaries\amd64" />
+    <file src="..\nuget.package\Tools\*.*" target="Tools" />
+    <file src="..\Lib\NativeBinaries\libgit2.license.txt" target="App_Readme" />
+  </files>
+</package>

nuget.package/LibGit2Sharp.nuspec

@@ -15,14 +15,13 @@
     <references>
       <reference file="LibGit2Sharp.dll" />
     </references>
+    <dependencies>
+      <dependency id="LibGit2Sharp-LibGit2" />
+    </dependencies>
   </metadata>
   <files>
-    <file src="..\Lib\NativeBinaries\**\*.dll" target="lib\net40\NativeBinaries" />
-    <file src="..\Lib\NativeBinaries\**\*.pdb" target="lib\net40\NativeBinaries" />
     <file src="..\README.md" target="App_Readme\LibGit2Sharp.README.md" />
     <file src="..\LICENSE.md" target="App_Readme\LibGit2Sharp.LICENSE.md" />
     <file src="..\CHANGES.md" target="App_Readme\LibGit2Sharp.CHANGES.md" />
-    <file src="..\nuget.package\Tools\*.*" target="Tools" />
-    <file src="..\Lib\NativeBinaries\libgit2.license.txt" target="App_Readme" />
   </files>
 </package>

nuget.package/build.libgit2.package.cmd

@@ -0,0 +1,34 @@
+SETLOCAL
+SET BASEDIR=%~dp0
+SET SRCDIR=%BASEDIR%..\libgit2\
+
+PUSHD "%SRCDIR%"
+
+FOR /F "delims=" %%A in ('git rev-parse --short HEAD') do call set LIBGIT2_ID=%%A
+
+MD "%SRCDIR%\build"
+MD "%SRCDIR%\build\x86"
+MD "%SRCDIR%\build\amd64"
+
+CD "%SRCDIR%\build\x86"
+cmake ..\.. -G"Visual Studio 12" -DTHREADSAFE=ON -DSTDCALL=ON -DLIBGIT2_FILENAME="git2-%LIBGIT2_ID%"
+cmake --build . --config RelWithDebInfo
+IF %ERRORLEVEL% NEQ 0 GOTO EXIT
+
+CD "%SRCDIR%\build\amd64"
+cmake ..\.. -G"Visual Studio 12 Win64" -DTHREADSAFE=ON -DLIBGIT2_FILENAME="git2-%LIBGIT2_ID%"
+cmake --build . --config RelWithDebInfo
+IF %ERRORLEVEL% NEQ 0 GOTO EXIT
+
+CD "%BASEDIR%"
+
+DEL LibGit2Sharp-LibGit2*.nupkg
+
+"..\Lib\NuGet\NuGet.exe" Pack -Symbols "LibGit2Sharp-LibGit2.nuspec" -Prop Configuration=Release
+
+:EXIT
+ENDLOCAL
+POPD
+
+PAUSE
+EXIT /B %ERRORLEVEL%

nuget.package/build.nuget.package.cmd → nuget.package/build.libgit2sharp.package.cmd

@@ -13,8 +13,6 @@ COPY "%BASEDIR%LibGit2Sharp.nuspec" "%SRCDIR%"
 
 PUSHD "%BASEDIR%"
 
-DEL *.nupkg
-
 CMD /c "..\build.libgit2sharp.cmd %CommitSha%"
 
 IF %ERRORLEVEL% NEQ 0 GOTO EXIT