Skip to content

Commit ede8551

Browse files
GeertvanHorrikJakeGinnivan
authored andcommitted
Removed "Version" variable (users should pick one of the existing ones)
1 parent abedac0 commit ede8551

9 files changed

+0
-14
lines changed

GitVersionCore/OutputVariables/VariableProvider.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public static class VariableProvider
2828
public const string OriginalRelease = "OriginalRelease";
2929

3030
// Synonyms
31-
public const string Version = "Version";
3231
public const string NuGetVersionV2 = "NuGetVersionV2";
3332
public const string NuGetVersionV3 = "NuGetVersionV3";
3433
public const string NuGetVersion = "NuGetVersion";
@@ -73,9 +72,6 @@ public static Dictionary<string, string> GetVariablesFor(
7372
bmd.ReleaseDate.OriginalDate.UtcDateTime.ToString("u"))},
7473
};
7574

76-
// Synonyms to ensure backwards compatibility
77-
variables[Version] = variables[LegacySemVer];
78-
7975
// Use ToLower() to fix a bug where Beta and beta are different in NuGet
8076
variables[NuGetVersionV2] = variables[LegacySemVerPadded].ToLower();
8177
//variables[NuGetVersionV3] = variables[LegacySemVerPadded].ToLower(); // TODO: when v3 is released, determine what to use

GitVersionTask/GetVersion.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ public class GetVersion : Task
7474
[Output]
7575
public string OriginalRelease { get; set; }
7676

77-
[Output]
78-
public string Version { get; set; }
79-
8077
[Output]
8178
public string NuGetVersionV2 { get; set; }
8279

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static class GitVersionInformation
4444
public static string AssemblyVersion = "2.0.0.0";
4545
public static string AssemblyFileVersion = "2.3.4.0";
4646
public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
47-
public static string Version = "2.3.4";
4847
public static string NuGetVersionV2 = "2.3.4";
4948
public static string NuGetVersion = "2.3.4";
5049

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static class GitVersionInformation
4444
public static string AssemblyVersion = "2.3.0.0";
4545
public static string AssemblyFileVersion = "2.3.4.0";
4646
public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
47-
public static string Version = "2.3.4";
4847
public static string NuGetVersionV2 = "2.3.4";
4948
public static string NuGetVersion = "2.3.4";
5049

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static class GitVersionInformation
4444
public static string AssemblyVersion = "2.3.4.0";
4545
public static string AssemblyFileVersion = "2.3.4.0";
4646
public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
47-
public static string Version = "2.3.4";
4847
public static string NuGetVersionV2 = "2.3.4";
4948
public static string NuGetVersion = "2.3.4";
5049

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_None.approved.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static class GitVersionInformation
4444
public static string AssemblyVersion = "1.0.0.0";
4545
public static string AssemblyFileVersion = "2.3.4.0";
4646
public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
47-
public static string Version = "2.3.4";
4847
public static string NuGetVersionV2 = "2.3.4";
4948
public static string NuGetVersion = "2.3.4";
5049

Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static class GitVersionInformation
4444
public static string AssemblyVersion = "1.2.3.0";
4545
public static string AssemblyFileVersion = "1.2.3.0";
4646
public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
47-
public static string Version = "1.2.3-unstable4";
4847
public static string NuGetVersionV2 = "1.2.3-unstable0004";
4948
public static string NuGetVersion = "1.2.3-unstable0004";
5049

Tests/JsonVersionBuilderTests.Json.approved.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"AssemblyVersion":"1.2.3.0",
2121
"AssemblyFileVersion":"1.2.3.0",
2222
"OriginalRelease":"originalCommitSha.2014-03-01 00:00:01Z",
23-
"Version":"1.2.3-unstable4",
2423
"NuGetVersionV2":"1.2.3-unstable0004",
2524
"NuGetVersion":"1.2.3-unstable0004"
2625
}

Tests/VariableProviderTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public void AssemblyVersion(
7373
vars[VariableProvider.AssemblyVersion].ShouldBe(version);
7474
vars[VariableProvider.AssemblyFileVersion].ShouldBe(fileVersion);
7575

76-
vars[VariableProvider.Version].ShouldBe(vars[VariableProvider.LegacySemVer]);
7776
vars[VariableProvider.NuGetVersionV2].ShouldBe(vars[VariableProvider.LegacySemVerPadded].ToLower());
7877
vars[VariableProvider.NuGetVersion].ShouldBe(vars[VariableProvider.NuGetVersionV2]);
7978
}

0 commit comments

Comments
 (0)