diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index bc9925bd64..4d320f968b 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -1,18 +1,14 @@  - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 True - InProcess + InProcess Company.WebApplication1 - + - - - diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index 3226d9683d..b0b291a64c 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -1,10 +1,9 @@  - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 True - InProcess + InProcess Company.WebApplication1 @@ -13,11 +12,8 @@ - + - - - diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 485062415d..0c784fc4ac 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -1,14 +1,12 @@ - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d - full 0 1 True - InProcess + InProcess Company.WebApplication1 @@ -19,27 +17,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index a7d70433eb..218be09fc2 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -1,14 +1,12 @@ - netcoreapp3.0 - TargetFrameworkOverride - full + netcoreapp3.0 aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 True - InProcess + InProcess Company.WebApplication1 @@ -19,27 +17,11 @@ - + - - - - - - - - - - - - - - - - - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 56607b1b3e..01aed3286d 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -1,11 +1,10 @@  - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 true True - InProcess + InProcess Company.WebApplication1 @@ -16,15 +15,8 @@ - + - - - - - - - diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index e5a2f4579f..28bf838648 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -1,27 +1,19 @@  - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 True - InProcess + InProcess Company.WebApplication1 - + - - - - - - - diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index 054dc75872..d3673b71f8 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -1,10 +1,9 @@  - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 True - InProcess + InProcess Company.WebApplication1 @@ -14,13 +13,8 @@ - + - - - - - diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json index 23f780ef98..79c2dc39e3 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework" }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json index 391e226158..2a6cd28774 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json @@ -24,12 +24,6 @@ "sources": [ { "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ @@ -86,13 +80,6 @@ }, "replaces": "44300" }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/app.config b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/dotnetcli.host.json index 9365baf180..2bfb0f6145 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework" }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json index 5fcbabce05..53429c688e 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json @@ -20,12 +20,6 @@ "sources": [ { "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ @@ -82,13 +76,6 @@ }, "replaces": "44300" }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/app.config b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/dotnetcli.host.json index a0e1462eeb..709f1b9629 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": true, - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework", "isHidden": true @@ -16,4 +11,3 @@ } } } -g \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json index 317a21659f..47000e198f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json @@ -21,13 +21,6 @@ "sourceName": "Company.RazorClassLibrary1", "preferNameDirectory": true, "symbols": { - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json index 1c0577ddb9..c39487b527 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "UseLocalDB": { "longName": "use-local-db" }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json index 1b4dab9bb2..183dda3ce7 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -33,12 +33,6 @@ "wwwroot/**" ], "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(!OrganizationalAuth && !IndividualAuth)", "exclude": [ @@ -310,13 +304,6 @@ "defaultValue": "false", "description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified." }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/app.config b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json index b846ff9c1d..2473827568 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "UseLocalDB": { "longName": "use-local-db" }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json index 0856719e73..7c6e019f41 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json @@ -29,12 +29,6 @@ "wwwroot/**" ], "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(!OrganizationalAuth && !IndividualAuth)", "exclude": [ @@ -300,13 +294,6 @@ "defaultValue": "false", "description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified." }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/app.config b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/dotnetcli.host.json index 3ea30fe564..6ac35c7a98 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/dotnetcli.host.json @@ -11,11 +11,6 @@ "longName": "exclude-launch-settings", "shortName": "" }, - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework" }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json index c156705918..7754fab903 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json @@ -25,12 +25,6 @@ "wwwroot/**" ], "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ @@ -87,13 +81,6 @@ }, "replaces": "44300" }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/app.config b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/dotnetcli.host.json index 5922b1d611..bf0d126f92 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "UseLocalDB": { "longName": "use-local-db" }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json index 8f6feec3db..4b824973b0 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json @@ -25,12 +25,6 @@ "sources": [ { "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(windir == 'C:\\Windows')", "exclude": [ @@ -209,13 +203,6 @@ "defaultValue": "false", "description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified." }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/app.config b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/dotnetcli.host.json index 3ea30fe564..6ac35c7a98 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/dotnetcli.host.json @@ -11,11 +11,6 @@ "longName": "exclude-launch-settings", "shortName": "" }, - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework" }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json index 1591a1c0e7..8252e60567 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json @@ -20,12 +20,6 @@ "sources": [ { "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ @@ -82,13 +76,6 @@ }, "replaces": "44300" }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/app.config b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file 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 f48d2b844a..f93f5d8318 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -1,8 +1,7 @@ - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 true Latest false @@ -15,17 +14,9 @@ Company.WebApplication1 - + - - - - - - - - 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 2b3f5b1eed..21b28dff48 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -1,8 +1,7 @@ - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 true Latest false @@ -12,17 +11,9 @@ Company.WebApplication1 - + - - - - - - - - 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 11821b6858..2763c4de1c 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -1,8 +1,7 @@ - netcoreapp3.0 - TargetFrameworkOverride + netcoreapp3.0 true Latest false @@ -12,17 +11,9 @@ Company.WebApplication1 - + - - - - - - - - diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/dotnetcli.host.json index 066179f4f4..d998d56bc4 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework" }, 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 6445aa79ea..578b63884e 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 @@ -24,12 +24,6 @@ ".template.config/**" ], "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ @@ -86,13 +80,6 @@ }, "replaces": "44300" }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/app.config b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/dotnetcli.host.json index 066179f4f4..d998d56bc4 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework" }, 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 19853a8678..9b8d7256ff 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 @@ -24,12 +24,6 @@ ".template.config/**" ], "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ @@ -86,13 +80,6 @@ }, "replaces": "44300" }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/app.config b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/dotnetcli.host.json index 5fcb131918..478b62db39 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/dotnetcli.host.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/dotnetcli.host.json @@ -1,11 +1,6 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { - "TargetFrameworkOverride": { - "isHidden": "true", - "longName": "target-framework-override", - "shortName": "" - }, "Framework": { "longName": "framework" }, 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 a9e0e788cc..660c888df4 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 @@ -24,12 +24,6 @@ ".template.config/**" ], "modifiers": [ - { - "condition": "(TargetFrameworkOverride == '')", - "exclude": [ - "app.config" - ] - }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ @@ -86,13 +80,6 @@ }, "replaces": "44300" }, - "TargetFrameworkOverride": { - "type": "parameter", - "description": "Overrides the target framework", - "replaces": "TargetFrameworkOverride", - "datatype": "string", - "defaultValue": "" - }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/app.config b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/app.config deleted file mode 100644 index a6ad828311..0000000000 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/test/Templates.Test/EmptyWebTemplateTest.cs b/test/Templates.Test/EmptyWebTemplateTest.cs index 08873b6362..9bb8cd5dcc 100644 --- a/test/Templates.Test/EmptyWebTemplateTest.cs +++ b/test/Templates.Test/EmptyWebTemplateTest.cs @@ -13,23 +13,14 @@ namespace Templates.Test { } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public void EmptyWebTemplate_Works_NetFramework() - => EmptyWebTemplateImpl("net461"); - [Fact] - public void EmptyWebTemplate_Works_NetCore() - => EmptyWebTemplateImpl(null); - - private void EmptyWebTemplateImpl(string targetFrameworkOverride) + public void EmptyWebTemplate() { - RunDotNetNew("web", targetFrameworkOverride); + RunDotNetNew("web"); foreach (var publish in new[] { false, true }) { - using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish)) + using (var aspNetProcess = StartAspNetProcess(publish)) { aspNetProcess.AssertOk("/"); } diff --git a/test/Templates.Test/Helpers/AspNetProcess.cs b/test/Templates.Test/Helpers/AspNetProcess.cs index e584efea59..c6d3c3b2f2 100644 --- a/test/Templates.Test/Helpers/AspNetProcess.cs +++ b/test/Templates.Test/Helpers/AspNetProcess.cs @@ -27,7 +27,7 @@ namespace Templates.Test.Helpers private readonly HttpClient _httpClient; private readonly ITestOutputHelper _output; - public AspNetProcess(ITestOutputHelper output, string workingDirectory, string projectName, string targetFrameworkOverride, bool publish) + public AspNetProcess(ITestOutputHelper output, string workingDirectory, string projectName, bool publish) { _output = output; _httpClient = new HttpClient(new HttpClientHandler() @@ -41,7 +41,6 @@ namespace Templates.Test.Helpers var now = DateTimeOffset.Now; new CertificateManager().EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1)); - var framework = string.IsNullOrEmpty(targetFrameworkOverride) ? DefaultFramework : targetFrameworkOverride; if (publish) { output.WriteLine("Publishing ASP.NET application..."); @@ -53,7 +52,7 @@ namespace Templates.Test.Helpers ProcessEx .Run(output, workingDirectory, DotNetMuxer.MuxerPathOrDefault(), $"publish -c Release {extraArgs}") .WaitForExit(assertSuccess: true); - workingDirectory = Path.Combine(workingDirectory, "bin", "Release", framework, "publish"); + workingDirectory = Path.Combine(workingDirectory, "bin", "Release", DefaultFramework, "publish"); if (File.Exists(Path.Combine(workingDirectory, "ClientApp", "package.json"))) { Npm.RestoreWithRetry(output, Path.Combine(workingDirectory, "ClientApp")); @@ -78,24 +77,10 @@ namespace Templates.Test.Helpers } output.WriteLine("Running ASP.NET application..."); - if (framework.StartsWith("netcore")) - { - var dllPath = publish ? $"{projectName}.dll" : $"bin/Debug/{framework}/{projectName}.dll"; - _process = ProcessEx.Run(output, workingDirectory, DotNetMuxer.MuxerPathOrDefault(), $"exec {dllPath}", envVars: envVars); - _listeningUri = GetListeningUri(output); - } - else - { - var exeFullPath = publish - ? Path.Combine(workingDirectory, $"{projectName}.exe") - : Path.Combine(workingDirectory, "bin", "Debug", framework, $"{projectName}.exe"); - using (new AddFirewallExclusion(exeFullPath)) - { - _process = ProcessEx.Run(output, workingDirectory, exeFullPath, envVars: envVars); - _listeningUri = GetListeningUri(output); - } - } + var dllPath = publish ? $"{projectName}.dll" : $"bin/Debug/{DefaultFramework}/{projectName}.dll"; + _process = ProcessEx.Run(output, workingDirectory, DotNetMuxer.MuxerPathOrDefault(), $"exec {dllPath}", envVars: envVars); + _listeningUri = GetListeningUri(output); } public void VisitInBrowser(IWebDriver driver) diff --git a/test/Templates.Test/Helpers/TemplateTestBase.cs b/test/Templates.Test/Helpers/TemplateTestBase.cs index 88a24c8f4e..67c1ef7b13 100644 --- a/test/Templates.Test/Helpers/TemplateTestBase.cs +++ b/test/Templates.Test/Helpers/TemplateTestBase.cs @@ -59,17 +59,12 @@ $@" File.WriteAllText(Path.Combine(TemplateOutputDir, "Directory.Build.targets"), directoryBuildTargetsContent); } - protected void RunDotNetNew(string templateName, string targetFrameworkOverride, string auth = null, string language = null, bool useLocalDB = false, bool noHttps = false) + protected void RunDotNetNew(string templateName, string auth = null, string language = null, bool useLocalDB = false, bool noHttps = false) { SetAfterDirectoryBuildPropsContents(); var args = $"new {templateName} --debug:custom-hive \"{TemplatePackageInstaller.CustomHivePath}\""; - if (!string.IsNullOrEmpty(targetFrameworkOverride)) - { - args += $" --target-framework-override {targetFrameworkOverride}"; - } - if (!string.IsNullOrEmpty(auth)) { args += $" --auth {auth}"; @@ -214,9 +209,9 @@ $@" return File.ReadAllText(Path.Combine(TemplateOutputDir, path)); } - protected AspNetProcess StartAspNetProcess(string targetFrameworkOverride, bool publish = false) + protected AspNetProcess StartAspNetProcess(bool publish = false) { - return new AspNetProcess(Output, TemplateOutputDir, ProjectName, targetFrameworkOverride, publish); + return new AspNetProcess(Output, TemplateOutputDir, ProjectName, publish); } public void Dispose() diff --git a/test/Templates.Test/MvcTemplateTest.cs b/test/Templates.Test/MvcTemplateTest.cs index 68ef61e1d7..97ac398c52 100644 --- a/test/Templates.Test/MvcTemplateTest.cs +++ b/test/Templates.Test/MvcTemplateTest.cs @@ -13,37 +13,12 @@ namespace Templates.Test { } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void MvcTemplate_NoAuth_Works_NetFramework_ForDefaultTemplate() - => MvcTemplate_NoAuthImpl("net461", languageOverride: default); - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void MvcTemplate_NoAuth_Works_NetFramework_ForFSharpTemplate() - => MvcTemplate_NoAuthImpl("net461", languageOverride: "F#"); - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void MvcTemplate_NoAuth_NoHttps_Works_NetFramework_ForDefaultTemplate() - => MvcTemplate_NoAuthImpl("net461", languageOverride: default, true); - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void MvcTemplate_NoAuth_NoHttps_Works_NetFramework_ForFSharpTemplate() - => MvcTemplate_NoAuthImpl("net461", languageOverride: "F#", true); - - [Fact] - public void MvcTemplate_NoAuth_Works_NetCore_ForDefaultTemplate() - => MvcTemplate_NoAuthImpl(null, languageOverride: default); - - [Fact(Skip = "https://github.com/aspnet/Templating/issues/673")] - public void MvcTemplate_NoAuth_Works_NetCore_ForFSharpTemplate() - => MvcTemplate_NoAuthImpl(null, languageOverride: "F#"); - - private void MvcTemplate_NoAuthImpl(string targetFrameworkOverride, string languageOverride, bool noHttps = false) + [Theory] + [InlineData(null)] + [InlineData("F#", Skip = "https://github.com/aspnet/Templating/issues/673")] + private void MvcTemplate_NoAuthImpl(string languageOverride) { - RunDotNetNew("mvc", targetFrameworkOverride, language: languageOverride, noHttps: noHttps); + RunDotNetNew("mvc", language: languageOverride); AssertDirectoryExists("Areas", false); AssertDirectoryExists("Extensions", false); @@ -58,21 +33,9 @@ namespace Templates.Test Assert.DoesNotContain("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents); Assert.DoesNotContain("Microsoft.Extensions.SecretManager.Tools", projectFileContents); - if (targetFrameworkOverride != null) - { - if (noHttps) - { - Assert.DoesNotContain("Microsoft.AspNetCore.HttpsPolicy", projectFileContents); - } - else - { - Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents); - } - } - foreach (var publish in new[] { false, true }) { - using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish)) + using (var aspNetProcess = StartAspNetProcess(publish)) { aspNetProcess.AssertOk("/"); aspNetProcess.AssertOk("/Home/Privacy"); @@ -80,27 +43,12 @@ namespace Templates.Test } } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void MvcTemplate_IndividualAuth_Works_NetFramework() - => MvcTemplate_IndividualAuthImpl("net461"); - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void MvcTemplate_WithIndividualAuth_NoHttpsSetToTrue_UsesHttps_NetFramework() - => MvcTemplate_IndividualAuthImpl("net461", false, true); - - [Fact] - public void MvcTemplate_IndividualAuth_Works_NetCore() - => MvcTemplate_IndividualAuthImpl(null); - - [Fact] - public void MvcTemplate_IndividualAuth_UsingLocalDB_Works_NetCore() - => MvcTemplate_IndividualAuthImpl(null, true); - - private void MvcTemplate_IndividualAuthImpl(string targetFrameworkOverride, bool useLocalDB = false, bool noHttps = false) + [Theory] + [InlineData(true)] + [InlineData(false)] + public void MvcTemplate_IndividualAuthImpl(bool useLocalDB) { - RunDotNetNew("mvc", targetFrameworkOverride, auth: "Individual", useLocalDB: useLocalDB); + RunDotNetNew("mvc", auth: "Individual", useLocalDB: useLocalDB); AssertDirectoryExists("Extensions", false); AssertFileExists("urlRewrite.config", false); @@ -112,18 +60,13 @@ namespace Templates.Test Assert.Contains(".db", projectFileContents); } - if (targetFrameworkOverride != null) - { - Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents); - } - RunDotNetEfCreateMigration("mvc"); AssertEmptyMigration("mvc"); foreach (var publish in new[] { false, true }) { - using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish)) + using (var aspNetProcess = StartAspNetProcess(publish)) { aspNetProcess.AssertOk("/"); aspNetProcess.AssertOk("/Home/Privacy"); diff --git a/test/Templates.Test/RazorPagesTemplateTest.cs b/test/Templates.Test/RazorPagesTemplateTest.cs index d5e985afde..abb3357be0 100644 --- a/test/Templates.Test/RazorPagesTemplateTest.cs +++ b/test/Templates.Test/RazorPagesTemplateTest.cs @@ -13,23 +13,10 @@ namespace Templates.Test { } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void RazorPagesTemplate_NoAuth_Works_NetFramework() - => RazorPagesTemplate_NoAuthImpl("net461"); - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void RazorPagesTemplate_NoAuth_NoHttps_Works_NetFramework() - => RazorPagesTemplate_NoAuthImpl("net461", true); - [Fact] - public void RazorPagesTemplate_NoAuth_Works_NetCore() - => RazorPagesTemplate_NoAuthImpl(null); - - private void RazorPagesTemplate_NoAuthImpl(string targetFrameworkOverride, bool noHttps = false) + private void RazorPagesTemplate_NoAuthImpl() { - RunDotNetNew("razor", targetFrameworkOverride, noHttps: noHttps); + RunDotNetNew("razor"); AssertFileExists("Pages/Shared/_LoginPartial.cshtml", false); @@ -40,21 +27,9 @@ namespace Templates.Test Assert.DoesNotContain("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents); Assert.DoesNotContain("Microsoft.Extensions.SecretManager.Tools", projectFileContents); - if (targetFrameworkOverride != null) - { - if (noHttps) - { - Assert.DoesNotContain("Microsoft.AspNetCore.HttpsPolicy", projectFileContents); - } - else - { - Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents); - } - } - foreach (var publish in new[] { false, true }) { - using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish)) + using (var aspNetProcess = StartAspNetProcess(publish)) { aspNetProcess.AssertOk("/"); aspNetProcess.AssertOk("/Privacy"); @@ -62,27 +37,12 @@ namespace Templates.Test } } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void RazorPagesTemplate_IndividualAuth_Works_NetFramework() - => RazorPagesTemplate_IndividualAuthImpl("net461"); - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void RazorPagesTemplate_WithIndividualAuth_NoHttpsSetToTrue_UsesHttps_NetFramework() - => RazorPagesTemplate_IndividualAuthImpl("net461", false, true); - - [Fact] - public void RazorPagesTemplate_IndividualAuth_Works_NetCore() - => RazorPagesTemplate_IndividualAuthImpl(null); - - [Fact] - public void RazorPagesTemplate_IndividualAuth_UsingLocalDB_Works_NetCore() - => RazorPagesTemplate_IndividualAuthImpl(null, true); - - private void RazorPagesTemplate_IndividualAuthImpl(string targetFrameworkOverride, bool useLocalDB = false, bool noHttps = false) + [Theory] + [InlineData(false)] + [InlineData(true)] + public void RazorPagesTemplate_IndividualAuthImpl( bool useLocalDB) { - RunDotNetNew("razor", targetFrameworkOverride, auth: "Individual", useLocalDB: useLocalDB); + RunDotNetNew("razor", auth: "Individual", useLocalDB: useLocalDB); AssertFileExists("Pages/Shared/_LoginPartial.cshtml", true); @@ -92,18 +52,13 @@ namespace Templates.Test Assert.Contains(".db", projectFileContents); } - if (targetFrameworkOverride != null) - { - Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents); - } - RunDotNetEfCreateMigration("razorpages"); AssertEmptyMigration("razorpages"); foreach (var publish in new[] { false, true }) { - using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish)) + using (var aspNetProcess = StartAspNetProcess(publish)) { aspNetProcess.AssertOk("/"); aspNetProcess.AssertOk("/Privacy"); diff --git a/test/Templates.Test/SpaTemplateTest/AngularTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/AngularTemplateTest.cs index 0123a5b0d3..7174652127 100644 --- a/test/Templates.Test/SpaTemplateTest/AngularTemplateTest.cs +++ b/test/Templates.Test/SpaTemplateTest/AngularTemplateTest.cs @@ -15,20 +15,8 @@ namespace Templates.Test.SpaTemplateTest { } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - // Just use 'angular' as representative for .NET 4.6.1 coverage, as - // the client-side code isn't affected by the .NET runtime choice - public void AngularTemplate_Works_NetFramework() - => SpaTemplateImpl("net461", "angular"); - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - public void AngularTemplate_NoHttps_Works_NetFramework() - => SpaTemplateImpl("net461", "angular", true); - [Fact] - public void AngularTemplate_Works_NetCore() - => SpaTemplateImpl(null, "angular"); + public void AngularTemplate_Works() + => SpaTemplateImpl("angular"); } } diff --git a/test/Templates.Test/SpaTemplateTest/ReactReduxTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/ReactReduxTemplateTest.cs index 64ed4dda72..6386432ea0 100644 --- a/test/Templates.Test/SpaTemplateTest/ReactReduxTemplateTest.cs +++ b/test/Templates.Test/SpaTemplateTest/ReactReduxTemplateTest.cs @@ -16,6 +16,6 @@ namespace Templates.Test.SpaTemplateTest [Fact] public void ReactReduxTemplate_Works_NetCore() - => SpaTemplateImpl(null, "reactredux"); + => SpaTemplateImpl("reactredux"); } } diff --git a/test/Templates.Test/SpaTemplateTest/ReactTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/ReactTemplateTest.cs index b46aa382c5..ef73344f05 100644 --- a/test/Templates.Test/SpaTemplateTest/ReactTemplateTest.cs +++ b/test/Templates.Test/SpaTemplateTest/ReactTemplateTest.cs @@ -16,6 +16,6 @@ namespace Templates.Test.SpaTemplateTest [Fact] public void ReactTemplate_Works_NetCore() - => SpaTemplateImpl(null, "react"); + => SpaTemplateImpl("react"); } } diff --git a/test/Templates.Test/SpaTemplateTest/SpaTemplateTestBase.cs b/test/Templates.Test/SpaTemplateTest/SpaTemplateTestBase.cs index ac35d63a32..6d21ddacd9 100644 --- a/test/Templates.Test/SpaTemplateTest/SpaTemplateTestBase.cs +++ b/test/Templates.Test/SpaTemplateTest/SpaTemplateTestBase.cs @@ -25,9 +25,9 @@ namespace Templates.Test.SpaTemplateTest // Rather than using [Theory] to pass each of the different values for 'template', // it's important to distribute the SPA template tests over different test classes // so they can be run in parallel. Xunit doesn't parallelize within a test class. - protected void SpaTemplateImpl(string targetFrameworkOverride, string template, bool noHttps = false) + protected void SpaTemplateImpl(string template, bool noHttps = false) { - RunDotNetNew(template, targetFrameworkOverride, noHttps: noHttps); + RunDotNetNew(template, noHttps: noHttps); // For some SPA templates, the NPM root directory is './ClientApp'. In other // templates it's at the project root. Strictly speaking we shouldn't have @@ -41,13 +41,13 @@ namespace Templates.Test.SpaTemplateTest Npm.RestoreWithRetry(Output, clientAppSubdirPath); Npm.Test(Output, clientAppSubdirPath); - TestApplication(targetFrameworkOverride, publish: false); - TestApplication(targetFrameworkOverride, publish: true); + TestApplication(publish: false); + TestApplication(publish: true); } - private void TestApplication(string targetFrameworkOverride, bool publish) + private void TestApplication(bool publish) { - using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish)) + using (var aspNetProcess = StartAspNetProcess(publish)) { aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html"); diff --git a/test/Templates.Test/Templates.Test.csproj b/test/Templates.Test/Templates.Test.csproj index 6b21d43f02..f469b0ae2c 100644 --- a/test/Templates.Test/Templates.Test.csproj +++ b/test/Templates.Test/Templates.Test.csproj @@ -2,9 +2,6 @@ netcoreapp3.0 $(DefineConstants);XPLAT - - - $(DefineConstants);NETCOREAPP2_2 diff --git a/test/Templates.Test/WebApiTemplateTest.cs b/test/Templates.Test/WebApiTemplateTest.cs index c7ca5be7bc..06c6ba58b4 100644 --- a/test/Templates.Test/WebApiTemplateTest.cs +++ b/test/Templates.Test/WebApiTemplateTest.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -13,23 +12,14 @@ namespace Templates.Test { } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public void WebApiTemplate_Works_NetFramework() - => WebApiTemplateImpl("net461"); - [Fact] - public void WebApiTemplate_Works_NetCore() - => WebApiTemplateImpl(null); - - private void WebApiTemplateImpl(string targetFrameworkOverride) + public void WebApiTemplate() { - RunDotNetNew("webapi", targetFrameworkOverride); + RunDotNetNew("webapi"); foreach (var publish in new[] { false, true }) { - using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish)) + using (var aspNetProcess = StartAspNetProcess(publish)) { aspNetProcess.AssertOk("/api/values"); aspNetProcess.AssertNotFound("/");