From 6ab9e94703b5c2b71133fe5af1d3d0fb347181dc Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Tue, 23 Jan 2018 21:14:03 -0800 Subject: [PATCH 1/3] Upgrade dependencies --- build/dependencies.props | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 135d77ebea..4a2b3ca923 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,44 +4,44 @@ 2.1.0-preview1-15679 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 15.3.409 15.3.409 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 2.0.0 - 2.1.0-preview1-26115-03 + 2.1.0-preview1-26122-01 15.3.0 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 + 2.1.0-preview1-28157 2.0.0 0.19.0 3.7.0 16.16299.0 3.7.0 - 4.5.0-preview1-26112-01 + 4.5.0-preview1-26119-06 0.8.0 2.3.1 2.3.1 From 1e0bde034581710afd406776c27401386a9e06ae Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Wed, 24 Jan 2018 13:56:07 -0800 Subject: [PATCH 2/3] Update dependencies --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 4a2b3ca923..977db78948 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 2.1.0-preview1-15679 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 15.3.409 15.3.409 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 2.0.0 2.1.0-preview1-26122-01 15.3.0 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 - 2.1.0-preview1-28157 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 + 2.1.0-preview1-28163 2.0.0 0.19.0 3.7.0 From b1ccc31ccfba5047d3536e447a0c8c0c77836355 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 23 Jan 2018 11:05:24 -0800 Subject: [PATCH 3/3] Update SPA template identifiers to end with ".2.1". Fixes #230 --- .../content/Aurelia-CSharp/.template.config/template.json | 2 +- .../content/Knockout-CSharp/.template.config/template.json | 2 +- .../content/Vue-CSharp/.template.config/template.json | 2 +- .../content/Angular-CSharp/.template.config/template.json | 2 +- .../content/React-CSharp/.template.config/template.json | 2 +- .../content/ReactRedux-CSharp/.template.config/template.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json index 6d595f5a0e..2501dd9a98 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Aurelia", - "identity": "Microsoft.AspNetCore.SpaTemplates.Aurelia.CSharp", + "identity": "Microsoft.AspNetCore.SpaTemplates.Aurelia.CSharp.2.1", "name": "ASP.NET Core with Aurelia", "preferNameDirectory": true, "primaryOutputs": [ diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json index d593dd2c50..91dd56cb7b 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Knockout", - "identity": "Microsoft.AspNetCore.SpaTemplates.Knockout.CSharp", + "identity": "Microsoft.AspNetCore.SpaTemplates.Knockout.CSharp.2.1", "name": "ASP.NET Core with Knockout.js", "preferNameDirectory": true, "primaryOutputs": [ diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json index aa22732976..84eb590b38 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Vue", - "identity": "Microsoft.AspNetCore.SpaTemplates.Vue.CSharp", + "identity": "Microsoft.AspNetCore.SpaTemplates.Vue.CSharp.2.1", "name": "ASP.NET Core with Vue.js", "preferNameDirectory": true, "primaryOutputs": [ diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json index 81b7931069..65f91e315b 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular", - "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.2.1", "name": "ASP.NET Core with Angular", "preferNameDirectory": true, "primaryOutputs": [ diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json index d50b0e58d9..b728ad8e6c 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React", - "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.2.1", "name": "ASP.NET Core with React.js", "preferNameDirectory": true, "primaryOutputs": [ diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json index 0cf95d3d41..445f7dfa7e 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux", - "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.2.1", "name": "ASP.NET Core with React.js and Redux", "preferNameDirectory": true, "primaryOutputs": [