added back global.json file, made the RefSpec internal

arturcic · arturcic · commit daf44f48eb8f · 2023-02-23T17:10:37.000+01:00
diff --git a/.github/actions/artifacts-restore/action.yml b/.github/actions/artifacts-restore/action.yml
@@ -1,9 +1,5 @@
 name: 'Artifacts restore'
 description: 'Artifacts restore'
-inputs:
-  dotnet-version:
-    description: 'The version of the dotnet'
-    default: '7.0.x'
 
 runs:
   using: 'composite'
@@ -32,4 +28,4 @@ runs:
     name: Setup .NET SDK
     uses: actions/setup-dotnet@v3
     with:
-      dotnet-version: ${{ inputs.dotnet-version }}
+      global-json-file: global.json
diff --git a/.github/workflows/_artifacts_linux.yml b/.github/workflows/_artifacts_linux.yml
@@ -16,10 +16,10 @@ jobs:
     name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
     runs-on: ${{ inputs.runner }}
     strategy:
+      fail-fast: false
       matrix:
         distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
         targetFramework: [ '7.0', '6.0' ]
-      fail-fast: false
 
     steps:
     -
diff --git a/.github/workflows/_artifacts_windows.yml b/.github/workflows/_artifacts_windows.yml
@@ -6,9 +6,9 @@ jobs:
     name: ${{ matrix.package }}
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         package: [ Executable, MsBuildFull ]
-      fail-fast: false
 
     steps:
     -
diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
@@ -5,6 +5,7 @@ jobs:
   build:
     name: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
 
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml
@@ -16,10 +16,10 @@ jobs:
     name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
     runs-on: ${{ inputs.runner }}
     strategy:
+      fail-fast: false
       matrix:
         distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
         targetFramework: [ '7.0', '6.0' ]
-      fail-fast: false
 
     steps:
     -
diff --git a/.github/workflows/_docker_manifests.yml b/.github/workflows/_docker_manifests.yml
@@ -9,10 +9,10 @@ jobs:
     name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
         targetFramework: [ '7.0', '6.0' ]
-      fail-fast: false
 
     steps:
     -
diff --git a/.github/workflows/_prepare.yml b/.github/workflows/_prepare.yml
@@ -5,6 +5,7 @@ jobs:
   prepare:
     name: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
 
@@ -24,7 +25,7 @@ jobs:
       name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        global-json-file: global.json
     -
       name: '[Prepare]'
       if: steps.cache-cake.outputs.cache-hit != 'true'
diff --git a/.github/workflows/_publish.yml b/.github/workflows/_publish.yml
@@ -6,9 +6,10 @@ jobs:
     name: ${{ matrix.taskName }}
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         taskName: [ NuGet, Chocolatey ]
-      fail-fast: false
+
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
@@ -31,4 +32,4 @@ jobs:
     -
       name: '[Publish]'
       shell: pwsh
-      run: dotnet run/publish.dll --target=Publish${{ matrix.taskName }}      
+      run: dotnet run/publish.dll --target=Publish${{ matrix.taskName }}
diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml
@@ -7,10 +7,10 @@ jobs:
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     strategy:
+      fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
         targetFramework: [net7.0, net6.0]
-      fail-fast: false
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,8 +62,10 @@ jobs:
     needs: [ build ]
     name: Artifacts Linux (${{ matrix.arch }})
     strategy:
+      fail-fast: false
       matrix:
         arch: [ amd64, arm64 ]
+
     uses: ./.github/workflows/_artifacts_linux.yml
     with:
       runner: ubuntu-latest
@@ -73,8 +75,10 @@ jobs:
     needs:  [ build ]
     name: Docker Images (${{ matrix.arch }})
     strategy:
+      fail-fast: false
       matrix:
         arch: [ amd64, arm64 ]
+
     uses: ./.github/workflows/_docker.yml
     with:
       runner: ubuntu-latest
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -72,7 +72,7 @@ jobs:
       name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        global-json-file: global.json
 
     -
       name: '[Prepare]'
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -35,9 +35,9 @@ jobs:
     name: Prepare Build
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-      fail-fast: false
 
     steps:
     -
@@ -78,7 +78,7 @@ jobs:
       name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        global-json-file: global.json
     -
       name: '[Prepare]'
       if: steps.cache-cake.outputs.cache-hit != 'true'
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -43,7 +43,7 @@ jobs:
         name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.103'
+          global-json-file: global.json
       -
         name: Run Format 'ci' solution
         run: dotnet format ./build/ --verify-no-changes
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "7.0.103"
+  }
+}
diff --git a/new-cli/GitVersion.Core.Libgit2Sharp/Git/GitRepository.cs b/new-cli/GitVersion.Core.Libgit2Sharp/Git/GitRepository.cs
@@ -7,7 +7,7 @@ namespace GitVersion;
 public sealed class GitRepository : IGitRepository
 {
     private Lazy<IRepository>? repositoryLazy;
-    private IRepository Instance
+    private IRepository RepositoryInstance
     {
         get
         {
@@ -25,19 +25,19 @@ public void Discover(string gitDirectory)
     public void Dispose()
     {
         var lazy = this.repositoryLazy;
-        if (lazy is { IsValueCreated: true }) Instance.Dispose();
+        if (lazy is { IsValueCreated: true }) RepositoryInstance.Dispose();
     }
 
-    public string Path => Instance.Info.Path;
-    public string WorkingDirectory => Instance.Info.WorkingDirectory;
-    public bool IsHeadDetached => Instance.Info.IsHeadDetached;
+    public string Path => RepositoryInstance.Info.Path;
+    public string WorkingDirectory => RepositoryInstance.Info.WorkingDirectory;
+    public bool IsHeadDetached => RepositoryInstance.Info.IsHeadDetached;
 
-    public IBranch Head => new Branch(Instance.Head);
-    public ITagCollection Tags => new TagCollection(Instance.Tags);
-    public IReferenceCollection Refs => new ReferenceCollection(Instance.Refs);
-    public IBranchCollection Branches => new BranchCollection(Instance.Branches);
-    public ICommitCollection Commits => new CommitCollection(Instance.Commits);
-    public IRemoteCollection Remotes => new RemoteCollection(Instance.Network.Remotes);
+    public IBranch Head => new Branch(RepositoryInstance.Head);
+    public ITagCollection Tags => new TagCollection(RepositoryInstance.Tags);
+    public IReferenceCollection Refs => new ReferenceCollection(RepositoryInstance.Refs);
+    public IBranchCollection Branches => new BranchCollection(RepositoryInstance.Branches);
+    public ICommitCollection Commits => new CommitCollection(RepositoryInstance.Commits);
+    public IRemoteCollection Remotes => new RemoteCollection(RepositoryInstance.Network.Remotes);
 
     public ICommit? FindMergeBase(ICommit commit, ICommit otherCommit)
     {
@@ -47,7 +47,7 @@ public void Dispose()
         var retryAction = new RetryAction<LockedFileException, ICommit?>();
         return retryAction.Execute(() =>
         {
-            var mergeBase = Instance.ObjectDatabase.FindMergeBase((Commit)commit, (Commit)otherCommit);
+            var mergeBase = RepositoryInstance.ObjectDatabase.FindMergeBase((Commit)commit, (Commit)otherCommit);
             return mergeBase == null ? null : new Commit(mergeBase);
         });
     }
@@ -61,14 +61,14 @@ private int GetNumberOfUncommittedChangesInternal()
         // check if we have a branch tip at all to behave properly with empty repos
         // => return that we have actually un-committed changes because we are apparently
         // running GitVersion on something which lives inside this brand new repo _/\Ö/\_
-        if (Instance.Head?.Tip == null || Instance.Diff == null)
+        if (RepositoryInstance.Head?.Tip == null || RepositoryInstance.Diff == null)
         {
             // this is a somewhat cumbersome way of figuring out the number of changes in the repo
             // which is more expensive than to use the Diff as it gathers more info, but
             // we can't use the other method when we are dealing with a new/empty repo
             try
             {
-                var status = Instance.RetrieveStatus();
+                var status = RepositoryInstance.RetrieveStatus();
                 return status.Untracked.Count() + status.Staged.Count();
             }
             catch (Exception)
@@ -80,7 +80,7 @@ private int GetNumberOfUncommittedChangesInternal()
         }
 
         // gets all changes of the last commit vs Staging area and WT
-        var changes = Instance.Diff.Compare<TreeChanges>(Instance.Head.Tip.Tree,
+        var changes = RepositoryInstance.Diff.Compare<TreeChanges>(RepositoryInstance.Head.Tip.Tree,
             DiffTargets.Index | DiffTargets.WorkingDirectory);
 
         return changes.Count;
diff --git a/new-cli/GitVersion.Core.Libgit2Sharp/Git/Reference.cs b/new-cli/GitVersion.Core.Libgit2Sharp/Git/Reference.cs
@@ -1,5 +1,4 @@
 using GitVersion.Extensions;
-using GitVersion;
 using GitVersion.Helpers;
 using LibGit2Sharp;
 
diff --git a/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs b/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs
@@ -3,7 +3,7 @@
 
 namespace GitVersion;
 
-public class RefSpec : IRefSpec
+internal class RefSpec : IRefSpec
 {
     private static readonly LambdaEqualityHelper<IRefSpec> equalityHelper = new(x => x.Specification);
     private static readonly LambdaKeyComparer<IRefSpec, string> comparerHelper = new(x => x.Specification);
diff --git a/src/GitVersion.LibGit2Sharp/PublicAPI.Unshipped.txt b/src/GitVersion.LibGit2Sharp/PublicAPI.Unshipped.txt
@@ -2,17 +2,7 @@
 GitVersion.GitVersionLibGit2SharpModule
 GitVersion.GitVersionLibGit2SharpModule.GitVersionLibGit2SharpModule() -> void
 GitVersion.GitVersionLibGit2SharpModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
-GitVersion.RefSpec
-GitVersion.RefSpec.CompareTo(GitVersion.IRefSpec? other) -> int
-GitVersion.RefSpec.Destination.get -> string!
-GitVersion.RefSpec.Direction.get -> GitVersion.RefSpecDirection
-GitVersion.RefSpec.Equals(GitVersion.IRefSpec? other) -> bool
-GitVersion.RefSpec.Source.get -> string!
-GitVersion.RefSpec.Specification.get -> string!
 GitVersion.RepositoryExtensions
-override GitVersion.RefSpec.Equals(object? obj) -> bool
-override GitVersion.RefSpec.GetHashCode() -> int
-override GitVersion.RefSpec.ToString() -> string!
 static GitVersion.RepositoryExtensions.RunSafe(System.Action! operation) -> void
 static GitVersion.RepositoryExtensions.RunSafe<T>(System.Func<T>! operation) -> T
 static GitVersion.RepositoryExtensions.ToGitRepository(this LibGit2Sharp.IRepository! repository) -> GitVersion.IGitRepository!
