Skip to content

Commit 61c14b9

Browse files
paulvanbrenkpaulvanbrenk
authored
Merge pull request #1666 from paulvanbrenk/templateCleanUp
Template clean up
2 parents 1dc62cc + 31d4481 commit 61c14b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+45
-5467
lines changed

‎Nodejs/Product/Nodejs/Nodejs.csproj‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -628,18 +628,6 @@
628628
<ZipItem Include="Templates\Files\EmptyTs\EmptyTs.vstemplate" />
629629
<ZipItem Include="Templates\Files\EmptyXml\EmptyXml.vstemplate" />
630630
<ZipItem Include="Templates\Files\EmptyXml\EmptyXml.xml" />
631-
<Content Include="TypingsAcquisitionTool\index.js">
632-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
633-
<IncludeInVSIX>true</IncludeInVSIX>
634-
</Content>
635-
<Content Include="TypingsAcquisitionTool\package.json">
636-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
637-
<IncludeInVSIX>true</IncludeInVSIX>
638-
</Content>
639-
<Content Include="TypingsAcquisitionTool\bin\install_typings">
640-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
641-
<IncludeInVSIX>true</IncludeInVSIX>
642-
</Content>
643631
<ZipProject Include="ProjectTemplates\CloudService\CloudService.ccproj" />
644632
<ZipProject Include="ProjectTemplates\CloudService\ServiceConfiguration.Cloud.cscfg" />
645633
<ZipProject Include="ProjectTemplates\CloudService\ServiceConfiguration.Local.cscfg" />
@@ -674,18 +662,6 @@
674662
<ZipItem Include="Templates\Files\TypeScriptTapeUnitTest\UnitTest.ts" />
675663
<ZipItem Include="Templates\Files\TypeScriptTsConfig\tsconfig.json" />
676664
<ZipItem Include="Templates\Files\TypeScriptTsConfig\tsconfig.vstemplate" />
677-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express-serve-static-core.typings.json" />
678-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express.typings.json" />
679-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\serve-static.typings.json" />
680-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\typings.json" />
681-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\mime.typings.json" />
682-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\debug.typings.json" />
683-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express-serve-static-core.typings.json" />
684-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express.typings.json" />
685-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\serve-static.typings.json" />
686-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mime.typings.json" />
687-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\typings.json" />
688-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\debug.typings.json" />
689665
<ZipItem Include="Templates\Files\EmptyJson\EmptyJson.json" />
690666
<ZipItem Include="Templates\Files\EmptyLess\EmptyLess.less" />
691667
<ZipItem Include="Templates\Files\EmptyPug\EmptyPug.pug" />
@@ -715,7 +691,6 @@
715691
<ZipProject Include="ProjectTemplates\FromExistingCode\FromExistingCode.vstemplate">
716692
<SubType>Designer</SubType>
717693
</ZipProject>
718-
<ZipProject Include="ProjectTemplates\AzureExpress4App\typings.json" />
719694
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\package.json" />
720695
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\README.md" />
721696
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\app.ts" />
@@ -766,7 +741,6 @@
766741
<ZipProject Include="ProjectTemplates\Express4App\ExpressApp.vstemplate">
767742
<SubType>Designer</SubType>
768743
</ZipProject>
769-
<ZipProject Include="ProjectTemplates\Express4App\typings.json" />
770744
<ZipProject Include="ProjectTemplates\Express4App\index.js" />
771745
<ZipProject Include="ProjectTemplates\Express4App\Preview.png" />
772746
<ZipProject Include="ProjectTemplates\Express4App\users.js" />
@@ -780,11 +754,6 @@
780754
<ZipProject Include="ProjectTemplates\AzureExpress4App\index.js" />
781755
<ZipProject Include="ProjectTemplates\AzureExpress4App\Preview.png" />
782756
<ZipProject Include="ProjectTemplates\AzureExpress4App\users.js" />
783-
<Content Include="Scripts\Typings\node\node.d.ts">
784-
<IncludeInVSIX>true</IncludeInVSIX>
785-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
786-
</Content>
787-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express.d.ts" />
788757
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\user.ts" />
789758
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\app.ts" />
790759
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\ExpressApp.vstemplate">
@@ -1014,32 +983,9 @@
1014983
<ItemGroup>
1015984
<Folder Include="RemoteDebug\" />
1016985
</ItemGroup>
1017-
<ItemGroup>
1018-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express-serve-static-core.d.ts" />
1019-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\serve-static.d.ts" />
1020-
</ItemGroup>
1021-
<ItemGroup>
1022-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\mime.d.ts" />
1023-
</ItemGroup>
1024-
<ItemGroup>
1025-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express-serve-static-core.d.ts" />
1026-
</ItemGroup>
1027-
<ItemGroup>
1028-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\express.d.ts" />
1029-
</ItemGroup>
1030-
<ItemGroup>
1031-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\serve-static.d.ts" />
1032-
</ItemGroup>
1033-
<ItemGroup>
1034-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mime.d.ts" />
1035-
</ItemGroup>
1036986
<ItemGroup>
1037987
<ZipItem Include="Templates\Files\EmptyTs\EmptyTs.ts" />
1038988
</ItemGroup>
1039-
<ItemGroup>
1040-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\debug.d.ts" />
1041-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\debug.d.ts" />
1042-
</ItemGroup>
1043989
<ItemGroup>
1044990
<Compile Include="SharedProject\Navigation\SourceLocation.cs" />
1045991
<Compile Include="SharedProject\AllFilesProjectElement.cs" />

‎Nodejs/Product/Nodejs/Project/NodejsFileNode.cs‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
1+
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

3-
using System;
4-
using System.IO;
5-
using Microsoft.VisualStudioTools.Project;
6-
using Microsoft.VisualStudioTools;
7-
using Microsoft.VisualStudio.Imaging.Interop;
83
using Microsoft.VisualStudio.Imaging;
4+
using Microsoft.VisualStudio.Imaging.Interop;
5+
using Microsoft.VisualStudioTools.Project;
96

107
namespace Microsoft.NodejsTools.Project
118
{
@@ -16,23 +13,6 @@ public NodejsFileNode(NodejsProjectNode root, ProjectElement e)
1613
{
1714
}
1815

19-
protected override void OnParentSet(HierarchyNode parent)
20-
{
21-
if (this.ProjectMgr == null)
22-
{
23-
return;
24-
}
25-
26-
if (this.Url.EndsWith(NodejsConstants.TypeScriptDeclarationExtension, StringComparison.OrdinalIgnoreCase)
27-
&& this.Url.StartsWith(Path.Combine(this.ProjectMgr.ProjectFolder, @"typings\"), StringComparison.OrdinalIgnoreCase))
28-
{
29-
this.ProjectMgr.Site.GetUIThread().Invoke(() =>
30-
{
31-
this.IncludeInProject(true);
32-
});
33-
}
34-
}
35-
3616
protected override ImageMoniker CodeFileIconMoniker => KnownMonikers.JSScript;
3717

3818
internal override int IncludeInProject(bool includeChildren)

‎Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
1+
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

33
using System;
44
using System.Collections.Generic;
@@ -129,46 +129,6 @@ private void AddProjectImage(NodejsProjectImageName name, string resourceId)
129129
public override Guid SharedCommandGuid => Guids.NodejsCmdSet;
130130

131131
internal override string IssueTrackerUrl => NodejsConstants.IssueTrackerUrl;
132-
protected override void FinishProjectCreation(string sourceFolder, string destFolder)
133-
{
134-
foreach (var item in this.BuildProject.Items)
135-
{
136-
if (IsProjectTypeScriptSourceFile(item.EvaluatedInclude))
137-
{
138-
// Create the 'typings' folder
139-
var typingsFolder = Path.Combine(this.ProjectHome, "Scripts", "typings");
140-
if (!Directory.Exists(typingsFolder))
141-
{
142-
Directory.CreateDirectory(typingsFolder);
143-
}
144-
145-
// Deploy node.d.ts
146-
var nodeTypingsFolder = Path.Combine(typingsFolder, "node");
147-
if (!Directory.Exists(Path.Combine(nodeTypingsFolder)))
148-
{
149-
Directory.CreateDirectory(nodeTypingsFolder);
150-
}
151-
152-
var nodeFolder = ((OAProject)this.GetAutomationObject()).ProjectItems
153-
.AddFolder("Scripts").ProjectItems
154-
.AddFolder("typings").ProjectItems
155-
.AddFolder("node");
156-
157-
nodeFolder.ProjectItems.AddFromFileCopy(
158-
Path.Combine(
159-
Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
160-
"Scripts",
161-
"typings",
162-
"node",
163-
"node.d.ts"
164-
)
165-
);
166-
break;
167-
}
168-
}
169-
170-
base.FinishProjectCreation(sourceFolder, destFolder);
171-
}
172132

173133
protected override void AddNewFileNodeToHierarchy(HierarchyNode parentNode, string fileName)
174134
{

‎Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/ExpressApp.vstemplate‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<ProjectItem OpenInEditor="true">app.js</ProjectItem>
3737
<ProjectItem ReplaceParameters="true">package.json</ProjectItem>
3838
<ProjectItem ReplaceParameters="true">README.md</ProjectItem>
39-
<ProjectItem>typings.json</ProjectItem>
4039
</Project>
4140
</TemplateContent>
4241
<WizardExtension>

‎Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/typings.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<ProjectItem OpenInEditor="true">app.js</ProjectItem>
3535
<ProjectItem ReplaceParameters="true">package.json</ProjectItem>
3636
<ProjectItem ReplaceParameters="true">README.md</ProjectItem>
37-
<ProjectItem>typings.json</ProjectItem>
3837
</Project>
3938
</TemplateContent>
4039
<WizardExtension>

‎Nodejs/Product/Nodejs/ProjectTemplates/Express4App/typings.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
<TypeScriptCompile Include="app.ts" />
3535
<TypeScriptCompile Include="routes\index.ts" />
3636
<TypeScriptCompile Include="routes\user.ts" />
37-
<TypeScriptCompile Include="typings\globals\debug\index.d.ts" />
38-
<TypeScriptCompile Include="typings\globals\express\index.d.ts" />
39-
<TypeScriptCompile Include="typings\globals\express-serve-static-core\index.d.ts" />
40-
<TypeScriptCompile Include="typings\globals\mime\index.d.ts" />
41-
<TypeScriptCompile Include="typings\globals\serve-static\index.d.ts" />
4237
<Content Include="package.json" />
4338
<Content Include="public\stylesheets\main.css" />
4439
<Content Include="README.md" />

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,11 @@
3131
<ProjectItem>layout.pug</ProjectItem>
3232
<ProjectItem>error.pug</ProjectItem>
3333
</Folder>
34-
<Folder Name="typings">
35-
<Folder Name="globals">
36-
<Folder Name="express">
37-
<ProjectItem TargetFileName="index.d.ts">express.d.ts</ProjectItem>
38-
<ProjectItem TargetFileName="typings.json">express.typings.json</ProjectItem>
39-
</Folder>
40-
<Folder Name="express-serve-static-core">
41-
<ProjectItem TargetFileName="index.d.ts">express-serve-static-core.d.ts</ProjectItem>
42-
<ProjectItem TargetFileName="typings.json">express-serve-static-core.typings.json</ProjectItem>
43-
</Folder>
44-
<Folder Name="mime">
45-
<ProjectItem TargetFileName="index.d.ts">mime.d.ts</ProjectItem>
46-
<ProjectItem TargetFileName="typings.json">mime.typings.json</ProjectItem>
47-
</Folder>
48-
<Folder Name="serve-static">
49-
<ProjectItem TargetFileName="index.d.ts">serve-static.d.ts</ProjectItem>
50-
<ProjectItem TargetFileName="typings.json">serve-static.typings.json</ProjectItem>
51-
</Folder>
52-
<Folder Name="debug">
53-
<ProjectItem TargetFileName="index.d.ts">debug.d.ts</ProjectItem>
54-
<ProjectItem TargetFileName="typings.json">debug.typings.json</ProjectItem>
55-
</Folder>
56-
</Folder>
57-
</Folder>
5834
<ProjectItem OpenInEditor="true">app.ts</ProjectItem>
5935
<ProjectItem ReplaceParameters="true">package.json</ProjectItem>
6036
<ProjectItem ReplaceParameters="true">README.md</ProjectItem>
6137
<ProjectItem ReplaceParameters="true">Web.config</ProjectItem>
6238
<ProjectItem ReplaceParameters="true">Web.Debug.config</ProjectItem>
63-
<ProjectItem>typings.json</ProjectItem>
6439
</Project>
6540
</TemplateContent>
6641
<WizardExtension>

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.d.ts‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)