From e7785dff01c19ed6bfdbef3981229dc664b5b265 Mon Sep 17 00:00:00 2001 From: SteveSandersonMS Date: Mon, 30 Jan 2017 13:01:00 +0000 Subject: [PATCH] Update templates to match VS2017RC build 26127 project file format, plus latest ASP.NET Core 'Program.cs' convention. Fixes #620. --- templates/Angular2Spa/Angular2Spa.csproj | 66 ++------------------ templates/Angular2Spa/Program.cs | 7 --- templates/AureliaSpa/Aurelia.csproj | 66 ++------------------ templates/AureliaSpa/Program.cs | 7 --- templates/KnockoutSpa/KnockoutSpa.csproj | 66 ++------------------ templates/KnockoutSpa/Program.cs | 7 --- templates/ReactReduxSpa/Program.cs | 7 --- templates/ReactReduxSpa/ReactReduxSpa.csproj | 66 ++------------------ templates/ReactSpa/Program.cs | 7 --- templates/ReactSpa/ReactSpa.csproj | 66 ++------------------ 10 files changed, 30 insertions(+), 335 deletions(-) diff --git a/templates/Angular2Spa/Angular2Spa.csproj b/templates/Angular2Spa/Angular2Spa.csproj index 842f935..1ae0755 100644 --- a/templates/Angular2Spa/Angular2Spa.csproj +++ b/templates/Angular2Spa/Angular2Spa.csproj @@ -1,72 +1,18 @@ - - + - Exe netcoreapp1.1 - true true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; - $(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\** - - - + + + + + - - - 1.1.0 - - - 1.0.0-alpha-20161104-2-112 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-preview4-final - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-* - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - - diff --git a/templates/Angular2Spa/Program.cs b/templates/Angular2Spa/Program.cs index b2e5e4b..193f1e2 100644 --- a/templates/Angular2Spa/Program.cs +++ b/templates/Angular2Spa/Program.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; namespace WebApplicationBasic { @@ -12,13 +11,7 @@ namespace WebApplicationBasic { public static void Main(string[] args) { - var config = new ConfigurationBuilder() - .AddCommandLine(args) - .AddEnvironmentVariables(prefix: "ASPNETCORE_") - .Build(); - var host = new WebHostBuilder() - .UseConfiguration(config) .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() diff --git a/templates/AureliaSpa/Aurelia.csproj b/templates/AureliaSpa/Aurelia.csproj index e8e6f9e..c33bf90 100644 --- a/templates/AureliaSpa/Aurelia.csproj +++ b/templates/AureliaSpa/Aurelia.csproj @@ -1,72 +1,18 @@ - - + - Exe netcoreapp1.1 - true true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; - $(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\** - - - + + + + + - - - 1.1.0 - - - 1.0.0-alpha-20161104-2-112 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-preview4-final - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-* - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - - diff --git a/templates/AureliaSpa/Program.cs b/templates/AureliaSpa/Program.cs index b2e5e4b..193f1e2 100644 --- a/templates/AureliaSpa/Program.cs +++ b/templates/AureliaSpa/Program.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; namespace WebApplicationBasic { @@ -12,13 +11,7 @@ namespace WebApplicationBasic { public static void Main(string[] args) { - var config = new ConfigurationBuilder() - .AddCommandLine(args) - .AddEnvironmentVariables(prefix: "ASPNETCORE_") - .Build(); - var host = new WebHostBuilder() - .UseConfiguration(config) .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/KnockoutSpa/KnockoutSpa.csproj index e8e6f9e..c33bf90 100644 --- a/templates/KnockoutSpa/KnockoutSpa.csproj +++ b/templates/KnockoutSpa/KnockoutSpa.csproj @@ -1,72 +1,18 @@ - - + - Exe netcoreapp1.1 - true true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; - $(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\** - - - + + + + + - - - 1.1.0 - - - 1.0.0-alpha-20161104-2-112 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-preview4-final - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-* - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - - diff --git a/templates/KnockoutSpa/Program.cs b/templates/KnockoutSpa/Program.cs index b2e5e4b..193f1e2 100644 --- a/templates/KnockoutSpa/Program.cs +++ b/templates/KnockoutSpa/Program.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; namespace WebApplicationBasic { @@ -12,13 +11,7 @@ namespace WebApplicationBasic { public static void Main(string[] args) { - var config = new ConfigurationBuilder() - .AddCommandLine(args) - .AddEnvironmentVariables(prefix: "ASPNETCORE_") - .Build(); - var host = new WebHostBuilder() - .UseConfiguration(config) .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() diff --git a/templates/ReactReduxSpa/Program.cs b/templates/ReactReduxSpa/Program.cs index b2e5e4b..193f1e2 100644 --- a/templates/ReactReduxSpa/Program.cs +++ b/templates/ReactReduxSpa/Program.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; namespace WebApplicationBasic { @@ -12,13 +11,7 @@ namespace WebApplicationBasic { public static void Main(string[] args) { - var config = new ConfigurationBuilder() - .AddCommandLine(args) - .AddEnvironmentVariables(prefix: "ASPNETCORE_") - .Build(); - var host = new WebHostBuilder() - .UseConfiguration(config) .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/ReactReduxSpa/ReactReduxSpa.csproj index 842f935..1ae0755 100644 --- a/templates/ReactReduxSpa/ReactReduxSpa.csproj +++ b/templates/ReactReduxSpa/ReactReduxSpa.csproj @@ -1,72 +1,18 @@ - - + - Exe netcoreapp1.1 - true true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; - $(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\** - - - + + + + + - - - 1.1.0 - - - 1.0.0-alpha-20161104-2-112 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-preview4-final - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-* - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - - diff --git a/templates/ReactSpa/Program.cs b/templates/ReactSpa/Program.cs index b2e5e4b..193f1e2 100644 --- a/templates/ReactSpa/Program.cs +++ b/templates/ReactSpa/Program.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; namespace WebApplicationBasic { @@ -12,13 +11,7 @@ namespace WebApplicationBasic { public static void Main(string[] args) { - var config = new ConfigurationBuilder() - .AddCommandLine(args) - .AddEnvironmentVariables(prefix: "ASPNETCORE_") - .Build(); - var host = new WebHostBuilder() - .UseConfiguration(config) .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/ReactSpa/ReactSpa.csproj index e8e6f9e..c33bf90 100644 --- a/templates/ReactSpa/ReactSpa.csproj +++ b/templates/ReactSpa/ReactSpa.csproj @@ -1,72 +1,18 @@ - - + - Exe netcoreapp1.1 - true true $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; - $(GlobalExclude);bin\**;obj\**;node_modules\**;**\*.user;**\*.suo;**\*.*proj;.git\** - - - + + + + + - - - 1.1.0 - - - 1.0.0-alpha-20161104-2-112 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-preview4-final - - - 1.1.0 - - - 1.1.0 - - - 1.1.0-* - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - 1.1.0 - - - -