@@ -50,11 +50,12 @@ var publishDir = "./Publish";
50
50
Setup ( context =>
51
51
{
52
52
gitVersion = GitVersion ( new GitVersionSettings { OutputType = GitVersionOutput . Json } ) ;
53
- Information ( "Informational Version : {0}" , gitVersion . InformationalVersion ) ;
54
- Information ( "SemVer Version : {0}" , gitVersion . SemVer ) ;
55
- Information ( "AssemblySemVer Version: {0}" , gitVersion . AssemblySemVer ) ;
56
- Information ( "NuGet Version : {0}" , gitVersion . NuGetVersion ) ;
57
- Information ( "IsLocalBuild : {0}" , local ) ;
53
+ Information ( "Informational Version : {0}" , gitVersion . InformationalVersion ) ;
54
+ Information ( "SemVer Version : {0}" , gitVersion . SemVer ) ;
55
+ Information ( "AssemblySemVer Version : {0}" , gitVersion . AssemblySemVer ) ;
56
+ Information ( "MajorMinorPatch Version: {0}" , gitVersion . MajorMinorPatch ) ;
57
+ Information ( "NuGet Version : {0}" , gitVersion . NuGetVersion ) ;
58
+ Information ( "IsLocalBuild : {0}" , local ) ;
58
59
59
60
Information ( Figlet ( "MahApps.Metro" ) ) ;
60
61
} ) ;
@@ -95,7 +96,7 @@ Task("Paket-Pack")
95
96
. Does ( ( ) =>
96
97
{
97
98
EnsureDirectoryExists ( Directory ( publishDir ) ) ;
98
- PaketPack ( publishDir , new PaketPackSettings { Version = isReleaseBranch ? gitVersion . AssemblySemVer : gitVersion . NuGetVersion } ) ;
99
+ PaketPack ( publishDir , new PaketPackSettings { Version = isReleaseBranch ? gitVersion . MajorMinorPatch : gitVersion . NuGetVersion } ) ;
99
100
} ) ;
100
101
101
102
Task( "Zip-Demos" )
@@ -118,8 +119,6 @@ Task("Unit-Tests")
118
119
} ) ;
119
120
120
121
Task( "CreateRelease" )
121
- . WithCriteria ( ( ) => ! isPullRequest )
122
- . WithCriteria ( ( ) => isReleaseBranch )
123
122
. WithCriteria ( ( ) => ! isTagged )
124
123
. Does ( ( ) =>
125
124
{
@@ -136,8 +135,8 @@ Task("CreateRelease")
136
135
}
137
136
138
137
GitReleaseManagerCreate ( username , token , "MahApps" , "MahApps.Metro" , new GitReleaseManagerCreateSettings {
139
- Milestone = gitVersion . SemVer ,
140
- Name = gitVersion . SemVer ,
138
+ Milestone = gitVersion . MajorMinorPatch ,
139
+ Name = "MahApps.Metro " + gitVersion . MajorMinorPatch ,
141
140
Prerelease = false ,
142
141
TargetCommitish = "master" ,
143
142
WorkingDirectory = "../"
0 commit comments