Merge pull request #62 from Pilchie/nuget-versioning

Use the appveyor version for the nupkg if present.
Pilchie · May 28, 2016 · 5de08e1 · 5de08e1
2 parents fcff523 + c7c33af
commit 5de08e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/xunit.runner.wpf/xunit.runner.wpf.csproj b/xunit.runner.wpf/xunit.runner.wpf.csproj
@@ -17,6 +17,8 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
+    <NuPkgVersion Condition="'$(appveyor_build_version)' != ''">$(appveyor_build_version)</NuPkgVersion>
+    <NuPkgVersion Condition="'$(NuPkgVersion)' == ''">1.0.0-local</NuPkgVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -192,8 +194,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
-    <Exec Command="&quot;$(SolutionDir)packages\NuGet.CommandLine.3.4.3\tools\NuGet.exe&quot; pack xunit.runner.wpf.nuspec -NoPackageAnalysis -OutputDirectory ." WorkingDirectory="$(OutDir)" LogStandardErrorAsError="true" ConsoleToMSBuild="true">
+    <Exec Command="&quot;$(SolutionDir)packages\NuGet.CommandLine.3.4.3\tools\NuGet.exe&quot; pack xunit.runner.wpf.nuspec -Version $(NuPkgVersion) -OutputDirectory ." WorkingDirectory="$(OutDir)" LogStandardErrorAsError="true" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
     </Exec>
   </Target>
-</Project>
+</Project>
diff --git a/xunit.runner.wpf/xunit.runner.wpf.nuspec b/xunit.runner.wpf/xunit.runner.wpf.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>xunit.runner.wpf</id>
-    <version>1.0.0</version>
+    <version>$version$</version>
     <title>xUnit.Runner.WPF</title>
     <authors>Pilchie</authors>
     <owners>Pilchie</owners>
@@ -16,4 +16,4 @@
     <file src="*.exe" target="tools\" exclude="*vshost*"/>
     <file src="*.config" target="tools\" exclude="*vshost*"/>
   </files>
-</package>
+</package>