From ca48606cbfc9fc178d4e8c9144d1df8c10a52c36 Mon Sep 17 00:00:00 2001 From: AustinHull Date: Sat, 23 Jul 2016 12:00:53 -0400 Subject: [PATCH 1/6] Atttempting to contribute to Issue #496. Altered DeafaultName tag to match target replacement filename. --- .../FromExistingCode/FromExistingCode.vstemplate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate index 2df2aaf35..7aca804a7 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate @@ -7,7 +7,7 @@ Microsoft.JavaScript.NodejsFromExistingCode 120 false - NodejsApp + FromExistingCode true 1 true From 4f744bf1f693719bf15ae831a27d74ffd8f46dc3 Mon Sep 17 00:00:00 2001 From: AustinHull Date: Mon, 25 Jul 2016 20:30:15 -0400 Subject: [PATCH 2/6] Changed CreateNewFolder tag of FromExistingCode template to true. --- .../FromExistingCode/FromExistingCode.vstemplate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate index 7aca804a7..97c545461 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate @@ -6,7 +6,7 @@ JavaScript Microsoft.JavaScript.NodejsFromExistingCode 120 - false + true FromExistingCode true 1 From d99d514ce7dc15ea1982ea65e124c69ed16bd75a Mon Sep 17 00:00:00 2001 From: AustinHull Date: Sat, 30 Jul 2016 19:54:51 -0400 Subject: [PATCH 3/6] Various fix measures for Issue #496. Solved by preventing deletion of appropriate directory folders for each respective project created. --- Nodejs/NodejsTools.sln | 6 +++++- .../FromExistingCode.vstemplate | 1 + .../NodejsWebApp/NodejsWebApp.vstemplate | 2 +- Nodejs/Product/ProjectWizard/ImportWizard.cs | 17 ++++++++++++----- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Nodejs/NodejsTools.sln b/Nodejs/NodejsTools.sln index 6793db090..14f7f8944 100644 --- a/Nodejs/NodejsTools.sln +++ b/Nodejs/NodejsTools.sln @@ -1,12 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs", "Product\Nodejs\Nodejs.csproj", "{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}" ProjectSection(ProjectDependencies) = postProject {5085DF35-3A32-4894-835E-E5A3956D4F57} = {5085DF35-3A32-4894-835E-E5A3956D4F57} + {D092D54E-FF29-4D32-9AEE-4EF704C92F67} = {D092D54E-FF29-4D32-9AEE-4EF704C92F67} + {E8150EBC-6B62-40BF-BF91-1DC60149B530} = {E8150EBC-6B62-40BF-BF91-1DC60149B530} {CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} + {A731C4C3-3741-4080-A946-C47574C1F3BF} = {A731C4C3-3741-4080-A946-C47574C1F3BF} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceGenerator", "Product\ReferenceGenerator\ReferenceGenerator.csproj", "{81FBB417-19B2-4E70-857E-D4564B77AD8F}" @@ -91,6 +94,7 @@ Global {240A6D2B-1982-4BC5-B1EA-C6CB0492329D}.Release|x86.Build.0 = Release|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.ActiveCfg = Debug|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.Build.0 = Debug|x86 + {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.Deploy.0 = Debug|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Release|x86.ActiveCfg = Release|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Release|x86.Build.0 = Release|x86 {E8150EBC-6B62-40BF-BF91-1DC60149B530}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate index 97c545461..03feb2623 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate @@ -14,6 +14,7 @@ + diff --git a/Nodejs/Product/Nodejs/ProjectTemplates/NodejsWebApp/NodejsWebApp.vstemplate b/Nodejs/Product/Nodejs/ProjectTemplates/NodejsWebApp/NodejsWebApp.vstemplate index 7173ef500..8acf0714f 100644 --- a/Nodejs/Product/Nodejs/ProjectTemplates/NodejsWebApp/NodejsWebApp.vstemplate +++ b/Nodejs/Product/Nodejs/ProjectTemplates/NodejsWebApp/NodejsWebApp.vstemplate @@ -8,7 +8,7 @@ 130 true NodejsWebApp - true + true 1 true Preview.png diff --git a/Nodejs/Product/ProjectWizard/ImportWizard.cs b/Nodejs/Product/ProjectWizard/ImportWizard.cs index 80956791d..90cfd2e30 100644 --- a/Nodejs/Product/ProjectWizard/ImportWizard.cs +++ b/Nodejs/Product/ProjectWizard/ImportWizard.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.IO; using System.Windows.Forms; +using System.Diagnostics; using EnvDTE; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Shell; @@ -34,8 +35,14 @@ public void RunFinished() { } public void RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) { try { - Directory.Delete(replacementsDictionary["$destinationdirectory$"]); - Directory.Delete(replacementsDictionary["$solutiondirectory$"]); + /* Commenting these lines out allows the Wizard to create folders for the FromExisting + * Code project, allowing subsequent projects of the type to generate appropriate names. + * + * - Austin Hull */ + + //Directory.Delete(replacementsDictionary["$destinationdirectory$"]); + //Directory.Delete(replacementsDictionary["$solutiondirectory$"]); + } catch { // If it fails (doesn't exist/contains files/read-only), let the directory stay. } @@ -68,13 +75,13 @@ out package if (String.IsNullOrWhiteSpace(solnName)) { // Create directory is unchecked, destinationdirectory is the // directory name the user entered plus the project name, we want - // to remove the project name. + // to remove the solution directory. directory = Path.GetDirectoryName(replacementsDictionary["$destinationdirectory$"]); } else { // Create directory is checked, the destinationdirectory is the // directory the user entered plus the project name plus the - // solution name - we want to remove both extra folders - directory = Path.GetDirectoryName(Path.GetDirectoryName(replacementsDictionary["$destinationdirectory$"])); + // solution name. + directory = Path.GetDirectoryName(replacementsDictionary["$destinationdirectory$"]); } var context = addingNewProject ? From 92df10f52b7b0fbf2869820c69f8094bbb1f17d5 Mon Sep 17 00:00:00 2001 From: AustinHull Date: Sat, 30 Jul 2016 21:45:37 -0400 Subject: [PATCH 4/6] Comment formatting. --- Nodejs/Product/ProjectWizard/ImportWizard.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Nodejs/Product/ProjectWizard/ImportWizard.cs b/Nodejs/Product/ProjectWizard/ImportWizard.cs index 90cfd2e30..98f45eeaa 100644 --- a/Nodejs/Product/ProjectWizard/ImportWizard.cs +++ b/Nodejs/Product/ProjectWizard/ImportWizard.cs @@ -35,10 +35,8 @@ public void RunFinished() { } public void RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) { try { - /* Commenting these lines out allows the Wizard to create folders for the FromExisting - * Code project, allowing subsequent projects of the type to generate appropriate names. - * - * - Austin Hull */ + // Commenting these lines out allows the Wizard to create folders for the FromExisting + // Code project, allowing subsequent projects of the type to generate appropriate names. //Directory.Delete(replacementsDictionary["$destinationdirectory$"]); //Directory.Delete(replacementsDictionary["$solutiondirectory$"]); From 3551a4d6b670d2b7344bc39d259fef2e84417509 Mon Sep 17 00:00:00 2001 From: AustinHull Date: Thu, 4 Aug 2016 21:24:39 -0400 Subject: [PATCH 5/6] Reverted changes to solution config info, and updated internal documentation within ImportWizard.cs. --- Nodejs/NodejsTools.sln | 6 +----- Nodejs/Product/ProjectWizard/ImportWizard.cs | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Nodejs/NodejsTools.sln b/Nodejs/NodejsTools.sln index 14f7f8944..b5e65734c 100644 --- a/Nodejs/NodejsTools.sln +++ b/Nodejs/NodejsTools.sln @@ -1,15 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs", "Product\Nodejs\Nodejs.csproj", "{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}" ProjectSection(ProjectDependencies) = postProject {5085DF35-3A32-4894-835E-E5A3956D4F57} = {5085DF35-3A32-4894-835E-E5A3956D4F57} - {D092D54E-FF29-4D32-9AEE-4EF704C92F67} = {D092D54E-FF29-4D32-9AEE-4EF704C92F67} - {E8150EBC-6B62-40BF-BF91-1DC60149B530} = {E8150EBC-6B62-40BF-BF91-1DC60149B530} {CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} - {A731C4C3-3741-4080-A946-C47574C1F3BF} = {A731C4C3-3741-4080-A946-C47574C1F3BF} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceGenerator", "Product\ReferenceGenerator\ReferenceGenerator.csproj", "{81FBB417-19B2-4E70-857E-D4564B77AD8F}" @@ -94,7 +91,6 @@ Global {240A6D2B-1982-4BC5-B1EA-C6CB0492329D}.Release|x86.Build.0 = Release|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.ActiveCfg = Debug|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.Build.0 = Debug|x86 - {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.Deploy.0 = Debug|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Release|x86.ActiveCfg = Release|x86 {D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Release|x86.Build.0 = Release|x86 {E8150EBC-6B62-40BF-BF91-1DC60149B530}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/Nodejs/Product/ProjectWizard/ImportWizard.cs b/Nodejs/Product/ProjectWizard/ImportWizard.cs index 98f45eeaa..5773d3bd9 100644 --- a/Nodejs/Product/ProjectWizard/ImportWizard.cs +++ b/Nodejs/Product/ProjectWizard/ImportWizard.cs @@ -35,12 +35,8 @@ public void RunFinished() { } public void RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) { try { - // Commenting these lines out allows the Wizard to create folders for the FromExisting - // Code project, allowing subsequent projects of the type to generate appropriate names. - - //Directory.Delete(replacementsDictionary["$destinationdirectory$"]); - //Directory.Delete(replacementsDictionary["$solutiondirectory$"]); - + // Regardless of whether or not an exception is thrown, created + // directories shall remain. } catch { // If it fails (doesn't exist/contains files/read-only), let the directory stay. } From 6c317a77583af62f115b045b07007d6f5768edcc Mon Sep 17 00:00:00 2001 From: AustinHull Date: Fri, 5 Aug 2016 15:11:15 -0400 Subject: [PATCH 6/6] Removed unnecessary try block. --- Nodejs/Product/ProjectWizard/ImportWizard.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Nodejs/Product/ProjectWizard/ImportWizard.cs b/Nodejs/Product/ProjectWizard/ImportWizard.cs index 5773d3bd9..1e44b5477 100644 --- a/Nodejs/Product/ProjectWizard/ImportWizard.cs +++ b/Nodejs/Product/ProjectWizard/ImportWizard.cs @@ -34,12 +34,6 @@ public void ProjectItemFinishedGenerating(EnvDTE.ProjectItem projectItem) { } public void RunFinished() { } public void RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) { - try { - // Regardless of whether or not an exception is thrown, created - // directories shall remain. - } catch { - // If it fails (doesn't exist/contains files/read-only), let the directory stay. - } var dte = automationObject as DTE; if (dte == null) {