From e932707fcf38954922c97c76ba6fcbf5b59f8838 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 15:24:22 -0700 Subject: [PATCH 01/26] 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath=$(SignedBinariesPath) 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 Date: Mon, 8 Aug 2016 15:34:29 -0700 Subject: [PATCH 02/26] 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 @@ true Microsoft.VisualStudio.NodejsTools.Targets $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix + $(CopyOutputsToPath)\ + <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\ + <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\ - - $(CopyOutputsToPath)\ - <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\ - <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\ - - @@ -31,7 +28,7 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath=$(SignedBinariesPath) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath="$(CopyOutputsToPath)$(_PathSuffix)" From 8540ba24bb1db49038cd3a2a0125a45f81b71658 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 15:46:51 -0700 Subject: [PATCH 03/26] 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 @@ true Microsoft.VisualStudio.NodejsTools.Targets $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix - $(CopyOutputsToPath)\ - <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\ - <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\ + + $(CopyOutputsToPath)\ + <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\ + <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\ + + @@ -28,7 +31,9 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);SignedBinariesPath="$(CopyOutputsToPath)$(_PathSuffix)" + $(SignedBinariesPath) + $(BuildOutputRoot)\Binaries\Nodejs\Debugger\RemoteDebug + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath) 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 Date: Mon, 8 Aug 2016 16:26:57 -0700 Subject: [PATCH 04/26] 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 @@ Microsoft.VisualStudio.NodejsTools.Targets $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix - - - - $(CopyOutputsToPath)\ - <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\ - <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\ - - - - - - - - $(SignedBinariesPath) From 775ac55a1795e3f481639ccc5a7a3f14c3b4f046 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 16:29:39 -0700 Subject: [PATCH 05/26] 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 @@ Microsoft.VisualStudio.NodejsTools.Targets $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix + + + + + $(SignedBinariesPath) - $(BuildOutputRoot)\Binaries\Nodejs\Debugger\RemoteDebug + $(BuildOutputRoot)\Binaries\WebRole $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath) From 83b63be1ffbd7118498dfb08302eabb2b546a1bd Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 16:59:23 -0700 Subject: [PATCH 06/26] 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 @@ - - + Condition="'$(CopyOutputsToPath)' != '' and $(OutputType) == 'Vsix'"> + + $(CopyOutputsToPath)\ + <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\ + <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\ + + + + + + + From c31841fc0030b07a60eeb8725325b17b878cfa51 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 17:03:13 -0700 Subject: [PATCH 07/26] 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 @@ true Microsoft.VisualStudio.NodejsTools.Targets $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix + $(SignedBinariesPath) + $(BuildOutputRoot)\Binaries\WebRole + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath) + + + + - - - - $(SignedBinariesPath) - $(BuildOutputRoot)\Binaries\WebRole - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath) - + From e83a1b95a95877364e66db44493444e7b968ea9f Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 17:15:29 -0700 Subject: [PATCH 08/26] 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 @@ --> - From 3dd2ef039e2b43a16ec29fc4a78e05eabbe4ab97 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 17:25:47 -0700 Subject: [PATCH 09/26] 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 @@ --> + - From d2fbc314ef15ce8d86aa6e9881e8a41504b7cc8e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 17:42:22 -0700 Subject: [PATCH 10/26] 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 @@ + From 5cfb78522855665e3c8d8de837b0a539ae9df1c2 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Aug 2016 17:51:41 -0700 Subject: [PATCH 11/26] 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 @@ $(SignedBinariesPath) $(BuildOutputRoot)\Binaries\WebRole $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath) + $(WebRoleDllPath)\Microsoft.NodejsTools.WebRole.dll Date: Mon, 8 Aug 2016 18:34:26 -0700 Subject: [PATCH 12/26] 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 @@ true Microsoft.VisualStudio.NodejsTools.Targets $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix - $(SignedBinariesPath) - $(BuildOutputRoot)\Binaries\WebRole - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDllPath=$(WebRoleDllPath) - $(WebRoleDllPath)\Microsoft.NodejsTools.WebRole.dll + $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll + $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDll=$(WebRoleDll) + + $(WebRoleDll) - - - Date: Tue, 9 Aug 2016 10:16:03 -0700 Subject: [PATCH 13/26] 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 @@ $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDll=$(WebRoleDll) - - $(WebRoleDll) Date: Tue, 9 Aug 2016 10:18:24 -0700 Subject: [PATCH 14/26] 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 @@ true Microsoft.VisualStudio.NodejsTools.Targets $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix - $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll - $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll + $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll + $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDll=$(WebRoleDll) From b82fc771883575e28c3cd48bdd5177dfb91dc5c0 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 10:47:17 -0700 Subject: [PATCH 15/26] 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 @@ - From d5a9d36f49548a6c2bb4ec4e6dd6cffda95d1a3e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 11:08:03 -0700 Subject: [PATCH 16/26] 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 @@ + 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 @@ $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDll=$(WebRoleDll) + + $(WebRoleDll) Date: Tue, 9 Aug 2016 11:46:27 -0700 Subject: [PATCH 17/26] 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);WebRoleDll=$(WebRoleDll) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion);WebRoleDll=$(WebRoleDll) $(WebRoleDll) 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 Date: Tue, 9 Aug 2016 11:48:46 -0700 Subject: [PATCH 18/26] 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) 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 @@ $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion);WebRoleDll=$(WebRoleDll) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber);WebRoleDll=$(WebRoleDll) $(WebRoleDll) From 6cfbed1b0d48d6913be3a8e98470c324bc801859 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 11:57:26 -0700 Subject: [PATCH 19/26] 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 @@ + + + $([System.DateTime]::Now.Year) + $([MSBuild]::Subtract($(Year), 4)) + $(YearMinus4.ToString()) + $(YearMinus4String.Substring(3,1)) + $([System.DateTime]::Now.ToString("MMdd")) + + + 1 + 2 + $(LastDigitOfYear)$(Date) + $(Time) + $(Build).$(Revision) + + $(MajorVersion).$(MinorVersion).$(BuildNumber) + $(MajorVersion).$(MinorVersion).$(Build).$(Revision) + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root)) Setup 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) From 5721b41cca0477b4c513d2bf54cdcdb35fe0b4ef Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 11:57:52 -0700 Subject: [PATCH 20/26] 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber);WebRoleDll=$(WebRoleDll) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion);WebRoleDll=$(WebRoleDll) $(WebRoleDll) From 6fdf2a958a66f6d8c13d28adc0ac63f37b1e3287 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 12:00:57 -0700 Subject: [PATCH 21/26] 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 @@ + + + $([System.DateTime]::Now.Year) + $([MSBuild]::Subtract($(Year), 4)) + $(YearMinus4.ToString()) + $(YearMinus4String.Substring(3,1)) + $([System.DateTime]::Now.ToString("MMdd")) + + + 1 + 2 + $(LastDigitOfYear)$(Date) + $(Time) + $(Build).$(Revision) + + $(MajorVersion).$(MinorVersion).$(BuildNumber) + $(MajorVersion).$(MinorVersion).$(Build).$(Revision) + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root)) Setup 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) 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 @@ $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber);WebRoleDll=$(WebRoleDll) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion);WebRoleDll=$(WebRoleDll) $(WebRoleDll) From 1111e588821e103599bb987f2e85fcc4c66a9d17 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 12:09:48 -0700 Subject: [PATCH 22/26] 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 @@ - - - $([System.DateTime]::Now.Year) - $([MSBuild]::Subtract($(Year), 4)) - $(YearMinus4.ToString()) - $(YearMinus4String.Substring(3,1)) - $([System.DateTime]::Now.ToString("MMdd")) - - - 1 - 2 - $(LastDigitOfYear)$(Date) - $(Time) - $(Build).$(Revision) - - $(MajorVersion).$(MinorVersion).$(BuildNumber) - $(MajorVersion).$(MinorVersion).$(Build).$(Revision) - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root)) Setup 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 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(MsiVersion) From a0dca0a6ac28cb19d317a4c7a311524f78f4a3a6 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 12:16:09 -0700 Subject: [PATCH 23/26] 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 @@ - - - $([System.DateTime]::Now.Year) - $([MSBuild]::Subtract($(Year), 4)) - $(YearMinus4.ToString()) - $(YearMinus4String.Substring(3,1)) - $([System.DateTime]::Now.ToString("MMdd")) - - - 1 - 2 - $(LastDigitOfYear)$(Date) - $(Time) - $(Build).$(Revision) - - $(MajorVersion).$(MinorVersion).$(BuildNumber) - $(MajorVersion).$(MinorVersion).$(Build).$(Revision) - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root)) Setup From ded9b5650b036850057c97d8fed96587352879e7 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 12 Aug 2016 11:43:55 -0700 Subject: [PATCH 24/26] Remove ProjectTemplatesDir from main pkgdef (#1201) **Bug** Duplicate template entries showing up in VS15 #1177 **Fix** The root cause seems to be our `*.pkgdef` file, which sets `ProjectTemplatesDir`. Set this to nullpath instead of the actual path. Also updated the dev pkgdef to point to the correct location for testing. --- Nodejs/Product/Nodejs/Project/NodejsProjectPackage.cs | 2 +- Nodejs/Product/Nodejs/VSTemplateStore.pkgdef | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nodejs/Product/Nodejs/Project/NodejsProjectPackage.cs b/Nodejs/Product/Nodejs/Project/NodejsProjectPackage.cs index e160732db..4f8dcd501 100644 --- a/Nodejs/Product/Nodejs/Project/NodejsProjectPackage.cs +++ b/Nodejs/Product/Nodejs/Project/NodejsProjectPackage.cs @@ -30,7 +30,7 @@ namespace Microsoft.NodejsTools.Project { [Guid("2C52FA27-791E-4D04-9F82-234BBB58DE78")] [DeveloperActivity(NodejsConstants.JavaScript, typeof(NodejsProjectPackage))] [ProvideObject(typeof(NodejsGeneralPropertyPage))] - [ProvideProjectFactory(typeof(BaseNodeProjectFactory), NodejsConstants.JavaScript, NodeFileFilter, "njsproj", "njsproj", "ProjectTemplates", LanguageVsTemplate = NodejsConstants.Nodejs, SortPriority = 0x17)] + [ProvideProjectFactory(typeof(BaseNodeProjectFactory), NodejsConstants.JavaScript, NodeFileFilter, "njsproj", "njsproj", ".\\NullPath", LanguageVsTemplate = NodejsConstants.Nodejs, SortPriority = 0x17)] public class NodejsProjectPackage : CommonProjectPackage { internal const string NodeFileFilter = "Node.js Project Files (*.njsproj);*.njsproj"; diff --git a/Nodejs/Product/Nodejs/VSTemplateStore.pkgdef b/Nodejs/Product/Nodejs/VSTemplateStore.pkgdef index 2ffd95346..6886fbbda 100644 --- a/Nodejs/Product/Nodejs/VSTemplateStore.pkgdef +++ b/Nodejs/Product/Nodejs/VSTemplateStore.pkgdef @@ -1,3 +1,3 @@ [$RootKey$\VSTemplate\{AD294C77-3CF5-4B22-8595-E09926A015A3}] -"ProjectTemplatesDir"="$AppDataLocalFolder$" +"ProjectTemplatesDir"="$AppDataLocalFolder$\\ProjectTemplates" "ItemTemplatesDir"="$AppDataLocalFolder$" \ No newline at end of file From 3f0f54c78c8acac4cd8db3449bf9457ba986e146 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 15 Aug 2016 13:04:53 -0700 Subject: [PATCH 25/26] Lightweight remote debug (#1203) * Include remotedebug.js in vsix * Remove unused file * Move remotedebug folder to match msi install location and remove registry lookup * Remove remote debug registry set msi step * Fix build to copy webrole.dll to correct location * Change remotedebug.js back to old location but make sure it is copied to the correct location for vsix and dev builds * Revert file path change for msi proj --- .../OpenRemoteDebugProxyFolderCommand.cs | 11 +- .../Product/Nodejs/Debugger/NodeConnection.cs | 219 ------------------ Nodejs/Product/Nodejs/Nodejs.csproj | 24 +- Nodejs/Product/Nodejs/NodejsPackage.cs | 36 --- Nodejs/Setup/NodejsTools/NodejsTools.wxs | 7 +- 5 files changed, 20 insertions(+), 277 deletions(-) delete mode 100644 Nodejs/Product/Nodejs/Debugger/NodeConnection.cs diff --git a/Nodejs/Product/Nodejs/Commands/OpenRemoteDebugProxyFolderCommand.cs b/Nodejs/Product/Nodejs/Commands/OpenRemoteDebugProxyFolderCommand.cs index 69511013e..515da09f9 100644 --- a/Nodejs/Product/Nodejs/Commands/OpenRemoteDebugProxyFolderCommand.cs +++ b/Nodejs/Product/Nodejs/Commands/OpenRemoteDebugProxyFolderCommand.cs @@ -17,6 +17,7 @@ using System; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Windows.Forms; using Microsoft.VisualStudioTools; using Microsoft.NodejsTools.Project; @@ -25,9 +26,17 @@ namespace Microsoft.NodejsTools.Commands { internal sealed class OpenRemoteDebugProxyFolderCommand : Command { private const string remoteDebugJsFileName = "RemoteDebug.js"; + private static string RemoteDebugProxyFolder { + get { + return Path.Combine( + Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), + "RemoteDebug"); + } + } + public override void DoCommand(object sender, EventArgs args) { // Open explorer to folder - var remoteDebugProxyFolder = NodejsPackage.RemoteDebugProxyFolder; + var remoteDebugProxyFolder = RemoteDebugProxyFolder; if (string.IsNullOrWhiteSpace(remoteDebugProxyFolder)) { MessageBox.Show(SR.GetString(SR.RemoteDebugProxyFolderDoesNotExist), SR.ProductName); return; diff --git a/Nodejs/Product/Nodejs/Debugger/NodeConnection.cs b/Nodejs/Product/Nodejs/Debugger/NodeConnection.cs deleted file mode 100644 index 8409e9644..000000000 --- a/Nodejs/Product/Nodejs/Debugger/NodeConnection.cs +++ /dev/null @@ -1,219 +0,0 @@ -//*********************************************************// -// Copyright (c) Microsoft. All rights reserved. -// -// Apache 2.0 License -// -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -// implied. See the License for the specific language governing -// permissions and limitations under the License. -// -//*********************************************************// - -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Diagnostics; -using System.Net; -using System.Net.Sockets; -using System.Text; -using System.Web.Script.Serialization; - -namespace Microsoft.NodejsTools.Debugger { - /// - /// Defines a node debugger connection. - /// - class NodeConnection : JsonListener, INodeConnection { - private readonly string _hostName; - private readonly ushort _portNumber; - private readonly ConcurrentDictionary _requestData = new ConcurrentDictionary(); - private readonly JavaScriptSerializer _serializer = new JavaScriptSerializer(); - private int _currentRequestSequence = 1; - - public NodeConnection(ushort portNumber) : this("localhost", portNumber) { - } - - public NodeConnection(string hostName, ushort portNumber) { - _hostName = hostName; - _portNumber = portNumber; - } - - /// - /// Gets a value indicating whether connection established. - /// - public bool Connected { - get { return Socket != null && Socket.Connected; } - } - - public event EventHandler SocketDisconnected; - public event EventHandler NodeEvent; - - /// - /// Connects to the node debugger. - /// - public void Connect() { - Socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); - Socket.NoDelay = true; - Socket.Connect(new DnsEndPoint(_hostName, _portNumber)); - - StartListenerThread(); - } - - /// - /// Disconnects from the node debugger. - /// - public void Disconnect() { - if (Socket != null && Socket.Connected) { - Socket.Disconnect(false); - } - Socket = null; - } - - /// - /// Sends a command to the node debugger. - /// - /// Command name. - /// Command arguments. - /// Successful handler. - /// Failure handler. - /// Timeout interval in ms. - /// - /// - public bool SendRequest( - string command, - Dictionary args = null, - Action> successHandler = null, - Action> failureHandler = null, - int? timeout = null, - Func shortCircuitPredicate = null) { - if (shortCircuitPredicate != null && shortCircuitPredicate()) { - if (failureHandler != null) { - failureHandler(null); - } - return false; - } - - int reqId = DispenseRequestId(); - - // Use response handler if followup (given success or failure handler) or synchronous (given timeout) - ResponseHandler responseHandler = null; - if ((successHandler != null) || (failureHandler != null) || (timeout != null)) { - responseHandler = new ResponseHandler(successHandler, failureHandler, timeout, shortCircuitPredicate); - if (!_requestData.TryAdd(reqId, responseHandler)) { - return false; - } - } - - Socket socket = Socket; - if (socket == null) { - return false; - } - try { - socket.Send(CreateRequest(command, args, reqId)); - } - catch (SocketException) { - return false; - } - - return responseHandler == null || responseHandler.Wait(); - } - - protected override void OnSocketDisconnected() { - EventHandler socketDisconnected = SocketDisconnected; - if (socketDisconnected != null) { - socketDisconnected(this, EventArgs.Empty); - } - } - - protected override void ProcessPacket(JsonResponse response) { - Debug.WriteLine("Headers:"); - - foreach (var keyValue in response.Headers) { - Debug.WriteLine("{0}: {1}", keyValue.Key, keyValue.Value); - } - - Debug.WriteLine(String.Format("Body: {0}", string.IsNullOrEmpty(response.Body) ? string.Empty : response.Body)); - - if (response.Headers.ContainsKey("type")) { - switch (response.Headers["type"]) { - case "connect": - // No-op, as ProcessConnect() is called on the main thread - break; - default: - Debug.WriteLine(String.Format("Unknown header type: {0}", response.Headers["type"])); - break; - } - return; - } - var json = (Dictionary)_serializer.DeserializeObject(response.Body); - switch ((string)json["type"]) { - case "response": - ProcessCommandResponse(json); - break; - case "event": - EventHandler nodeEvent = NodeEvent; - if (nodeEvent != null) { - nodeEvent(this, new NodeEventEventArgs(json)); - } - break; - default: - Debug.WriteLine("Unknown body type: {0}", json["type"]); - break; - } - } - - private void ProcessCommandResponse(Dictionary json) { - object reqIdObj; - if (!json.TryGetValue("request_seq", out reqIdObj)) { - return; - } - var reqId = (int)reqIdObj; - - object responseHandlerObj; - if (!_requestData.TryRemove(reqId, out responseHandlerObj)) { - return; - } - var responseHandler = responseHandlerObj as ResponseHandler; - if (responseHandler == null) { - return; - } - - responseHandler.HandleResponse(json); - } - - private int DispenseRequestId() { - return _currentRequestSequence++; - } - - private byte[] CreateRequest(string command, Dictionary args, int reqId) { - string json; - - if (args != null) { - json = _serializer.Serialize( - new { - command, - seq = reqId, - type = "request", - arguments = args - }); - } else { - json = _serializer.Serialize( - new { - command, - seq = reqId, - type = "request" - }); - } - - string requestStr = string.Format("Content-Length: {0}\r\n\r\n{1}", Encoding.UTF8.GetByteCount(json), json); - - Debug.WriteLine(String.Format("Request: {0}", requestStr)); - - return Encoding.UTF8.GetBytes(requestStr); - } - } -} \ No newline at end of file diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj index 75b248b2e..19c0470ad 100644 --- a/Nodejs/Product/Nodejs/Nodejs.csproj +++ b/Nodejs/Product/Nodejs/Nodejs.csproj @@ -68,17 +68,17 @@ - - + + - True + True - True + True @@ -902,7 +902,10 @@ true + RemoteDebug\RemoteDebug.js PreserveNewest + true + RemoteDebug Designer @@ -1279,7 +1282,7 @@ Designer - + @@ -1684,27 +1687,18 @@ - copy /y $(OutDir)..\WebRole\Microsoft.NodejsTools.WebRole.dll $(OutDir)Debugger\RemoteDebug\ + copy /y $(OutDir)..\WebRole\Microsoft.NodejsTools.WebRole.dll $(OutDir)RemoteDebug\ - - - - - - - - - \ No newline at end of file diff --git a/Nodejs/Product/Nodejs/NodejsPackage.cs b/Nodejs/Product/Nodejs/NodejsPackage.cs index b999ac885..55a9518dc 100644 --- a/Nodejs/Product/Nodejs/NodejsPackage.cs +++ b/Nodejs/Product/Nodejs/NodejsPackage.cs @@ -381,42 +381,6 @@ internal LanguagePreferences LangPrefs { } } - private static Lazy remoteDebugProxyFolder = new Lazy(() => { - const string ROOT_KEY = "Software\\Microsoft\\NodeJSTools\\" + AssemblyVersionInfo.VSVersion; - - // Try HKCU - try { - using (RegistryKey node = Registry.CurrentUser.OpenSubKey(ROOT_KEY)) { - if (node != null) { - var value = (string)node.GetValue("RemoteDebugProxyFolder"); - if (value != null) - return value; - } - } - } catch (Exception) { - } - - // Try HKLM - try { - using (RegistryKey node = Registry.LocalMachine.OpenSubKey(ROOT_KEY)) { - if (node != null) { - var value = (string)node.GetValue("RemoteDebugProxyFolder"); - if (value != null) - return value; - } - } - } catch (Exception) { - } - - return null; - }); - - public static string RemoteDebugProxyFolder { - get { - return remoteDebugProxyFolder.Value; - } - } - private IContentType ReplContentType { get { if (_contentType == null) { diff --git a/Nodejs/Setup/NodejsTools/NodejsTools.wxs b/Nodejs/Setup/NodejsTools/NodejsTools.wxs index 08b7e3daf..3455f2687 100644 --- a/Nodejs/Setup/NodejsTools/NodejsTools.wxs +++ b/Nodejs/Setup/NodejsTools/NodejsTools.wxs @@ -40,12 +40,7 @@ - - - - - - + From a61e814a6232d5010802df1716ee7bb17779cccb Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 15 Aug 2016 13:27:04 -0700 Subject: [PATCH 26/26] Fix file path for msi builds --- Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj index 3e515ac40..ecbcde02f 100644 --- a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj +++ b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj @@ -170,8 +170,8 @@ + RemoteDebug\RemoteDebug.js; + RemoteDebug\Microsoft.NodejsTools.WebRole.dll"> RemoteDebug