Merge remote-tracking branch 'origin/v3.4'

Author: AArnott

3rdPartyNotices.txt

@@ -3,7 +3,7 @@ trigger:
   branches:
     include:
       - master
-      - 'v*'
+      - 'v*.*'
   paths:
     exclude:
     - doc
@@ -58,10 +58,10 @@ stages:
       displayName: Configure git commit author for testing
 
     - task: UseDotNet@2
-      displayName: Install .NET Core SDK 5.0.100
+      displayName: Install .NET Core SDK 5.0.202
       inputs:
         packageType: sdk
-        version: 5.0.100
+        version: 5.0.202
 
     - task: UseDotNet@2
       displayName: Install .NET Core 3.1
@@ -306,10 +306,10 @@ stages:
         packageType: sdk
         version: 3.1.100
     - task: UseDotNet@2
-      displayName: Install .NET Core SDK 5.0.100
+      displayName: Install .NET Core SDK 5.0.202
       inputs:
         packageType: sdk
-        version: 5.0.100
+        version: 5.0.202
     - script: dotnet --info
       displayName: Show dotnet SDK info
     - bash: |

azure-pipelines.yml

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.100"
+    "version": "5.0.202"
   }
 }

global.json

@@ -4,7 +4,7 @@
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
     <DocumentationRootFolder>$(MSBuildThisFileDirectory)..\wiki\api</DocumentationRootFolder>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
 
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)strongname.snk</AssemblyOriginatorKeyFile>
@@ -28,6 +28,9 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\3rdPartyNotices.txt" Pack="true" PackagePath="" />
+  </ItemGroup>
 
   <Target Name="PrepareReleaseNotes" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>

src/Directory.Build.props

@@ -162,4 +162,23 @@ public void SelectDirectory_SubDir()
         Assert.Equal("sub", this.Context.RepoRelativeProjectDirectory);
         Assert.Equal(absolutePath, this.Context.AbsoluteProjectDirectory);
     }
+
+    [Fact]
+    public void GetVersion_PackedHead()
+    {
+        using var expandedRepo = TestUtilities.ExtractRepoArchive("PackedHeadRef");
+        this.Context = this.CreateGitContext(Path.Combine(expandedRepo.RepoPath));
+        var oracle = new VersionOracle(this.Context);
+        Assert.Equal("1.0.1", oracle.SimpleVersion.ToString());
+        this.Context.TrySelectCommit("HEAD");
+        Assert.Equal("1.0.1", oracle.SimpleVersion.ToString());
+    }
+
+    [Fact]
+    public void HeadCanonicalName_PackedHead()
+    {
+        using var expandedRepo = TestUtilities.ExtractRepoArchive("PackedHeadRef");
+        this.Context = this.CreateGitContext(Path.Combine(expandedRepo.RepoPath));
+        Assert.Equal("refs/heads/main", this.Context.HeadCanonicalName);
+    }
 }

src/NerdBank.GitVersioning.Tests/GitContextTests.cs

@@ -286,6 +286,47 @@ public void GetMissingObjectByShaTest()
             }
         }
 
+        [Fact]
+        public void ParseAlternates_SingleValue_Test()
+        {
+            var alternates = GitRepository.ParseAlternates(Encoding.UTF8.GetBytes("/home/git/nbgv/.git/objects\n"));
+            Assert.Collection(
+                alternates,
+                a => Assert.Equal("/home/git/nbgv/.git/objects", a));
+        }
+
+        [Fact]
+        public void ParseAlternates_SingleValue_NoTrailingNewline_Test()
+        {
+            var alternates = GitRepository.ParseAlternates(Encoding.UTF8.GetBytes("../repo/.git/objects"));
+            Assert.Collection(
+                alternates,
+                a => Assert.Equal("../repo/.git/objects", a));
+        }
+
+        [Fact]
+        public void ParseAlternates_TwoValues_Test()
+        {
+            var alternates = GitRepository.ParseAlternates(Encoding.UTF8.GetBytes("/home/git/nbgv/.git/objects:../../clone/.git/objects\n"));
+            Assert.Collection(
+                alternates,
+                a => Assert.Equal("/home/git/nbgv/.git/objects", a),
+                a => Assert.Equal("../../clone/.git/objects", a));
+        }
+
+        [Fact]
+        public void ParseAlternates_PathWithColon_Test()
+        {
+            var alternates = GitRepository.ParseAlternates(
+                Encoding.UTF8.GetBytes("C:/Users/nbgv/objects:C:/Users/nbgv2/objects/:../../clone/.git/objects\n"),
+                2);
+            Assert.Collection(
+                alternates,
+                a => Assert.Equal("C:/Users/nbgv/objects", a),
+                a => Assert.Equal("C:/Users/nbgv2/objects/", a),
+                a => Assert.Equal("../../clone/.git/objects", a));
+        }
+
         private static void AssertPath(string expected, string actual)
         {
             Assert.Equal(

src/NerdBank.GitVersioning.Tests/ManagedGit/GitRepositoryTests.cs

@@ -25,14 +25,13 @@
     <EmbeddedResource Include="ManagedGit\tree*" />
     <EmbeddedResource Include="test.vcprj" />
     <EmbeddedResource Include="test.prj" />
-    <EmbeddedResource Include="repos\submodules.7z" />
+    <EmbeddedResource Include="repos\*" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Nerdbank.GitVersioning.Tasks\Nerdbank.GitVersioning.Tasks.csproj" />
     <ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="7z.NET" Version="1.0.3" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.10" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Include="Microsoft.Build" Version="15.1.548" ExcludeAssets="runtime" />
@@ -51,7 +50,4 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
     <PackageReference Include="Moq" Version="4.14.7" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="LibGit2\" />
-  </ItemGroup>
 </Project>

src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj

@@ -1,7 +1,4 @@
-#if NET461
-using SevenZipNET;
-#endif
-using Validation;
+using Validation;
 
 using System;
 using System.Collections.Generic;
@@ -67,36 +64,19 @@ internal static void ExtractEmbeddedResource(string resourcePath, string extract
 
     internal static ExpandedRepo ExtractRepoArchive(string repoArchiveName)
     {
-#if NET461
         string archiveFilePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
         string expandedFolderPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
 
-        ExtractEmbeddedResource($"repos.{repoArchiveName}.7z", archiveFilePath);
+        ExtractEmbeddedResource($"repos.{repoArchiveName}.zip", archiveFilePath);
         try
         {
-            for (int retryCount = 0; ; retryCount++)
-            {
-                try
-                {
-                    var extractor = new SevenZipExtractor(archiveFilePath);
-                    extractor.ExtractAll(expandedFolderPath);
-                    return new ExpandedRepo(expandedFolderPath);
-                }
-                catch (System.ComponentModel.Win32Exception) when (retryCount < 2)
-                {
-                }
-            }
+            System.IO.Compression.ZipFile.ExtractToDirectory(archiveFilePath, expandedFolderPath);
+            return new ExpandedRepo(expandedFolderPath);
         }
         finally
         {
-            if (File.Exists(archiveFilePath))
-            {
-                File.Delete(archiveFilePath);
-            }
+            File.Delete(archiveFilePath);
         }
-#else
-        throw new PlatformNotSupportedException();
-#endif
     }
 
     internal class ExpandedRepo : IDisposable

src/NerdBank.GitVersioning.Tests/TestUtilities.cs

@@ -49,19 +49,17 @@ public void NotRepo()
         Assert.Equal(0, oracle.VersionHeight);
     }
 
-    [Fact(Skip = "Unstable test. See issue #125")]
+    [Fact]
     public void Submodule_RecognizedWithCorrectVersion()
     {
         using (var expandedRepo = TestUtilities.ExtractRepoArchive("submodules"))
         {
-            this.Context = this.CreateGitContext(expandedRepo.RepoPath);
-
-            this.Context.RepoRelativeProjectDirectory = "a";
+            this.Context = this.CreateGitContext(Path.Combine(expandedRepo.RepoPath, "a"));
             var oracleA = new VersionOracle(this.Context);
             Assert.Equal("1.3.1", oracleA.SimpleVersion.ToString());
             Assert.Equal("e238b03e75", oracleA.GitCommitIdShort);
 
-            this.Context.RepoRelativeProjectDirectory = Path.Combine("b", "projB");
+            this.Context = this.CreateGitContext(Path.Combine(expandedRepo.RepoPath, "b", "projB"));
             var oracleB = new VersionOracle(this.Context);
             Assert.Equal("2.5.2", oracleB.SimpleVersion.ToString());
             Assert.Equal("3ea7f010c3", oracleB.GitCommitIdShort);
@@ -444,7 +442,7 @@ public void Worktree_Support(bool detachedHead)
         var context = this.CreateGitContext(workTreePath);
         var oracleWorkTree = new VersionOracle(context);
         Assert.Equal(oracleOriginal.Version, oracleWorkTree.Version);
-   
+
         Assert.True(context.TrySelectCommit("HEAD"));
         Assert.True(context.TrySelectCommit(this.LibGit2Repository.Head.Tip.Sha));
     }
@@ -731,6 +729,28 @@ public void GetVersionHeight_IncludeRootExcludeSome()
         Assert.Equal(2, this.GetVersionHeight(relativeDirectory));
     }
 
+    [Fact]
+    public void GetVersion_PathFilterInTwoDeepSubDirAndVersionBump()
+    {
+        this.InitializeSourceControl();
+
+        const string relativeDirectory = "src/lib";
+        var versionOptions = new VersionOptions
+        {
+            Version = new SemanticVersion("1.1"),
+            PathFilters = new FilterPath[]
+            {
+                new FilterPath(".", relativeDirectory),
+            },
+        };
+        this.WriteVersionFile(versionOptions, relativeDirectory);
+        Assert.Equal(1, this.GetVersionHeight(relativeDirectory));
+
+        versionOptions.Version = new SemanticVersion("1.2");
+        this.WriteVersionFile(versionOptions, relativeDirectory);
+        Assert.Equal(1, this.GetVersionHeight(relativeDirectory));
+    }
+
     [Fact]
     public void GetVersionHeight_ProjectDirectoryDifferentToVersionJsonDirectory()
     {