diff --git a/build/Directory.Build.props b/build/Directory.Build.props index cf7017fab7..945f92f0fc 100644 --- a/build/Directory.Build.props +++ b/build/Directory.Build.props @@ -37,5 +37,14 @@ + + + + + + + + + diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props index e035cee9d4..be37704d4b 100644 --- a/build/Directory.Packages.props +++ b/build/Directory.Packages.props @@ -1,12 +1,20 @@  + + true + - - - - - - - + + + + + + + + + + + + diff --git a/build/build/build.csproj b/build/build/build.csproj index 55494cff57..e524c14b31 100644 --- a/build/build/build.csproj +++ b/build/build/build.csproj @@ -7,7 +7,7 @@ - - + + diff --git a/build/chores/chores.csproj b/build/chores/chores.csproj index 7795f57080..9779cfabf7 100644 --- a/build/chores/chores.csproj +++ b/build/chores/chores.csproj @@ -7,6 +7,6 @@ - + diff --git a/build/common/common.csproj b/build/common/common.csproj index e9da2e2d31..58bf33189e 100644 --- a/build/common/common.csproj +++ b/build/common/common.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/build/docs/docs.csproj b/build/docs/docs.csproj index 89058b02d8..75d53c4b02 100644 --- a/build/docs/docs.csproj +++ b/build/docs/docs.csproj @@ -7,7 +7,7 @@ - - + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 98cb8ad494..845e9145ab 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -28,57 +28,44 @@ True - - 0.27.0-preview-0182 - 2.0.315-alpha.0.9 - - 2022.1.0 - 12.0.2 - 6.0.0 - 6.0.0 - 6.0.0 - 17.3.1 - - 17.3.2 - 4.4.0 - 3.1.2 - 3.13.3 - 4.2.1 - 3.0.114 - 4.1.0 - 3.3.3 - - + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - + + - - + + - - - - + + + + - + all runtime; build; native; contentfiles; analyzers - + - - - - - - + + + + + + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 0000000000..9140527f7f --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,40 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/GitTools.Testing/GitTools.Testing.csproj b/src/GitTools.Testing/GitTools.Testing.csproj index 5c885c3877..a19fdd5b88 100644 --- a/src/GitTools.Testing/GitTools.Testing.csproj +++ b/src/GitTools.Testing/GitTools.Testing.csproj @@ -4,7 +4,7 @@ false - - + + diff --git a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj index bdb6d0dc1c..180f5611c0 100644 --- a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj +++ b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/GitVersion.App/GitVersion.App.csproj b/src/GitVersion.App/GitVersion.App.csproj index bb840e13fb..ac73795313 100644 --- a/src/GitVersion.App/GitVersion.App.csproj +++ b/src/GitVersion.App/GitVersion.App.csproj @@ -22,26 +22,20 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + - - + + - + - + diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj index cfb7cfd05d..6ffeea0ace 100644 --- a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj +++ b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs index 0df146f6d5..f9edfaf6e3 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs @@ -1,6 +1,5 @@ using GitTools.Testing; using GitVersion.Core.Tests.Helpers; -using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; using LibGit2Sharp; using Microsoft.Extensions.DependencyInjection; @@ -16,7 +15,7 @@ public class VersionSourceTests : TestBase public void VersionSourceSha() { using var fixture = new EmptyRepositoryFixture(); - var initialCommit = fixture.Repository.MakeACommit(); + _ = fixture.Repository.MakeACommit(); Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop")); _ = fixture.Repository.MakeACommit(); var featureBranch = fixture.Repository.CreateBranch("feature/foo"); @@ -36,7 +35,7 @@ public void VersionSourceSha() public void VersionSourceShaOneCommit() { using var fixture = new EmptyRepositoryFixture(); - var initialCommit = fixture.Repository.MakeACommit(); + _ = fixture.Repository.MakeACommit(); var nextVersionCalculator = GetNextVersionCalculator(fixture); diff --git a/src/GitVersion.Core/Core/MainlineBranchFinder.cs b/src/GitVersion.Core/Core/MainlineBranchFinder.cs index 687a178496..e7837c0879 100644 --- a/src/GitVersion.Core/Core/MainlineBranchFinder.cs +++ b/src/GitVersion.Core/Core/MainlineBranchFinder.cs @@ -43,7 +43,7 @@ public IDictionary> FindMainlineBranches(ICommit commit) private bool BranchIsMainline(INamedReference branch) { var matcher = new MainlineConfigBranchMatcher(branch, this.log); - return this.mainlineBranchConfigurations.Any(matcher.IsMainline) == true; + return this.mainlineBranchConfigurations.Any(matcher.IsMainline); } private class MainlineConfigBranchMatcher diff --git a/src/GitVersion.Core/Core/RepositoryStore.cs b/src/GitVersion.Core/Core/RepositoryStore.cs index fade95d46f..14492f47de 100644 --- a/src/GitVersion.Core/Core/RepositoryStore.cs +++ b/src/GitVersion.Core/Core/RepositoryStore.cs @@ -150,7 +150,7 @@ public IEnumerable GetSourceBranches(IBranch branch, Config configurati { foreach (var branchCommit in FindCommitBranchesWasBranchedFrom(branch, configuration, excludedBranches)) { - foreach (var item in referenceLookup[branchCommit.Commit.Sha] + foreach (var _ in referenceLookup[branchCommit.Commit.Sha] .Where(r => r.Name.Friendly == branchCommit.Branch.Name.Friendly)) { if (returnedBranches.Add(branchCommit.Branch)) diff --git a/src/GitVersion.Core/GitVersion.Core.csproj b/src/GitVersion.Core/GitVersion.Core.csproj index 17cfc5c5ff..809cf8db21 100644 --- a/src/GitVersion.Core/GitVersion.Core.csproj +++ b/src/GitVersion.Core/GitVersion.Core.csproj @@ -14,32 +14,26 @@ - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + + + + - - - - + + + + - + - - - + + + diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs index 45c141c925..30b0fabd62 100644 --- a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs +++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs @@ -53,7 +53,7 @@ public VersionField DetermineIncrementedField(GitVersionContext context, BaseVer return defaultIncrement; } - return commitMessageIncrement ?? VersionField.None; + return commitMessageIncrement.Value; } public VersionField? GetIncrementForCommits(Config configuration, IEnumerable commits) diff --git a/src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj b/src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj index be6aa028f4..7b0778d9c3 100644 --- a/src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj +++ b/src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj @@ -5,14 +5,10 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj index 6387c42766..65ac88c7d9 100644 --- a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj +++ b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj index 016c11a751..91fe0c2154 100644 --- a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj +++ b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj @@ -13,15 +13,9 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + diff --git a/src/GitVersion.sln b/src/GitVersion.sln index 947a2ae9b9..66280ae5d5 100644 --- a/src/GitVersion.sln +++ b/src/GitVersion.sln @@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\GitVersion.yml = ..\GitVersion.yml ..\LICENSE = ..\LICENSE ..\README.md = ..\README.md + Directory.Packages.props = Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.Core", "GitVersion.Core\GitVersion.Core.csproj", "{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}"