Merge pull request #11 from heaths/versioning

Switch to GitVersioning and update branding
heaths · Sep 3, 2016 · 0004190 · 0004190
2 parents 4c1329a + f22a468
commit 0004190
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 29 deletions.
diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
diff --git a/res/psmsi.png b/res/psmsi.png
diff --git a/src/PowerShell/MSI.tt b/src/PowerShell/MSI.tt
@@ -53,9 +53,9 @@ FileList = 'about_MSI.help.txt', 'Microsoft.Tools.WindowsInstaller.PowerShell.dl
 PrivateData = @{
   PSData = @{
     Tags = @('WindowsInstaller', 'MSI', 'MSP')
-    LicenseUri = 'http://bit.ly/psmsi-license'
-    ProjectUri = 'http://bit.ly/psmsi-home'
-    IronUri = 'http://bit.ly/psmsi-icon'
+    ProjectUri = 'https://github.com/heaths/psmsi'
+    LicenseUri = 'https://raw.githubusercontent.com/heaths/psmsi/master/LICENSE.txt'
+    IconUri = 'https://raw.githubusercontent.com/heaths/psmsi/master/res/psmsi.png'
   }
 }
 }
diff --git a/src/PowerShell/PowerShell.csproj b/src/PowerShell/PowerShell.csproj
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <BeforeTransform>
       $(BeforeTransform);
-      UpdateAssemblyInfo;
+      GenerateAssemblyVersionInfo;
       CalculateVersion;
     </BeforeTransform>
   </PropertyGroup>
@@ -187,35 +187,30 @@
   <Import Project="$(IncludeDir)Common.targets" />
   <Import Project="$(IncludeDir)TextTemplating.targets" />
   <Import Project="$(SolutionDir).nuget\NuGet.targets" />
-  <Target Name="CalculateVersion" DependsOnTargets="GetVersion" AfterTargets="UpdateAssemblyInfo">
-    <PropertyGroup>
-      <BuildNumber>$(GitVersion_BuildMetaData)</BuildNumber>
-      <BuildNumber Condition="'$(BuildNumber)'==''">0</BuildNumber>
-      <PackageVersion>$(GitVersion_MajorMinorPatch).$(BuildNumber)</PackageVersion>
-    </PropertyGroup>
+  <Target Name="CalculateVersion" DependsOnTargets="GetBuildVersion" AfterTargets="GenerateAssemblyVersionInfo">
     <ItemGroup>
       <T4ParameterValues Include="PackageVersion">
-        <Value>$(PackageVersion)</Value>
+        <Value>$(BuildVersion)</Value>
         <Visible>false</Visible>
       </T4ParameterValues>
     </ItemGroup>
   </Target>
-  <Target Name="BuildPackage" DependsOnTargets="CalculateVersion" Inputs="$(TargetPath);$(MSBuildProjectName).nuspec" Outputs="$(OutputPath)MSI.$(PackageVersion).nupkg">
+  <Target Name="BuildPackage" DependsOnTargets="CalculateVersion" Inputs="$(TargetPath);$(MSBuildProjectName).nuspec" Outputs="$(OutputPath)MSI.$(BuildVersion).nupkg">
     <PropertyGroup>
       <ProjectPath>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ProjectPath>
-      <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "SolutionDir=$(SolutionDir);Configuration=$(Configuration);Platform=$(Platform);Version=$(PackageVersion)" -OutputDirectory "$(OutputPath.TrimEnd('\'))" -Symbols -NonInteractive -NoPackageAnalysis</BuildCommand>
+      <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "SolutionDir=$(SolutionDir);Configuration=$(Configuration);Platform=$(Platform);Version=$(BuildVersion)" -OutputDirectory "$(OutputPath.TrimEnd('\'))" -Symbols -NonInteractive -NoPackageAnalysis</BuildCommand>
     </PropertyGroup>
-    <Exec Command="$(BuildCommand)" Outputs="$(OutputPath)MSI.$(PackageVersion).nupkg">
+    <Exec Command="$(BuildCommand)" Outputs="$(OutputPath)MSI.$(BuildVersion).nupkg">
       <Output TaskParameter="Outputs" ItemName="FileWrites" />
     </Exec>
   </Target>
   <Target Name="AfterBuild" DependsOnTargets="BuildPackage" />
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets'))" />
   </Target>
-  <Import Project="..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" />
   <!-- vim: set sw=2 ts=2 sts=2 ft=xml: -->
 </Project>
diff --git a/src/PowerShell/PowerShell.nuspec b/src/PowerShell/PowerShell.nuspec
@@ -5,11 +5,11 @@
     <version>$version$</version>
     <description>Exposes Windows Installer functionality to Windows PowerShell</description>
     <authors>Heath Stewart</authors>
-    <owners>Heath Stewart</owners>
+    <owners>Heath Stewart, Microsoft</owners>
     <copyright>Microsoft Corporation. All rights reserved.</copyright>
-    <projectUrl>http://bit.ly/psmsi-home</projectUrl>
-    <iconUrl>http://bit.ly/psmsi-icon</iconUrl>
-    <licenseUrl>http://bit.ly/psmsi-license</licenseUrl>
+    <projectUrl>https://github.com/heaths/psmsi</projectUrl>
+    <licenseUrl>https://raw.githubusercontent.com/heaths/psmsi/master/LICENSE.txt</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/heaths/psmsi/master/res/psmsi.png</iconUrl>
     <tags>
       WindowsInstaller
       MSI

diff --git a/src/PowerShell/packages.config b/src/PowerShell/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="3.4.1" targetFramework="net40" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="1.5.46" targetFramework="net40" developmentDependency="true" />
 </packages>
diff --git a/src/Setup/Module.wxs b/src/Setup/Module.wxs
@@ -38,8 +38,8 @@
             </Directory>
         </Directory>
         <Property Id="ALLUSERS" Value="2" />
-        <Property Id="ARPHELPLINK" Value="http://psmsi.codeplex.com/thread/list.aspx" />
-        <Property Id="ARPURLINFOABOUT" Value="http://psmsi.codeplex.com" />
+        <Property Id="ARPHELPLINK" Value="https://github.com/heaths/psmsi/issues" />
+        <Property Id="ARPURLINFOABOUT" Value="https://github.com/heaths/psmsi" />
         <Property Id="REINSTALLMODE" Value="amu" />
         <Property Id="MSIINSTALLPERUSER" Value="1" />
         <WixVariable Id="WixUIBannerBmp" Value="Banner.bmp" />

diff --git a/test/PowerShell.Test/PowerShell.Test.csproj b/test/PowerShell.Test/PowerShell.Test.csproj
@@ -133,12 +133,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(IncludeDir)Common.targets" />
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets'))" />
   </Target>
-  <Import Project="..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets')" />
   <!-- vim: set sw=2 ts=2 sts=2 ft=xml: -->
-</Project>
+</Project>
diff --git a/test/PowerShell.Test/packages.config b/test/PowerShell.Test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="1.5.46" targetFramework="net45" developmentDependency="true" />
 </packages>
diff --git a/version.json b/version.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "3.2.0",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$"
+  ],
+  "cloudBuild": {
+    "buildNumber": {
+      "enabled": true,
+      "includeCommitId": {
+        "when": "nonPublicReleaseOnly",
+        "where": "buildMetadata"
+      }
+    },
+    "setVersionVariables": true
+  }
+}