Switch version placeholder in .nuspec and build

Author: maartenba

build.cmd

@@ -5,8 +5,10 @@ if "%config%" == "" (
 )
 
 set version=
+set versionPlaceholder=
 if not "%PackageVersion%" == "" (
    set version=-Version %PackageVersion%
+   set versionPlaceholder=-p packageVersion=%PackageVersion%
 )
 
 
@@ -41,11 +43,11 @@ IF %ERRORLEVEL% NEQ 0 goto error
 REM Package
 mkdir artifacts
 mkdir artifacts\packages
-call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server.Core\NuGet.Server.Core.csproj" -symbols -o artifacts\packages -p Configuration=%config% %version%
+call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server.Core\NuGet.Server.Core.csproj" -symbols -o artifacts\packages -p Configuration=%config% %versionPlaceholder% %version%
 IF %ERRORLEVEL% NEQ 0 goto error
-call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server\NuGet.Server.csproj" -symbols -o artifacts\packages -p Configuration=%config% %version%
+call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server\NuGet.Server.csproj" -symbols -o artifacts\packages -p Configuration=%config% %versionPlaceholder% %version%
 IF %ERRORLEVEL% NEQ 0 goto error
-call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server.V2\NuGet.Server.V2.csproj" -symbols -o artifacts\packages -p Configuration=%config% %version%
+call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server.V2\NuGet.Server.V2.csproj" -symbols -o artifacts\packages -p Configuration=%config% %versionPlaceholder% %version%
 IF %ERRORLEVEL% NEQ 0 goto error
 
 

src/NuGet.Server.Core/NuGet.Server.Core.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata minClientVersion="2.6">
     <id>$id$</id>
-    <version>$version$</version>
+    <version>$packageVersion$</version>
     <description>$description$</description>
     <authors>.NET Foundation</authors>
     <owners>$author$</owners>

src/NuGet.Server.V2/NuGet.Server.V2.csproj

@@ -105,7 +105,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="NuGet.Server.V2.nuspec" />
+    <None Include="NuGet.Server.V2.nuspec">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

src/NuGet.Server.V2/NuGet.Server.V2.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata minClientVersion="2.6">
     <id>$id$</id>
-    <version>$version$</version>
+    <version>$packageVersion$</version>
     <description>$description$</description>
     <authors>.NET Foundation</authors>
     <owners>$author$</owners>
@@ -16,7 +16,7 @@
       <dependency id="Microsoft.Web.Xdt" version="[2.1.1,)" />
       <dependency id="Newtonsoft.Json" version="[8.0.3,)" />
       <dependency id="NuGet.Core" version="[2.14.0-rtm-830,)" />
-      <dependency id="NuGet.Server.Core" version="$version$" />
+      <dependency id="NuGet.Server.Core" version="$packageVersion$" />
 
       <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.3,)" />
       <dependency id="Microsoft.AspNet.WebApi.Core" version="[5.2.3,)" />

src/NuGet.Server/NuGet.Server.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata minClientVersion="2.6">
     <id>$id$</id>
-    <version>$version$</version>
+    <version>$packageVersion$</version>
     <description>$description$</description>
     <authors>.NET Foundation</authors>
     <owners>$author$</owners>
@@ -18,8 +18,8 @@
     <dependencies>
       <dependency id="Microsoft.Web.Xdt" version="[2.1.1,)" />
       <dependency id="NuGet.Core" version="[2.14.0-rtm-830,)" />
-      <dependency id="NuGet.Server.Core" version="$version$" />
-      <dependency id="NuGet.Server.V2" version="$version$" />
+      <dependency id="NuGet.Server.Core" version="$packageVersion$" />
+      <dependency id="NuGet.Server.V2" version="$packageVersion$" />
     </dependencies>
   </metadata>
 </package>