From e932707fcf38954922c97c76ba6fcbf5b59f8838 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 15:24:22 -0700
Subject: [PATCH 01/23] Use signed version of webrole.dll

---
 .../swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj    | 2 +-
 Nodejs/Setup/swix/Targets_files.swr                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index fa58688c4..4ea9c2628 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -31,7 +31,7 @@
   </Target>
 
   <PropertyGroup> 
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath=$(SignedBinariesPath)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Targets_files.swr b/Nodejs/Setup/swix/Targets_files.swr
index 0bf662780..3b869440f 100644
--- a/Nodejs/Setup/swix/Targets_files.swr
+++ b/Nodejs/Setup/swix/Targets_files.swr
@@ -6,4 +6,4 @@ package name="Microsoft.VisualStudio.NodejsTools.Targets"
 folder "InstallFolder:\"
     folder "MSBuild\Microsoft\VisualStudio\v15.0\Node.js Tools"
         file source=$(BuildOutputRoot)\Binaries\Nodejs\Microsoft.NodejsTools.targets
-        file source=$(BuildOutputRoot)\Binaries\Nodejs\Debugger\RemoteDebug\Microsoft.NodejsTools.WebRole.dll
\ No newline at end of file
+        file source=$(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll
\ No newline at end of file

From be0b062edc8f82a75f52785ef08679384a74a3a1 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 15:34:29 -0700
Subject: [PATCH 02/23] Use full path for CopyOutputsToPath

---
 ...icrosoft.VisualStudio.NodejsTools.Targets.swixproj | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index 4ea9c2628..b50b7db3b 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -9,17 +9,14 @@
     <IsPackage>true</IsPackage>
     <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
+    <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
+    <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>
+    <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\</_PathSuffix>
   </PropertyGroup> 
   
   <Target Name="_CopyWixOutputsToPath"
           AfterTargets="AfterBuild"
           Condition="'$(CopyOutputsToPath)' != '' and $(OutputType) == 'Vsix'">
-    <PropertyGroup>
-      <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
-      <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>
-      <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\</_PathSuffix>
-    </PropertyGroup>
-
     <MakeDir Directories="$(CopyOutputsToPath)$(_PathSuffix)"
              ContinueOnError="true" />
 
@@ -31,7 +28,7 @@
   </Target>
 
   <PropertyGroup> 
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath=$(SignedBinariesPath)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath="$(CopyOutputsToPath)$(_PathSuffix)"</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 

From 8540ba24bb1db49038cd3a2a0125a45f81b71658 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 15:46:51 -0700
Subject: [PATCH 03/23] Use WebRoleDllPath based on existance of
 SignedBinariesPath

---
 ...rosoft.VisualStudio.NodejsTools.Targets.swixproj | 13 +++++++++----
 Nodejs/Setup/swix/Targets_files.swr                 |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index b50b7db3b..0acf539d1 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -9,14 +9,17 @@
     <IsPackage>true</IsPackage>
     <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
-    <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
-    <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>
-    <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\</_PathSuffix>
   </PropertyGroup> 
   
   <Target Name="_CopyWixOutputsToPath"
           AfterTargets="AfterBuild"
           Condition="'$(CopyOutputsToPath)' != '' and $(OutputType) == 'Vsix'">
+    <PropertyGroup>
+      <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
+      <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>
+      <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\</_PathSuffix>
+    </PropertyGroup>
+
     <MakeDir Directories="$(CopyOutputsToPath)$(_PathSuffix)"
              ContinueOnError="true" />
 
@@ -28,7 +31,9 @@
   </Target>
 
   <PropertyGroup> 
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath="$(CopyOutputsToPath)$(_PathSuffix)"</PackagePreprocessorDefinitions>
+    <WebRoleDllPath Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)</WebRoleDllPath>
+    <WebRoleDllPath Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\Nodejs\Debugger\RemoteDebug</WebRoleDllPath>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 
diff --git a/Nodejs/Setup/swix/Targets_files.swr b/Nodejs/Setup/swix/Targets_files.swr
index 3b869440f..1811c4365 100644
--- a/Nodejs/Setup/swix/Targets_files.swr
+++ b/Nodejs/Setup/swix/Targets_files.swr
@@ -6,4 +6,4 @@ package name="Microsoft.VisualStudio.NodejsTools.Targets"
 folder "InstallFolder:\"
     folder "MSBuild\Microsoft\VisualStudio\v15.0\Node.js Tools"
         file source=$(BuildOutputRoot)\Binaries\Nodejs\Microsoft.NodejsTools.targets
-        file source=$(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll
\ No newline at end of file
+        file source=$(WebRoleDllPath)\Microsoft.NodejsTools.WebRole.dll
\ No newline at end of file

From 284724e7e7ac0e7efcd6920bb34d4857c97ed3e4 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 16:26:57 -0700
Subject: [PATCH 04/23] Delete custom target for targets build

---
 ....VisualStudio.NodejsTools.Targets.swixproj | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index 0acf539d1..a15fd52f3 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -10,25 +10,6 @@
     <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
   </PropertyGroup> 
-  
-  <Target Name="_CopyWixOutputsToPath"
-          AfterTargets="AfterBuild"
-          Condition="'$(CopyOutputsToPath)' != '' and $(OutputType) == 'Vsix'">
-    <PropertyGroup>
-      <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
-      <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>
-      <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\</_PathSuffix>
-    </PropertyGroup>
-
-    <MakeDir Directories="$(CopyOutputsToPath)$(_PathSuffix)"
-             ContinueOnError="true" />
-
-    <Message Text="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"/>
-    <Message Text="$(TargetPath)"/>
-    <Copy SourceFiles="$(TargetPath)"
-          DestinationFiles="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"
-          SkipUnchangedFiles="true" />
-  </Target>
 
   <PropertyGroup> 
     <WebRoleDllPath Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)</WebRoleDllPath>

From 775ac55a1795e3f481639ccc5a7a3f14c3b4f046 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 16:29:39 -0700
Subject: [PATCH 05/23] pull webrole from webrole binaries

---
 .../Microsoft.VisualStudio.NodejsTools.Targets.swixproj  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index a15fd52f3..1ea1feea2 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -10,10 +10,17 @@
     <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
   </PropertyGroup> 
+  
+  <Target Name="_CopyWixOutputsToPath"
+          AfterTargets="AfterBuild"
+          Condition="$(OutputType) == 'Vsix'">
+          
+    <Message Text="SignedBinariesPathss $(SignedBinariesPath)"/>
+  </Target>
 
   <PropertyGroup> 
     <WebRoleDllPath Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)</WebRoleDllPath>
-    <WebRoleDllPath Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\Nodejs\Debugger\RemoteDebug</WebRoleDllPath>
+    <WebRoleDllPath Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole</WebRoleDllPath>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 

From 83b63be1ffbd7118498dfb08302eabb2b546a1bd Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 16:59:23 -0700
Subject: [PATCH 06/23] Revert removal of  _CopyWixOutputsToPath

---
 ...t.VisualStudio.NodejsTools.Targets.swixproj | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index 1ea1feea2..8c9b0e6f3 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -13,9 +13,21 @@
   
   <Target Name="_CopyWixOutputsToPath"
           AfterTargets="AfterBuild"
-          Condition="$(OutputType) == 'Vsix'">
-          
-    <Message Text="SignedBinariesPathss $(SignedBinariesPath)"/>
+          Condition="'$(CopyOutputsToPath)' != '' and $(OutputType) == 'Vsix'">
+    <PropertyGroup>
+      <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
+      <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>
+      <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\</_PathSuffix>
+    </PropertyGroup>
+
+    <MakeDir Directories="$(CopyOutputsToPath)$(_PathSuffix)"
+             ContinueOnError="true" />
+
+    <Message Text="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"/>
+    <Message Text="$(TargetPath)"/>
+    <Copy SourceFiles="$(TargetPath)"
+          DestinationFiles="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"
+          SkipUnchangedFiles="true" />
   </Target>
 
   <PropertyGroup> 

From c31841fc0030b07a60eeb8725325b17b878cfa51 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 17:03:13 -0700
Subject: [PATCH 07/23] Add a few debug messages

---
 ...soft.VisualStudio.NodejsTools.Targets.swixproj | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index 8c9b0e6f3..cb2c0bf9d 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -9,6 +9,9 @@
     <IsPackage>true</IsPackage>
     <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
+    <WebRoleDllPath Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)</WebRoleDllPath>
+    <WebRoleDllPath Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole</WebRoleDllPath>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
   
   <Target Name="_CopyWixOutputsToPath"
@@ -25,16 +28,14 @@
 
     <Message Text="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"/>
     <Message Text="$(TargetPath)"/>
+    
+    <Message Text="SignedBinariesPath: $(SignedBinariesPath)"/>
+    <Message Text="WebRoleDllPath: $(WebRoleDllPath)"/>
+
     <Copy SourceFiles="$(TargetPath)"
           DestinationFiles="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"
           SkipUnchangedFiles="true" />
-  </Target>
-
-  <PropertyGroup> 
-    <WebRoleDllPath Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)</WebRoleDllPath>
-    <WebRoleDllPath Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole</WebRoleDllPath>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath)</PackagePreprocessorDefinitions>
-  </PropertyGroup> 
+  </Target> 
 
   <ItemGroup> 
     <Package Include="Targets_files.swr" /> 

From e83a1b95a95877364e66db44493444e7b968ea9f Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 17:15:29 -0700
Subject: [PATCH 08/23] Remove reference to swix from setup files

---
 Nodejs/Setup/dirs.proj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Nodejs/Setup/dirs.proj b/Nodejs/Setup/dirs.proj
index 91d49541b..2fa74241b 100644
--- a/Nodejs/Setup/dirs.proj
+++ b/Nodejs/Setup/dirs.proj
@@ -14,7 +14,6 @@
   -->
   
   <ItemGroup>
-    <ProjectFile Include="..\Product\dirs.proj"/>
     <ProjectFile Include="setup.proj"/>
     <ProjectFile Condition="$(VSTarget)=='15.0'" Include="setup-swix.proj"/>
   </ItemGroup>

From 3dd2ef039e2b43a16ec29fc4a78e05eabbe4ab97 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 17:25:47 -0700
Subject: [PATCH 09/23] Remove correct line in dirs.proj

---
 Nodejs/Setup/dirs.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Nodejs/Setup/dirs.proj b/Nodejs/Setup/dirs.proj
index 2fa74241b..c2ef7964d 100644
--- a/Nodejs/Setup/dirs.proj
+++ b/Nodejs/Setup/dirs.proj
@@ -14,8 +14,8 @@
   -->
   
   <ItemGroup>
+    <ProjectFile Include="..\Product\dirs.proj"/>
     <ProjectFile Include="setup.proj"/>
-    <ProjectFile Condition="$(VSTarget)=='15.0'" Include="setup-swix.proj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

From d2fbc314ef15ce8d86aa6e9881e8a41504b7cc8e Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 17:42:22 -0700
Subject: [PATCH 10/23] revert dirs.proj changes

---
 Nodejs/Setup/dirs.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Nodejs/Setup/dirs.proj b/Nodejs/Setup/dirs.proj
index c2ef7964d..91d49541b 100644
--- a/Nodejs/Setup/dirs.proj
+++ b/Nodejs/Setup/dirs.proj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectFile Include="..\Product\dirs.proj"/>
     <ProjectFile Include="setup.proj"/>
+    <ProjectFile Condition="$(VSTarget)=='15.0'" Include="setup-swix.proj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

From 5cfb78522855665e3c8d8de837b0a539ae9df1c2 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 17:51:41 -0700
Subject: [PATCH 11/23] Try adding custom MSBuildAllProjects path to trigger
 rebuild

---
 .../swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index cb2c0bf9d..f95c957ab 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -12,6 +12,7 @@
     <WebRoleDllPath Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)</WebRoleDllPath>
     <WebRoleDllPath Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole</WebRoleDllPath>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath)</PackagePreprocessorDefinitions>
+    <MSBuildAllProjects>$(WebRoleDllPath)\Microsoft.NodejsTools.WebRole.dll</MSBuildAllProjects>
   </PropertyGroup> 
   
   <Target Name="_CopyWixOutputsToPath"

From 10e00d5cbfcf45233b4b626587feece20b0b56f3 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Aug 2016 18:34:26 -0700
Subject: [PATCH 12/23] Clean up change and remove log statements

---
 ...crosoft.VisualStudio.NodejsTools.Targets.swixproj | 12 +++++-------
 Nodejs/Setup/swix/Targets_files.swr                  |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index f95c957ab..da45b89dc 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -9,10 +9,11 @@
     <IsPackage>true</IsPackage>
     <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
-    <WebRoleDllPath Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)</WebRoleDllPath>
-    <WebRoleDllPath Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole</WebRoleDllPath>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath)</PackagePreprocessorDefinitions>
-    <MSBuildAllProjects>$(WebRoleDllPath)\Microsoft.NodejsTools.WebRole.dll</MSBuildAllProjects>
+    <WebRoleDll Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll</WebRoleDllPath>
+    <WebRoleDll Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll</WebRoleDllPath>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>
+    <!--Retrigger a build on webrole.dll to pick up signed version-->
+    <MSBuildAllProjects>$(WebRoleDll)</MSBuildAllProjects>
   </PropertyGroup> 
   
   <Target Name="_CopyWixOutputsToPath"
@@ -29,9 +30,6 @@
 
     <Message Text="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"/>
     <Message Text="$(TargetPath)"/>
-    
-    <Message Text="SignedBinariesPath: $(SignedBinariesPath)"/>
-    <Message Text="WebRoleDllPath: $(WebRoleDllPath)"/>
 
     <Copy SourceFiles="$(TargetPath)"
           DestinationFiles="$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)"
diff --git a/Nodejs/Setup/swix/Targets_files.swr b/Nodejs/Setup/swix/Targets_files.swr
index 1811c4365..0a62c3dd6 100644
--- a/Nodejs/Setup/swix/Targets_files.swr
+++ b/Nodejs/Setup/swix/Targets_files.swr
@@ -6,4 +6,4 @@ package name="Microsoft.VisualStudio.NodejsTools.Targets"
 folder "InstallFolder:\"
     folder "MSBuild\Microsoft\VisualStudio\v15.0\Node.js Tools"
         file source=$(BuildOutputRoot)\Binaries\Nodejs\Microsoft.NodejsTools.targets
-        file source=$(WebRoleDllPath)\Microsoft.NodejsTools.WebRole.dll
\ No newline at end of file
+        file source=$(WebRoleDll)
\ No newline at end of file

From 3115af72e80b74b3f9e8188afc5ff38f0f65ecd9 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 10:16:03 -0700
Subject: [PATCH 13/23] Swtich to force clean build root output

---
 Nodejs/Setup/BuildRelease.ps1                 | 25 ++++++++++++-------
 ....VisualStudio.NodejsTools.Targets.swixproj |  2 --
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Nodejs/Setup/BuildRelease.ps1 b/Nodejs/Setup/BuildRelease.ps1
index 7351403be..b8188a3d6 100644
--- a/Nodejs/Setup/BuildRelease.ps1
+++ b/Nodejs/Setup/BuildRelease.ps1
@@ -242,6 +242,19 @@ function after-build-all($buildroot, $outdir) {
     Copy-Item -Force "$outdir\**.vsix" $vsdrop
 }
 
+# Manually clean up an output directory
+function clean-outdir($outdir) {
+    if ((Test-Path $outdir) -and (Get-ChildItem $outdir)) {
+        Write-Output "Cleaning previous release in $outdir"
+        del -Recurse -Force $outdir\* -EA 0
+        while (Get-ChildItem $outdir) {
+            Write-Output "Failed to clean release. Retrying in five seconds. (Press Ctrl+C to abort)"
+            Sleep -Seconds 5
+            del -Recurse -Force $outdir\* -EA 0
+        }
+    }
+}
+
 # Add product name mappings here
 #   {0} will be replaced by the major version preceded by a space
 #   {1} will be replaced by the build name preceded by a space
@@ -427,15 +440,9 @@ Write-Output "============================================================"
 Write-Output ""
 
 if (-not $skipclean) {
-    if ((Test-Path $outdir) -and (Get-ChildItem $outdir)) {
-        Write-Output "Cleaning previous release in $outdir"
-        del -Recurse -Force $outdir\* -EA 0
-        while (Get-ChildItem $outdir) {
-            Write-Output "Failed to clean release. Retrying in five seconds. (Press Ctrl+C to abort)"
-            Sleep -Seconds 5
-            del -Recurse -Force $outdir\* -EA 0
-        }
-    }
+    clean-outdir $outdir
+    clean-outdir $buildroot\BuildOutput
+    
     if (-not (Test-Path $outdir)) {
         mkdir $outdir -EA 0 | Out-Null
         if (-not $?) {
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index da45b89dc..8b7dfd525 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -12,8 +12,6 @@
     <WebRoleDll Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll</WebRoleDllPath>
     <WebRoleDll Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll</WebRoleDllPath>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>
-    <!--Retrigger a build on webrole.dll to pick up signed version-->
-    <MSBuildAllProjects>$(WebRoleDll)</MSBuildAllProjects>
   </PropertyGroup> 
   
   <Target Name="_CopyWixOutputsToPath"

From bc68ea308d1cf2d53733971231fc6edb4b8bb209 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 10:18:24 -0700
Subject: [PATCH 14/23] Fix WebRoleDll paths

---
 .../swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index 8b7dfd525..dd36765e6 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -9,8 +9,8 @@
     <IsPackage>true</IsPackage>
     <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>
     <TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
-    <WebRoleDll Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll</WebRoleDllPath>
-    <WebRoleDll Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll</WebRoleDllPath>
+    <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>
   </PropertyGroup> 
   

From b82fc771883575e28c3cd48bdd5177dfb91dc5c0 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 10:47:17 -0700
Subject: [PATCH 15/23] Redo dirs.proj change

---
 Nodejs/Setup/dirs.proj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Nodejs/Setup/dirs.proj b/Nodejs/Setup/dirs.proj
index 91d49541b..c2ef7964d 100644
--- a/Nodejs/Setup/dirs.proj
+++ b/Nodejs/Setup/dirs.proj
@@ -16,7 +16,6 @@
   <ItemGroup>
     <ProjectFile Include="..\Product\dirs.proj"/>
     <ProjectFile Include="setup.proj"/>
-    <ProjectFile Condition="$(VSTarget)=='15.0'" Include="setup-swix.proj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

From d5a9d36f49548a6c2bb4ec4e6dd6cffda95d1a3e Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 11:08:03 -0700
Subject: [PATCH 16/23] Restore workaround to retrigger build and revert
 dirs.proj change

---
 Nodejs/Setup/dirs.proj                                          | 1 +
 .../swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Nodejs/Setup/dirs.proj b/Nodejs/Setup/dirs.proj
index c2ef7964d..91d49541b 100644
--- a/Nodejs/Setup/dirs.proj
+++ b/Nodejs/Setup/dirs.proj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectFile Include="..\Product\dirs.proj"/>
     <ProjectFile Include="setup.proj"/>
+    <ProjectFile Condition="$(VSTarget)=='15.0'" Include="setup-swix.proj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
index dd36765e6..f7ae64761 100644
--- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
+++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
@@ -12,6 +12,8 @@
     <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>
+    <!--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> 
   
   <Target Name="_CopyWixOutputsToPath"

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 17/23] 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 18/23] 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> 

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 19/23] 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 20/23] 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> 

From 6fdf2a958a66f6d8c13d28adc0ac63f37b1e3287 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 12:00:57 -0700
Subject: [PATCH 21/23] Use custom defined buildversion  (#1199)

* Use custom defined buildversion

* Update other swix files
---
 Nodejs/Setup/SetupProjectBefore.settings      | 19 +++++++++++++++++++
 ...dio.NodejsTools.InteractiveWindow.swixproj |  2 +-
 ...ualStudio.NodejsTools.NodejsTools.swixproj |  2 +-
 ...isualStudio.NodejsTools.Profiling.swixproj |  2 +-
 ....VisualStudio.NodejsTools.Targets.swixproj |  2 +-
 5 files changed, 23 insertions(+), 4 deletions(-)

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> 
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> 

From 1111e588821e103599bb987f2e85fcc4c66a9d17 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 12:09:48 -0700
Subject: [PATCH 22/23] Use MsiVersion instead of custom version logic

---
 Nodejs/Setup/SetupProjectBefore.settings      | 19 -------------------
 ...ualStudio.NodejsTools.NodejsTools.swixproj |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Nodejs/Setup/SetupProjectBefore.settings b/Nodejs/Setup/SetupProjectBefore.settings
index d3a433d9d..577a470f3 100644
--- a/Nodejs/Setup/SetupProjectBefore.settings
+++ b/Nodejs/Setup/SetupProjectBefore.settings
@@ -1,23 +1,4 @@
 <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.NodejsTools.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj
index cf797b163..74db309ae 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=$(MsiVersion)</PackagePreprocessorDefinitions>
   </PropertyGroup> 
 
   <ItemGroup> 

From a0dca0a6ac28cb19d317a4c7a311524f78f4a3a6 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 9 Aug 2016 12:16:09 -0700
Subject: [PATCH 23/23] REmove custom build logic

---
 Nodejs/Setup/SetupProjectBefore.settings | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Nodejs/Setup/SetupProjectBefore.settings b/Nodejs/Setup/SetupProjectBefore.settings
index d3a433d9d..577a470f3 100644
--- a/Nodejs/Setup/SetupProjectBefore.settings
+++ b/Nodejs/Setup/SetupProjectBefore.settings
@@ -1,23 +1,4 @@
 <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>