Skip to content

This changes AssemblyVersioningScheme.MajorMinorPatchMetadata to Assembl... #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JakeGinnivan merged 1 commit into from
May 28, 2015
Merged

This changes AssemblyVersioningScheme.MajorMinorPatchMetadata to Assembl... #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GitVersionCore/AssemblyVersioningScheme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
public enum AssemblyVersioningScheme
{
MajorMinorPatchMetadata,
MajorMinorPatchTag,
MajorMinorPatch,
MajorMinor,
Major
Expand Down
4 changes: 2 additions & 2 deletions GitVersionCore/AssemblyVersionsGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public static string GetAssemblyVersion(
return string.Format("{0}.{1}.0.0", sv.Major, sv.Minor);
case AssemblyVersioningScheme.MajorMinorPatch:
return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);
case AssemblyVersioningScheme.MajorMinorPatchMetadata:
return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.BuildMetaData.CommitsSinceTag ?? 0);
case AssemblyVersioningScheme.MajorMinorPatchTag:
return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.PreReleaseTag.Number ?? 0);
default:
throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
}
Expand Down
2 changes: 1 addition & 1 deletion GitVersionCore/Configuration/ConfigSerialiser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void Write(Config config, TextWriter writer)

public static void WriteSample(TextWriter writer)
{
writer.WriteLine("# assembly-versioning-scheme: MajorMinorPatchMetadata | MajorMinorPatch | MajorMinor | Major");
writer.WriteLine("# assembly-versioning-scheme: MajorMinorPatchTag | MajorMinorPatch | MajorMinor | Major");
writer.WriteLine("# tag-prefix: '[vV|version-] # regex to match git tag prefix");
writer.WriteLine("# next-version: 1.0.0");
writer.WriteLine("# mode: ContinuousDelivery | ContinuousDeployment");
Expand Down
24 changes: 12 additions & 12 deletions GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using System.Reflection;

[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.3.4.0")]
[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
[assembly: ReleaseDate("2014-03-06")]

[System.Runtime.CompilerServices.CompilerGenerated]
Expand All @@ -24,21 +24,21 @@ static class GitVersionInformation
public static string Major = "2";
public static string Minor = "3";
public static string Patch = "4";
public static string PreReleaseTag = "";
public static string PreReleaseTagWithDash = "";
public static string BuildMetaData = "5";
public static string FullBuildMetaData = "5.Branch.master.Sha.commitSha";
public static string PreReleaseTag = "beta.5";
public static string PreReleaseTagWithDash = "-beta.5";
public static string BuildMetaData = "6";
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
public static string MajorMinorPatch = "2.3.4";
public static string SemVer = "2.3.4";
public static string LegacySemVer = "2.3.4";
public static string LegacySemVerPadded = "2.3.4";
public static string SemVer = "2.3.4-beta.5";
public static string LegacySemVer = "2.3.4-beta5";
public static string LegacySemVerPadded = "2.3.4-beta0005";
public static string AssemblySemVer = "2.0.0.0";
public static string FullSemVer = "2.3.4+5";
public static string InformationalVersion = "2.3.4+5.Branch.master.Sha.commitSha";
public static string FullSemVer = "2.3.4-beta.5+6";
public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
public static string BranchName = "master";
public static string Sha = "commitSha";
public static string NuGetVersionV2 = "2.3.4";
public static string NuGetVersion = "2.3.4";
public static string NuGetVersionV2 = "2.3.4-beta0005";
public static string NuGetVersion = "2.3.4-beta0005";

}

Expand Down
24 changes: 12 additions & 12 deletions GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using System.Reflection;

[assembly: AssemblyVersion("2.3.0.0")]
[assembly: AssemblyFileVersion("2.3.4.0")]
[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
[assembly: ReleaseDate("2014-03-06")]

[System.Runtime.CompilerServices.CompilerGenerated]
Expand All @@ -24,21 +24,21 @@ static class GitVersionInformation
public static string Major = "2";
public static string Minor = "3";
public static string Patch = "4";
public static string PreReleaseTag = "";
public static string PreReleaseTagWithDash = "";
public static string BuildMetaData = "5";
public static string FullBuildMetaData = "5.Branch.master.Sha.commitSha";
public static string PreReleaseTag = "beta.5";
public static string PreReleaseTagWithDash = "-beta.5";
public static string BuildMetaData = "6";
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
public static string MajorMinorPatch = "2.3.4";
public static string SemVer = "2.3.4";
public static string LegacySemVer = "2.3.4";
public static string LegacySemVerPadded = "2.3.4";
public static string SemVer = "2.3.4-beta.5";
public static string LegacySemVer = "2.3.4-beta5";
public static string LegacySemVerPadded = "2.3.4-beta0005";
public static string AssemblySemVer = "2.3.0.0";
public static string FullSemVer = "2.3.4+5";
public static string InformationalVersion = "2.3.4+5.Branch.master.Sha.commitSha";
public static string FullSemVer = "2.3.4-beta.5+6";
public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
public static string BranchName = "master";
public static string Sha = "commitSha";
public static string NuGetVersionV2 = "2.3.4";
public static string NuGetVersion = "2.3.4";
public static string NuGetVersionV2 = "2.3.4-beta0005";
public static string NuGetVersion = "2.3.4-beta0005";

}

Expand Down
24 changes: 12 additions & 12 deletions ...ionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using System.Reflection;

[assembly: AssemblyVersion("2.3.4.0")]
[assembly: AssemblyFileVersion("2.3.4.0")]
[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
[assembly: ReleaseDate("2014-03-06")]

[System.Runtime.CompilerServices.CompilerGenerated]
Expand All @@ -24,21 +24,21 @@ static class GitVersionInformation
public static string Major = "2";
public static string Minor = "3";
public static string Patch = "4";
public static string PreReleaseTag = "";
public static string PreReleaseTagWithDash = "";
public static string BuildMetaData = "5";
public static string FullBuildMetaData = "5.Branch.master.Sha.commitSha";
public static string PreReleaseTag = "beta.5";
public static string PreReleaseTagWithDash = "-beta.5";
public static string BuildMetaData = "6";
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
public static string MajorMinorPatch = "2.3.4";
public static string SemVer = "2.3.4";
public static string LegacySemVer = "2.3.4";
public static string LegacySemVerPadded = "2.3.4";
public static string SemVer = "2.3.4-beta.5";
public static string LegacySemVer = "2.3.4-beta5";
public static string LegacySemVerPadded = "2.3.4-beta0005";
public static string AssemblySemVer = "2.3.4.0";
public static string FullSemVer = "2.3.4+5";
public static string InformationalVersion = "2.3.4+5.Branch.master.Sha.commitSha";
public static string FullSemVer = "2.3.4-beta.5+6";
public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
public static string BranchName = "master";
public static string Sha = "commitSha";
public static string NuGetVersionV2 = "2.3.4";
public static string NuGetVersion = "2.3.4";
public static string NuGetVersionV2 = "2.3.4-beta0005";
public static string NuGetVersion = "2.3.4-beta0005";

}

Expand Down
24 changes: 12 additions & 12 deletions ...sion_MajorMinorPatchMetadata.approved.txt → ...lyVersion_MajorMinorPatchTag.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using System.Reflection;

[assembly: AssemblyVersion("2.3.4.5")]
[assembly: AssemblyFileVersion("2.3.4.0")]
[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
[assembly: ReleaseDate("2014-03-06")]

[System.Runtime.CompilerServices.CompilerGenerated]
Expand All @@ -24,21 +24,21 @@ static class GitVersionInformation
public static string Major = "2";
public static string Minor = "3";
public static string Patch = "4";
public static string PreReleaseTag = "";
public static string PreReleaseTagWithDash = "";
public static string BuildMetaData = "5";
public static string FullBuildMetaData = "5.Branch.master.Sha.commitSha";
public static string PreReleaseTag = "beta.5";
public static string PreReleaseTagWithDash = "-beta.5";
public static string BuildMetaData = "6";
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
public static string MajorMinorPatch = "2.3.4";
public static string SemVer = "2.3.4";
public static string LegacySemVer = "2.3.4";
public static string LegacySemVerPadded = "2.3.4";
public static string SemVer = "2.3.4-beta.5";
public static string LegacySemVer = "2.3.4-beta5";
public static string LegacySemVerPadded = "2.3.4-beta0005";
public static string AssemblySemVer = "2.3.4.5";
public static string FullSemVer = "2.3.4+5";
public static string InformationalVersion = "2.3.4+5.Branch.master.Sha.commitSha";
public static string FullSemVer = "2.3.4-beta.5+6";
public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
public static string BranchName = "master";
public static string Sha = "commitSha";
public static string NuGetVersionV2 = "2.3.4";
public static string NuGetVersion = "2.3.4";
public static string NuGetVersionV2 = "2.3.4-beta0005";
public static string NuGetVersion = "2.3.4-beta0005";

}

Expand Down
7 changes: 4 additions & 3 deletions GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ public void VerifyAssemblyVersion_MajorMinorPatch()

[Test]
[MethodImpl(MethodImplOptions.NoInlining)]
public void VerifyAssemblyVersion_MajorMinorPatchMetadata()
public void VerifyAssemblyVersion_MajorMinorPatchTag()
{
VerifyAssemblyVersion(AssemblyVersioningScheme.MajorMinorPatchMetadata);
VerifyAssemblyVersion(AssemblyVersioningScheme.MajorMinorPatchTag);
}

static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
Expand All @@ -80,7 +80,8 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
Major = 2,
Minor = 3,
Patch = 4,
BuildMetaData = new SemanticVersionBuildMetaData(5,
PreReleaseTag = "beta.5",
BuildMetaData = new SemanticVersionBuildMetaData(6,
"master", "commitSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z")),
};
var assemblyInfoBuilder = new AssemblyInfoBuilder
Expand Down