diff --git a/build/dependencies.props b/build/dependencies.props index 977db78948..e7c8a05fc7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -36,7 +36,6 @@ 2.1.0-preview1-28163 2.1.0-preview1-28163 2.1.0-preview1-28163 - 2.0.0 0.19.0 3.7.0 16.16299.0 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index 76ce08321e..2146fd4d24 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -3,8 +3,6 @@ netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp21PackageVersion} - ${NETStandardLibraryPackageVersion} diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index 82453e4d8e..e6d8afc8d4 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -3,8 +3,6 @@ netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp21PackageVersion} - ${NETStandardLibraryPackageVersion} 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 b9133c5854..ead011a142 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -33,8 +33,6 @@ MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion); MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion); MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion); - MicrosoftNETCoreApp21PackageVersion=$(MicrosoftNETCoreApp21PackageVersion); - NETStandardLibraryPackageVersion=$(NETStandardLibraryPackageVersion); diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 979955efc8..93cc67fc3c 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -3,8 +3,6 @@ netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp21PackageVersion} - ${NETStandardLibraryPackageVersion} aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d 0 1 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 4f518056bf..5dbb7eeeb5 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -3,8 +3,6 @@ netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp21PackageVersion} - ${NETStandardLibraryPackageVersion} aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 0b7d388318..825793ae3a 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -3,8 +3,6 @@ netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp21PackageVersion} - ${NETStandardLibraryPackageVersion} true diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index 7f396d567b..82705eed0c 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -3,9 +3,6 @@ netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp21PackageVersion} - ${NETStandardLibraryPackageVersion} - aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index 5b328d9730..dc545b1de0 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -3,8 +3,6 @@ netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp21PackageVersion} - ${NETStandardLibraryPackageVersion} 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 e1764c72e9..a940b60e9b 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 @@ -22,11 +22,6 @@ "ExcludeLaunchSettings": { "longName": "exclude-launch-settings", "shortName": "" - }, - "RuntimeFrameworkVersion": { - "longName": "runtime-framework-version", - "shortName": "fv", - "isHidden": "true" } }, "usageExamples": [ 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 855e21cfba..46c7ff779f 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 @@ -41,12 +41,6 @@ } ], "symbols": { - "RuntimeFrameworkVersion": { - "type": "parameter", - "replaces": "2.1.0-preview2-25624-02", - "datatype": "string", - "defaultValue": "2.1.0-preview2-25624-02" - }, "ExcludeLaunchSettings": { "type": "parameter", "datatype": "bool", 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 c5d4c2f7a4..497dcf2578 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 @@ -22,11 +22,6 @@ "ExcludeLaunchSettings": { "longName": "exclude-launch-settings", "shortName": "" - }, - "RuntimeFrameworkVersion": { - "longName": "runtime-framework-version", - "shortName": "fv", - "isHidden": "true" } }, "usageExamples": [ 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 2be09b46da..6c97a26ac3 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 @@ -37,12 +37,6 @@ } ], "symbols": { - "RuntimeFrameworkVersion": { - "type": "parameter", - "replaces": "2.1.0-preview2-25624-02", - "datatype": "string", - "defaultValue": "2.1.0-preview2-25624-02" - }, "ExcludeLaunchSettings": { "type": "parameter", "datatype": "bool", 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 aeff794dfa..ac0e6c406f 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 @@ -76,11 +76,6 @@ "UseBrowserLink": { "longName": "use-browserlink", "shortName": "" - }, - "RuntimeFrameworkVersion": { - "longName": "runtime-framework-version", - "shortName": "fv", - "isHidden": "true" } }, "usageExamples": [ 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 39e8cfbcea..8fc0011b1d 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 @@ -89,12 +89,6 @@ } ], "symbols": { - "RuntimeFrameworkVersion": { - "type": "parameter", - "replaces": "2.1.0-preview2-25624-02", - "datatype": "string", - "defaultValue": "2.1.0-preview2-25624-02" - }, "auth": { "type": "parameter", "datatype": "choice", 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 414c2aa60f..f028268165 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 @@ -76,11 +76,6 @@ "UseBrowserLink": { "longName": "use-browserlink", "shortName": "" - }, - "RuntimeFrameworkVersion": { - "longName": "runtime-framework-version", - "shortName": "fv", - "isHidden": "true" } }, "usageExamples": [ 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 299446e972..160ea0313c 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 @@ -84,12 +84,6 @@ } ], "symbols": { - "RuntimeFrameworkVersion": { - "type": "parameter", - "replaces": "2.1.0-preview2-25624-02", - "datatype": "string", - "defaultValue": "2.1.0-preview2-25624-02" - }, "auth": { "type": "parameter", "datatype": "choice", 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 382744612d..db799ba1a4 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 @@ -22,11 +22,6 @@ "skipRestore": { "longName": "no-restore", "shortName": "" - }, - "RuntimeFrameworkVersion": { - "longName": "runtime-framework-version", - "shortName": "fv", - "isHidden": "true" } }, "usageExamples": [ 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 4e7c28308b..5bef8764fd 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 @@ -38,12 +38,6 @@ } ], "symbols": { - "RuntimeFrameworkVersion": { - "type": "parameter", - "replaces": "2.1.0-preview2-25624-02", - "datatype": "string", - "defaultValue": "2.1.0-preview2-25624-02" - }, "ExcludeLaunchSettings": { "type": "parameter", "datatype": "bool", 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 74aa3d3988..3120978438 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 @@ -56,11 +56,6 @@ }, "UserSecretsId": { "isHidden": true - }, - "RuntimeFrameworkVersion": { - "longName": "runtime-framework-version", - "shortName": "fv", - "isHidden": "true" } }, "usageExamples": [ 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 5152217c94..fadd9c9aac 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 @@ -62,12 +62,6 @@ } ], "symbols": { - "RuntimeFrameworkVersion": { - "type": "parameter", - "replaces": "2.1.0-preview2-25624-02", - "datatype": "string", - "defaultValue": "2.1.0-preview2-25624-02" - }, "auth": { "type": "parameter", "datatype": "choice", 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 382744612d..db799ba1a4 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 @@ -22,11 +22,6 @@ "skipRestore": { "longName": "no-restore", "shortName": "" - }, - "RuntimeFrameworkVersion": { - "longName": "runtime-framework-version", - "shortName": "fv", - "isHidden": "true" } }, "usageExamples": [ 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 7f4e679d08..1464b4165d 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 @@ -83,12 +83,6 @@ }, "replaces": "44300" }, - "RuntimeFrameworkVersion": { - "type": "parameter", - "replaces": "2.1.0-preview2-25624-02", - "datatype": "string", - "defaultValue": "2.1.0-preview2-25624-02" - }, "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework",