diff --git a/Directory.Build.props b/Directory.Build.props
index 22caf1d1c..574ce1764 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -38,10 +38,6 @@
true
-
-
- 2.0.315-alpha.0.9
-
diff --git a/Directory.Packages.props b/Directory.Packages.props
index e7d07ea38..d304039f5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,13 +6,16 @@
0.13.5
16.9.0
15.9.20
+
+ 2.0.320
-
+
+
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets
index 47becee3c..6ccb82a1a 100644
--- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets
@@ -2,7 +2,7 @@
$(NuGetPackageRoot)libgit2sharp.nativebinaries\$(LibGit2SharpNativeVersion)\
- $(NuspecProperties);Version=$(Version);commit=$(GitCommitId);BaseOutputPath=$(OutputPath);LibGit2SharpNativeBinaries=$(LibGit2SharpNativeBinaries)
+ $(NuspecProperties);Version=$(Version);commit=$(GitCommitId);BaseOutputPath=$(OutputPath);LibGit2SharpNativeBinaries=$(LibGit2SharpNativeBinaries);libgit2_filename=$(libgit2_filename)
$(NuspecProperties);LKGSuffix=.LKG
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
index 9c825edd6..bd92e87b9 100644
--- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
+++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
@@ -32,9 +32,9 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
-
-
-
+
+
+
diff --git a/test/Nerdbank.GitVersioning.Tests/VersionOracleTests.cs b/test/Nerdbank.GitVersioning.Tests/VersionOracleTests.cs
index 8098be4c3..aae31b8df 100644
--- a/test/Nerdbank.GitVersioning.Tests/VersionOracleTests.cs
+++ b/test/Nerdbank.GitVersioning.Tests/VersionOracleTests.cs
@@ -604,16 +604,20 @@ public void Worktree_Support(bool detachedHead)
string workTreePath = this.CreateDirectoryForNewRepo();
Directory.Delete(workTreePath);
+ Worktree worktree;
if (detachedHead)
{
- this.LibGit2Repository.Worktrees.Add("HEAD~1", "myworktree", workTreePath, isLocked: false);
+ worktree = this.LibGit2Repository.Worktrees.Add("HEAD~1", "myworktree", workTreePath, isLocked: false);
}
else
{
this.LibGit2Repository.Branches.Add("wtbranch", "HEAD~1");
- this.LibGit2Repository.Worktrees.Add("wtbranch", "myworktree", workTreePath, isLocked: false);
+ worktree = this.LibGit2Repository.Worktrees.Add("wtbranch", "myworktree", workTreePath, isLocked: false);
}
+ // Workaround for https://github.com/libgit2/libgit2sharp/issues/2037
+ Commands.Checkout(worktree.WorktreeRepository, "HEAD", new CheckoutOptions { CheckoutModifiers = CheckoutModifiers.Force });
+
GitContext context = this.CreateGitContext(workTreePath);
var oracleWorkTree = new VersionOracle(context);
Assert.Equal(oracleOriginal.Version, oracleWorkTree.Version);