Skip to content

Commit c7b7f40

Browse files
SteveSandersonMSSteveSandersonMS
committed
Update template package to support generating net461 projects as well as netcoreapp2.0
1 parent 5127a74 commit c7b7f40

File tree

7 files changed

+76
-15
lines changed

7 files changed

+76
-15
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: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,13 @@ function buildDotNetNewNuGetPackage(packageId: string) {
181181
exclude: ['.template.config/**']
182182
}],
183183
symbols: {
184+
TargetFrameworkOverride: {
185+
type: 'parameter',
186+
description: 'Overrides the target framework',
187+
replaces: 'TargetFrameworkOverride',
188+
datatype: 'string',
189+
defaultValue: ''
190+
},
184191
Framework: {
185192
type: 'parameter',
186193
description: 'The target framework for the project.',
@@ -191,6 +198,7 @@ function buildDotNetNewNuGetPackage(packageId: string) {
191198
description: 'Target netcoreapp2.0'
192199
}
193200
],
201+
replaces: 'netcoreapp2.0',
194202
defaultValue: 'netcoreapp2.0'
195203
},
196204
skipRestore: {
@@ -226,7 +234,16 @@ function buildDotNetNewNuGetPackage(packageId: string) {
226234
}, null, 2));
227235

228236
fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({
237+
$schema: 'http://json.schemastore.org/dotnetcli.host',
229238
symbolInfo: {
239+
TargetFrameworkOverride: {
240+
isHidden: 'true',
241+
longName: 'target-framework-override',
242+
shortName: ''
243+
},
244+
Framework: {
245+
longName: 'framework'
246+
},
230247
skipRestore: {
231248
longName: 'no-restore',
232249
shortName: ''
@@ -235,12 +252,14 @@ function buildDotNetNewNuGetPackage(packageId: string) {
235252
}, null, 2));
236253

237254
fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({
255+
$schema: 'http://json.schemastore.org/vs-2017.3.host',
238256
name: { text: templateConfig.displayName },
239-
description: { text: `Web application built with MVC ASP.NET Core and ${templateConfig.displayName}` },
240-
order: 2000,
257+
description: { text: `ASP.NET Core application with MVC and ${templateConfig.displayName}` },
258+
order: 301,
241259
icon: 'icon.png',
242260
learnMoreLink: 'https://github.com/aspnet/JavaScriptServices',
243-
uiFilters: [ 'oneaspnet' ]
261+
uiFilters: [ 'oneaspnet' ],
262+
minFullFrameworkVersion: '4.6.1'
244263
}, null, 2));
245264
});
246265

0 commit comments

Comments
 (0)