diff --git a/build/build/Tasks/Package/PackageChocolatey.cs b/build/build/Tasks/Package/PackageChocolatey.cs index 81c3dcec60..936aef9a3a 100644 --- a/build/build/Tasks/Package/PackageChocolatey.cs +++ b/build/build/Tasks/Package/PackageChocolatey.cs @@ -30,7 +30,7 @@ public override void Run(BuildContext context) var chocolateySettings = new ChocolateyPackSettings { LimitOutput = true, - Version = context.Version?.SemVersion, + Version = context.Version?.ChocolateyVersion, OutputDirectory = Paths.Nuget, Files = context.GetFiles(artifactPath + "/**/*.*") .Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") }) diff --git a/build/common/Addins/GitVersion/GitVersion.cs b/build/common/Addins/GitVersion/GitVersion.cs index 833cb5c387..a6fd1d1bc1 100644 --- a/build/common/Addins/GitVersion/GitVersion.cs +++ b/build/common/Addins/GitVersion/GitVersion.cs @@ -45,11 +45,6 @@ public sealed class GitVersion /// public string? BuildMetaData { get; set; } - /// - /// Gets or sets the build metadata padded. - /// - public string? BuildMetaDataPadded { get; set; } - /// /// Gets or sets the major version. /// @@ -65,16 +60,6 @@ public sealed class GitVersion /// public string? SemVer { get; set; } - /// - /// Gets or sets the legacy Semantic Version. - /// - public string? LegacySemVer { get; set; } - - /// - /// Gets or sets the padded legacy Semantic Version. - /// - public string? LegacySemVerPadded { get; set; } - /// /// Gets or sets the assembly Semantic Version. /// @@ -105,26 +90,11 @@ public sealed class GitVersion /// public string? Sha { get; set; } - /// - /// Gets or sets the NuGet version for v2. - /// - public string? NuGetVersionV2 { get; set; } - - /// - /// Gets or sets the NuGet version. - /// - public string? NuGetVersion { get; set; } - /// /// Gets or sets the commits since version source. /// public int? CommitsSinceVersionSource { get; set; } - /// - /// Gets or sets the commits since version source padded. - /// - public string? CommitsSinceVersionSourcePadded { get; set; } - /// /// Gets or sets the commit date. /// diff --git a/build/common/Utilities/Models.cs b/build/common/Utilities/Models.cs index 3811de6b29..b6f1cd6e18 100644 --- a/build/common/Utilities/Models.cs +++ b/build/common/Utilities/Models.cs @@ -12,17 +12,24 @@ public record NugetCredentials(string ApiKey); public record ChocolateyCredentials(string ApiKey); -public record BuildVersion(GitVersion GitVersion, string? Version, string? Milestone, string? SemVersion, string? NugetVersion) +public record BuildVersion(GitVersion GitVersion, string? Version, string? Milestone, string? SemVersion, string? NugetVersion, string? ChocolateyVersion) { public static BuildVersion Calculate(GitVersion gitVersion) { var version = gitVersion.MajorMinorPatch; - var semVersion = gitVersion.LegacySemVer; - var nugetVersion = gitVersion.LegacySemVer; + var semVersion = gitVersion.SemVer; + var nugetVersion = gitVersion.SemVer; + var chocolateyVersion = gitVersion.MajorMinorPatch; + + if (!string.IsNullOrWhiteSpace(gitVersion.PreReleaseTag)) + { + chocolateyVersion += $"-{gitVersion.PreReleaseTag?.Replace(".", "-")}"; + } if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaData)) { semVersion += $"-{gitVersion.BuildMetaData}"; + chocolateyVersion += $"-{gitVersion.BuildMetaData}"; nugetVersion += $".{gitVersion.BuildMetaData}"; } @@ -31,7 +38,8 @@ public static BuildVersion Calculate(GitVersion gitVersion) Version: version, Milestone: version, SemVersion: semVersion, - NugetVersion: nugetVersion?.ToLowerInvariant() + NugetVersion: nugetVersion?.ToLowerInvariant(), + ChocolateyVersion: chocolateyVersion?.ToLowerInvariant() ); } } diff --git a/docs/input/docs/reference/configuration.md b/docs/input/docs/reference/configuration.md index c0858f1e08..59eacc4e5f 100644 --- a/docs/input/docs/reference/configuration.md +++ b/docs/input/docs/reference/configuration.md @@ -52,9 +52,6 @@ major-version-bump-message: '\+semver:\s?(breaking|major)' minor-version-bump-message: '\+semver:\s?(feature|minor)' patch-version-bump-message: '\+semver:\s?(fix|patch)' no-bump-message: '\+semver:\s?(none|skip)' -legacy-semver-padding: 4 -build-metadata-padding: 4 -commits-since-version-source-padding: 4 tag-pre-release-weight: 60000 commit-message-incrementing: Enabled ignore: @@ -194,24 +191,6 @@ Used to tell GitVersion not to increment when in Mainline development mode. Default `\+semver:\s?(none|skip)`, which will match occurrences of `+semver: none` and `+semver: skip` -### legacy-semver-padding - -The number of characters to pad `LegacySemVer` to in the `LegacySemVerPadded` -[variable][variables]. Default is `4`, which will pad the `LegacySemVer` value - of `3.0.0-beta1` to `3.0.0-beta0001`. - -### build-metadata-padding - -The number of characters to pad `BuildMetaData` to in the `BuildMetaDataPadded` -[variable][variables]. Default is `4`, which will pad the `BuildMetaData` value -of `1` to `0001`. - -### commits-since-version-source-padding - -The number of characters to pad `CommitsSinceVersionSource` to in the -`CommitsSinceVersionSourcePadded` [variable][variables]. Default is `4`, which -will pad the `CommitsSinceVersionSource` value of `1` to `0001`. - ### tag-pre-release-weight The pre-release weight in case of tagged commits. If the value is not set in the diff --git a/docs/input/docs/reference/variables.md b/docs/input/docs/reference/variables.md index bb52759a96..8f963405fd 100644 --- a/docs/input/docs/reference/variables.md +++ b/docs/input/docs/reference/variables.md @@ -21,12 +21,9 @@ what is available. For the `release/3.0.0` branch of GitVersion it shows: "PreReleaseNumber": 99, "WeightedPreReleaseNumber": 1099, "BuildMetaData": 88, - "BuildMetaDataPadded": "0088", "FullBuildMetaData": "99.Branch.release/3.22.11.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a", "MajorMinorPatch": "3.22.11", "SemVer": "3.22.11-beta.99", - "LegacySemVer": "3.22.11-beta99", - "LegacySemVerPadded": "3.22.11-beta0099", "AssemblySemVer": "3.22.11.0", "AssemblySemFileVer": "3.22.11.0", "InformationalVersion": "3.22.11-beta.99+88.Branch.release/3.022.011.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a", @@ -35,13 +32,8 @@ what is available. For the `release/3.0.0` branch of GitVersion it shows: "EscapedBranchName": "release-3.022.011", "Sha": "28c853159a46b5a87e6cc9c4f6e940c59d6bc68a", "ShortSha": "28c8531", - "NuGetVersionV2": "3.22.11-beta0099", - "NuGetVersion": "3.22.11-beta0099", - "NuGetPreReleaseTagV2": "beta0099", - "NuGetPreReleaseTag": "beta0099", "VersionSourceSha": "28c853159a46b5a87e6cc9c4f6e940c59d6bc68a", "CommitsSinceVersionSource": 7, - "CommitsSinceVersionSourcePadded": "0007", "CommitDate": "2021-12-31", "UncommittedChanges": 0 } @@ -61,12 +53,9 @@ Each property of the above JSON document is described in the below table. | `PreReleaseNumber` | The pre-release number. | | `WeightedPreReleaseNumber` | A summation of branch specific `pre-release-weight` and the `PreReleaseNumber`. Can be used to obtain a monotonically increasing version number across the branches. | | `BuildMetaData` | The build metadata, usually representing number of commits since the `VersionSourceSha`. Despite its name, will not increment for every build. | -| `BuildMetaDataPadded` | The `BuildMetaData` padded with `0` up to 4 digits. | | `FullBuildMetaData` | The `BuildMetaData` suffixed with `BranchName` and `Sha`. | | `MajorMinorPatch` | `Major`, `Minor` and `Patch` joined together, separated by `.`. | | `SemVer` | The semantical version number, including `PreReleaseTagWithDash` for pre-release version numbers. | -| `LegacySemVer` | Equal to `SemVer`, but without a `.` separating `PreReleaseLabel` and `PreReleaseNumber`. | -| `LegacySemVerPadded` | Equal to `LegacySemVer`, but with `PreReleaseNumber` padded with `0` up to 4 digits. | | `AssemblySemVer` | Suitable for .NET `AssemblyVersion`. Defaults to `Major.Minor.0.0` to allow the assembly to be hotfixed without breaking existing applications that may be referencing it. | | `AssemblySemFileVer` | Suitable for .NET `AssemblyFileVersion`. Defaults to `Major.Minor.Patch.0`. | | `InformationalVersion` | Suitable for .NET `AssemblyInformationalVersion`. Defaults to `FullSemVer` suffixed by `FullBuildMetaData`. | @@ -75,13 +64,8 @@ Each property of the above JSON document is described in the below table. | `EscapedBranchName` | Equal to `BranchName`, but with `/` replaced with `-`. | | `Sha` | The SHA of the Git commit. | | `ShortSha` | The `Sha` limited to 7 characters. | -| `NuGetVersionV2` | A NuGet 2.0 compatible version number. | -| `NuGetVersion` | A NuGet 1.0 compatible version number. | -| `NuGetPreReleaseTagV2` | A NuGet 2.0 compatible `PreReleaseTag`. | -| `NuGetPreReleaseTag` | A NuGet 1.0 compatible `PreReleaseTag`. | | `VersionSourceSha` | The SHA of the commit used as version source. | | `CommitsSinceVersionSource` | The number of commits since the version source. | -| `CommitsSinceVersionSourcePadded` | The `CommitsSinceVersionSource` padded with `0` up to 4 digits. | | `CommitDate` | The ISO-8601 formatted date of the commit identified by `Sha`. | | `UncommittedChanges` | The number of uncommitted changes present in the repository. | diff --git a/docs/input/docs/usage/cli/arguments.md b/docs/input/docs/usage/cli/arguments.md index abc684bd33..0746b52c1a 100644 --- a/docs/input/docs/usage/cli/arguments.md +++ b/docs/input/docs/usage/cli/arguments.md @@ -115,13 +115,10 @@ Following options are supported: 3. `assembly-informational-format` 4. `assembly-versioning-format` 5. `assembly-versioning-scheme` -6. `build-metadata-padding` 7. `commit-date-format` 8. `commit-message-incrementing` -9. `commits-since-version-source-padding` 10. `continuous-delivery-fallback-tag` 11. `increment` -12. `legacy-semver-padding` 13. `major-version-bump-message` 14. `minor-version-bump-message` 15. `mode` diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs index 5573c8609b..0655a1dec3 100644 --- a/src/GitVersion.App.Tests/ArgumentParserTests.cs +++ b/src/GitVersion.App.Tests/ArgumentParserTests.cs @@ -409,14 +409,14 @@ private static IEnumerable OverrideconfigWithInvalidOptionTestData }; } - [TestCaseSource(nameof(OverrideconfigWithSingleOptionTestData))] - public void OverrideconfigWithSingleOptions(string options, Config expected) + [TestCaseSource(nameof(OverrideConfigWithSingleOptionTestData))] + public void OverrideConfigWithSingleOptions(string options, Config expected) { var arguments = this.argumentParser.ParseArguments($"/overrideconfig {options}"); arguments.OverrideConfig.ShouldBeEquivalentTo(expected); } - private static IEnumerable OverrideconfigWithSingleOptionTestData() + private static IEnumerable OverrideConfigWithSingleOptionTestData() { yield return new TestCaseData( "assembly-versioning-scheme=MajorMinor", @@ -509,27 +509,6 @@ private static IEnumerable OverrideconfigWithSingleOptionTestData( NoBumpMessage = "This is no bump message." } ); - yield return new TestCaseData( - "legacy-semver-padding=99", - new Config - { - LegacySemVerPadding = 99 - } - ); - yield return new TestCaseData( - "build-metadata-padding=30", - new Config - { - BuildMetaDataPadding = 30 - } - ); - yield return new TestCaseData( - "commits-since-version-source-padding=5", - new Config - { - CommitsSinceVersionSourcePadding = 5 - } - ); yield return new TestCaseData( "tag-pre-release-weight=2", new Config diff --git a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs index 7e12374d66..262603d28c 100644 --- a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs +++ b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs @@ -175,7 +175,7 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu result.ExitCode.ShouldBe(0); result.OutputVariables.ShouldNotBeNull(); - result.OutputVariables.FullSemVer.ShouldBe("1.0.4-PullRequest0005.3"); + result.OutputVariables.FullSemVer.ShouldBe("1.0.4-PullRequest5.3"); // Cleanup repository files DirectoryHelper.DeleteDirectory(remoteRepositoryPath); diff --git a/src/GitVersion.App.Tests/VersionWriterTests.cs b/src/GitVersion.App.Tests/VersionWriterTests.cs index 5ce3a4be1c..b4dd0846fa 100644 --- a/src/GitVersion.App.Tests/VersionWriterTests.cs +++ b/src/GitVersion.App.Tests/VersionWriterTests.cs @@ -32,13 +32,13 @@ public void WriteVersionShouldWriteFileVersionWithNoPrereleaseTag() [Test] public void WriteVersionShouldWriteFileVersionWithPrereleaseTag() { - var asm = GenerateAssembly(new Version(1, 0, 0), "-beta0004"); + var asm = GenerateAssembly(new Version(1, 0, 0), "-beta4"); string? version = string.Empty; this.versionWriter.WriteTo(asm, v => version = v); Assert.IsNotNull(asm); - Assert.AreEqual("1.0.0-beta0004", version); + Assert.AreEqual("1.0.0-beta4", version); } private static Assembly GenerateAssembly(Version fileVersion, string prereleaseInfo) diff --git a/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs b/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs index 7c0fd58948..87ac7f6f7f 100644 --- a/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs +++ b/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs @@ -35,7 +35,7 @@ public void EscapeValues() [Test] public void BuildNumber() { - var message = this.buildServer.GenerateSetParameterMessage("LegacySemVerPadded", "0.8.0-unstable568"); + var message = this.buildServer.GenerateSetParameterMessage("SemVer", "0.8.0-unstable568"); Assert.AreEqual("##myget[buildNumber '0.8.0-unstable568']", message[1]); } } diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt index f7a27ad32f..1c2b8b70d9 100644 --- a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt +++ b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt @@ -7,9 +7,6 @@ major-version-bump-message: '\+semver:\s?(breaking|major)' minor-version-bump-message: '\+semver:\s?(feature|minor)' patch-version-bump-message: '\+semver:\s?(fix|patch)' no-bump-message: '\+semver:\s?(none|skip)' -legacy-semver-padding: 4 -build-metadata-padding: 4 -commits-since-version-source-padding: 4 tag-pre-release-weight: 60000 commit-message-incrementing: Enabled branches: diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs index 1b1de22c32..bb1b1386de 100644 --- a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs +++ b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs @@ -432,9 +432,6 @@ public void ShouldNotOverrideAnythingWhenOverrideConfigIsEmpty() overridenConfig.MinorVersionBumpMessage.ShouldBe(expectedConfig.MinorVersionBumpMessage); overridenConfig.PatchVersionBumpMessage.ShouldBe(expectedConfig.PatchVersionBumpMessage); overridenConfig.NoBumpMessage.ShouldBe(expectedConfig.NoBumpMessage); - overridenConfig.LegacySemVerPadding.ShouldBe(expectedConfig.LegacySemVerPadding); - overridenConfig.BuildMetaDataPadding.ShouldBe(expectedConfig.BuildMetaDataPadding); - overridenConfig.CommitsSinceVersionSourcePadding.ShouldBe(expectedConfig.CommitsSinceVersionSourcePadding); overridenConfig.TagPreReleaseWeight.ShouldBe(expectedConfig.TagPreReleaseWeight); overridenConfig.CommitMessageIncrementing.ShouldBe(expectedConfig.CommitMessageIncrementing); overridenConfig.Increment.ShouldBe(expectedConfig.Increment); diff --git a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs index 9b11fdf967..107e6a3bd9 100644 --- a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs +++ b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs @@ -119,12 +119,9 @@ public void CacheFileExistsOnDisk() PreReleaseNumber: 19 WeightedPreReleaseNumber: 19 BuildMetaData: - BuildMetaDataPadded: FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f MajorMinorPatch: 4.10.3 SemVer: 4.10.3-test.19 - LegacySemVer: 4.10.3-test19 - LegacySemVerPadded: 4.10.3-test0019 AssemblySemVer: 4.10.3.0 AssemblySemFileVer: 4.10.3.0 FullSemVer: 4.10.3-test.19 @@ -133,13 +130,8 @@ public void CacheFileExistsOnDisk() EscapedBranchName: feature-test Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f ShortSha: dd2a29af - NuGetVersionV2: 4.10.3-test0019 - NuGetVersion: 4.10.3-test0019 - NuGetPreReleaseTagV2: test0019 - NuGetPreReleaseTag: test0019 VersionSourceSha: 4.10.2 CommitsSinceVersionSource: 19 - CommitsSinceVersionSourcePadded: 0019 CommitDate: 2015-11-10 UncommittedChanges: 0 "; @@ -182,12 +174,9 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn PreReleaseLabelWithDash: -test PreReleaseNumber: 19 BuildMetaData: - BuildMetaDataPadded: FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f MajorMinorPatch: 4.10.3 SemVer: 4.10.3-test.19 - LegacySemVer: 4.10.3-test19 - LegacySemVerPadded: 4.10.3-test0019 AssemblySemVer: 4.10.3.0 AssemblySemFileVer: 4.10.3.0 FullSemVer: 4.10.3-test.19 @@ -196,12 +185,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn EscapedBranchName: feature-test Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f ShortSha: dd2a29af - NuGetVersionV2: 4.10.3-test0019 - NuGetVersion: 4.10.3-test0019 - NuGetPreReleaseTagV2: test0019 - NuGetPreReleaseTag: test0019 CommitsSinceVersionSource: 19 - CommitsSinceVersionSourcePadded: 0019 CommitDate: 2015-11-10 UncommittedChanges: 0 "; @@ -269,12 +253,9 @@ public void ConfigChangeInvalidatesCache() PreReleaseNumber: 19 WeightedPreReleaseNumber: 19 BuildMetaData: - BuildMetaDataPadded: FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f MajorMinorPatch: 4.10.3 SemVer: 4.10.3-test.19 - LegacySemVer: 4.10.3-test19 - LegacySemVerPadded: 4.10.3-test0019 AssemblySemVer: 4.10.3.0 AssemblySemFileVer: 4.10.3.0 FullSemVer: 4.10.3-test.19 @@ -283,13 +264,8 @@ public void ConfigChangeInvalidatesCache() EscapedBranchName: feature-test Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f ShortSha: dd2a29af - NuGetVersionV2: 4.10.3-test0019 - NuGetVersion: 4.10.3-test0019 - NuGetPreReleaseTagV2: test0019 - NuGetPreReleaseTag: test0019 VersionSourceSha: 4.10.2 CommitsSinceVersionSource: 19 - CommitsSinceVersionSourcePadded: 0019 CommitDate: 2015-11-10 UncommittedChanges: 0 "; @@ -334,12 +310,9 @@ public void NoCacheBypassesCache() PreReleaseNumber: 19 WeightedPreReleaseNumber: 19 BuildMetaData: - BuildMetaDataPadded: FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f MajorMinorPatch: 4.10.3 SemVer: 4.10.3-test.19 - LegacySemVer: 4.10.3-test19 - LegacySemVerPadded: 4.10.3-test0019 AssemblySemVer: 4.10.3.0 AssemblySemFileVer: 4.10.3.0 FullSemVer: 4.10.3-test.19 @@ -348,13 +321,8 @@ public void NoCacheBypassesCache() EscapedBranchName: feature-test Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f ShortSha: dd2a29af - NuGetVersionV2: 4.10.3-test0019 - NuGetVersion: 4.10.3-test0019 - NuGetPreReleaseTagV2: test0019 - NuGetPreReleaseTag: test0019 VersionSourceSha: 4.10.2 CommitsSinceVersionSource: 19 - CommitsSinceVersionSourcePadded: 0019 CommitDate: 2015-11-10 UncommittedChanges: 0 "; diff --git a/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs b/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs index 1cc3306f73..06809a62a1 100644 --- a/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs +++ b/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs @@ -26,9 +26,6 @@ public TestEffectiveConfiguration( string? patchMessage = null, string? noBumpMessage = null, CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled, - int legacySemVerPadding = 4, - int buildMetaDataPadding = 4, - int commitsSinceVersionSourcePadding = 4, IEnumerable? versionFilters = null, bool tracksReleaseBranches = false, bool isRelease = false, @@ -54,9 +51,6 @@ public TestEffectiveConfiguration( patchMessage, noBumpMessage, commitMessageMode, - legacySemVerPadding, - buildMetaDataPadding, - commitsSinceVersionSourcePadding, versionFilters ?? Enumerable.Empty(), tracksReleaseBranches, isRelease, diff --git a/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs b/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs index c6cf98e02c..7838f8d8e7 100644 --- a/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs +++ b/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs @@ -5,21 +5,17 @@ namespace GitVersion.Core.Tests.Helpers; internal class TestableVersionVariables : VersionVariables { public TestableVersionVariables( - string major = "", string minor = "", string patch = "", string buildMetaData = "", - string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", + string major = "", string minor = "", string patch = "", string buildMetaData = "", string fullBuildMetaData = "", string branchName = "", string escapedBranchName = "", string sha = "", string shortSha = "", string majorMinorPatch = "", - string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", + string semVer = "", string fullSemVer = "", string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseLabelWithDash = "", string preReleaseNumber = "", - string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "", - string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "", - string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "", - string commitsSinceVersionSourcePadded = "", string uncommittedChanges = "") : base( - major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, escapedBranchName, - sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, + string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "", string versionSourceSha = "", string commitsSinceVersionSource = "", string uncommittedChanges = "") : base( + major, minor, patch, buildMetaData, fullBuildMetaData, branchName, escapedBranchName, + sha, shortSha, majorMinorPatch, semVer, fullSemVer, assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash, - preReleaseLabel, preReleaseLabelWithDash, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2, - nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, uncommittedChanges) + preReleaseLabel, preReleaseLabelWithDash, preReleaseNumber, informationalVersion, commitDate, + versionSourceSha, commitsSinceVersionSource, uncommittedChanges) { } } diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs index 5b1d12634a..221934a70e 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs @@ -60,9 +60,9 @@ public void GitFlowPullRequestBranch() // Open Pull Request fixture.BranchTo("pull/2/merge", "pr"); fixture.SequenceDiagram.Activate("pull/2/merge"); - fixture.AssertFullSemver("1.3.0-PullRequest0002.1"); + fixture.AssertFullSemver("1.3.0-PullRequest2.1"); fixture.MakeACommit(); - fixture.AssertFullSemver("1.3.0-PullRequest0002.2"); + fixture.AssertFullSemver("1.3.0-PullRequest2.2"); // Merge into develop fixture.Checkout("develop"); @@ -348,9 +348,9 @@ public void GitHubFlowPullRequestBranch() // Open Pull Request fixture.BranchTo("pull/2/merge", "pr"); fixture.SequenceDiagram.Activate("pull/2/merge"); - fixture.AssertFullSemver("1.2.1-PullRequest0002.1"); + fixture.AssertFullSemver("1.2.1-PullRequest2.1"); fixture.MakeACommit(); - fixture.AssertFullSemver("1.2.1-PullRequest0002.2"); + fixture.AssertFullSemver("1.2.1-PullRequest2.2"); // Merge into main fixture.Checkout(MainBranch); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs index b5d81bc45d..9f3d0f0575 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs @@ -525,9 +525,6 @@ public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature() VersioningMode = VersioningMode.ContinuousDeployment, AssemblyVersioningScheme = AssemblyVersioningScheme.Major, AssemblyFileVersioningFormat = "{MajorMinorPatch}.{env:WeightedPreReleaseNumber ?? 0}", - LegacySemVerPadding = 4, - BuildMetaDataPadding = 4, - CommitsSinceVersionSourcePadding = 4, CommitMessageIncrementing = CommitMessageIncrementMode.Disabled, Branches = new Dictionary { diff --git a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs index 614260e171..332fe6c421 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs @@ -102,7 +102,7 @@ public void PatchOlderReleaseExample() fixture.AssertFullSemver("1.1.1-fix.1+3"); fixture.Repository.CreatePullRequestRef("feature/fix", "hotfix-1.1.1", normalise: true, prNumber: 8); - fixture.AssertFullSemver("1.1.1-PullRequest0008.4"); + fixture.AssertFullSemver("1.1.1-PullRequest8.4"); Commands.Checkout(fixture.Repository, "hotfix-1.1.1"); fixture.Repository.MergeNoFF("feature/fix", Generate.SignatureNow()); fixture.AssertFullSemver("1.1.1-beta.1+4"); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs index 202820d0e8..79f196efe2 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs @@ -111,7 +111,7 @@ public void VerifyPullRequestsActLikeContinuousDelivery() fixture.MakeACommit(); fixture.MakeACommit(); fixture.Repository.CreatePullRequestRef("feature/foo", MainBranch, normalise: true, prNumber: 8); - fixture.AssertFullSemver("1.0.2-PullRequest0008.3", this.config); + fixture.AssertFullSemver("1.0.2-PullRequest8.3", this.config); } [Test] @@ -144,7 +144,7 @@ public void SupportBranches() fixture.MakeACommit(); fixture.AssertFullSemver("1.0.5-foo.2", this.config); fixture.Repository.CreatePullRequestRef("feature/foo", "support/1.0", normalise: true, prNumber: 7); - fixture.AssertFullSemver("1.0.5-PullRequest0007.3", this.config); + fixture.AssertFullSemver("1.0.5-PullRequest7.3", this.config); } [Test] diff --git a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs index ce3aa66d62..13cd261f34 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs @@ -19,7 +19,7 @@ public void CanCalculatePullRequestChanges() fixture.Repository.CreatePullRequestRef("feature/Foo", MainBranch, normalise: true); fixture.Repository.DumpGraph(); - fixture.AssertFullSemver("0.1.1-PullRequest0002.2"); + fixture.AssertFullSemver("0.1.1-PullRequest2.2"); } [Test] @@ -35,7 +35,7 @@ public void CanCalculatePullRequestChangesInheritingConfig() fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", 44, true); fixture.Repository.DumpGraph(); - fixture.AssertFullSemver("0.2.0-PullRequest0044.3"); + fixture.AssertFullSemver("0.2.0-PullRequest44.3"); } [Test] @@ -50,7 +50,7 @@ public void CanCalculatePullRequestChangesFromRemoteRepo() fixture.Repository.CreatePullRequestRef("feature/Foo", MainBranch, normalise: true); fixture.Repository.DumpGraph(); - fixture.AssertFullSemver("0.1.1-PullRequest0002.2"); + fixture.AssertFullSemver("0.1.1-PullRequest2.2"); } [Test] @@ -65,7 +65,7 @@ public void CanCalculatePullRequestChangesInheritingConfigFromRemoteRepo() fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true); - fixture.AssertFullSemver("0.2.0-PullRequest0002.3"); + fixture.AssertFullSemver("0.2.0-PullRequest2.3"); } [Test] @@ -81,7 +81,7 @@ public void CanCalculatePullRequestChangesWhenThereAreMultipleMergeCandidates() fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true); - fixture.AssertFullSemver("0.2.0-PullRequest0002.3"); + fixture.AssertFullSemver("0.2.0-PullRequest2.3"); } [Test] @@ -96,6 +96,6 @@ public void CalculatesCorrectVersionAfterReleaseBranchMergedToMain() fixture.Repository.CreatePullRequestRef("release/2.0.0", MainBranch, normalise: true); - fixture.AssertFullSemver("2.0.0-PullRequest0002.0"); + fixture.AssertFullSemver("2.0.0-PullRequest2.0"); } } diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt index 25f1cbdc3a..afefffd16a 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": 4, "WeightedPreReleaseNumber": 4, "BuildMetaData": 5, - "BuildMetaDataPadded": "0005", "FullBuildMetaData": "5.Branch.feature1.Sha.commitSha", "MajorMinorPatch": "1.2.0", "SemVer": "1.2.0-unstable.4", - "LegacySemVer": "1.2.0-unstable4", - "LegacySemVerPadded": "1.2.0-unstable0004", "AssemblySemVer": "1.2.0.0", "AssemblySemFileVer": "1.2.0.0", "FullSemVer": "1.2.0-unstable.4+5", @@ -23,13 +20,8 @@ "EscapedBranchName": "feature1", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.0-unstable0004", - "NuGetVersion": "1.2.0-unstable0004", - "NuGetPreReleaseTagV2": "unstable0004", - "NuGetPreReleaseTag": "unstable0004", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt index 0490ce34e1..16f7124219 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": null, "WeightedPreReleaseNumber": 0, "BuildMetaData": 5, - "BuildMetaDataPadded": "0005", "FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3", - "LegacySemVer": "1.2.3", - "LegacySemVerPadded": "1.2.3", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3+5", @@ -23,13 +20,8 @@ "EscapedBranchName": "feature-123", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3", - "NuGetVersion": "1.2.3", - "NuGetPreReleaseTagV2": "", - "NuGetPreReleaseTag": "", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt index f5f7edf738..89cdc1caf4 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": null, "WeightedPreReleaseNumber": 0, "BuildMetaData": 5, - "BuildMetaDataPadded": "0005", "FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3", - "LegacySemVer": "1.2.3", - "LegacySemVerPadded": "1.2.3", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3+5", @@ -23,13 +20,8 @@ "EscapedBranchName": "feature-123", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3", - "NuGetVersion": "1.2.3", - "NuGetPreReleaseTagV2": "", - "NuGetPreReleaseTag": "", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt index 5ad80cff71..d9c308b49e 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": 4, "WeightedPreReleaseNumber": 4, "BuildMetaData": 5, - "BuildMetaDataPadded": "0005", "FullBuildMetaData": "5.Branch.develop.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3-unstable.4", - "LegacySemVer": "1.2.3-unstable4", - "LegacySemVerPadded": "1.2.3-unstable0004", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3-unstable.4+5", @@ -23,13 +20,8 @@ "EscapedBranchName": "develop", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3-unstable0004", - "NuGetVersion": "1.2.3-unstable0004", - "NuGetPreReleaseTagV2": "unstable0004", - "NuGetPreReleaseTag": "unstable0004", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt index 039e780d29..d9c308b49e 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": 4, "WeightedPreReleaseNumber": 4, "BuildMetaData": 5, - "BuildMetaDataPadded": "05", "FullBuildMetaData": "5.Branch.develop.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3-unstable.4", - "LegacySemVer": "1.2.3-unstable4", - "LegacySemVerPadded": "1.2.3-unstable00004", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3-unstable.4+5", @@ -23,13 +20,8 @@ "EscapedBranchName": "develop", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3-unstable00004", - "NuGetVersion": "1.2.3-unstable00004", - "NuGetPreReleaseTagV2": "unstable0004", - "NuGetPreReleaseTag": "unstable0004", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt index 51a0616f66..79e9c10b66 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": null, "WeightedPreReleaseNumber": 0, "BuildMetaData": 5, - "BuildMetaDataPadded": "0005", "FullBuildMetaData": "5.Branch.develop.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3", - "LegacySemVer": "1.2.3", - "LegacySemVerPadded": "1.2.3", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3+5", @@ -23,13 +20,8 @@ "EscapedBranchName": "develop", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3", - "NuGetVersion": "1.2.3", - "NuGetPreReleaseTagV2": "", - "NuGetPreReleaseTag": "", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt index 831febba8e..a8449f527c 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": 8, "WeightedPreReleaseNumber": 8, "BuildMetaData": null, - "BuildMetaDataPadded": "", "FullBuildMetaData": "Branch.develop.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3-unstable.8", - "LegacySemVer": "1.2.3-unstable8", - "LegacySemVerPadded": "1.2.3-unstable0008", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3-unstable.8", @@ -23,13 +20,8 @@ "EscapedBranchName": "develop", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3-unstable0008", - "NuGetVersion": "1.2.3-unstable0008", - "NuGetPreReleaseTagV2": "unstable0008", - "NuGetPreReleaseTag": "unstable0008", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt index 7cc02e1bf3..bf0ce5f0c1 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": 5, "WeightedPreReleaseNumber": 5, "BuildMetaData": null, - "BuildMetaDataPadded": "", "FullBuildMetaData": "Branch.develop.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3-ci.5", - "LegacySemVer": "1.2.3-ci5", - "LegacySemVerPadded": "1.2.3-ci0005", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3-ci.5", @@ -23,13 +20,8 @@ "EscapedBranchName": "develop", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3-ci0005", - "NuGetVersion": "1.2.3-ci0005", - "NuGetPreReleaseTagV2": "ci0005", - "NuGetPreReleaseTag": "ci0005", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt index 11b2530fef..d8a95e0c35 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt +++ b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt @@ -9,12 +9,9 @@ "PreReleaseNumber": null, "WeightedPreReleaseNumber": 0, "BuildMetaData": 5, - "BuildMetaDataPadded": "0005", "FullBuildMetaData": "5.Sha.commitSha", "MajorMinorPatch": "1.2.3", "SemVer": "1.2.3", - "LegacySemVer": "1.2.3", - "LegacySemVerPadded": "1.2.3", "AssemblySemVer": "1.2.3.0", "AssemblySemFileVer": "1.2.3.0", "FullSemVer": "1.2.3+5", @@ -23,13 +20,8 @@ "EscapedBranchName": "", "Sha": "commitSha", "ShortSha": "commitShortSha", - "NuGetVersionV2": "1.2.3", - "NuGetVersion": "1.2.3", - "NuGetPreReleaseTagV2": "", - "NuGetPreReleaseTag": "", "VersionSourceSha": "versionSourceSha", "CommitsSinceVersionSource": 5, - "CommitsSinceVersionSourcePadded": "0005", "UncommittedChanges": 0, "CommitDate": "2014-03-06" } \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs index 58caf701de..58e5463762 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs @@ -68,16 +68,6 @@ public void ValidateVersionParsing( public void ValidateInvalidVersionParsing(string versionString, string? tagPrefixRegex = null) => Assert.IsFalse(SemanticVersion.TryParse(versionString, tagPrefixRegex, out _), "TryParse Result"); - [Test] - public void LegacySemVerTest() - { - new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT-2134"); - new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", null).ToString("l").ShouldBe("AReallyReallyReallyL"); - new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT-2134-0001"); - new SemanticVersionPreReleaseTag("TKT-2134", 1).ToString("lp").ShouldBe("TKT-2134-0001"); - new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", 1).ToString("lp").ShouldBe("AReallyReallyRea0001"); - } - [Test] public void VersionSorting() { @@ -122,24 +112,6 @@ public string ToStringWithFormatJTests(int major, int minor, int patch, string p return semVer.ToString("j"); } - [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")] - [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta4")] - [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta4")] - public string ToStringWithFormatLTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata) - { - var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata); - return semVer.ToString("l"); - } - - [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")] - [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta0004")] - [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta0004")] - public string ToStringWithFormatLpTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata) - { - var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata); - return semVer.ToString("lp"); - } - [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")] [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")] [TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")] diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs index c72fbe6765..76e3a95e00 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs @@ -29,24 +29,6 @@ public void Setup() this.variableProvider = sp.GetRequiredService(); } - [Test] - public void ShouldLogWarningWhenUsingDefaultInformationalVersionInCustomFormat() - { - var semVer = new SemanticVersion - { - Major = 1, - Minor = 2, - Patch = 3 - }; - -#pragma warning disable CS0618 // Type or member is obsolete - const string propertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion); -#pragma warning restore CS0618 // Type or member is obsolete - var config = new TestEffectiveConfiguration(assemblyInformationalFormat: $"{{{propertyName}}}"); - this.variableProvider.GetVariablesFor(semVer, config, false); - this.logMessages.ShouldContain(message => message.Trim().StartsWith("WARN") && message.Contains(propertyName), 1, $"Expected a warning to be logged when using the variable {propertyName} in a configuration format template"); - } - [Test] public void ProvidesVariablesInContinuousDeliveryModeForPreRelease() { @@ -72,31 +54,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreRelease() vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved")); } - [Test] - public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding() - { - var semVer = new SemanticVersion - { - Major = 1, - Minor = 2, - Patch = 3, - PreReleaseTag = "unstable.4", - BuildMetaData = "5.Branch.develop" - }; - - semVer.BuildMetaData.VersionSourceSha = "versionSourceSha"; - semVer.BuildMetaData.Sha = "commitSha"; - semVer.BuildMetaData.ShortSha = "commitShortSha"; - semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z"); - - - var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5); - - var vars = this.variableProvider.GetVariablesFor(semVer, config, false); - - vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved")); - } - [Test] public void ProvidesVariablesInContinuousDeploymentModeForPreRelease() { @@ -213,7 +170,7 @@ public void ProvidesVariablesInContinuousDeploymentModeWithTagNamePattern() var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tagNumberPattern: @"[/-](?\d+)[-/]"); var vars = this.variableProvider.GetVariablesFor(semVer, config, false); - vars.FullSemVer.ShouldBe("1.2.3-PullRequest0002.5"); + vars.FullSemVer.ShouldBe("1.2.3-PullRequest2.5"); } [Test] diff --git a/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFile.approved.txt b/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFile.approved.txt index aac25ac588..d935478f68 100644 --- a/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFile.approved.txt +++ b/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFile.approved.txt @@ -4,23 +4,15 @@ - - - - - - - - diff --git a/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFileWhenFileAlreadyExists.approved.txt b/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFileWhenFileAlreadyExists.approved.txt index aac25ac588..d935478f68 100644 --- a/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFileWhenFileAlreadyExists.approved.txt +++ b/src/GitVersion.Core.Tests/VersionConverters/Approved/WixFileTests.UpdateWixVersionFileWhenFileAlreadyExists.approved.txt @@ -4,23 +4,15 @@ - - - - - - - - diff --git a/src/GitVersion.Core.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Core.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt index c1fa1addf1..fd0c71cb6a 100644 --- a/src/GitVersion.Core.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt +++ b/src/GitVersion.Core.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt @@ -38,12 +38,9 @@ static class GitVersionInformation public const string PreReleaseNumber = "4"; public const string WeightedPreReleaseNumber = "4"; public const string BuildMetaData = "5"; - public const string BuildMetaDataPadded = "0005"; public const string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha"; public const string MajorMinorPatch = "1.2.3"; public const string SemVer = "1.2.3-unstable.4"; - public const string LegacySemVer = "1.2.3-unstable4"; - public const string LegacySemVerPadded = "1.2.3-unstable0004"; public const string AssemblySemVer = "1.2.3.0"; public const string AssemblySemFileVer = "1.2.3.0"; public const string FullSemVer = "1.2.3-unstable.4+5"; @@ -52,13 +49,8 @@ static class GitVersionInformation public const string EscapedBranchName = "feature1"; public const string Sha = "commitSha"; public const string ShortSha = "commitShortSha"; - public const string NuGetVersionV2 = "1.2.3-unstable0004"; - public const string NuGetVersion = "1.2.3-unstable0004"; - public const string NuGetPreReleaseTagV2 = "unstable0004"; - public const string NuGetPreReleaseTag = "unstable0004"; public const string VersionSourceSha = "versionSourceSha"; public const string CommitsSinceVersionSource = "5"; - public const string CommitsSinceVersionSourcePadded = "0005"; public const string UncommittedChanges = "0"; public const string CommitDate = "2014-03-06"; } diff --git a/src/GitVersion.Core.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Core.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt index b8aa9a35bb..3523aab60f 100644 --- a/src/GitVersion.Core.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt +++ b/src/GitVersion.Core.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt @@ -40,12 +40,9 @@ type GitVersionInformation = static member PreReleaseNumber = "4" static member WeightedPreReleaseNumber = "4" static member BuildMetaData = "5" - static member BuildMetaDataPadded = "0005" static member FullBuildMetaData = "5.Branch.feature1.Sha.commitSha" static member MajorMinorPatch = "1.2.3" static member SemVer = "1.2.3-unstable.4" - static member LegacySemVer = "1.2.3-unstable4" - static member LegacySemVerPadded = "1.2.3-unstable0004" static member AssemblySemVer = "1.2.3.0" static member AssemblySemFileVer = "1.2.3.0" static member FullSemVer = "1.2.3-unstable.4+5" @@ -54,12 +51,7 @@ type GitVersionInformation = static member EscapedBranchName = "feature1" static member Sha = "commitSha" static member ShortSha = "commitShortSha" - static member NuGetVersionV2 = "1.2.3-unstable0004" - static member NuGetVersion = "1.2.3-unstable0004" - static member NuGetPreReleaseTagV2 = "unstable0004" - static member NuGetPreReleaseTag = "unstable0004" static member VersionSourceSha = "versionSourceSha" static member CommitsSinceVersionSource = "5" - static member CommitsSinceVersionSourcePadded = "0005" static member UncommittedChanges = "0" static member CommitDate = "2014-03-06" diff --git a/src/GitVersion.Core.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Core.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt index 39760d6b8e..346e8c8eda 100644 --- a/src/GitVersion.Core.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt +++ b/src/GitVersion.Core.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt @@ -41,12 +41,9 @@ Namespace Global Public Shared PreReleaseNumber As String = "4" Public Shared WeightedPreReleaseNumber As String = "4" Public Shared BuildMetaData As String = "5" - Public Shared BuildMetaDataPadded As String = "0005" Public Shared FullBuildMetaData As String = "5.Branch.feature1.Sha.commitSha" Public Shared MajorMinorPatch As String = "1.2.3" Public Shared SemVer As String = "1.2.3-unstable.4" - Public Shared LegacySemVer As String = "1.2.3-unstable4" - Public Shared LegacySemVerPadded As String = "1.2.3-unstable0004" Public Shared AssemblySemVer As String = "1.2.3.0" Public Shared AssemblySemFileVer As String = "1.2.3.0" Public Shared FullSemVer As String = "1.2.3-unstable.4+5" @@ -55,13 +52,8 @@ Namespace Global Public Shared EscapedBranchName As String = "feature1" Public Shared Sha As String = "commitSha" Public Shared ShortSha As String = "commitShortSha" - Public Shared NuGetVersionV2 As String = "1.2.3-unstable0004" - Public Shared NuGetVersion As String = "1.2.3-unstable0004" - Public Shared NuGetPreReleaseTagV2 As String = "unstable0004" - Public Shared NuGetPreReleaseTag As String = "unstable0004" Public Shared VersionSourceSha As String = "versionSourceSha" Public Shared CommitsSinceVersionSource As String = "5" - Public Shared CommitsSinceVersionSourcePadded As String = "0005" Public Shared UncommittedChanges As String = "0" Public Shared CommitDate As String = "2014-03-06" End Class diff --git a/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs b/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs index 155d5c172b..6aa2c9e478 100644 --- a/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs +++ b/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs @@ -33,7 +33,7 @@ public void UpdateWixVersionFile() semVer.BuildMetaData.ShortSha = "commitShortSha"; semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2019-02-20 23:59:59Z"); - var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5); + var config = new TestEffectiveConfiguration(); var stringBuilder = new StringBuilder(); void Action(string s) => stringBuilder.AppendLine(s); @@ -74,7 +74,7 @@ public void UpdateWixVersionFileWhenFileAlreadyExists() semVer.BuildMetaData.ShortSha = "commitShortSha"; semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2019-02-20 23:59:59Z"); - var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5); + var config = new TestEffectiveConfiguration(); var stringBuilder = new StringBuilder(); void Action(string s) => stringBuilder.AppendLine(s); diff --git a/src/GitVersion.Core/BuildAgents/MyGet.cs b/src/GitVersion.Core/BuildAgents/MyGet.cs index 2f77cc69d6..b53879f606 100644 --- a/src/GitVersion.Core/BuildAgents/MyGet.cs +++ b/src/GitVersion.Core/BuildAgents/MyGet.cs @@ -28,7 +28,7 @@ public override string[] GenerateSetParameterMessage(string name, string value) $"##myget[setParameter name='GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']" }; - if (string.Equals(name, "LegacySemVerPadded", StringComparison.InvariantCultureIgnoreCase)) + if (string.Equals(name, "SemVer", StringComparison.InvariantCultureIgnoreCase)) { messages.Add($"##myget[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(value)}']"); } diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs index da93481cd8..98fd36bca5 100644 --- a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs +++ b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs @@ -48,9 +48,6 @@ private static void ApplyOverrides(Config targetConfig, Config overrideConfig) targetConfig.MinorVersionBumpMessage = overrideConfig.MinorVersionBumpMessage ?? targetConfig.MinorVersionBumpMessage; targetConfig.PatchVersionBumpMessage = overrideConfig.PatchVersionBumpMessage ?? targetConfig.PatchVersionBumpMessage; targetConfig.NoBumpMessage = overrideConfig.NoBumpMessage ?? targetConfig.NoBumpMessage; - targetConfig.LegacySemVerPadding = overrideConfig.LegacySemVerPadding ?? targetConfig.LegacySemVerPadding; - targetConfig.BuildMetaDataPadding = overrideConfig.BuildMetaDataPadding ?? targetConfig.BuildMetaDataPadding; - targetConfig.CommitsSinceVersionSourcePadding = overrideConfig.CommitsSinceVersionSourcePadding ?? targetConfig.CommitsSinceVersionSourcePadding; targetConfig.TagPreReleaseWeight = overrideConfig.TagPreReleaseWeight ?? targetConfig.TagPreReleaseWeight; targetConfig.CommitMessageIncrementing = overrideConfig.CommitMessageIncrementing ?? targetConfig.CommitMessageIncrementing; targetConfig.Increment = overrideConfig.Increment ?? targetConfig.Increment; @@ -186,9 +183,6 @@ private static Config CreateDefaultConfiguration() PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern, NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern, CommitMessageIncrementing = CommitMessageIncrementMode.Enabled, - LegacySemVerPadding = 4, - BuildMetaDataPadding = 4, - CommitsSinceVersionSourcePadding = 4, CommitDateFormat = "yyyy-MM-dd", UpdateBuildNumber = true, TagPreReleaseWeight = DefaultTagPreReleaseWeight diff --git a/src/GitVersion.Core/GitVersion.Core.csproj b/src/GitVersion.Core/GitVersion.Core.csproj index 45819f607e..f90be245cf 100644 --- a/src/GitVersion.Core/GitVersion.Core.csproj +++ b/src/GitVersion.Core/GitVersion.Core.csproj @@ -10,6 +10,7 @@ Derives SemVer information from a repository following GitFlow or GitHubFlow. This is the Core library which both GitVersion cli and Task use allowing programatic usage of GitVersion. $(AssemblyName) + $(WarningsAsErrors);RS0016;RS0017;RS0022;RS0024;RS0025;RS0026;RS0027 diff --git a/src/GitVersion.Core/Model/Configuration/Config.cs b/src/GitVersion.Core/Model/Configuration/Config.cs index f655cec39b..a6c340cc30 100644 --- a/src/GitVersion.Core/Model/Configuration/Config.cs +++ b/src/GitVersion.Core/Model/Configuration/Config.cs @@ -62,15 +62,6 @@ public string? NextVersion [YamlMember(Alias = "no-bump-message")] public string? NoBumpMessage { get; set; } - [YamlMember(Alias = "legacy-semver-padding")] - public int? LegacySemVerPadding { get; set; } - - [YamlMember(Alias = "build-metadata-padding")] - public int? BuildMetaDataPadding { get; set; } - - [YamlMember(Alias = "commits-since-version-source-padding")] - public int? CommitsSinceVersionSourcePadding { get; set; } - [YamlMember(Alias = "tag-pre-release-weight")] public int? TagPreReleaseWeight { get; set; } @@ -112,6 +103,7 @@ public override string ToString() public const string SupportBranchRegex = "^support[/-]"; public const string DevelopBranchRegex = "^dev(elop)?(ment)?$"; public const string MainBranchRegex = "^master$|^main$"; + public const string MainBranchKey = "main"; public const string MasterBranchKey = "master"; public const string ReleaseBranchKey = "release"; diff --git a/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs b/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs index 1f94252cb2..c9eec627f5 100644 --- a/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs +++ b/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs @@ -43,15 +43,6 @@ public EffectiveConfiguration(Config configuration, BranchConfig currentBranchCo if (!configuration.CommitMessageIncrementing.HasValue) throw new Exception("Configuration value for 'CommitMessageIncrementing' has no value. (this should not happen, please report an issue)"); - if (!configuration.LegacySemVerPadding.HasValue) - throw new Exception("Configuration value for 'LegacySemVerPadding' has no value. (this should not happen, please report an issue)"); - - if (!configuration.BuildMetaDataPadding.HasValue) - throw new Exception("Configuration value for 'BuildMetaDataPadding' has no value. (this should not happen, please report an issue)"); - - if (!configuration.CommitsSinceVersionSourcePadding.HasValue) - throw new Exception("Configuration value for 'CommitsSinceVersionSourcePadding' has no value. (this should not happen, please report an issue)"); - if (!configuration.TagPreReleaseWeight.HasValue) throw new Exception("Configuration value for 'TagPreReleaseWeight' has no value. (this should not happen, please report an issue)"); @@ -75,9 +66,6 @@ public EffectiveConfiguration(Config configuration, BranchConfig currentBranchCo PatchVersionBumpMessage = configuration.PatchVersionBumpMessage; NoBumpMessage = configuration.NoBumpMessage; CommitMessageIncrementing = currentBranchConfig.CommitMessageIncrementing ?? configuration.CommitMessageIncrementing.Value; - LegacySemVerPadding = configuration.LegacySemVerPadding.Value; - BuildMetaDataPadding = configuration.BuildMetaDataPadding.Value; - CommitsSinceVersionSourcePadding = configuration.CommitsSinceVersionSourcePadding.Value; VersionFilters = configuration.Ignore.ToFilters(); TracksReleaseBranches = currentBranchConfig.TracksReleaseBranches.Value; IsCurrentBranchRelease = currentBranchConfig.IsReleaseBranch.Value; @@ -107,9 +95,6 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche string? patchVersionBumpMessage, string? noBumpMessage, CommitMessageIncrementMode commitMessageIncrementing, - int legacySemVerPaddding, - int buildMetaDataPadding, - int commitsSinceVersionSourcePadding, IEnumerable versionFilters, bool tracksReleaseBranches, bool isCurrentBranchRelease, @@ -138,9 +123,6 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche PatchVersionBumpMessage = patchVersionBumpMessage; NoBumpMessage = noBumpMessage; CommitMessageIncrementing = commitMessageIncrementing; - LegacySemVerPadding = legacySemVerPaddding; - BuildMetaDataPadding = buildMetaDataPadding; - CommitsSinceVersionSourcePadding = commitsSinceVersionSourcePadding; VersionFilters = versionFilters; TracksReleaseBranches = tracksReleaseBranches; IsCurrentBranchRelease = isCurrentBranchRelease; @@ -190,10 +172,6 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche public string? PatchVersionBumpMessage { get; } public string? NoBumpMessage { get; } - public int LegacySemVerPadding { get; } - public int BuildMetaDataPadding { get; } - - public int CommitsSinceVersionSourcePadding { get; } public CommitMessageIncrementMode CommitMessageIncrementing { get; } diff --git a/src/GitVersion.Core/Model/VersionVariables.cs b/src/GitVersion.Core/Model/VersionVariables.cs index 174de05b15..d82d492cbc 100644 --- a/src/GitVersion.Core/Model/VersionVariables.cs +++ b/src/GitVersion.Core/Model/VersionVariables.cs @@ -12,7 +12,6 @@ public VersionVariables(string major, string minor, string patch, string? buildMetaData, - string? buildMetaDataPadded, string? fullBuildMetaData, string? branchName, string? escapedBranchName, @@ -20,8 +19,6 @@ public VersionVariables(string major, string? shortSha, string majorMinorPatch, string semVer, - string legacySemVer, - string legacySemVerPadded, string fullSemVer, string? assemblySemVer, string? assemblySemFileVer, @@ -33,20 +30,14 @@ public VersionVariables(string major, string weightedPreReleaseNumber, string? informationalVersion, string? commitDate, - string nugetVersion, - string nugetVersionV2, - string? nugetPreReleaseTag, - string? nugetPreReleaseTagV2, string? versionSourceSha, string? commitsSinceVersionSource, - string? commitsSinceVersionSourcePadded, string? uncommittedChanges) { Major = major; Minor = minor; Patch = patch; BuildMetaData = buildMetaData; - BuildMetaDataPadded = buildMetaDataPadded; FullBuildMetaData = fullBuildMetaData; BranchName = branchName; EscapedBranchName = escapedBranchName; @@ -54,8 +45,6 @@ public VersionVariables(string major, ShortSha = shortSha; MajorMinorPatch = majorMinorPatch; SemVer = semVer; - LegacySemVer = legacySemVer; - LegacySemVerPadded = legacySemVerPadded; FullSemVer = fullSemVer; AssemblySemVer = assemblySemVer; AssemblySemFileVer = assemblySemFileVer; @@ -67,13 +56,8 @@ public VersionVariables(string major, WeightedPreReleaseNumber = weightedPreReleaseNumber; InformationalVersion = informationalVersion; CommitDate = commitDate; - NuGetVersion = nugetVersion; - NuGetVersionV2 = nugetVersionV2; - NuGetPreReleaseTag = nugetPreReleaseTag; - NuGetPreReleaseTagV2 = nugetPreReleaseTagV2; VersionSourceSha = versionSourceSha; CommitsSinceVersionSource = commitsSinceVersionSource; - CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded; UncommittedChanges = uncommittedChanges; } @@ -87,12 +71,9 @@ public VersionVariables(string major, public string? PreReleaseNumber { get; } public string WeightedPreReleaseNumber { get; } public string? BuildMetaData { get; } - public string? BuildMetaDataPadded { get; } public string? FullBuildMetaData { get; } public string MajorMinorPatch { get; } public string SemVer { get; } - public string LegacySemVer { get; } - public string LegacySemVerPadded { get; } public string? AssemblySemVer { get; } public string? AssemblySemFileVer { get; } public string FullSemVer { get; } @@ -101,13 +82,8 @@ public VersionVariables(string major, public string? EscapedBranchName { get; } public string? Sha { get; } public string? ShortSha { get; } - public string NuGetVersionV2 { get; } - public string NuGetVersion { get; } - public string? NuGetPreReleaseTagV2 { get; } - public string? NuGetPreReleaseTag { get; } public string? VersionSourceSha { get; } public string? CommitsSinceVersionSource { get; } - public string? CommitsSinceVersionSourcePadded { get; } public string? UncommittedChanges { get; } public string? CommitDate { get; set; } diff --git a/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs b/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs index cbb451730b..5677be7ef7 100644 --- a/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs +++ b/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs @@ -25,18 +25,12 @@ public class VersionVariablesJsonModel [JsonConverter(typeof(VersionVariablesJsonNumberConverter))] public string? BuildMetaData { get; set; } [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? BuildMetaDataPadded { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] public string? FullBuildMetaData { get; set; } [JsonConverter(typeof(VersionVariablesJsonStringConverter))] public string? MajorMinorPatch { get; set; } [JsonConverter(typeof(VersionVariablesJsonStringConverter))] public string? SemVer { get; set; } [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? LegacySemVer { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? LegacySemVerPadded { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] public string? AssemblySemVer { get; set; } [JsonConverter(typeof(VersionVariablesJsonStringConverter))] public string? AssemblySemFileVer { get; set; } @@ -53,19 +47,9 @@ public class VersionVariablesJsonModel [JsonConverter(typeof(VersionVariablesJsonStringConverter))] public string? ShortSha { get; set; } [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? NuGetVersionV2 { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? NuGetVersion { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? NuGetPreReleaseTagV2 { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? NuGetPreReleaseTag { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] public string? VersionSourceSha { get; set; } [JsonConverter(typeof(VersionVariablesJsonNumberConverter))] public string? CommitsSinceVersionSource { get; set; } - [JsonConverter(typeof(VersionVariablesJsonStringConverter))] - public string? CommitsSinceVersionSourcePadded { get; set; } [JsonConverter(typeof(VersionVariablesJsonNumberConverter))] public string? UncommittedChanges { get; set; } [JsonConverter(typeof(VersionVariablesJsonStringConverter))] diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt index 58818b425b..4c4b273b51 100644 --- a/src/GitVersion.Core/PublicAPI.Shipped.txt +++ b/src/GitVersion.Core/PublicAPI.Shipped.txt @@ -625,14 +625,10 @@ GitVersion.Model.Configuration.Config.AssemblyVersioningScheme.get -> GitVersion GitVersion.Model.Configuration.Config.AssemblyVersioningScheme.set -> void GitVersion.Model.Configuration.Config.Branches.get -> System.Collections.Generic.Dictionary! GitVersion.Model.Configuration.Config.Branches.set -> void -GitVersion.Model.Configuration.Config.BuildMetaDataPadding.get -> int? -GitVersion.Model.Configuration.Config.BuildMetaDataPadding.set -> void GitVersion.Model.Configuration.Config.CommitDateFormat.get -> string? GitVersion.Model.Configuration.Config.CommitDateFormat.set -> void GitVersion.Model.Configuration.Config.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode? GitVersion.Model.Configuration.Config.CommitMessageIncrementing.set -> void -GitVersion.Model.Configuration.Config.CommitsSinceVersionSourcePadding.get -> int? -GitVersion.Model.Configuration.Config.CommitsSinceVersionSourcePadding.set -> void GitVersion.Model.Configuration.Config.Config() -> void GitVersion.Model.Configuration.Config.ContinuousDeploymentFallbackTag.get -> string? GitVersion.Model.Configuration.Config.ContinuousDeploymentFallbackTag.set -> void @@ -640,8 +636,6 @@ GitVersion.Model.Configuration.Config.Ignore.get -> GitVersion.Model.Configurati GitVersion.Model.Configuration.Config.Ignore.set -> void GitVersion.Model.Configuration.Config.Increment.get -> GitVersion.IncrementStrategy? GitVersion.Model.Configuration.Config.Increment.set -> void -GitVersion.Model.Configuration.Config.LegacySemVerPadding.get -> int? -GitVersion.Model.Configuration.Config.LegacySemVerPadding.set -> void GitVersion.Model.Configuration.Config.MajorVersionBumpMessage.get -> string? GitVersion.Model.Configuration.Config.MajorVersionBumpMessage.set -> void GitVersion.Model.Configuration.Config.MergeMessageFormats.get -> System.Collections.Generic.Dictionary! @@ -669,18 +663,14 @@ GitVersion.Model.Configuration.EffectiveConfiguration.AssemblyInformationalForma GitVersion.Model.Configuration.EffectiveConfiguration.AssemblyVersioningFormat.get -> string? GitVersion.Model.Configuration.EffectiveConfiguration.AssemblyVersioningScheme.get -> GitVersion.Extensions.AssemblyVersioningScheme GitVersion.Model.Configuration.EffectiveConfiguration.BranchPrefixToTrim.get -> string? -GitVersion.Model.Configuration.EffectiveConfiguration.BuildMetaDataPadding.get -> int GitVersion.Model.Configuration.EffectiveConfiguration.CommitDateFormat.get -> string? GitVersion.Model.Configuration.EffectiveConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode -GitVersion.Model.Configuration.EffectiveConfiguration.CommitsSinceVersionSourcePadding.get -> int GitVersion.Model.Configuration.EffectiveConfiguration.Configuration.get -> GitVersion.Model.Configuration.Config! GitVersion.Model.Configuration.EffectiveConfiguration.ContinuousDeploymentFallbackTag.get -> string? -GitVersion.Model.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.VersioningMode versioningMode, string? gitTagPrefix, string? tag, string? nextVersion, GitVersion.IncrementStrategy increment, string? branchPrefixToTrim, bool preventIncrementForMergedBranchVersion, string? tagNumberPattern, string? continuousDeploymentFallbackTag, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, int legacySemVerPaddding, int buildMetaDataPadding, int commitsSinceVersionSourcePadding, System.Collections.Generic.IEnumerable! versionFilters, bool tracksReleaseBranches, bool isCurrentBranchRelease, string? commitDateFormat, bool updateBuildNumber, int preReleaseWeight, int tagPreReleaseWeight) -> void GitVersion.Model.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Model.Configuration.Config! configuration, GitVersion.Model.Configuration.BranchConfig! currentBranchConfig) -> void GitVersion.Model.Configuration.EffectiveConfiguration.GitTagPrefix.get -> string? GitVersion.Model.Configuration.EffectiveConfiguration.Increment.get -> GitVersion.IncrementStrategy GitVersion.Model.Configuration.EffectiveConfiguration.IsCurrentBranchRelease.get -> bool -GitVersion.Model.Configuration.EffectiveConfiguration.LegacySemVerPadding.get -> int GitVersion.Model.Configuration.EffectiveConfiguration.MajorVersionBumpMessage.get -> string? GitVersion.Model.Configuration.EffectiveConfiguration.MinorVersionBumpMessage.get -> string? GitVersion.Model.Configuration.EffectiveConfiguration.NextVersion.get -> string? @@ -713,11 +703,9 @@ GitVersion.OutputVariables.VersionVariables.AssemblySemFileVer.get -> string? GitVersion.OutputVariables.VersionVariables.AssemblySemVer.get -> string? GitVersion.OutputVariables.VersionVariables.BranchName.get -> string? GitVersion.OutputVariables.VersionVariables.BuildMetaData.get -> string? -GitVersion.OutputVariables.VersionVariables.BuildMetaDataPadded.get -> string? GitVersion.OutputVariables.VersionVariables.CommitDate.get -> string? GitVersion.OutputVariables.VersionVariables.CommitDate.set -> void GitVersion.OutputVariables.VersionVariables.CommitsSinceVersionSource.get -> string? -GitVersion.OutputVariables.VersionVariables.CommitsSinceVersionSourcePadded.get -> string? GitVersion.OutputVariables.VersionVariables.EscapedBranchName.get -> string? GitVersion.OutputVariables.VersionVariables.FileName.get -> string? GitVersion.OutputVariables.VersionVariables.FileName.set -> void @@ -725,15 +713,9 @@ GitVersion.OutputVariables.VersionVariables.FullBuildMetaData.get -> string? GitVersion.OutputVariables.VersionVariables.FullSemVer.get -> string! GitVersion.OutputVariables.VersionVariables.GetEnumerator() -> System.Collections.Generic.IEnumerator>! GitVersion.OutputVariables.VersionVariables.InformationalVersion.get -> string? -GitVersion.OutputVariables.VersionVariables.LegacySemVer.get -> string! -GitVersion.OutputVariables.VersionVariables.LegacySemVerPadded.get -> string! GitVersion.OutputVariables.VersionVariables.Major.get -> string! GitVersion.OutputVariables.VersionVariables.MajorMinorPatch.get -> string! GitVersion.OutputVariables.VersionVariables.Minor.get -> string! -GitVersion.OutputVariables.VersionVariables.NuGetPreReleaseTag.get -> string? -GitVersion.OutputVariables.VersionVariables.NuGetPreReleaseTagV2.get -> string? -GitVersion.OutputVariables.VersionVariables.NuGetVersion.get -> string! -GitVersion.OutputVariables.VersionVariables.NuGetVersionV2.get -> string! GitVersion.OutputVariables.VersionVariables.Patch.get -> string! GitVersion.OutputVariables.VersionVariables.PreReleaseLabel.get -> string? GitVersion.OutputVariables.VersionVariables.PreReleaseLabelWithDash.get -> string? @@ -747,7 +729,7 @@ GitVersion.OutputVariables.VersionVariables.this[string! variable].get -> string GitVersion.OutputVariables.VersionVariables.TryGetValue(string! variable, out string? variableValue) -> bool GitVersion.OutputVariables.VersionVariables.UncommittedChanges.get -> string? GitVersion.OutputVariables.VersionVariables.VersionSourceSha.get -> string? -GitVersion.OutputVariables.VersionVariables.VersionVariables(string! major, string! minor, string! patch, string? buildMetaData, string? buildMetaDataPadded, string? fullBuildMetaData, string? branchName, string? escapedBranchName, string? sha, string? shortSha, string! majorMinorPatch, string! semVer, string! legacySemVer, string! legacySemVerPadded, string! fullSemVer, string? assemblySemVer, string? assemblySemFileVer, string? preReleaseTag, string? preReleaseTagWithDash, string? preReleaseLabel, string? preReleaseLabelWithDash, string? preReleaseNumber, string! weightedPreReleaseNumber, string? informationalVersion, string? commitDate, string! nugetVersion, string! nugetVersionV2, string? nugetPreReleaseTag, string? nugetPreReleaseTagV2, string? versionSourceSha, string? commitsSinceVersionSource, string? commitsSinceVersionSourcePadded, string? uncommittedChanges) -> void +GitVersion.OutputVariables.VersionVariables.VersionVariables(string! major, string! minor, string! patch, string? buildMetaData, string? fullBuildMetaData, string? branchName, string? escapedBranchName, string? sha, string? shortSha, string! majorMinorPatch, string! semVer, string! fullSemVer, string? assemblySemVer, string? assemblySemFileVer, string? preReleaseTag, string? preReleaseTagWithDash, string? preReleaseLabel, string? preReleaseLabelWithDash, string? preReleaseNumber, string! weightedPreReleaseNumber, string? informationalVersion, string? commitDate, string? versionSourceSha, string? commitsSinceVersionSource, string? uncommittedChanges) -> void GitVersion.OutputVariables.VersionVariables.WeightedPreReleaseNumber.get -> string! GitVersion.OutputVariables.VersionVariablesJsonModel GitVersion.OutputVariables.VersionVariablesJsonModel.AssemblySemFileVer.get -> string? @@ -758,14 +740,10 @@ GitVersion.OutputVariables.VersionVariablesJsonModel.BranchName.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.BranchName.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.BuildMetaData.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.BuildMetaData.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.BuildMetaDataPadded.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.BuildMetaDataPadded.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.CommitDate.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.CommitDate.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.CommitsSinceVersionSource.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.CommitsSinceVersionSource.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.CommitsSinceVersionSourcePadded.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.CommitsSinceVersionSourcePadded.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.EscapedBranchName.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.EscapedBranchName.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.FullBuildMetaData.get -> string? @@ -774,24 +752,12 @@ GitVersion.OutputVariables.VersionVariablesJsonModel.FullSemVer.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.FullSemVer.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.InformationalVersion.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.InformationalVersion.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.LegacySemVer.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.LegacySemVer.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.LegacySemVerPadded.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.LegacySemVerPadded.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.Major.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.Major.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.MajorMinorPatch.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.MajorMinorPatch.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.Minor.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.Minor.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetPreReleaseTag.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetPreReleaseTag.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetPreReleaseTagV2.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetPreReleaseTagV2.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetVersion.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetVersion.set -> void -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetVersionV2.get -> string? -GitVersion.OutputVariables.VersionVariablesJsonModel.NuGetVersionV2.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.Patch.get -> string? GitVersion.OutputVariables.VersionVariablesJsonModel.Patch.set -> void GitVersion.OutputVariables.VersionVariablesJsonModel.PreReleaseLabel.get -> string? @@ -905,24 +871,15 @@ GitVersion.SemanticVersionFormatValues.AssemblyFileSemVer.get -> string? GitVersion.SemanticVersionFormatValues.AssemblySemVer.get -> string? GitVersion.SemanticVersionFormatValues.BranchName.get -> string? GitVersion.SemanticVersionFormatValues.BuildMetaData.get -> string? -GitVersion.SemanticVersionFormatValues.BuildMetaDataPadded.get -> string? GitVersion.SemanticVersionFormatValues.CommitDate.get -> string? GitVersion.SemanticVersionFormatValues.CommitsSinceVersionSource.get -> string? -GitVersion.SemanticVersionFormatValues.CommitsSinceVersionSourcePadded.get -> string? -GitVersion.SemanticVersionFormatValues.DefaultInformationalVersion.get -> string! GitVersion.SemanticVersionFormatValues.EscapedBranchName.get -> string? GitVersion.SemanticVersionFormatValues.FullBuildMetaData.get -> string? GitVersion.SemanticVersionFormatValues.FullSemVer.get -> string! GitVersion.SemanticVersionFormatValues.InformationalVersion.get -> string! -GitVersion.SemanticVersionFormatValues.LegacySemVer.get -> string! -GitVersion.SemanticVersionFormatValues.LegacySemVerPadded.get -> string! GitVersion.SemanticVersionFormatValues.Major.get -> string! GitVersion.SemanticVersionFormatValues.MajorMinorPatch.get -> string! GitVersion.SemanticVersionFormatValues.Minor.get -> string! -GitVersion.SemanticVersionFormatValues.NuGetPreReleaseTag.get -> string? -GitVersion.SemanticVersionFormatValues.NuGetPreReleaseTagV2.get -> string? -GitVersion.SemanticVersionFormatValues.NuGetVersion.get -> string! -GitVersion.SemanticVersionFormatValues.NuGetVersionV2.get -> string! GitVersion.SemanticVersionFormatValues.Patch.get -> string! GitVersion.SemanticVersionFormatValues.PreReleaseLabel.get -> string? GitVersion.SemanticVersionFormatValues.PreReleaseLabelWithDash.get -> string? diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt index e69de29bb2..863b6430c3 100644 --- a/src/GitVersion.Core/PublicAPI.Unshipped.txt +++ b/src/GitVersion.Core/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ +GitVersion.Model.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.VersioningMode versioningMode, string? gitTagPrefix, string? tag, string? nextVersion, GitVersion.IncrementStrategy increment, string? branchPrefixToTrim, bool preventIncrementForMergedBranchVersion, string? tagNumberPattern, string? continuousDeploymentFallbackTag, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, System.Collections.Generic.IEnumerable! versionFilters, bool tracksReleaseBranches, bool isCurrentBranchRelease, string? commitDateFormat, bool updateBuildNumber, int preReleaseWeight, int tagPreReleaseWeight) -> void \ No newline at end of file diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs index 6934094cb6..902d827313 100644 --- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs +++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs @@ -228,8 +228,6 @@ public int CompareTo(SemanticVersion? value, bool includePrerelease) /// i - Informational SemVer [1.2.3-beta.4+5.Branch.main.BranchType.main.Sha.000000] /// j - Just the SemVer part [1.2.3] /// t - SemVer with the tag [1.2.3-beta.4] - /// l - Legacy SemVer tag for systems which do not support SemVer 2.0 properly [1.2.3-beta4] - /// lp - Legacy SemVer tag for systems which do not support SemVer 2.0 properly (padded) [1.2.3-beta0004] /// public string ToString(string? format, IFormatProvider? formatProvider) { @@ -241,12 +239,6 @@ public string ToString(string? format, IFormatProvider? formatProvider) // Check for lp first because the param can vary format = format.ToLower(); - if (format.StartsWith("lp", StringComparison.Ordinal)) - { - // handle the padding - return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString(format)}" : ToString("j"); - } - switch (format) { case "j": @@ -255,8 +247,6 @@ public string ToString(string? format, IFormatProvider? formatProvider) return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag}" : ToString("j"); case "t": return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString("t")}" : ToString("j"); - case "l": - return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString("l")}" : ToString("j"); case "f": { var buildMetadata = this.BuildMetaData?.ToString(); diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs index 895acb092c..520b302843 100644 --- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs +++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs @@ -68,7 +68,6 @@ public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData? buildMetaData) /// b - Formats just the build number /// s - Formats the build number and the Git Sha /// f - Formats the full build metadata - /// p - Formats the padded build number. Can specify an integer for padding, default is 4. (i.e., p5) /// public string ToString(string? format, IFormatProvider? formatProvider) { @@ -79,22 +78,6 @@ public string ToString(string? format, IFormatProvider? formatProvider) format = "b"; format = format.ToLower(); - if (format.StartsWith("p", StringComparison.Ordinal)) - { - // Handle format - var padding = 4; - if (format.Length > 1) - { - // try to parse - if (int.TryParse(format.Substring(1), out var p)) - { - padding = p; - } - } - - return this.CommitsSinceTag != null ? this.CommitsSinceTag.Value.ToString("D" + padding) : string.Empty; - } - return format.ToLower() switch { "b" => this.CommitsSinceTag.ToString(), diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs index ef809ab386..db7be5524b 100644 --- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs +++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs @@ -35,18 +35,12 @@ public SemanticVersionFormatValues(SemanticVersion semver, EffectiveConfiguratio public string? BuildMetaData => this.semver.BuildMetaData; - public string? BuildMetaDataPadded => this.semver.BuildMetaData?.ToString("p" + this.config.BuildMetaDataPadding); - public string? FullBuildMetaData => this.semver.BuildMetaData?.ToString("f"); public string MajorMinorPatch => $"{this.semver.Major}.{this.semver.Minor}.{this.semver.Patch}"; public string SemVer => this.semver.ToString(); - public string LegacySemVer => this.semver.ToString("l"); - - public string LegacySemVerPadded => this.semver.ToString("lp" + this.config.LegacySemVerPadding); - public string? AssemblySemVer => this.semver.GetAssemblyVersion(this.config.AssemblyVersioningScheme); public string? AssemblyFileSemVer => this.semver.GetAssemblyFileVersion(this.config.AssemblyFileVersioningScheme); @@ -63,27 +57,12 @@ public SemanticVersionFormatValues(SemanticVersion semver, EffectiveConfiguratio public string? CommitDate => this.semver.BuildMetaData?.CommitDate?.UtcDateTime.ToString(this.config.CommitDateFormat, CultureInfo.InvariantCulture); - // TODO When NuGet 3 is released: public string NuGetVersionV3 { get { return ??; } } - - public string NuGetVersionV2 => LegacySemVerPadded.ToLower(); - - public string NuGetVersion => NuGetVersionV2; - - public string? NuGetPreReleaseTagV2 => this.semver.PreReleaseTag?.HasTag() == true ? this.semver.PreReleaseTag?.ToString("lp").ToLower() : null; - - public string? NuGetPreReleaseTag => NuGetPreReleaseTagV2; - public string InformationalVersion => this.semver.ToString("i"); - [Obsolete("Use InformationalVersion instead")] - public string DefaultInformationalVersion => InformationalVersion; - public string? VersionSourceSha => this.semver.BuildMetaData?.VersionSourceSha; public string? CommitsSinceVersionSource => this.semver.BuildMetaData?.CommitsSinceVersionSource?.ToString(CultureInfo.InvariantCulture); - public string? CommitsSinceVersionSourcePadded => this.semver.BuildMetaData?.CommitsSinceVersionSource?.ToString(CultureInfo.InvariantCulture).PadLeft(this.config.CommitsSinceVersionSourcePadding, '0'); - public string? UncommittedChanges => this.semver.BuildMetaData?.UncommittedChanges.ToString(CultureInfo.InvariantCulture); private string GetWeightedPreReleaseNumber() diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs index 6c20f4b6ca..759eead96d 100644 --- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs +++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs @@ -108,8 +108,6 @@ public int CompareTo(SemanticVersionPreReleaseTag? other) /// /// Default formats: /// t - SemVer 2.0 formatted tag [beta.1] - /// l - Legacy SemVer tag with the tag number padded. [beta1] - /// lp - Legacy SemVer tag with the tag number padded. [beta0001]. Can specify an integer to control padding (i.e., lp5) /// public string ToString(string? format, IFormatProvider? formatProvider) { @@ -120,49 +118,14 @@ public string ToString(string? format, IFormatProvider? formatProvider) format = "t"; format = format.ToLower(); - if (format.StartsWith("lp", StringComparison.Ordinal)) - { - // Handle format - var padding = 4; - if (format.Length > 2) - { - // try to parse - if (int.TryParse(format.Substring(2), out var p)) - { - padding = p; - } - } - - return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString("D" + padding)) : FormatLegacy(GetLegacyName()); - } return format switch { "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name ?? string.Empty), - "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())), _ => throw new FormatException($"Unknown format '{format}'.") }; } - private static string FormatLegacy(string tag, string number = "") - { - var tagEndsWithANumber = char.IsNumber(tag.LastOrDefault()); - if (tagEndsWithANumber && number.Length > 0) - number = "-" + number; - - return tag.Length + number.Length > 20 ? $"{tag.Substring(0, 20 - number.Length)}{number}" : $"{tag}{number}"; - } - - private string GetLegacyName() - { - if (Name.IsNullOrEmpty()) - { - return string.Empty; - } - var firstPart = Name.Split('_')[0]; - return firstPart.Replace(".", string.Empty); - } - public bool HasTag() => !Name.IsNullOrEmpty() || (Number.HasValue && PromotedFromCommits != true); } diff --git a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs index 1924666e1d..793c30ff8a 100644 --- a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs +++ b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs @@ -46,7 +46,7 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti var numberGroup = match.Groups["number"]; if (numberGroup.Success && semanticVersion.PreReleaseTag != null) { - semanticVersion.PreReleaseTag.Name += numberGroup.Value.PadLeft(config.BuildMetaDataPadding, '0'); + semanticVersion.PreReleaseTag.Name += numberGroup.Value; } } } @@ -69,7 +69,6 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti semverFormatValues.Minor, semverFormatValues.Patch, semverFormatValues.BuildMetaData, - semverFormatValues.BuildMetaDataPadded, semverFormatValues.FullBuildMetaData, semverFormatValues.BranchName, semverFormatValues.EscapedBranchName, @@ -77,8 +76,6 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti semverFormatValues.ShortSha, semverFormatValues.MajorMinorPatch, semverFormatValues.SemVer, - semverFormatValues.LegacySemVer, - semverFormatValues.LegacySemVerPadded, semverFormatValues.FullSemVer, assemblySemVer, assemblyFileSemVer, @@ -90,13 +87,8 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti semverFormatValues.WeightedPreReleaseNumber, informationalVersion, semverFormatValues.CommitDate, - semverFormatValues.NuGetVersion, - semverFormatValues.NuGetVersionV2, - semverFormatValues.NuGetPreReleaseTag, - semverFormatValues.NuGetPreReleaseTagV2, semverFormatValues.VersionSourceSha, semverFormatValues.CommitsSinceVersionSource, - semverFormatValues.CommitsSinceVersionSourcePadded, semverFormatValues.UncommittedChanges); return variables; @@ -140,8 +132,6 @@ private static void PromoteNumberOfCommitsToTagNumber(SemanticVersion semanticVe } else { - WarnIfUsingObsoleteFormatValues(formatString); - try { formattedString = formatString.FormatWith(source, this.environment).RegexReplace("[^0-9A-Za-z-.+]", "-"); @@ -154,15 +144,4 @@ private static void PromoteNumberOfCommitsToTagNumber(SemanticVersion semanticVe return formattedString; } - - private void WarnIfUsingObsoleteFormatValues(string formatString) - { -#pragma warning disable CS0618 // Type or member is obsolete - const string obsoletePropertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion); -#pragma warning restore CS0618 // Type or member is obsolete - if (formatString.Contains($"{{{obsoletePropertyName}}}")) - { - this.log.Write(LogLevel.Warn, $"Use format variable '{nameof(SemanticVersionFormatValues.InformationalVersion)}' instead of '{obsoletePropertyName}' which is obsolete and will be removed in a future release."); - } - } } diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs b/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs index 6824943a90..3eb04017cd 100644 --- a/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs +++ b/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs @@ -40,7 +40,7 @@ public void Execute(VersionVariables variables, AssemblyInfoContext context) var assemblyVersion = variables.AssemblySemVer; var assemblyInfoVersion = variables.InformationalVersion; var assemblyFileVersion = variables.AssemblySemFileVer; - var packageVersion = variables.NuGetVersion; + var packageVersion = variables.SemVer; foreach (var projectFile in projectFilesToUpdate) { diff --git a/src/GitVersion.MsBuild/PublicAPI.Shipped.txt b/src/GitVersion.MsBuild/PublicAPI.Shipped.txt index 452c036fcc..21a5456ecf 100644 --- a/src/GitVersion.MsBuild/PublicAPI.Shipped.txt +++ b/src/GitVersion.MsBuild/PublicAPI.Shipped.txt @@ -50,14 +50,10 @@ GitVersion.MsBuild.Tasks.GetVersion.BranchName.get -> string! GitVersion.MsBuild.Tasks.GetVersion.BranchName.set -> void GitVersion.MsBuild.Tasks.GetVersion.BuildMetaData.get -> string! GitVersion.MsBuild.Tasks.GetVersion.BuildMetaData.set -> void -GitVersion.MsBuild.Tasks.GetVersion.BuildMetaDataPadded.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.BuildMetaDataPadded.set -> void GitVersion.MsBuild.Tasks.GetVersion.CommitDate.get -> string! GitVersion.MsBuild.Tasks.GetVersion.CommitDate.set -> void GitVersion.MsBuild.Tasks.GetVersion.CommitsSinceVersionSource.get -> string! GitVersion.MsBuild.Tasks.GetVersion.CommitsSinceVersionSource.set -> void -GitVersion.MsBuild.Tasks.GetVersion.CommitsSinceVersionSourcePadded.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.CommitsSinceVersionSourcePadded.set -> void GitVersion.MsBuild.Tasks.GetVersion.EscapedBranchName.get -> string! GitVersion.MsBuild.Tasks.GetVersion.EscapedBranchName.set -> void GitVersion.MsBuild.Tasks.GetVersion.FullBuildMetaData.get -> string! @@ -67,24 +63,12 @@ GitVersion.MsBuild.Tasks.GetVersion.FullSemVer.set -> void GitVersion.MsBuild.Tasks.GetVersion.GetVersion() -> void GitVersion.MsBuild.Tasks.GetVersion.InformationalVersion.get -> string! GitVersion.MsBuild.Tasks.GetVersion.InformationalVersion.set -> void -GitVersion.MsBuild.Tasks.GetVersion.LegacySemVer.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.LegacySemVer.set -> void -GitVersion.MsBuild.Tasks.GetVersion.LegacySemVerPadded.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.LegacySemVerPadded.set -> void GitVersion.MsBuild.Tasks.GetVersion.Major.get -> string! GitVersion.MsBuild.Tasks.GetVersion.Major.set -> void GitVersion.MsBuild.Tasks.GetVersion.MajorMinorPatch.get -> string! GitVersion.MsBuild.Tasks.GetVersion.MajorMinorPatch.set -> void GitVersion.MsBuild.Tasks.GetVersion.Minor.get -> string! GitVersion.MsBuild.Tasks.GetVersion.Minor.set -> void -GitVersion.MsBuild.Tasks.GetVersion.NuGetPreReleaseTag.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.NuGetPreReleaseTag.set -> void -GitVersion.MsBuild.Tasks.GetVersion.NuGetPreReleaseTagV2.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.NuGetPreReleaseTagV2.set -> void -GitVersion.MsBuild.Tasks.GetVersion.NuGetVersion.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.NuGetVersion.set -> void -GitVersion.MsBuild.Tasks.GetVersion.NuGetVersionV2.get -> string! -GitVersion.MsBuild.Tasks.GetVersion.NuGetVersionV2.set -> void GitVersion.MsBuild.Tasks.GetVersion.Patch.get -> string! GitVersion.MsBuild.Tasks.GetVersion.Patch.set -> void GitVersion.MsBuild.Tasks.GetVersion.PreReleaseLabel.get -> string! diff --git a/src/GitVersion.MsBuild/Tasks/GetVersion.cs b/src/GitVersion.MsBuild/Tasks/GetVersion.cs index 74f56e2df5..3fca217eef 100644 --- a/src/GitVersion.MsBuild/Tasks/GetVersion.cs +++ b/src/GitVersion.MsBuild/Tasks/GetVersion.cs @@ -34,9 +34,6 @@ public class GetVersion : GitVersionTaskBase [Output] public string BuildMetaData { get; set; } - [Output] - public string BuildMetaDataPadded { get; set; } - [Output] public string FullBuildMetaData { get; set; } @@ -46,12 +43,6 @@ public class GetVersion : GitVersionTaskBase [Output] public string SemVer { get; set; } - [Output] - public string LegacySemVer { get; set; } - - [Output] - public string LegacySemVerPadded { get; set; } - [Output] public string AssemblySemVer { get; set; } @@ -76,18 +67,6 @@ public class GetVersion : GitVersionTaskBase [Output] public string ShortSha { get; set; } - [Output] - public string NuGetVersionV2 { get; set; } - - [Output] - public string NuGetVersion { get; set; } - - [Output] - public string NuGetPreReleaseTagV2 { get; set; } - - [Output] - public string NuGetPreReleaseTag { get; set; } - [Output] public string CommitDate { get; set; } @@ -97,10 +76,6 @@ public class GetVersion : GitVersionTaskBase [Output] public string CommitsSinceVersionSource { get; set; } - [Output] - public string CommitsSinceVersionSourcePadded { get; set; } - - [Output] public string UncommittedChanges { get; set; } diff --git a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets index 2b180aa2d7..2597da08a1 100644 --- a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets +++ b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets @@ -26,12 +26,9 @@ - - - @@ -40,23 +37,16 @@ - - - - - - $(GitVersion_NuGetVersion) + $(GitVersion_SemVer) $(GitVersion_MajorMinorPatch) - $(GitVersion_NuGetPreReleaseTag) $(GitVersion_PreReleaseTag) - $(GitVersion_NuGetVersion) $(GitVersion_FullSemVer) $(GitVersion_InformationalVersion) $(GitVersion_AssemblySemVer) @@ -76,12 +66,9 @@ GitVersion_PreReleaseNumber=$(GitVersion_PreReleaseNumber);$(DefineConstants) GitVersion_WeightedPreReleaseNumber=$(GitVersion_WeightedPreReleaseNumber);$(DefineConstants) GitVersion_BuildMetaData=$(GitVersion_BuildMetaData);$(DefineConstants) - GitVersion_BuildMetaDataPadded=$(GitVersion_BuildMetaDataPadded);$(DefineConstants) GitVersion_FullBuildMetaData=$(GitVersion_FullBuildMetaData);$(DefineConstants) GitVersion_MajorMinorPatch=$(GitVersion_MajorMinorPatch);$(DefineConstants) GitVersion_SemVer=$(GitVersion_SemVer);$(DefineConstants) - GitVersion_LegacySemVer=$(GitVersion_LegacySemVer);$(DefineConstants) - GitVersion_LegacySemVerPadded=$(GitVersion_LegacySemVerPadded);$(DefineConstants) GitVersion_AssemblySemVer=$(GitVersion_AssemblySemVer);$(DefineConstants) GitVersion_AssemblySemFileVer=$(GitVersion_AssemblySemFileVer);$(DefineConstants) GitVersion_FullSemVer=$(GitVersion_FullSemVer);$(DefineConstants) @@ -90,14 +77,9 @@ GitVersion_EscapedBranchName=$(GitVersion_EscapedBranchName);$(DefineConstants) GitVersion_Sha=$(GitVersion_Sha);$(DefineConstants) GitVersion_ShortSha=$(GitVersion_ShortSha);$(DefineConstants) - GitVersion_NuGetVersionV2=$(GitVersion_NuGetVersionV2);$(DefineConstants) - GitVersion_NuGetVersion=$(GitVersion_NuGetVersion);$(DefineConstants) - GitVersion_NuGetPreReleaseTagV2=$(GitVersion_NuGetPreReleaseTagV2);$(DefineConstants) - GitVersion_NuGetPreReleaseTag=$(GitVersion_NuGetPreReleaseTag);$(DefineConstants) GitVersion_CommitDate=$(GitVersion_CommitDate);$(DefineConstants) GitVersion_VersionSourceSha=$(GitVersion_VersionSourceSha);$(DefineConstants) GitVersion_CommitsSinceVersionSource=$(GitVersion_CommitsSinceVersionSource);$(DefineConstants) - GitVersion_CommitsSinceVersionSourcePadded=$(GitVersion_CommitsSinceVersionSourcePadded);$(DefineConstants) GitVersion_UncommittedChanges=$(GitVersion_UncommittedChanges);$(DefineConstants)