Sync Lightweight Install Branch with Master

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;

Nodejs/Product/Nodejs/Nodejs.csproj

@@ -68,17 +68,17 @@
     </VSTemplate>
   </ItemDefinitionGroup>
   <ItemGroup>
-  <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-  <Reference Include="Microsoft.VisualStudio.Imaging, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Imaging, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <!-- 
     Temporarily freeze versions of some interop assemblies
     TODO: https://github.com/Microsoft/nodejstools/issues/759
      -->
     <Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-    <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-    <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.$(VSTarget), Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -902,7 +902,10 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Debugger\RemoteDebug\RemoteDebug.js">
+      <Link>RemoteDebug\RemoteDebug.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <VSIXSubPath>RemoteDebug</VSIXSubPath>
     </Content>
     <Content Include="Snippets\1033\SnippetsIndex.xml">
       <SubType>Designer</SubType>
@@ -1279,7 +1282,7 @@
     <ZipItem Include="Templates\Files\DockerfileTemplate\Dockerfile" />
     <ZipItem Include="Templates\Files\DockerfileTemplate\Dockerfile.vstemplate">
       <SubType>Designer</SubType>
-    </ZipItem> 
+    </ZipItem>
     <None Include="Theme\Microsoft.NodejsTools.theme.v14.0.pkgdef" />
     <None Include="Theme\Microsoft.NodejsTools.theme.v15.0.pkgdef" />
     <Content Include="TestFrameworks\Tape\tape.js">
@@ -1684,27 +1687,18 @@
   </Target>
   <PropertyGroup>
     <PostBuildEvent>
-      copy /y $(OutDir)..\WebRole\Microsoft.NodejsTools.WebRole.dll $(OutDir)Debugger\RemoteDebug\
+      copy /y $(OutDir)..\WebRole\Microsoft.NodejsTools.WebRole.dll $(OutDir)RemoteDebug\
     </PostBuildEvent>
   </PropertyGroup>
-
   <!-- We build these assemblies into separate folders to avoid incremental cleaning issues,
        but then CreatePkgDef can't find them for the ProvideCodeBase attributes. So we copy
        into the NodejsTools output folder temporarily to generate the pkgdef file. -->
-
   <Target Name="_CopyForCreatePkgDef" BeforeTargets="GeneratePkgDef">
-
     <Copy SourceFiles="$(OutputPath)..\Analysis\Microsoft.NodejsTools.Analysis.dll;$(OutputPath)..\ProjectWizard\Microsoft.NodejsTools.ProjectWizard.dll;$(OutputPath)..\Npm\Microsoft.NodejsTools.Npm.dll;$(OutputPath)..\PressAnyKey\Microsoft.NodejsTools.PressAnyKey.exe;$(OutputPath)..\TestAdapter\Microsoft.NodejsTools.TestAdapter.dll;" DestinationFolder="$(OutputPath)">
-
       <Output TaskParameter="CopiedFiles" ItemName="_CopiedForCreatePkgdef" />
-
     </Copy>
-
   </Target>
-
   <Target Name="_DeleteAfterCreatePkgDef" AfterTargets="GeneratePkgDef">
-
     <Delete Files="@(_CopiedForCreatePkgdef)" />
-
   </Target>
 </Project>

Nodejs/Product/Nodejs/NodejsPackage.cs

@@ -381,42 +381,6 @@ internal LanguagePreferences LangPrefs {
             }
         }
 
-        private static Lazy<string> remoteDebugProxyFolder = new Lazy<string>(() => {
-            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) {

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

Nodejs/Product/Nodejs/VSTemplateStore.pkgdef

@@ -1,3 +1,3 @@
 [$RootKey$\VSTemplate\{AD294C77-3CF5-4B22-8595-E09926A015A3}]
-"ProjectTemplatesDir"="$AppDataLocalFolder$"
+"ProjectTemplatesDir"="$AppDataLocalFolder$\\ProjectTemplates"
 "ItemTemplatesDir"="$AppDataLocalFolder$"

Nodejs/Setup/NodejsTools/NodejsTools.wxs

@@ -40,12 +40,7 @@
 
         <DirectoryRef Id="TARGETDIR">
             <Directory Id="Dir_StartMenu" />
-        </DirectoryRef>
-
-        <Component Id="Comp_RemoteDebug" Directory="Dir_VSInstallLocation" Guid="*">
-            <RegistryValue Root='HKMU' Key='SOFTWARE\Microsoft\NodejsTools\$(var.VSTargetVersion)' Type='string' Value='Readme' KeyPath='yes' />
-            <RegistryValue Root='HKMU' Key='SOFTWARE\Microsoft\NodejsTools\$(var.VSTargetVersion)' Type='string' Name='RemoteDebugProxyFolder' Value='[Dir_VSRemoteDebug]' />                          
-        </Component>       
+        </DirectoryRef>   
 
         <!-- Per user components -->
         <Component Id="PerUserInstallRegistry" Directory="Dir_VSInstallLocation" Guid="*">