From 6cfbed1b0d48d6913be3a8e98470c324bc801859 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 11:57:26 -0700
Subject: [PATCH 1/2] Use custom defined buildversion

---
 Nodejs/Setup/SetupProjectBefore.settings      | 19 +++++++++++++++++++
 ...dio.NodejsTools.InteractiveWindow.swixproj |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Nodejs/Setup/SetupProjectBefore.settings b/Nodejs/Setup/SetupProjectBefore.settings
index 577a470f3..d3a433d9d 100644
--- a/Nodejs/Setup/SetupProjectBefore.settings
+++ b/Nodejs/Setup/SetupProjectBefore.settings
@@ -1,4 +1,23 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- 0.1.YMMDD.HHMM -->
+    <Year Condition="'$(Year)' == ''">$([System.DateTime]::Now.Year)</Year>
+    <YearMinus4>$([MSBuild]::Subtract($(Year), 4))</YearMinus4>
+    <YearMinus4String>$(YearMinus4.ToString())</YearMinus4String>
+    <LastDigitOfYear>$(YearMinus4String.Substring(3,1))</LastDigitOfYear>
+    <Date Condition="'$(Date)' == ''">$([System.DateTime]::Now.ToString("MMdd"))</Date>
+    <Time Condition="'$(Time)' == ''">$([System.DateTime]::Now.ToString("HHmm"))</Time>
+
+    <MajorVersion>1</MajorVersion>
+    <MinorVersion>2</MinorVersion>
+    <Build>$(LastDigitOfYear)$(Date)</Build>
+    <Revision>$(Time)</Revision>
+    <BuildNumber Condition="'$(BuildNumber)' == ''">$(Build).$(Revision)</BuildNumber>
+
+    <AssemblyVersion>$(MajorVersion).$(MinorVersion).$(BuildNumber)</AssemblyVersion>
+    <BuildVersion>$(MajorVersion).$(MinorVersion).$(Build).$(Revision)</BuildVersion>
+  </PropertyGroup>
+
   <PropertyGroup>
     <BuildRoot Condition="'$(BuildRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
     <OutputPathSuffix>Setup</OutputPathSuffix>
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj
index d3f8f0af7..49c4ad9dc 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj
@@ -9,7 +9,7 @@
   </PropertyGroup> 
   
   <PropertyGroup> 
-      <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
+      <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
   
   <ItemGroup> 

From 5721b41cca0477b4c513d2bf54cdcdb35fe0b4ef Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 11:57:52 -0700
Subject: [PATCH 2/2] Update other swix files

---
 .../Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj     | 2 +-
 .../swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj  | 2 +-
 .../swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj
index c6286e60b..cf797b163 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj
@@ -9,7 +9,7 @@
   </PropertyGroup> 
 
   <PropertyGroup> 
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj
index 9954379aa..e8f588b58 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj
@@ -9,7 +9,7 @@
   </PropertyGroup> 
 
   <PropertyGroup> 
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index 7ce198f44..ab84713a8 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -11,7 +11,7 @@
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
     <WebRoleDll Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>
     <WebRoleDll Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>
     <!--Retrigger a build on webrole.dll to pick up signed version. TODO: see if there's a better way to do this.-->
     <MSBuildAllProjects>$(WebRoleDll)</MSBuildAllProjects>
   </PropertyGroup>