From 0059d12068bf74afcd493f65ca3b05ab47a14d7c Mon Sep 17 00:00:00 2001 From: Jake Ginnivan Date: Wed, 20 Jan 2016 18:41:49 +0800 Subject: [PATCH 1/4] Cleaned up the build output folder and ignored it --- .gitignore | 11 +--- build/Build.cmd => Build.cmd | 6 +- build/GitVersionVsoTaskBuild/icon.png | Bin 1189 -> 0 bytes build/GitVersionVsoTaskBuild/task.json | 54 ------------------ src/GitVersion.sln | 4 +- src/GitVersionExe/GitVersionExe.csproj | 2 +- .../Update-GitVersionTfsTaskVersion.ps1 | 0 7 files changed, 7 insertions(+), 70 deletions(-) rename build/Build.cmd => Build.cmd (74%) delete mode 100644 build/GitVersionVsoTaskBuild/icon.png delete mode 100644 build/GitVersionVsoTaskBuild/task.json rename {build => src}/Update-GitVersionTfsTaskVersion.ps1 (100%) diff --git a/.gitignore b/.gitignore index 360e510eeb..9f6e9fcaae 100644 --- a/.gitignore +++ b/.gitignore @@ -36,11 +36,6 @@ ## If you have NuGet Package Restore enabled, uncomment this packages/ ForSample/ -*NugetTaskBuild* -*NugetRefBuild* -*NugetExeBuild* -*GitVersionTfsTaskBuild* -*GemBuild* # Visual Studio profiler *.psess @@ -83,11 +78,7 @@ Thumbs.db Desktop.ini _NCrunch_GitVersion -NuGetCommandLineBuild/ GitVersion.sln.ide/ .vs/ -NuGetExeBuild/ -NuGetRefBuild/ Packages/ -NuGetTaskBuild/ -GitVersionTfsTaskBuild/ \ No newline at end of file +build/ diff --git a/build/Build.cmd b/Build.cmd similarity index 74% rename from build/Build.cmd rename to Build.cmd index 3da6b0e692..364d1ab554 100644 --- a/build/Build.cmd +++ b/Build.cmd @@ -1,7 +1,7 @@ @echo on set framework=v4.0.30319 -set src=%~dp0..\src\ +set src=%~dp0src\ "%src%.nuget\nuget.exe" restore %src% @@ -10,8 +10,8 @@ set src=%~dp0..\src\ rmdir /s /q "%tmp%GitVersion" md "%tmp%GitVersion" -xcopy /E "%~dp0NuGetCommandLineBuild\tools" "%tmp%GitVersion" +xcopy /E "%~dp0build\NuGetCommandLineBuild\tools" "%tmp%GitVersion" "%tmp%GitVersion\GitVersion.exe" /l console /output buildserver /updateAssemblyInfo /proj "%src%GitVersion.sln" -rmdir /s /q "%tmp%GitVersion" +rmdir /s /q "%tmp%GitVersion" diff --git a/build/GitVersionVsoTaskBuild/icon.png b/build/GitVersionVsoTaskBuild/icon.png deleted file mode 100644 index fe52c661cbb5aa655290eda965c5618210948522..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+081LK|mpAc7|f>AI;L!e!Q zI~VBm$t6L4!3_52-c>U1e%={hcJz-8<1G*NQ=XgTR#b%>oZ0f8PsnQZKhxjSxG!d^ zif6sJ6fCRd?tM4K_0?7d(V4&6!z5yPHmB~i+wr>fFh`F6*`G7=Zhm+?hjo@z+V*`3 zaXJ&`ihcghcH%)pp^^E#rmtT@RP;kH7(Nw#`{xtCl z=k1y-@0|FO@sZpvpz|1$yxm;OkH}(RdcF?Aj7}P}D}V}?d%8G=Se&j6 zObvH(6p1;K$CD$Fvr#nKFpzQg0hVZy-NL(z|7|#3{f1fO{$B&@^0IUDZdP*&dI>Q& zNJ+T-Tba<(($?y(V07wzX$en~rBb)^9(!jdA<3!AnwC$$*NRNC_0>At6cFzmwJTit zbbyBO!k}vDO`GcX&z$_4?`Zjn&*Iwg4_Gz62*(6JF>OwA^Y&uh%JVcYtkKAEt;^H{ zTd#V(JLA%O{cz!m)Gh1wHQr{FntAEU9LJK3#9ZxL8r#ZCg03uHJ$HrTTeT(ZI&F+@ zUA)WUx@!M2dq~R^ojfd|czChZsbdCy7kRkf&u37xG-6dY@I5)f)Bhqz^Y5cGBUd-c zZL>V1ucH^J<{PnWM^mVnS7Lm0xykA^(lycN{?{3od;fT}ExX@(_q)9FC+3S)Y`gEx zJNr<@&5CdQEQb{X4sKqYJjdXx$Y-lgTe~DWM4fLb^2H diff --git a/build/GitVersionVsoTaskBuild/task.json b/build/GitVersionVsoTaskBuild/task.json deleted file mode 100644 index 51a7655e8f..0000000000 --- a/build/GitVersionVsoTaskBuild/task.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "id": "e5983830-3f75-11e5-82ed-81492570a08e", - "name": "GitVersion", - "friendlyName": "GitVersion Task", - "description": "Easy Semantic Versioning (http://semver.org) for projects using Git", - "author": "GitTools and Contributors", - "helpMarkDown": "See the [documentation](http://gitversion.readthedocs.org/en/latest/) for help", - "category": "Build", - "visibility": [ - "Build", - "Release" - ], - "demands": [], - "version": { - "Major": "0", - "Minor": "0", - "Patch": "0" - }, - "minimumAgentVersion": "1.83.0", - "groups": [ - { - "name": "additional", - "displayName": "Additional Options", - "isExpanded": false - } - ], - "instanceNameFormat": "GitVersion", - "inputs": [ - { - "name": "updateAssemblyInfo", - "type": "boolean", - "label": "Update AssemblyInfo files", - "defaultValue": "false", - "required": false, - "helpMarkDown": "Whether to update versions in the AssemblyInfo files" - }, - { - "name": "additionalArguments", - "type": "string", - "label": "Additional GitVersion.exe arguments", - "defaultValue": "", - "required": false, - "helpMarkDown": "Additional arguments to send to GitVersion.exe", - "groupName": "additional" - } - ], - "execution": { - "Process": { - "target": "$(currentDirectory)\\GitVersion.exe", - "argumentFormat": "\"$(Build.SourcesDirectory)\" /output buildserver /updateAssemblyInfo $(updateAssemblyInfo) /nofetch $(additionalArguments)", - "workingDirectory": "$(currentDirectory)" - } - } -} \ No newline at end of file diff --git a/src/GitVersion.sln b/src/GitVersion.sln index 4b783ef413..e18e477ba2 100644 --- a/src/GitVersion.sln +++ b/src/GitVersion.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23103.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionExe", "GitVersionExe\GitVersionExe.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}" EndProject @@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject ..\appveyor.yml = ..\appveyor.yml ..\BREAKING CHANGES.md = ..\BREAKING CHANGES.md - ..\build\Build.cmd = ..\build\Build.cmd + ..\Build.cmd = ..\Build.cmd ..\CONTRIBUTING.md = ..\CONTRIBUTING.md ..\GitVersionConfig.yaml = ..\GitVersionConfig.yaml ..\LICENSE = ..\LICENSE diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj index 43e5f5f95f..d5880b9164 100644 --- a/src/GitVersionExe/GitVersionExe.csproj +++ b/src/GitVersionExe/GitVersionExe.csproj @@ -166,7 +166,7 @@ - + diff --git a/build/Update-GitVersionTfsTaskVersion.ps1 b/src/Update-GitVersionTfsTaskVersion.ps1 similarity index 100% rename from build/Update-GitVersionTfsTaskVersion.ps1 rename to src/Update-GitVersionTfsTaskVersion.ps1 From 90d268b71e778ebb596775b1eebfbfc55920cc04 Mon Sep 17 00:00:00 2001 From: Jake Ginnivan Date: Sat, 23 Jan 2016 09:25:31 +0800 Subject: [PATCH 2/4] Changed appveyor semver so it doesn't generate duplicate version numbers --- src/GitVersionCore/BuildServers/AppVeyor.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/GitVersionCore/BuildServers/AppVeyor.cs b/src/GitVersionCore/BuildServers/AppVeyor.cs index 1d9bafafbb..fb656a909e 100644 --- a/src/GitVersionCore/BuildServers/AppVeyor.cs +++ b/src/GitVersionCore/BuildServers/AppVeyor.cs @@ -13,12 +13,13 @@ public override bool CanApplyToCurrentContext() public override string GenerateSetVersionMessage(VersionVariables variables) { + var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER"); var restBase = Environment.GetEnvironmentVariable("APPVEYOR_API_URL"); var request = (HttpWebRequest)WebRequest.Create(restBase + "api/build"); request.Method = "PUT"; - var data = string.Format("{{ \"version\": \"{0}\" }}", variables.FullSemVer); + var data = string.Format("{{ \"version\": \"{0}.build.{1}\" }}", variables.FullSemVer, buildNumber); var bytes = Encoding.UTF8.GetBytes(data); request.ContentLength = bytes.Length; request.ContentType = "application/json"; From b75dffbc091f7dfd8338977de571ab96237678f9 Mon Sep 17 00:00:00 2001 From: Jake Ginnivan Date: Sat, 23 Jan 2016 11:05:34 +0800 Subject: [PATCH 3/4] Fixed path --- src/GitVersionExe/GitVersionExe.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj index d5880b9164..12c033e9c2 100644 --- a/src/GitVersionExe/GitVersionExe.csproj +++ b/src/GitVersionExe/GitVersionExe.csproj @@ -166,7 +166,7 @@ - + From 9585e05e61460d49ac42c2f4fac9616dd1a60893 Mon Sep 17 00:00:00 2001 From: Jake Ginnivan Date: Sat, 23 Jan 2016 11:20:05 +0800 Subject: [PATCH 4/4] Removed duplicated step from appveyor.yml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 62cf32695e..1d4c46c172 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,6 @@ build_script: - cmd: 7z a "GitVersion_%GitVersion_NuGetVersion%.zip" -r .\build\NuGetCommandLineBuild\Tools\*.* - cmd: appveyor PushArtifact "GitVersion_%GitVersion_NuGetVersion%.zip" - - ps: .\build\Update-GitVersionTfsTaskVersion.ps1 .\build\GitVersionTfsTaskBuild\task.json $env:GitVersion_Major $env:GitVersion_Minor $env:GitVersion_Patch - cmd: 7z a "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip" -r .\build\GitVersionTfsTaskBuild\*.* - cmd: appveyor PushArtifact "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip"