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

Commit e331355

Browse files
SteveSandersonMSSteveSandersonMS
committed
Merge branch 'rel/2.0.0-preview2' into dev
2 parents d8c0bd8 + 60c8a34 commit e331355

File tree

7 files changed

+88
-22
lines changed

7 files changed

+88
-22
lines changed

‎templates/AngularSpa/AngularSpa.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
56
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
67
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
910

10-
<ItemGroup>
11+
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
1112
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
1213
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
19+
</ItemGroup>
1320

1421
<ItemGroup>
1522
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />

‎templates/AureliaSpa/AureliaSpa.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
56
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
67
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
910

10-
<ItemGroup>
11+
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
1112
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
1213
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
19+
</ItemGroup>
1320

1421
<ItemGroup>
1522
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />

‎templates/KnockoutSpa/KnockoutSpa.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
56
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
67
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
910

10-
<ItemGroup>
11+
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
1112
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
1213
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
19+
</ItemGroup>
1320

1421
<ItemGroup>
1522
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />

‎templates/ReactReduxSpa/ReactReduxSpa.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
56
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
67
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
910

10-
<ItemGroup>
11+
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
1112
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
1213
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
19+
</ItemGroup>
1320

1421
<ItemGroup>
1522
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />

‎templates/ReactSpa/ReactSpa.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
56
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
67
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
910

10-
<ItemGroup>
11+
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
1112
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
1213
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
19+
</ItemGroup>
1320

1421
<ItemGroup>
1522
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />

‎templates/VueSpa/VueSpa.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
56
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
67
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
78
<IsPackable>false</IsPackable>
89
</PropertyGroup>
910

10-
<ItemGroup>
11+
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
1112
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
1213
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
19+
</ItemGroup>
1320

1421
<ItemGroup>
1522
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />

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

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import * as targz from 'tar.gz';
1111
const isWindows = /^win/.test(process.platform);
1212
const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx'];
1313
const yeomanGeneratorSource = './src/yeoman';
14+
const localizationPackageGuid = '{296D76CB-AD6F-4B46-9072-33CC07E265F8}';
1415

1516
const dotNetPackages = {
1617
builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates',
@@ -22,15 +23,16 @@ interface TemplateConfig {
2223
dotNetNewId: string;
2324
dotNetPackageId: string;
2425
displayName: string;
26+
localizationIdStart: number;
2527
}
2628

2729
const templates: { [key: string]: TemplateConfig } = {
28-
'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular' },
29-
'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia' },
30-
'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js' },
31-
'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux' },
32-
'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js' },
33-
'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js' }
30+
'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 100 },
31+
'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 200 },
32+
'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 300 },
33+
'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 400 },
34+
'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 500 },
35+
'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 600 }
3436
};
3537

3638
function isTextFile(filename: string): boolean {
@@ -181,6 +183,13 @@ function buildDotNetNewNuGetPackage(packageId: string) {
181183
exclude: ['.template.config/**']
182184
}],
183185
symbols: {
186+
TargetFrameworkOverride: {
187+
type: 'parameter',
188+
description: 'Overrides the target framework',
189+
replaces: 'TargetFrameworkOverride',
190+
datatype: 'string',
191+
defaultValue: ''
192+
},
184193
Framework: {
185194
type: 'parameter',
186195
description: 'The target framework for the project.',
@@ -191,6 +200,7 @@ function buildDotNetNewNuGetPackage(packageId: string) {
191200
description: 'Target netcoreapp2.0'
192201
}
193202
],
203+
replaces: 'netcoreapp2.0',
194204
defaultValue: 'netcoreapp2.0'
195205
},
196206
skipRestore: {
@@ -226,21 +236,35 @@ function buildDotNetNewNuGetPackage(packageId: string) {
226236
}, null, 2));
227237

228238
fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({
239+
$schema: 'http://json.schemastore.org/dotnetcli.host',
229240
symbolInfo: {
241+
TargetFrameworkOverride: {
242+
isHidden: 'true',
243+
longName: 'target-framework-override',
244+
shortName: ''
245+
},
246+
Framework: {
247+
longName: 'framework'
248+
},
230249
skipRestore: {
231250
longName: 'no-restore',
232251
shortName: ''
233252
}
234253
}
235254
}, null, 2));
236255

256+
const localisedNameId = templateConfig.localizationIdStart + 0;
257+
const localisedDescId = templateConfig.localizationIdStart + 1;
258+
237259
fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({
238-
name: { text: templateConfig.displayName },
239-
description: { text: `Web application built with MVC ASP.NET Core and ${templateConfig.displayName}` },
240-
order: 2000,
260+
$schema: 'http://json.schemastore.org/vs-2017.3.host',
261+
name: { text: templateConfig.displayName, package: localizationPackageGuid, id: localisedNameId.toString() },
262+
description: { text: `ASP.NET Core application with ${templateConfig.displayName}`, package: localizationPackageGuid, id: localisedDescId.toString() },
263+
order: 301,
241264
icon: 'icon.png',
242265
learnMoreLink: 'https://github.com/aspnet/JavaScriptServices',
243-
uiFilters: [ 'oneaspnet' ]
266+
uiFilters: [ 'oneaspnet' ],
267+
minFullFrameworkVersion: '4.6.1'
244268
}, null, 2));
245269
});
246270

0 commit comments

Comments
 (0)