Skip to content

Commit e7785df

Browse files
SteveSandersonMSSteveSandersonMS
committed
Update templates to match VS2017RC build 26127 project file format, plus latest ASP.NET Core 'Program.cs' convention. Fixes aspnet#620.
1 parent 6ed34dd commit e7785df

File tree

10 files changed

+30
-335
lines changed

10 files changed

+30
-335
lines changed

‎templates/Angular2Spa/Angular2Spa.csproj‎

Lines changed: 6 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,18 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
32
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
53
<TargetFramework>netcoreapp1.1</TargetFramework>
6-
<PreserveCompilationContext>true</PreserveCompilationContext>
74
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
85
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
9-
<GlobalExclude>$(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\**</GlobalExclude>
106
</PropertyGroup>
117
<ItemGroup>
12-
<None Include="**\*" Exclude="$(GlobalExclude)"/>
13-
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
14-
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
8+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="1.1.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
1513
</ItemGroup>
16-
<ItemGroup>
17-
<PackageReference Include="Microsoft.NETCore.App">
18-
<Version>1.1.0</Version>
19-
</PackageReference>
20-
<PackageReference Include="Microsoft.NET.Sdk.Web">
21-
<Version>1.0.0-alpha-20161104-2-112</Version>
22-
</PackageReference>
23-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics">
24-
<Version>1.1.0</Version>
25-
</PackageReference>
26-
<PackageReference Include="Microsoft.AspNetCore.Mvc">
27-
<Version>1.1.0</Version>
28-
</PackageReference>
29-
<PackageReference Include="Microsoft.AspNetCore.Razor.Tools">
30-
<Version>1.1.0-preview4-final</Version>
31-
</PackageReference>
32-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration">
33-
<Version>1.1.0</Version>
34-
</PackageReference>
35-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel">
36-
<Version>1.1.0</Version>
37-
</PackageReference>
38-
<PackageReference Include="Microsoft.AspNetCore.SpaServices">
39-
<Version>1.1.0-*</Version>
40-
</PackageReference>
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles">
42-
<Version>1.1.0</Version>
43-
</PackageReference>
44-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables">
45-
<Version>1.1.0</Version>
46-
</PackageReference>
47-
<PackageReference Include="Microsoft.Extensions.Configuration.Json">
48-
<Version>1.1.0</Version>
49-
</PackageReference>
50-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine">
51-
<Version>1.1.0</Version>
52-
</PackageReference>
53-
<PackageReference Include="Microsoft.Extensions.Logging">
54-
<Version>1.1.0</Version>
55-
</PackageReference>
56-
<PackageReference Include="Microsoft.Extensions.Logging.Console">
57-
<Version>1.1.0</Version>
58-
</PackageReference>
59-
<PackageReference Include="Microsoft.Extensions.Logging.Debug">
60-
<Version>1.1.0</Version>
61-
</PackageReference>
62-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
63-
<Version>1.1.0</Version>
64-
</PackageReference>
65-
</ItemGroup>
66-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6714
<ItemGroup>
6815
<!-- Files not to show in IDE -->
69-
<None Remove=".bowerrc" />
7016
<None Remove="yarn.lock" />
7117

7218
<!-- Files not to publish (note that the 'dist' subfolders are re-added below) -->

‎templates/Angular2Spa/Program.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,14 @@
44
using System.Linq;
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.Extensions.Configuration;
87

98
namespace WebApplicationBasic
109
{
1110
public class Program
1211
{
1312
public static void Main(string[] args)
1413
{
15-
var config = new ConfigurationBuilder()
16-
.AddCommandLine(args)
17-
.AddEnvironmentVariables(prefix: "ASPNETCORE_")
18-
.Build();
19-
2014
var host = new WebHostBuilder()
21-
.UseConfiguration(config)
2215
.UseKestrel()
2316
.UseContentRoot(Directory.GetCurrentDirectory())
2417
.UseIISIntegration()

‎templates/AureliaSpa/Aurelia.csproj‎

Lines changed: 6 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,18 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
32
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
53
<TargetFramework>netcoreapp1.1</TargetFramework>
6-
<PreserveCompilationContext>true</PreserveCompilationContext>
74
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
85
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
9-
<GlobalExclude>$(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\**</GlobalExclude>
106
</PropertyGroup>
117
<ItemGroup>
12-
<None Include="**\*" Exclude="$(GlobalExclude)"/>
13-
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
14-
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
8+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="1.1.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
1513
</ItemGroup>
16-
<ItemGroup>
17-
<PackageReference Include="Microsoft.NETCore.App">
18-
<Version>1.1.0</Version>
19-
</PackageReference>
20-
<PackageReference Include="Microsoft.NET.Sdk.Web">
21-
<Version>1.0.0-alpha-20161104-2-112</Version>
22-
</PackageReference>
23-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics">
24-
<Version>1.1.0</Version>
25-
</PackageReference>
26-
<PackageReference Include="Microsoft.AspNetCore.Mvc">
27-
<Version>1.1.0</Version>
28-
</PackageReference>
29-
<PackageReference Include="Microsoft.AspNetCore.Razor.Tools">
30-
<Version>1.1.0-preview4-final</Version>
31-
</PackageReference>
32-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration">
33-
<Version>1.1.0</Version>
34-
</PackageReference>
35-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel">
36-
<Version>1.1.0</Version>
37-
</PackageReference>
38-
<PackageReference Include="Microsoft.AspNetCore.SpaServices">
39-
<Version>1.1.0-*</Version>
40-
</PackageReference>
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles">
42-
<Version>1.1.0</Version>
43-
</PackageReference>
44-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables">
45-
<Version>1.1.0</Version>
46-
</PackageReference>
47-
<PackageReference Include="Microsoft.Extensions.Configuration.Json">
48-
<Version>1.1.0</Version>
49-
</PackageReference>
50-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine">
51-
<Version>1.1.0</Version>
52-
</PackageReference>
53-
<PackageReference Include="Microsoft.Extensions.Logging">
54-
<Version>1.1.0</Version>
55-
</PackageReference>
56-
<PackageReference Include="Microsoft.Extensions.Logging.Console">
57-
<Version>1.1.0</Version>
58-
</PackageReference>
59-
<PackageReference Include="Microsoft.Extensions.Logging.Debug">
60-
<Version>1.1.0</Version>
61-
</PackageReference>
62-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
63-
<Version>1.1.0</Version>
64-
</PackageReference>
65-
</ItemGroup>
66-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6714
<ItemGroup>
6815
<!-- Files not to show in IDE -->
69-
<None Remove=".bowerrc" />
7016
<None Remove="yarn.lock" />
7117
</ItemGroup>
7218
<Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">

‎templates/AureliaSpa/Program.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,14 @@
44
using System.Linq;
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.Extensions.Configuration;
87

98
namespace WebApplicationBasic
109
{
1110
public class Program
1211
{
1312
public static void Main(string[] args)
1413
{
15-
var config = new ConfigurationBuilder()
16-
.AddCommandLine(args)
17-
.AddEnvironmentVariables(prefix: "ASPNETCORE_")
18-
.Build();
19-
2014
var host = new WebHostBuilder()
21-
.UseConfiguration(config)
2215
.UseKestrel()
2316
.UseContentRoot(Directory.GetCurrentDirectory())
2417
.UseIISIntegration()

‎templates/KnockoutSpa/KnockoutSpa.csproj‎

Lines changed: 6 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,18 @@
1-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1+
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
32
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
53
<TargetFramework>netcoreapp1.1</TargetFramework>
6-
<PreserveCompilationContext>true</PreserveCompilationContext>
74
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
85
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
9-
<GlobalExclude>$(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\**</GlobalExclude>
106
</PropertyGroup>
117
<ItemGroup>
12-
<None Include="**\*" Exclude="$(GlobalExclude)"/>
13-
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
14-
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
8+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="1.1.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
1513
</ItemGroup>
16-
<ItemGroup>
17-
<PackageReference Include="Microsoft.NETCore.App">
18-
<Version>1.1.0</Version>
19-
</PackageReference>
20-
<PackageReference Include="Microsoft.NET.Sdk.Web">
21-
<Version>1.0.0-alpha-20161104-2-112</Version>
22-
</PackageReference>
23-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics">
24-
<Version>1.1.0</Version>
25-
</PackageReference>
26-
<PackageReference Include="Microsoft.AspNetCore.Mvc">
27-
<Version>1.1.0</Version>
28-
</PackageReference>
29-
<PackageReference Include="Microsoft.AspNetCore.Razor.Tools">
30-
<Version>1.1.0-preview4-final</Version>
31-
</PackageReference>
32-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration">
33-
<Version>1.1.0</Version>
34-
</PackageReference>
35-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel">
36-
<Version>1.1.0</Version>
37-
</PackageReference>
38-
<PackageReference Include="Microsoft.AspNetCore.SpaServices">
39-
<Version>1.1.0-*</Version>
40-
</PackageReference>
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles">
42-
<Version>1.1.0</Version>
43-
</PackageReference>
44-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables">
45-
<Version>1.1.0</Version>
46-
</PackageReference>
47-
<PackageReference Include="Microsoft.Extensions.Configuration.Json">
48-
<Version>1.1.0</Version>
49-
</PackageReference>
50-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine">
51-
<Version>1.1.0</Version>
52-
</PackageReference>
53-
<PackageReference Include="Microsoft.Extensions.Logging">
54-
<Version>1.1.0</Version>
55-
</PackageReference>
56-
<PackageReference Include="Microsoft.Extensions.Logging.Console">
57-
<Version>1.1.0</Version>
58-
</PackageReference>
59-
<PackageReference Include="Microsoft.Extensions.Logging.Debug">
60-
<Version>1.1.0</Version>
61-
</PackageReference>
62-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
63-
<Version>1.1.0</Version>
64-
</PackageReference>
65-
</ItemGroup>
66-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6714
<ItemGroup>
6815
<!-- Files not to show in IDE -->
69-
<None Remove=".bowerrc" />
7016
<None Remove="yarn.lock" />
7117
</ItemGroup>
7218
<Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">

‎templates/KnockoutSpa/Program.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,14 @@
44
using System.Linq;
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.Extensions.Configuration;
87

98
namespace WebApplicationBasic
109
{
1110
public class Program
1211
{
1312
public static void Main(string[] args)
1413
{
15-
var config = new ConfigurationBuilder()
16-
.AddCommandLine(args)
17-
.AddEnvironmentVariables(prefix: "ASPNETCORE_")
18-
.Build();
19-
2014
var host = new WebHostBuilder()
21-
.UseConfiguration(config)
2215
.UseKestrel()
2316
.UseContentRoot(Directory.GetCurrentDirectory())
2417
.UseIISIntegration()

‎templates/ReactReduxSpa/Program.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,14 @@
44
using System.Linq;
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.Extensions.Configuration;
87

98
namespace WebApplicationBasic
109
{
1110
public class Program
1211
{
1312
public static void Main(string[] args)
1413
{
15-
var config = new ConfigurationBuilder()
16-
.AddCommandLine(args)
17-
.AddEnvironmentVariables(prefix: "ASPNETCORE_")
18-
.Build();
19-
2014
var host = new WebHostBuilder()
21-
.UseConfiguration(config)
2215
.UseKestrel()
2316
.UseContentRoot(Directory.GetCurrentDirectory())
2417
.UseIISIntegration()

0 commit comments

Comments
 (0)