Update to libgit2sharp 0.27.0-preview-0029

Fixes #396
dotnet · Oct 22, 2019 · 3916db2 · 3916db2
1 parent 3e03693
commit 3916db2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/NerdBank.GitVersioning.Tests/RepoTestBase.cs b/src/NerdBank.GitVersioning.Tests/RepoTestBase.cs
@@ -74,10 +74,7 @@ protected void InitializeSourceControl()
         this.Repo = new Repository(this.RepoPath);
         foreach (var file in this.Repo.RetrieveStatus().Untracked)
         {
-            if (!file.FilePath.StartsWith("_git2_", StringComparison.Ordinal)) // libgit2sharp creates these special junction directories that we should ignore
-            {
-                Commands.Stage(this.Repo, file.FilePath);
-            }
+            Commands.Stage(this.Repo, file.FilePath);
         }
 
         if (this.Repo.Index.Count > 0)

diff --git a/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj b/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DotNetMDDocs" Version="0.111.0" PrivateAssets="all" Condition=" '$(GenerateMarkdownApiDocs)' == 'true' " />
-    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0024" PrivateAssets="none" />
+    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0029" PrivateAssets="none" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netcoreapp2.0' " />

diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj
@@ -18,7 +18,7 @@
 
   <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
-      <LibGit2SharpNativeBinaries>$(NuGetPackageRoot)libgit2sharp.nativebinaries\2.0.289\</LibGit2SharpNativeBinaries>
+      <LibGit2SharpNativeBinaries>$(NuGetPackageRoot)libgit2sharp.nativebinaries\2.0.298\</LibGit2SharpNativeBinaries>
       <NuspecProperties>$(NuspecProperties);Version=$(Version);commit=$(GitCommitId);BaseOutputPath=$(OutputPath);LibGit2SharpNativeBinaries=$(LibGit2SharpNativeBinaries)</NuspecProperties>
     </PropertyGroup>
   </Target>

diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
@@ -26,12 +26,12 @@ See https://github.com/AArnott/Nerdbank.GitVersioning/releases for details.</rel
     <file src="$LibGit2SharpNativeBinaries$runtimes\**" target="build\runtimes\" />
 
     <!-- Additional copies to work around DllNotFoundException on Mono (https://github.com/AArnott/Nerdbank.GitVersioning/issues/222) -->
-    <file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-7ce88e6.dylib" target="build\MSBuildFull\lib\osx\libgit2-7ce88e6.dylib" />
-    <file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-7ce88e6.so" target="build\MSBuildFull\lib\linux\x86_64\libgit2-7ce88e6.so" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-ef5a385.dylib" target="build\MSBuildFull\lib\osx\libgit2-ef5a385.dylib" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-ef5a385.so" target="build\MSBuildFull\lib\linux\x86_64\libgit2-ef5a385.so" />
 
     <!-- Additional copies to work with our own ps1 scripts (https://github.com/AArnott/Nerdbank.GitVersioning/issues/248) -->
-    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x64\native\git2-7ce88e6.dll" target="build\MSBuildFull\lib\win32\x64\git2-7ce88e6.dll" />
-    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x86\native\git2-7ce88e6.dll" target="build\MSBuildFull\lib\win32\x86\git2-7ce88e6.dll" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x64\native\git2-ef5a385.dll" target="build\MSBuildFull\lib\win32\x64\git2-ef5a385.dll" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x86\native\git2-ef5a385.dll" target="build\MSBuildFull\lib\win32\x86\git2-ef5a385.dll" />
 
     <file src="$LibGit2SharpNativeBinaries$libgit2\LibGit2Sharp.dll.config" target="build\MSBuildCore\LibGit2Sharp.dll.config" />
     <file src="$BaseOutputPath$netcoreapp2.0\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />

diff --git a/src/nbgv/Properties/launchSettings.json b/src/nbgv/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "nbgv": {
+      "commandName": "Project",
+      "commandLineArgs": "cloud -s VisualStudioTeamServices -p D:\\temp\\GitVersioningBugRepro"
+    }
+  }
+}