From 383b222807c38117e40fd5cc4d26cd319ada9a0a Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Thu, 3 Oct 2013 00:19:13 +0200
Subject: [PATCH] Build: automatically grab NuGet version (different from
 assembly or build) from TeamCity

---
 build/NuGet/nuget-signed.proj | 6 +++++-
 build/NuGet/nuget.proj        | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build/NuGet/nuget-signed.proj b/build/NuGet/nuget-signed.proj
index 4781cabc..511b3eef 100644
--- a/build/NuGet/nuget-signed.proj
+++ b/build/NuGet/nuget-signed.proj
@@ -47,10 +47,14 @@
         </PropertyGroup>
 
         <!-- Package Versions (skip 4th part/build number, for semvar compliance) -->
-        <PropertyGroup>
+        <PropertyGroup Condition="'$(semverPackage)' == ''">
             <NumericsPackVersion>$(NumericsAssemblyVersion.Substring(0, $(NumericsAssemblyVersion.LastIndexOf('.'))))</NumericsPackVersion>
             <FSharpPackVersion>$(FSharpAssemblyVersion.Substring(0, $(FSharpAssemblyVersion.LastIndexOf('.'))))</FSharpPackVersion>
         </PropertyGroup>
+        <PropertyGroup Condition="'$(semverPackage)' != ''">
+            <NumericsPackVersion>$(semverPackage)</NumericsPackVersion>
+            <FSharpPackVersion>$(semverPackage)</FSharpPackVersion>
+        </PropertyGroup>
 
         <XmlUpdate
             Prefix="n" Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
diff --git a/build/NuGet/nuget.proj b/build/NuGet/nuget.proj
index 8dc8a171..3c30418e 100644
--- a/build/NuGet/nuget.proj
+++ b/build/NuGet/nuget.proj
@@ -70,10 +70,14 @@
         </PropertyGroup>
 
         <!-- Package Versions (skip 4th part/build number, for semvar compliance) -->
-        <PropertyGroup>
+        <PropertyGroup Condition="'$(semverPackage)' == ''">
             <NumericsPackVersion>$(NumericsAssemblyVersion.Substring(0, $(NumericsAssemblyVersion.LastIndexOf('.'))))</NumericsPackVersion>
             <FSharpPackVersion>$(FSharpAssemblyVersion.Substring(0, $(FSharpAssemblyVersion.LastIndexOf('.'))))</FSharpPackVersion>
         </PropertyGroup>
+        <PropertyGroup Condition="'$(semverPackage)' != ''">
+            <NumericsPackVersion>$(semverPackage)</NumericsPackVersion>
+            <FSharpPackVersion>$(semverPackage)</FSharpPackVersion>
+        </PropertyGroup>
 
         <XmlUpdate
             Prefix="n" Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"