Skip to content

Commit 0004190

Browse files
heathsheaths
authored
Merge pull request #11 from heaths/versioning
Switch to GitVersioning and update branding
2 parents 4c1329a + f22a468 commit 0004190

File tree

10 files changed

+39
-29
lines changed

10 files changed

+39
-29
lines changed

‎GitVersionConfig.yaml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎res/psmsi.png‎

4.45 KB
Loading

‎src/PowerShell/MSI.tt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ FileList = 'about_MSI.help.txt', 'Microsoft.Tools.WindowsInstaller.PowerShell.dl
5353
PrivateData = @{
5454
PSData = @{
5555
Tags = @('WindowsInstaller', 'MSI', 'MSP')
56-
LicenseUri = 'http://bit.ly/psmsi-license'
57-
ProjectUri = 'http://bit.ly/psmsi-home'
58-
IronUri = 'http://bit.ly/psmsi-icon'
56+
ProjectUri = 'https://github.com/heaths/psmsi'
57+
LicenseUri = 'https://raw.githubusercontent.com/heaths/psmsi/master/LICENSE.txt'
58+
IconUri = 'https://raw.githubusercontent.com/heaths/psmsi/master/res/psmsi.png'
5959
}
6060
}
6161
}

‎src/PowerShell/PowerShell.csproj‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PropertyGroup>
1212
<BeforeTransform>
1313
$(BeforeTransform);
14-
UpdateAssemblyInfo;
14+
GenerateAssemblyVersionInfo;
1515
CalculateVersion;
1616
</BeforeTransform>
1717
</PropertyGroup>
@@ -187,35 +187,30 @@
187187
<Import Project="$(IncludeDir)Common.targets" />
188188
<Import Project="$(IncludeDir)TextTemplating.targets" />
189189
<Import Project="$(SolutionDir).nuget\NuGet.targets" />
190-
<Target Name="CalculateVersion" DependsOnTargets="GetVersion" AfterTargets="UpdateAssemblyInfo">
191-
<PropertyGroup>
192-
<BuildNumber>$(GitVersion_BuildMetaData)</BuildNumber>
193-
<BuildNumber Condition="'$(BuildNumber)'==''">0</BuildNumber>
194-
<PackageVersion>$(GitVersion_MajorMinorPatch).$(BuildNumber)</PackageVersion>
195-
</PropertyGroup>
190+
<Target Name="CalculateVersion" DependsOnTargets="GetBuildVersion" AfterTargets="GenerateAssemblyVersionInfo">
196191
<ItemGroup>
197192
<T4ParameterValues Include="PackageVersion">
198-
<Value>$(PackageVersion)</Value>
193+
<Value>$(BuildVersion)</Value>
199194
<Visible>false</Visible>
200195
</T4ParameterValues>
201196
</ItemGroup>
202197
</Target>
203-
<Target Name="BuildPackage" DependsOnTargets="CalculateVersion" Inputs="$(TargetPath);$(MSBuildProjectName).nuspec" Outputs="$(OutputPath)MSI.$(PackageVersion).nupkg">
198+
<Target Name="BuildPackage" DependsOnTargets="CalculateVersion" Inputs="$(TargetPath);$(MSBuildProjectName).nuspec" Outputs="$(OutputPath)MSI.$(BuildVersion).nupkg">
204199
<PropertyGroup>
205200
<ProjectPath>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ProjectPath>
206-
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "SolutionDir=$(SolutionDir);Configuration=$(Configuration);Platform=$(Platform);Version=$(PackageVersion)" -OutputDirectory "$(OutputPath.TrimEnd('\'))" -Symbols -NonInteractive -NoPackageAnalysis</BuildCommand>
201+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "SolutionDir=$(SolutionDir);Configuration=$(Configuration);Platform=$(Platform);Version=$(BuildVersion)" -OutputDirectory "$(OutputPath.TrimEnd('\'))" -Symbols -NonInteractive -NoPackageAnalysis</BuildCommand>
207202
</PropertyGroup>
208-
<Exec Command="$(BuildCommand)" Outputs="$(OutputPath)MSI.$(PackageVersion).nupkg">
203+
<Exec Command="$(BuildCommand)" Outputs="$(OutputPath)MSI.$(BuildVersion).nupkg">
209204
<Output TaskParameter="Outputs" ItemName="FileWrites" />
210205
</Exec>
211206
</Target>
212207
<Target Name="AfterBuild" DependsOnTargets="BuildPackage" />
208+
<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')" />
213209
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
214210
<PropertyGroup>
215211
<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>
216212
</PropertyGroup>
217-
<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'))" />
213+
<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'))" />
218214
</Target>
219-
<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')" />
220215
<!-- vim: set sw=2 ts=2 sts=2 ft=xml: -->
221216
</Project>

‎src/PowerShell/PowerShell.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<version>$version$</version>
66
<description>Exposes Windows Installer functionality to Windows PowerShell</description>
77
<authors>Heath Stewart</authors>
8-
<owners>Heath Stewart</owners>
8+
<owners>Heath Stewart, Microsoft</owners>
99
<copyright>Microsoft Corporation. All rights reserved.</copyright>
10-
<projectUrl>http://bit.ly/psmsi-home</projectUrl>
11-
<iconUrl>http://bit.ly/psmsi-icon</iconUrl>
12-
<licenseUrl>http://bit.ly/psmsi-license</licenseUrl>
10+
<projectUrl>https://github.com/heaths/psmsi</projectUrl>
11+
<licenseUrl>https://raw.githubusercontent.com/heaths/psmsi/master/LICENSE.txt</licenseUrl>
12+
<iconUrl>https://raw.githubusercontent.com/heaths/psmsi/master/res/psmsi.png</iconUrl>
1313
<tags>
1414
WindowsInstaller
1515
MSI

‎src/PowerShell/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="GitVersionTask" version="3.4.1" targetFramework="net40" developmentDependency="true" />
3+
<package id="Nerdbank.GitVersioning" version="1.5.46" targetFramework="net40" developmentDependency="true" />
44
</packages>

‎src/Setup/Module.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
</Directory>
3939
</Directory>
4040
<Property Id="ALLUSERS" Value="2" />
41-
<Property Id="ARPHELPLINK" Value="http://psmsi.codeplex.com/thread/list.aspx" />
42-
<Property Id="ARPURLINFOABOUT" Value="http://psmsi.codeplex.com" />
41+
<Property Id="ARPHELPLINK" Value="https://github.com/heaths/psmsi/issues" />
42+
<Property Id="ARPURLINFOABOUT" Value="https://github.com/heaths/psmsi" />
4343
<Property Id="REINSTALLMODE" Value="amu" />
4444
<Property Id="MSIINSTALLPERUSER" Value="1" />
4545
<WixVariable Id="WixUIBannerBmp" Value="Banner.bmp" />

‎test/PowerShell.Test/PowerShell.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@
133133
<None Include="packages.config" />
134134
</ItemGroup>
135135
<Import Project="$(IncludeDir)Common.targets" />
136+
<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')" />
136137
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
137138
<PropertyGroup>
138139
<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>
139140
</PropertyGroup>
140-
<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'))" />
141+
<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'))" />
141142
</Target>
142-
<Import Project="..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets')" />
143143
<!-- vim: set sw=2 ts=2 sts=2 ft=xml: -->
144-
</Project>
144+
</Project>

‎test/PowerShell.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
3+
<package id="Nerdbank.GitVersioning" version="1.5.46" targetFramework="net45" developmentDependency="true" />
44
</packages>

‎version.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3+
"version": "3.2.0",
4+
"publicReleaseRefSpec": [
5+
"^refs/heads/master$"
6+
],
7+
"cloudBuild": {
8+
"buildNumber": {
9+
"enabled": true,
10+
"includeCommitId": {
11+
"when": "nonPublicReleaseOnly",
12+
"where": "buildMetadata"
13+
}
14+
},
15+
"setVersionVariables": true
16+
}
17+
}

0 commit comments

Comments
 (0)