Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit fadc5d7

Browse files
SteveSandersonMSSteveSandersonMS
committed
Update dotnet new template builder to match tooling preview 4 file structure
1 parent 85dcc66 commit fadc5d7

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

‎templates/package-builder/src/build/build.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,14 @@ function buildDotNetNewNuGetPackage() {
139139
{ from: /\s*<OutputPath.*?<\/OutputPath>/g, to: '' },
140140
];
141141
_.forEach(templates, (templateConfig, templateName) => {
142-
const templateOutputDir = path.join(outputRoot, 'templates', templateName);
143-
const templateOutputProjectDir = path.join(templateOutputDir, sourceProjectName);
144-
writeTemplate(templateConfig.dir, templateOutputProjectDir, contentReplacements, filenameReplacements, templateConfig.forceInclusion);
142+
const templateOutputDir = path.join(outputRoot, 'Content', templateName);
143+
writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements, templateConfig.forceInclusion);
145144

146-
// Add a .netnew.json file
147-
fs.writeFileSync(path.join(templateOutputDir, '.netnew.json'), JSON.stringify({
145+
// Add the .template.config dir and its contents
146+
const templateConfigDir = path.join(templateOutputDir, '.template.config');
147+
mkdirp.sync(templateConfigDir);
148+
149+
fs.writeFileSync(path.join(templateConfigDir, 'template.json'), JSON.stringify({
148150
author: 'Microsoft',
149151
classifications: [ 'Standard>>Quick Starts' ],
150152
name: `ASP.NET Core SPA with ${templateConfig.displayName}`,
@@ -155,6 +157,10 @@ function buildDotNetNewNuGetPackage() {
155157
guids: [ projectGuid ],
156158
sourceName: sourceProjectName
157159
}, null, 2));
160+
161+
fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({
162+
symbolInfo: {}
163+
}, null, 2));
158164
});
159165

160166
// Invoke NuGet to create the final package

‎templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Microsoft.AspNetCore.Spa.Templates</id>
55
<version>{version}</version>
6-
<title>Class Library and Console Application Templates for .NET Core</title>
6+
<description>Single Page Application templates for ASP.NET Core</description>
77
<authors>Microsoft</authors>
8-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9-
<description>My package description.</description>
10-
<dependencies>
11-
<group targetFramework=".NETCoreApp,Version=v1.0">
12-
<dependency id="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" version="1.0.0" />
13-
</group>
14-
</dependencies>
8+
<language>en-US</language>
9+
<projectUrl>https://github.com/aspnet/javascriptservices</projectUrl>
10+
<licenseUrl>https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
11+
<packageTypes>
12+
<packageType name="Template" />
13+
</packageTypes>
1514
</metadata>
16-
<files>
17-
<file src="templates/**" />
18-
</files>
19-
</package>
15+
</package>

0 commit comments

Comments
 (0)