From 087598882e032c9d460467a4fa7f7ede34bff2f0 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 11:46:27 -0700
Subject: [PATCH 1/2] Use buildversion variable instead of hardcoded 1.2
 version for vsix packages

---
 Nodejs/Setup/swix/InteractiveWindow_files.swr                   | 2 +-
 ...icrosoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj | 2 +-
 .../Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj     | 2 +-
 .../swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj  | 2 +-
 .../swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj    | 2 +-
 Nodejs/Setup/swix/Nodejs_files.swr                              | 2 +-
 Nodejs/Setup/swix/Profiling_files.swr                           | 2 +-
 Nodejs/Setup/swix/Targets_files.swr                             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Nodejs/Setup/swix/InteractiveWindow_files.swr b/Nodejs/Setup/swix/InteractiveWindow_files.swr
index 5f3823af0..589104918 100644
--- a/Nodejs/Setup/swix/InteractiveWindow_files.swr
+++ b/Nodejs/Setup/swix/InteractiveWindow_files.swr
@@ -1,7 +1,7 @@
 use vs
 
 package name=Microsoft.VisualStudio.NodejsTools.InteractiveWindow
-    version=1.2
+    version=$(BuildVersion)
     vs.package.type=vsix
     vs.package.vsixId=29102E6C-34F2-4FF1-BA2F-C02ADE3846E8
 
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj
index 0c47892c8..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)</PackagePreprocessorDefinitions>
+      <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
   
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj
index 4f947d966..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)</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 8ae837933..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)</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 f7ae64761..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);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> 
diff --git a/Nodejs/Setup/swix/Nodejs_files.swr b/Nodejs/Setup/swix/Nodejs_files.swr
index cb0342020..bb1a3fc1d 100644
--- a/Nodejs/Setup/swix/Nodejs_files.swr
+++ b/Nodejs/Setup/swix/Nodejs_files.swr
@@ -1,7 +1,7 @@
 use vs
 
 package name=Microsoft.VisualStudio.NodejsTools.NodejsTools
-    version=1.2
+    version=$(BuildVersion)
     vs.package.type=vsix
     vs.package.vsixId=FE8A8C3D-328A-476D-99F9-2A24B75F8C7F
 
diff --git a/Nodejs/Setup/swix/Profiling_files.swr b/Nodejs/Setup/swix/Profiling_files.swr
index 54d436c72..524d3fe70 100644
--- a/Nodejs/Setup/swix/Profiling_files.swr
+++ b/Nodejs/Setup/swix/Profiling_files.swr
@@ -1,7 +1,7 @@
 use vs
 
 package name=Microsoft.VisualStudio.NodejsTools.Profiling
-    version=1.2
+    version=$(BuildVersion)
     vs.package.type=vsix
     vs.package.vsixId=B515653F-FB69-4B64-9D3F-F1FCF8421DD0
 
diff --git a/Nodejs/Setup/swix/Targets_files.swr b/Nodejs/Setup/swix/Targets_files.swr
index 0a62c3dd6..262942825 100644
--- a/Nodejs/Setup/swix/Targets_files.swr
+++ b/Nodejs/Setup/swix/Targets_files.swr
@@ -1,7 +1,7 @@
 use vs
 
 package name="Microsoft.VisualStudio.NodejsTools.Targets"
-    version=1.2
+    version=$(BuildVersion)
 
 folder "InstallFolder:\"
     folder "MSBuild\Microsoft\VisualStudio\v15.0\Node.js Tools"

From 515a403ada8ed35e5161bf01aa6a3c8383b3856b Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 11:48:46 -0700
Subject: [PATCH 2/2] Use build.buildnumber instead

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

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj
index 49c4ad9dc..d3f8f0af7 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=$(BuildVersion)</PackagePreprocessorDefinitions>
+      <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
   
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj
index cf797b163..c6286e60b 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=$(BuildVersion)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj
index e8f588b58..9954379aa 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=$(BuildVersion)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index ab84713a8..7ce198f44 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=$(BuildVersion);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber);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>