Skip to content

Commit f33cc58

Browse files
billtibillti
committed
Fixed up remaining TypeScript templates, and fixed self-closing tag
(cherry picked from commit de612d2)
1 parent 6700f75 commit f33cc58

25 files changed

+12991
-27
lines changed

‎Nodejs/Product/Nodejs/Nodejs.csproj‎

Lines changed: 49 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,11 @@
730730
</TypeScriptProject>
731731
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\NodejsConsoleApp.vstemplate" />
732732
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\Preview.png" />
733+
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\tsconfig.json" />
734+
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\node.package.json" />
735+
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\node.LICENSE" />
736+
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\node.index.d.ts" />
737+
<TypeScriptProject Include="ProjectTemplates\TypeScriptConsoleApp\node.README.md" />
733738
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\server.ts" />
734739
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\NodejsWebApp.njsproj">
735740
<SubType>Designer</SubType>
@@ -738,6 +743,11 @@
738743
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\Preview.png" />
739744
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\package.json" />
740745
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\README.md" />
746+
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\tsconfig.json" />
747+
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\node.package.json" />
748+
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\node.LICENSE" />
749+
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\node.index.d.ts" />
750+
<TypeScriptProject Include="ProjectTemplates\TypeScriptWebApp\node.README.md" />
741751
<Content Include="GeneratedHelpAboutVersion.tt">
742752
<Generator>TextTemplatingFileGenerator</Generator>
743753
<LastGenOutput>GeneratedHelpAboutVersion.cs</LastGenOutput>
@@ -789,21 +799,27 @@
789799
<ZipProject Include="ProjectTemplates\AzureExpress4App\index.js" />
790800
<ZipProject Include="ProjectTemplates\AzureExpress4App\Preview.png" />
791801
<ZipProject Include="ProjectTemplates\AzureExpress4App\users.js" />
792-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\user.ts" />
793-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\app.ts" />
794802
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\ExpressApp.vstemplate">
795803
<SubType>Designer</SubType>
796804
</TypeScriptProject>
797-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\index.ts" />
798-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\Preview.png" />
799-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\TypeScriptWebApp.vstemplate">
800-
<SubType>Designer</SubType>
801-
</TypeScriptProject>
802-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\Preview.png" />
803-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\TypeScriptExpressApp.vstemplate">
805+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\ExpressApp.njsproj">
804806
<SubType>Designer</SubType>
805807
</TypeScriptProject>
806-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\Preview.png" />
808+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\app.ts" />
809+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\error.pug" />
810+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\index.pug" />
811+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\index.ts" />
812+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\layout.pug" />
813+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\main.css" />
814+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\tsconfig.json" />
815+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\node.package.json" />
816+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\node.LICENSE" />
817+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\node.index.d.ts" />
818+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\node.README.md" />
819+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\package.json" />
820+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\Preview.png" />
821+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\README.md" />
822+
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\user.ts" />
807823
<TypeScriptProject Include="ProjectTemplates\TypeScriptFromExistingCode\FromExistingCode.njsproj">
808824
<SubType>Designer</SubType>
809825
</TypeScriptProject>
@@ -870,32 +886,46 @@
870886
<SubType>Designer</SubType>
871887
</None>
872888
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\ExpressApp.njsproj">
889+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\server.ts" />
890+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\TypeScriptWebApp.vstemplate">
873891
<SubType>Designer</SubType>
874892
</TypeScriptProject>
875-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\index.pug" />
876-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\error.pug" />
877-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\layout.pug" />
878-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\package.json" />
879-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\README.md" />
880-
<TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\main.css" />
893+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\Preview.png" />
881894
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\TypeScriptWebApp.njsproj">
882895
<SubType>Designer</SubType>
883896
</TypeScriptProject>
884897
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\package.json" />
885898
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\README.md" />
886899
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\Web.Debug.config" />
887900
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\Web.config" />
901+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\tsconfig.json" />
902+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\node.package.json" />
903+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\node.LICENSE" />
904+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\node.index.d.ts" />
905+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\node.README.md" />
906+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\TypeScriptExpressApp.vstemplate">
907+
<SubType>Designer</SubType>
908+
</TypeScriptProject>
888909
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\TypeScriptExpressApp.njsproj">
889910
<SubType>Designer</SubType>
890911
</TypeScriptProject>
891-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\index.pug" />
912+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\app.ts" />
892913
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\error.pug" />
914+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\index.pug" />
915+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\index.ts" />
893916
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\layout.pug" />
917+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\main.css" />
918+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\node.index.d.ts" />
919+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\node.LICENSE" />
920+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\node.package.json" />
921+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\node.README.md" />
894922
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\package.json" />
923+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\Preview.png" />
895924
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\README.md" />
896-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\main.css" />
897-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\Web.Debug.config" />
925+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\tsconfig.json" />
926+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\user.ts" />
898927
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\Web.config" />
928+
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\Web.Debug.config" />
899929
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureNodejsWorker\Preview.png" />
900930
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureNodejsWorker\server.ts" />
901931
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureNodejsWorker\startup.ts" />
@@ -1004,12 +1034,6 @@
10041034
<Name>ProjectWizard</Name>
10051035
</ProjectReference>
10061036
</ItemGroup>
1007-
<ItemGroup>
1008-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\server.ts" />
1009-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\app.ts" />
1010-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\index.ts" />
1011-
<TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\user.ts" />
1012-
</ItemGroup>
10131037
<ItemGroup>
10141038
<ZipProject Include="ProjectTemplates\TypeScriptAzureNodejsWorkerRole\server.ts" />
10151039
<ZipProject Include="ProjectTemplates\TypeScriptAzureNodejsWorkerRole\startup.ts" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<TypeScriptCompile Include="app.ts" />
3535
<TypeScriptCompile Include="routes\index.ts" />
3636
<TypeScriptCompile Include="routes\user.ts" />
37+
<Content Include="tsconfig.json" />
3738
<Content Include="package.json" />
3839
<Content Include="public\stylesheets\main.css" />
3940
<Content Include="README.md" />

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@
1515
</TemplateData>
1616
<TemplateContent>
1717
<Project File="TypeScriptExpressApp.njsproj" ReplaceParameters="true">
18+
<Folder Name="node_modules">
19+
<Folder Name="@types">
20+
<Folder Name="node">
21+
<ProjectItem TargetFileName="package.json">node.package.json</ProjectItem>
22+
<ProjectItem TargetFileName="LICENSE">node.LICENSE</ProjectItem>
23+
<ProjectItem TargetFileName="index.d.ts">node.index.d.ts</ProjectItem>
24+
<ProjectItem TargetFileName="README.md">node.README.md</ProjectItem>
25+
</Folder>
26+
</Folder>
27+
</Folder>
28+
<ProjectItem>tsconfig.json</ProjectItem>
1829
<Folder Name="public">
1930
<Folder Name="images"/>
2031
<Folder Name="javascripts"/>

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/node.LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) Microsoft Corporation. All rights reserved.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE

‎Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/node.README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Installation
2+
> `npm install --save @types/node`
3+
4+
# Summary
5+
This package contains type definitions for Node.js (http://nodejs.org/).
6+
7+
# Details
8+
Files were exported from https://www.github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node/v6
9+
10+
Additional Details
11+
* Last updated: Thu, 24 Aug 2017 17:15:34 GMT
12+
* Dependencies: events, net, stream, child_process, tls, http, readline, crypto
13+
* Global values: Buffer, NodeJS, SlowBuffer, ___dirname, ___filename, clearImmediate, clearInterval, clearTimeout, console, exports, global, module, process, require, setImmediate, setInterval, setTimeout
14+
15+
# Credits
16+
These definitions were written by Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>, Wilco Bakker <https://github.com/WilcoBakker>.

0 commit comments

Comments
 (0)