diff --git a/.appveyor.yml b/.appveyor.yml index ba86366..5e0c6f4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ install: - ps: Install-Product node 8 x64 branches: only: - - dev + - master - /^release\/.*$/ - /^(.*\/)?ci-.*$/ build_script: diff --git a/.gitignore b/.gitignore index 6f6c10c..38c1bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,4 @@ node_modules .vscode global.json .idea/ -*.binlog +*.binlog \ No newline at end of file diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml index 84d17f9..da64d3f 100644 --- a/.vsts-pipelines/builds/ci-internal.yml +++ b/.vsts-pipelines/builds/ci-internal.yml @@ -7,7 +7,7 @@ resources: - repository: buildtools type: git name: aspnet-BuildTools - ref: refs/heads/release/2.2 + ref: refs/heads/master phases: - template: ../templates/project-ci.yml diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml index b75ca3b..c4e6cf5 100644 --- a/.vsts-pipelines/builds/ci-public.yml +++ b/.vsts-pipelines/builds/ci-public.yml @@ -9,7 +9,7 @@ resources: type: github endpoint: DotNet-Bot GitHub Connection name: aspnet/BuildTools - ref: refs/heads/release/2.2 + ref: refs/heads/master phases: - template: ../templates/project-ci.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64ff041..eac4268 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ Contributing ====== -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. +Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo. diff --git a/Directory.Build.targets b/Directory.Build.targets index 73b97f2..0863fc6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,9 +1,8 @@ - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) + $(MicrosoftNETCoreApp30PackageVersion) $(NETStandardLibrary20PackageVersion) 99.9 - + \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 7b2956e..b3b180c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,14 +1,201 @@ -Copyright (c) .NET Foundation and Contributors + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -All rights reserved. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at + 1. Definitions. - http://www.apache.org/licenses/LICENSE-2.0 + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) .NET Foundation and Contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index a1bfc0f..bc3d3ec 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -19,7 +19,7 @@ "Template" ] }, - "Microsoft.DotNet.Web.ProjectTemplates.2.2": { + "Microsoft.DotNet.Web.ProjectTemplates.3.0": { "packageTypes": [ "Template" ] @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/build/dependencies.props b/build/dependencies.props index 972f867..3e934ec 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,47 +4,43 @@ 0.9.9 - 2.2.0-preview3-35359 - 2.2.0-preview1-20180928.5 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-20181017.4 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 15.6.82 15.6.82 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.0.9 - 2.1.3 - 2.2.0-preview3-26927-02 - 2.2.0-preview3-35359 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-preview1-26907-05 + 3.0.0-alpha1-10620 15.6.1 - 2.2.0-preview3-35359 + 3.0.0-alpha1-10620 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.5.0 + 4.6.0-preview1-26907-04 0.10.0 2.3.1 2.4.0 diff --git a/build/repo.props b/build/repo.props index 931e807..167382e 100644 --- a/build/repo.props +++ b/build/repo.props @@ -4,13 +4,11 @@ Internal.AspNetCore.Universe.Lineup - 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - + - netcoreapp2.2 + netcoreapp3.0 Web Client-Side File Templates for Microsoft Template Engine To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. diff --git a/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj b/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj index 295513c..3476ced 100644 --- a/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 Web File Templates for Microsoft Template Engine To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index 2ffb238..95715f3 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 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 d1d8933..3226d96 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride True InProcess 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 5d61ac7..6891c01 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -3,8 +3,8 @@ - netcoreapp2.2 - Microsoft.DotNet.Web.ProjectTemplates.2.2 + netcoreapp3.0 + Microsoft.DotNet.Web.ProjectTemplates.3.0 ASP.NET Core Web Template Pack for Microsoft Template Engine To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. @@ -40,7 +40,7 @@ MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion); MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion); MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); - MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion); + MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion); MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion); diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index df5b2a3..11d8977 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d full diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index b5d58b9..0c0af68 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride full aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 4511833..56607b1 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride true True @@ -23,7 +23,6 @@ - diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index 9ca2868..7dffbad 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index e9bf8c6..054dc75 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride True InProcess 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 dd8af99..391e226 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 @@ -9,8 +9,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", - "precedence": "4000", - "identity": "Microsoft.Web.Empty.CSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.Empty.CSharp.3.0", "shortName": "web", "tags": { "language": "C#", @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -124,7 +124,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ @@ -146,4 +146,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 30348dc..5fcbabc 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 @@ -8,8 +8,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", - "precedence": "4000", - "identity": "Microsoft.Web.Empty.FSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.Empty.FSharp.3.0", "shortName": "web", "tags": { "language": "F#", @@ -95,12 +95,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ @@ -142,4 +142,4 @@ "continueOnError": true } ] -} \ 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 6a9262d..317a216 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 @@ -11,8 +11,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project for creating a Razor class library that targets .NET Standard", "groupIdentity": "Microsoft.Web.Razor", - "precedence": "4000", - "identity": "Microsoft.Web.Razor.Library.CSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.Razor.Library.CSharp.3.0", "shortName": "razorclasslib", "tags": { "language": "C#", @@ -34,11 +34,11 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "defaultValue": "netcoreapp2.2" + "defaultValue": "netcoreapp3.0" }, "HostIdentifier": { "type": "bind", @@ -84,4 +84,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 de9a5a7..b337607 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 @@ -10,8 +10,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content", "groupIdentity": "Microsoft.Web.RazorPages", - "precedence": "4000", - "identity": "Microsoft.Web.RazorPages.CSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.RazorPages.CSharp.3.0", "shortName": [ "webapp", "razor" @@ -308,7 +308,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." }, "UseLocalDB": { "type": "parameter", @@ -329,12 +329,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", 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 440408c..fbca0bd 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 @@ -9,8 +9,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", - "precedence": "4000", - "identity": "Microsoft.Web.Mvc.CSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.Mvc.CSharp.3.0", "shortName": "mvc", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { @@ -298,7 +298,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." }, "UseLocalDB": { "type": "parameter", @@ -319,12 +319,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -360,4 +360,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 bc61368..f8041a2 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 @@ -9,8 +9,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", - "precedence": "4000", - "identity": "Microsoft.Web.Mvc.FSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.Mvc.FSharp.3.0", "shortName": "mvc", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { @@ -106,12 +106,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -131,7 +131,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ @@ -153,4 +153,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 67f8851..8f6feec 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 @@ -9,8 +9,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.", "groupIdentity": "Microsoft.Web.WebApi", - "precedence": "4000", - "identity": "Microsoft.Web.WebApi.CSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.WebApi.CSharp.3.0", "shortName": "webapi", "tags": { "language": "C#", @@ -201,7 +201,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." }, "UseLocalDB": { "type": "parameter", @@ -222,12 +222,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -263,4 +263,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 8bf6f04..1591a1c 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 @@ -8,8 +8,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.", "groupIdentity": "Microsoft.Web.WebApi", - "precedence": "4000", - "identity": "Microsoft.Web.WebApi.FSharp.2.2", + "precedence": "5000", + "identity": "Microsoft.Web.WebApi.FSharp.3.0", "shortName": "webapi", "tags": { "language": "F#", @@ -95,12 +95,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ @@ -142,4 +142,4 @@ "continueOnError": true } ] -} \ 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 8c4f03a..16d4ebb 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride true Latest 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 b31f3d8..7e0c544 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 @@ -3,7 +3,7 @@ - netcoreapp2.2 + netcoreapp3.0 Single Page Application templates for ASP.NET Core To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. 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 eda4438..d9d26ad 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride true Latest 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 19b2a0b..4733a1d 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride true Latest 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 b38a66f..6445aa7 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.2.2", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.3.0", "name": "ASP.NET Core with Angular", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "HostIdentifier": { "type": "bind", @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "tags": { @@ -140,4 +140,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 fcc131c..19853a8 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.2.2", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.3.0", "name": "ASP.NET Core with React.js", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "HostIdentifier": { "type": "bind", @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "tags": { @@ -140,4 +140,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 cb404dd..a9e0e78 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.2.2", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.3.0", "name": "ASP.NET Core with React.js and Redux", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "HostIdentifier": { "type": "bind", @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "tags": { @@ -140,4 +140,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} diff --git a/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj b/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj index 3f1d65e..ca9253c 100644 --- a/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj +++ b/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj @@ -1,6 +1,6 @@ - netcoreapp2.2 + netcoreapp3.0 DotnetToolReference @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/test/Templates.Test/Helpers/AspNetProcess.cs b/test/Templates.Test/Helpers/AspNetProcess.cs index d307c36..e584efe 100644 --- a/test/Templates.Test/Helpers/AspNetProcess.cs +++ b/test/Templates.Test/Helpers/AspNetProcess.cs @@ -18,7 +18,7 @@ namespace Templates.Test.Helpers { public class AspNetProcess : IDisposable { - private const string DefaultFramework = "netcoreapp2.2"; + private const string DefaultFramework = "netcoreapp3.0"; private const string ListeningMessagePrefix = "Now listening on: "; private static int Port = 5000 + new Random().Next(3000); diff --git a/test/Templates.Test/MvcTemplateTest.cs b/test/Templates.Test/MvcTemplateTest.cs index bc0d608..68ef61e 100644 --- a/test/Templates.Test/MvcTemplateTest.cs +++ b/test/Templates.Test/MvcTemplateTest.cs @@ -37,7 +37,7 @@ namespace Templates.Test public void MvcTemplate_NoAuth_Works_NetCore_ForDefaultTemplate() => MvcTemplate_NoAuthImpl(null, languageOverride: default); - [Fact] + [Fact(Skip = "https://github.com/aspnet/Templating/issues/673")] public void MvcTemplate_NoAuth_Works_NetCore_ForFSharpTemplate() => MvcTemplate_NoAuthImpl(null, languageOverride: "F#"); diff --git a/test/Templates.Test/Templates.Test.csproj b/test/Templates.Test/Templates.Test.csproj index 10f46cd..6b21d43 100644 --- a/test/Templates.Test/Templates.Test.csproj +++ b/test/Templates.Test/Templates.Test.csproj @@ -1,7 +1,10 @@  - netcoreapp2.2 + netcoreapp3.0 $(DefineConstants);XPLAT + + + $(DefineConstants);NETCOREAPP2_2 @@ -32,7 +35,7 @@ <_Parameter1>DotNetEfFullPath - <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp2.2/any/dotnet-ef.dll + <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.0/any/dotnet-ef.dll diff --git a/version.props b/version.props index 2fc7711..bfb9ede 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - + - 2.2.0 - rtm + 3.0.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000