From 8a553a7826bcc9e2c9aa462db60890b0e59c4ea0 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 20 Aug 2018 09:43:01 -0700 Subject: [PATCH 1/8] Bumping version from 2.1.4 to 2.1.5 --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index f9f6ff2170..86ee48f6f8 100644 --- a/version.props +++ b/version.props @@ -1,6 +1,6 @@  - 2.1.4 + 2.1.5 rtm $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final From a3b20c57ea5be76530e929a042dd0ef4cfb13732 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 20 Aug 2018 11:48:42 -0700 Subject: [PATCH 2/8] Add appsettings.json to EmptyWeb --- .../EmptyWeb-CSharp/appsettings.Development.json | 9 +++++++++ .../content/EmptyWeb-CSharp/appsettings.json | 8 ++++++++ .../EmptyWeb-FSharp/appsettings.Development.json | 9 +++++++++ .../content/EmptyWeb-FSharp/appsettings.json | 8 ++++++++ test/Templates.Test/template-baselines.json | 14 ++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json create mode 100644 src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json create mode 100644 src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json create mode 100644 src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json new file mode 100644 index 0000000000..e203e9407e --- /dev/null +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json new file mode 100644 index 0000000000..def9159a7d --- /dev/null +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json new file mode 100644 index 0000000000..e203e9407e --- /dev/null +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json new file mode 100644 index 0000000000..def9159a7d --- /dev/null +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/test/Templates.Test/template-baselines.json b/test/Templates.Test/template-baselines.json index 2efb384c9c..0d77abafe4 100644 --- a/test/Templates.Test/template-baselines.json +++ b/test/Templates.Test/template-baselines.json @@ -411,6 +411,20 @@ "AuthOption": "MultiOrg" } }, + "web": { + "None": { + "Template": "web", + "Arguments": "new web", + "Files": [ + "appsettings.Development.json", + "appsettings.json", + "Program.cs", + "Startup.cs", + "Properties/launchSettings.json" + ], + "AuthOption": "None" + } + }, "webapi": { "IndividualB2C": { "Template": "webapi", From 9652fbd2b438ad64415278f2224286dadebcc7ab Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Fri, 8 Jun 2018 13:56:32 -0700 Subject: [PATCH 3/8] Fix default None items not being removed from ClientApp directory Content MSBuild items from the ClientApp directory are removed from the project using an MSBuild and then all files are added as None items. None items that were added by the .NET Core SDK default MSBuild items were not being removed from the ClientApp directory. This resulted in duplicate files shown in Visual Studio for Mac. This affected all the SPA project templates. Fixes #559 --- .../Angular-CSharp.csproj.in | 1 + .../React-CSharp.csproj.in | 1 + .../ReactRedux-CSharp.csproj.in | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index e95e902c88..7902c5877a 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -28,6 +28,7 @@ + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 95dc85dbd6..89b786c2c1 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -25,6 +25,7 @@ + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index 5b6d2ee374..0b70f416ce 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -25,6 +25,7 @@ + From 9c28f95b1259d77885a1c81a80a3e60984e8f2fb Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 28 Aug 2018 09:41:15 -0700 Subject: [PATCH 4/8] Add Microsoft.AspNetCore.Razor.Design to templates (#674) --- build/dependencies.props | 1 + korebuild-lock.txt | 4 ++-- .../EmptyWeb-CSharp.csproj.in | 1 + .../Microsoft.DotNet.Web.ProjectTemplates.csproj | 1 + .../RazorPagesWeb-CSharp.csproj.in | 1 + .../StarterWeb-CSharp.csproj.in | 1 + .../WebApi-CSharp.csproj.in | 1 + .../Angular-CSharp.csproj.in | 2 ++ .../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 1 + .../React-CSharp.csproj.in | 2 ++ .../ReactRedux-CSharp.csproj.in | 2 ++ 11 files changed, 15 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 98d48d83db..a647d872e7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -23,6 +23,7 @@ 2.1.3-rtm-30913 2.1.2-rtm-30913 2.1.1 + 2.1.1 2.1.3-rtm-30913 2.1.1 2.1.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 1dfc352a0a..5c4ddc6928 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15802 -commithash:a7c08b45b440a7d2058a0aa1eaa3eb6ba811976a +version:2.1.3-rtm-15814 +commithash:6ca1b9d686c747a38a45f538ae34b99354876658 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index 0db9c70633..769cc51bb8 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -11,6 +11,7 @@ + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index 1e3b76e3e8..b068a0b34f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -24,6 +24,7 @@ MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion=$(MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion); MicrosoftAspNetCoreMvcPackageVersion=$(MicrosoftAspNetCoreMvcPackageVersion); MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion=$(MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion); + MicrosoftAspNetCoreRazorDesignPackageVersion=$(MicrosoftAspNetCoreRazorDesignPackageVersion); MicrosoftAspNetCorePackageVersion=$(MicrosoftAspNetCorePackageVersion); MicrosoftAspNetCoreStaticFilesPackageVersion=$(MicrosoftAspNetCoreStaticFilesPackageVersion); MicrosoftEntityFrameworkCoreDesignPackageVersion=$(MicrosoftEntityFrameworkCoreDesignPackageVersion); diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 4716d05f5b..dc190443c5 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -19,6 +19,7 @@ + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 2e90989e97..a053ae2edc 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -19,6 +19,7 @@ + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index b57b346386..45d3752a9d 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -16,6 +16,7 @@ + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index 020f592ccd..4919fe59bb 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -15,12 +15,14 @@ + + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index 8b2745c15a..e9821e1319 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -16,6 +16,7 @@ MicrosoftAspNetCorePackageVersion=$(MicrosoftAspNetCorePackageVersion); MicrosoftAspNetCoreHttpsPolicyPackageVersion=$(MicrosoftAspNetCoreHttpsPolicyPackageVersion); MicrosoftAspNetCoreMvcPackageVersion=$(MicrosoftAspNetCoreMvcPackageVersion); + MicrosoftAspNetCoreRazorDesignPackageVersion=$(MicrosoftAspNetCoreRazorDesignPackageVersion); MicrosoftAspNetCoreSpaServicesPackageVersion=$(MicrosoftAspNetCoreSpaServicesPackageVersion); MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion=$(MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion); MicrosoftAspNetCoreStaticFilesPackageVersion=$(MicrosoftAspNetCoreStaticFilesPackageVersion); diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 24e96c27a4..896d7a3bde 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -12,12 +12,14 @@ + + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index 82ec5a5dd2..12995468dc 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -12,12 +12,14 @@ + + From 208f6ff568db16b19723b4c9b29762f1e6967a1f Mon Sep 17 00:00:00 2001 From: Patrick Westerhoff Date: Tue, 19 Jun 2018 00:32:45 +0200 Subject: [PATCH 5/8] Fix #574: Set NoDefaultLaunchSettingsFile When a project is created with ExcludeLaunchSettings enabled, set the NoDefaultLaunchSettingsFile property to prevent Visual Studio from creating a launchSettings.json. --- .../EmptyWeb-CSharp.csproj.in | 1 + .../EmptyWeb-FSharp.fsproj.in | 1 + .../RazorPagesWeb-CSharp.csproj.in | 1 + .../StarterWeb-CSharp.csproj.in | 1 + .../StarterWeb-FSharp.fsproj.in | 1 + .../WebApi-CSharp.csproj.in | 1 + .../WebApi-FSharp.fsproj.in | 1 + .../Angular-CSharp.csproj.in | 1 + .../React-CSharp.csproj.in | 1 + .../ReactRedux-CSharp.csproj.in | 1 + 10 files changed, 10 insertions(+) diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index aec74e2333..b31f8939ab 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -3,6 +3,7 @@ netcoreapp2.2 TargetFrameworkOverride + True diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index b1607c7ff1..a9973cc245 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -3,6 +3,7 @@ netcoreapp2.2 TargetFrameworkOverride + True diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 4ea5093f58..c8110d06a4 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -7,6 +7,7 @@ full 0 1 + True diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 838f8a7d2f..3d9d787577 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -7,6 +7,7 @@ aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 + True diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 00fc13577a..e964d3e6ae 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -4,6 +4,7 @@ netcoreapp2.2 TargetFrameworkOverride true + True diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index 0b80a72843..12691edcfb 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -6,6 +6,7 @@ aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 + True diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index 28fb3993d1..b02d93c99f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -3,6 +3,7 @@ netcoreapp2.2 TargetFrameworkOverride + True diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index 7902c5877a..753dec5e25 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -8,6 +8,7 @@ false ClientApp\ $(DefaultItemExcludes);$(SpaRoot)node_modules\** + True false diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 89b786c2c1..987e3a4453 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -8,6 +8,7 @@ false ClientApp\ $(DefaultItemExcludes);$(SpaRoot)node_modules\** + True diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index 0b70f416ce..1caeb18ac0 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -8,6 +8,7 @@ false ClientApp\ $(DefaultItemExcludes);$(SpaRoot)node_modules\** + True From 75fa0cd6e84b27b28b40e96c00bc70e7f390665b Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 29 Aug 2018 15:24:12 -0700 Subject: [PATCH 6/8] Remove SpaServices where they're un-needed --- .../Angular-CSharp.csproj.in | 1 - .../React-CSharp.csproj.in | 1 - .../ReactRedux-CSharp.csproj.in | 1 - 3 files changed, 3 deletions(-) diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index ef2661f565..6756aa6ddc 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -17,7 +17,6 @@ - diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 5c0b9177da..bff0b2ca85 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -14,7 +14,6 @@ - diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index e14598532a..112d68b769 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -14,7 +14,6 @@ - From 26710080fe9fa0e18c743f66d3d649bd1e908bf5 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 29 Aug 2018 16:08:58 -0700 Subject: [PATCH 7/8] Set AspNetCoreHostingModel in templates (#716) --- .../EmptyWeb-CSharp.csproj.in | 1 + .../EmptyWeb-FSharp.fsproj.in | 1 + .../RazorPagesWeb-CSharp.csproj.in | 1 + .../StarterWeb-CSharp.csproj.in | 1 + .../StarterWeb-FSharp.fsproj.in | 1 + .../WebApi-CSharp.csproj.in | 1 + .../WebApi-FSharp.fsproj.in | 1 + 7 files changed, 7 insertions(+) diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index b646b5ebe3..336329f2e1 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -4,6 +4,7 @@ netcoreapp2.2 TargetFrameworkOverride True + inprocess diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index a9973cc245..909432c588 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -4,6 +4,7 @@ netcoreapp2.2 TargetFrameworkOverride True + inprocess diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 5f56456a57..fe3d3b1350 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -8,6 +8,7 @@ 0 1 True + inprocess diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 780cb01dfc..59dc844bd4 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -8,6 +8,7 @@ 0 1 True + inprocess diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index e964d3e6ae..6a6532bdc7 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -5,6 +5,7 @@ TargetFrameworkOverride true True + inprocess diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index a8a3d03468..52b3089b42 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -7,6 +7,7 @@ 0 1 True + inprocess diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index b02d93c99f..e581a3a001 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -4,6 +4,7 @@ netcoreapp2.2 TargetFrameworkOverride True + inprocess From afccb085a287322fd4d60f643fe04d04462f5394 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 21 Aug 2018 10:57:10 -0700 Subject: [PATCH 8/8] Fix links and formating --- scripts/.gitignore | 6 +- scripts/Custom-Hive.ps1 | 13 ++-- scripts/Minify-Scripts.ps1 | 4 +- scripts/Run-Angular-Locally.ps1 | 2 +- scripts/Run-Razor-Locally.ps1 | 2 +- scripts/Run-React-Locally.ps1 | 2 +- scripts/Run-ReactRedux-Locally.ps1 | 2 +- scripts/Run-Starterweb-Locally.ps1 | 2 +- scripts/package.json | 14 ++++ .../Pages/Shared/_Layout.cshtml | 10 +-- .../Shared/_LoginPartial.Identity.cshtml | 4 +- .../wwwroot/css/site.min.css | Bin 994 -> 1976 bytes .../Views/Shared/_Layout.cshtml | 4 +- .../wwwroot/css/site.min.css | Bin 994 -> 1976 bytes .../wwwroot/css/site.min.css | Bin 530 -> 1976 bytes .../src/app/counter/counter.component.html | 2 +- .../app/fetch-data/fetch-data.component.html | 2 +- .../src/app/nav-menu/nav-menu.component.css | 64 ++++------------- .../src/app/nav-menu/nav-menu.component.html | 36 +++++----- .../ClientApp/src/components/Counter.js | 2 +- .../ClientApp/src/components/FetchData.js | 2 +- .../ClientApp/src/components/Layout.js | 18 ++--- .../ClientApp/src/components/NavMenu.css | 65 ++++------------- .../ClientApp/src/components/NavMenu.js | 42 +++++------ .../React-CSharp/ClientApp/src/index.css | 6 -- .../React-CSharp/ClientApp/src/index.js | 1 - .../ClientApp/src/components/Counter.js | 2 +- .../ClientApp/src/components/FetchData.js | 2 +- .../ClientApp/src/components/Layout.js | 18 ++--- .../ClientApp/src/components/NavMenu.css | 68 ++++-------------- .../ClientApp/src/components/NavMenu.js | 42 ++++++----- .../ReactRedux-CSharp/ClientApp/src/index.css | 6 -- .../ReactRedux-CSharp/ClientApp/src/index.js | 1 - 33 files changed, 167 insertions(+), 277 deletions(-) create mode 100644 scripts/package.json delete mode 100644 src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/index.css delete mode 100644 src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ClientApp/src/index.css diff --git a/scripts/.gitignore b/scripts/.gitignore index 69b9ca6b59..28dd619ab6 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,4 +1,8 @@ -package.json package-lock.json tmp/ CustomHive/ +angular/ +mvc/ +razor/ +react/ +reactredux/ diff --git a/scripts/Custom-Hive.ps1 b/scripts/Custom-Hive.ps1 index f66bc12714..9e2323baa2 100644 --- a/scripts/Custom-Hive.ps1 +++ b/scripts/Custom-Hive.ps1 @@ -1,7 +1,7 @@ $customHive = "$PSScriptRoot/CustomHive" -function Test-Template($templateName, $templateNupkg, $isSPA) { - $tmpDir = "$PSScriptRoot/tmp" +function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) { + $tmpDir = "$PSScriptRoot/$templateName" Remove-Item -Path $tmpDir -Recurse -ErrorAction Ignore Create-Hive @@ -12,10 +12,10 @@ function Test-Template($templateName, $templateNupkg, $isSPA) { New-Item -ErrorAction Ignore -Path $tmpDir -ItemType Directory Push-Location $tmpDir try { - Run-DotnetNew $templateName, "--no-restore" - $csproj = "$tmpDir/tmp.csproj" + Run-DotnetNew $templateArgs, "--no-restore" + $csproj = "$tmpDir/$templateName.csproj" $csprojContent = Get-Content -Path $csproj -Raw - $csprojContent = $csprojContent -replace ('', "`n") + $csprojContent = $csprojContent -replace ('', "`n") $csprojContent | Set-Content $csproj dotnet publish @@ -49,5 +49,6 @@ function Clean-Hive() { } function Run-DotnetNew($arguments) { - dotnet new $arguments --debug:custom-hive $customHive + $expression = "dotnet new $arguments --debug:custom-hive $customHive" + Invoke-Expression $expression } diff --git a/scripts/Minify-Scripts.ps1 b/scripts/Minify-Scripts.ps1 index f46fbe0a88..6d5b3d2b55 100644 --- a/scripts/Minify-Scripts.ps1 +++ b/scripts/Minify-Scripts.ps1 @@ -26,13 +26,13 @@ foreach ($contentDir in $contentDirs) { $siteCss = Join-Path $cssFolder "site.css" $siteMinCss = Join-Path $cssFolder "site.min.css" if (Test-Path $siteCss) { - uglifycss $siteCss > $siteMinCss + npm uglifycss $siteCss > $siteMinCss } $jsFolder = Join-Path $wwwRoot "js" $siteJs = Join-Path $jsFolder "site.js" $siteMinJs = Join-Path $jsFolder "site.min.js" if (Test-Path $siteJs) { - uglifyjs $siteJs --output $siteMinJs + npm uglifyjs $siteJs --output $siteMinJs } } diff --git a/scripts/Run-Angular-Locally.ps1 b/scripts/Run-Angular-Locally.ps1 index 91d0b5ecf2..575a796ed4 100644 --- a/scripts/Run-Angular-Locally.ps1 +++ b/scripts/Run-Angular-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-preview1-t000.nupkg" $true +Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-preview2-t000.nupkg" $true diff --git a/scripts/Run-Razor-Locally.ps1 b/scripts/Run-Razor-Locally.ps1 index d3d641b565..61691987c0 100644 --- a/scripts/Run-Razor-Locally.ps1 +++ b/scripts/Run-Razor-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "razor" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-preview1-t000.nupkg" $false +Test-Template "razor" "razor -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-preview2-t000.nupkg" $false diff --git a/scripts/Run-React-Locally.ps1 b/scripts/Run-React-Locally.ps1 index 9f62dc6fa5..12e1267661 100644 --- a/scripts/Run-React-Locally.ps1 +++ b/scripts/Run-React-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-preview1-t000.nupkg" $true +Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-preview2-t000.nupkg" $true diff --git a/scripts/Run-ReactRedux-Locally.ps1 b/scripts/Run-ReactRedux-Locally.ps1 index 0a9ed50ca2..6c496cd05e 100644 --- a/scripts/Run-ReactRedux-Locally.ps1 +++ b/scripts/Run-ReactRedux-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-preview1-t000.nupkg" $true +Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-preview2-t000.nupkg" $true diff --git a/scripts/Run-Starterweb-Locally.ps1 b/scripts/Run-Starterweb-Locally.ps1 index f7d9e8cf4c..cda01aa425 100644 --- a/scripts/Run-Starterweb-Locally.ps1 +++ b/scripts/Run-Starterweb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "mvc", "-au", "Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-preview1-t000.nupkg" $false +Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-preview2-t000.nupkg" $false diff --git a/scripts/package.json b/scripts/package.json new file mode 100644 index 0000000000..54201aea0d --- /dev/null +++ b/scripts/package.json @@ -0,0 +1,14 @@ +{ + "name": "scripts", + "version": "1.0.0", + "description": "", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "dependencies": { + "uglify-js": "~3.4.7", + "uglifycss": "~0.0.29" + }, + "author": "", + "license": "ISC" +} diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml index 36563ac808..0c296caefb 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml @@ -20,7 +20,7 @@
-
+
@RenderBody()
-