From 2a4a9dc3024cccc8c9ebd6eb673862979f31d68f Mon Sep 17 00:00:00 2001 From: KevinMarquette Date: Sun, 5 Feb 2017 16:12:16 -0800 Subject: [PATCH] Updated version number handling in build system. --- Chronometer/chronometer.psd1 | Bin 4342 -> 2172 bytes psake.ps1 | 14 +++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Chronometer/chronometer.psd1 b/Chronometer/chronometer.psd1 index 066b559315876a25acd09ca1c2bc4bcb8fcf6027..629a0e04b2df0a0d056968706fe5378f044ab242 100644 GIT binary patch literal 2172 zcmc&#QBNB=5Ppx8|1c5{p{FDpC>#Z;5(p@&3a6+*@7cSaO?=w5x3)KF?$rO@&t4~N z(Dfef;Vu!`Fd5H$^UciX19~vBt(a<|Rmsj%X)M*9ZB#6+(WYk4b~GFu&>d^G!n34& zb3vbYr8GSV`?Y27dEde43p&p5o*kVH2gAYTU*YqB9t*1)zs-PLxzfUJwuVvxi*U{q zD&|=$za+m@ZU=BW9DFv$C)n?)4|3YL`UprvqAzTnGMaQ-=WNN8DNHO4LAn52FT|Nm zPo}eU_~Q+=4rO{ntyZY7+K`g0y(%~TIK#o+GkkHne0z3uUc4cRn0Dz)FE&Q(Sy>eZfjbljwV#UD=p31 z(cG-rJ}wz0v0j8smcO>j{tdzx*IwUGcU}LG>U5#+{H-w-3|mw8%N$35dDxVuD^Tcy z$0QAD-(^##2IAGwav-Qwl9wr9nR;{1`B!w4&ga(os zo?*O_c)NxRRVr)&MEXTBvrhM(%-ouSotx5Ar>>a6${8w*_5vpa%^z<<^rdi1AK1oR zLyLu!s?&mPB3ut5;)sfgEq~cE6p@g|P#DvA3lLr@dfybx2lONsSe&M*0`yo?5dTiK zffZ^+*!8AElWLX96$bKv4T5OtC^HLDRcsYIfC!PpE5?q?A|Pg)KXI*%M<9wNo=KPR zt+&{tNO*TTpu3{y&-YuVD^;)to^WOMRJfP$zVmptD%=rE?;CfKWeX75=F`H|S(N(S z6`J+-H_I!NXSHy+e6#zH*SEht-p1Me379%`ZOyq;n2Q}Ei1i;__#PzmJy`w?q+R;& aVB!|q1|@zyB|%^MKX-$=KS}TiZa)B1h|mQ9 literal 4342 zcmd^?U2hXt5QgWvQvbtBTo@{1CjnZDREa1F2$fV(Na(dcgRA(Xb_`7`{(9T@nepNH z*lSa9(Ti4*v%6>K%z5XX&;9Gqdsf+*O{`}NyRp8WM%K2m4Q-&Ox!r1Ip!YL>vntoH zuD#RxMA8%O>Pxn-=Z1Z4Um1E|>Ur#IZGYF(TF36}nXW%-{k={Z>;6n9&g@qqKnGfO zY2Z9G99nDn+qVPz&iAnIx&86!9u#kcbEcD~(u{ShHiTUr#{q`B4T*u?1ut!}G1u;{ zRk2&k)--;HYbU?56X{+ERbLT<%@cnnUc!Gj&f!pR@%^pV2fhMF ziJgoGi(cB5h2A)OV2|X@1N&Y~KhkecNcQciIN!6!vhvWL=&qypk9EqP^mlbX(CSm| z8`!s!=;<%wFmZMy)L;mY@8XCZrF7uh9kJzU$2w;!yNSDNol4}9OA$BZ3f$z(+Rjd$ zroeMwc0Z7gL$O2re=et*k~mT<-{_ig5wA1h!J{)}Bz|qKad+bHa~7qz%Pdki24Z+D zO!%C*Z0jU)gPfX5_r&v^xJY%N%$YJOww)QapF7&9OCw>gbXw)-QE#HktUkjy`MYpi zGyh>h-+t5ku183+4J(jCcdCDL$)rj$U*qUZ@?^nCT1MIflQZp3`bw^TcIlot`QRs< z`yD&pC|deUFA*izE{RQei5wgH-9O>5PHTO>KkTrv;P5_H(d|7=|J9$}&$1J~ELq&{$CCTE z9$U-~9rwVO@*f>-Q(HZbhJCYEsptWqpyGcihW~C(N7vfLPQ*aTVmcJ;dO6$xoUQwy{}f z;p;-jmGe;<);7d9-;#VmJ=2$B%O@#xFI0b<&hkjBd8*(13T00t*ANs>-BteO@9LeN73m3 diff --git a/psake.ps1 b/psake.ps1 index cf732c6..d3cf65a 100644 --- a/psake.ps1 +++ b/psake.ps1 @@ -56,7 +56,7 @@ Task Test -Depends UnitTests { "JobID: $env:APPVEYOR_JOB_ID" (New-Object 'System.Net.WebClient').UploadFile( "https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", - (Resolve-Path "$ProjectRoot\$TestFile" ) + "$ProjectRoot\$TestFile" ) } @@ -82,8 +82,16 @@ Task Build -Depends Test { Set-ModuleFunctions -Name $env:BHPSModuleManifest -FunctionsToExport $functions # Bump the module version - $Version = Get-NextPSGalleryVersion -Name $env:BHProjectName - Update-Metadata -Path $env:BHPSModuleManifest -PropertyName ModuleVersion -Value $Version + $version = Step-Version (Get-Metadata -Path $env:BHPSModuleManifest) + $galleryVersion = Get-NextPSGalleryVersion -Name $env:BHProjectName + if($version -gt $galleryVersion) + { + $version = $galleryVersion + } + $version = [version]::New($version.Major,$version.minor.$version.build,$BHBuildNumber) + Write-Host "Using version: $version" + + Update-Metadata -Path $env:BHPSModuleManifest -PropertyName ModuleVersion -Value $version } Task Deploy -Depends Build {