From 6fa8cbcbc8d33de770577d4c2db6f36b2ebc0115 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 16:14:19 -0700 Subject: [PATCH] Remove ProjectTemplatesDir from main pkgdef **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