diff --git a/Directory.Build.targets b/Directory.Build.targets
index 9a6821f5e3..4bcc9df925 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,10 +1,8 @@
- $(MicrosoftNETCoreApp20PackageVersion)
- $(MicrosoftNETCoreApp21PackageVersion)
- $(MicrosoftNETCoreApp22PackageVersion)
+ $(MicrosoftNETCoreApp30PackageVersion)
$(NETStandardLibrary20PackageVersion)
99.9
-
\ No newline at end of file
+
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index a1bfc0f1c5..bc3d3ec447 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 a8bb50f8ac..34cea5caf5 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -33,9 +33,7 @@
2.2.0-preview1-34530
2.2.0-preview1-34530
2.2.0-preview1-34530
- 2.0.0
- 2.1.0
- 2.2.0-preview1-26618-02
+ 2.2.0-preview1-26618-02
2.2.0-preview1-34530
15.6.1
2.2.0-preview1-34530
diff --git a/build/repo.props b/build/repo.props
index de6ed02ca5..f31319821d 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,8 +8,7 @@
-
-
+
- netcoreapp2.2
+ netcoreapp3.0
Web Client-Side File Templates for Microsoft Template Engine
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 c789a961e6..66041173c3 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
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
index ba9103aa17..afebc28397 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
@@ -1,15 +1,15 @@
- netcoreapp2.2
+ netcoreapp3.0
TargetFrameworkOverride
99.9
- ${MicrosoftNETCoreApp22PackageVersion}
+ ${MicrosoftNETCoreApp30PackageVersion}
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in
index 4491281d5f..fe5b75b11a 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in
@@ -1,15 +1,15 @@
- netcoreapp2.2
+ netcoreapp3.0
TargetFrameworkOverride
99.9
- ${MicrosoftNETCoreApp22PackageVersion}
+ ${MicrosoftNETCoreApp30PackageVersion}
-
+
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 ab46f63cd9..ac56dc261a 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
@@ -32,7 +32,7 @@
MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);
MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion);
MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion);
- MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion);
+ MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);
MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion);
MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion);
MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion);
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
index 1837cfec18..98955e555d 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
@@ -9,11 +9,11 @@
1
99.9
- ${MicrosoftNETCoreApp22PackageVersion}
+ ${MicrosoftNETCoreApp30PackageVersion}
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
index e5d4c7cbee..8c87ef713f 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
@@ -9,11 +9,11 @@
1
99.9
- ${MicrosoftNETCoreApp22PackageVersion}
+ ${MicrosoftNETCoreApp30PackageVersion}
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in
index 5afc2e41f8..73e370d707 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in
@@ -1,16 +1,16 @@
- netcoreapp2.2
+ netcoreapp3.0
TargetFrameworkOverride
true
99.9
- ${MicrosoftNETCoreApp22PackageVersion}
+ ${MicrosoftNETCoreApp30PackageVersion}
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
index 28b4517c53..4291cc403f 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
@@ -1,18 +1,18 @@
- netcoreapp2.2
+ netcoreapp3.0
TargetFrameworkOverride
aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502
0
1
99.9
- ${MicrosoftNETCoreApp22PackageVersion}
+ ${MicrosoftNETCoreApp30PackageVersion}
-
+
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in
index fc557dbd7d..a78e8ea142 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in
@@ -1,15 +1,15 @@
- netcoreapp2.2
+ netcoreapp3.0
TargetFrameworkOverride
99.9
- ${MicrosoftNETCoreApp22PackageVersion}
+ ${MicrosoftNETCoreApp30PackageVersion}
-
+
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 fa1a686e36..1f86c6d6d7 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
@@ -10,7 +10,7 @@
"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": "3000",
- "identity": "Microsoft.Web.Empty.CSharp.2.2",
+ "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",
@@ -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 b625c29b16..c81c7d633f 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
@@ -9,7 +9,7 @@
"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": "3000",
- "identity": "Microsoft.Web.Empty.FSharp.2.2",
+ "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",
@@ -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 5855186742..c7998b848f 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
@@ -12,7 +12,7 @@
"description": "A project for creating a Razor class library that targets .NET Standard",
"groupIdentity": "Microsoft.Web.Razor",
"precedence": "3000",
- "identity": "Microsoft.Web.Razor.Library.CSharp.2.2",
+ "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 91c964a10a..1dc4289cfe 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
@@ -11,7 +11,7 @@
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content",
"groupIdentity": "Microsoft.Web.RazorPages",
"precedence": "3000",
- "identity": "Microsoft.Web.RazorPages.CSharp.2.2",
+ "identity": "Microsoft.Web.RazorPages.CSharp.3.0",
"shortName": [
"razor",
"webapp"
@@ -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",
@@ -364,4 +364,4 @@
"continueOnError": true
}
]
-}
\ No newline at end of file
+}
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 c1b8bcda52..674e434cb4 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
@@ -10,7 +10,7 @@
"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": "3000",
- "identity": "Microsoft.Web.Mvc.CSharp.2.2",
+ "identity": "Microsoft.Web.Mvc.CSharp.3.0",
"shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": {
@@ -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 dad23ea741..ad098064db 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
@@ -10,7 +10,7 @@
"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": "3000",
- "identity": "Microsoft.Web.Mvc.FSharp.2.2",
+ "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",
@@ -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 00b4b90a85..3024765085 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
@@ -10,7 +10,7 @@
"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": "3000",
- "identity": "Microsoft.Web.WebApi.CSharp.2.2",
+ "identity": "Microsoft.Web.WebApi.CSharp.3.0",
"shortName": "webapi",
"tags": {
"language": "C#",
@@ -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 36a84c89ea..04c08eea10 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
@@ -9,7 +9,7 @@
"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": "3000",
- "identity": "Microsoft.Web.WebApi.FSharp.2.2",
+ "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",
@@ -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 0b4b8f451c..25092086eb 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 d4ebf83c23..19dbf77299 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
$(PackageTags);spa
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 be23dc22f7..12b0a78e94 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 abf4252943..e79cb077f2 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 b38a66ff1e..382358d0e0 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",
@@ -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 fcc131cb9a..841691d10a 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",
@@ -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 cb404dd503..5f184af257 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",
@@ -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 3f1d65e2b7..ca9253ccec 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/GenerateTestProps.targets b/test/GenerateTestProps.targets
index 9e6fcb1b8a..9d513ebb5a 100644
--- a/test/GenerateTestProps.targets
+++ b/test/GenerateTestProps.targets
@@ -18,12 +18,12 @@
- BundledAspNetCoreAllTargetFrameworkVersion=2.2
+ BundledAspNetCoreAllTargetFrameworkVersion=3.0
$(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion)
- BundledAspNetCoreAppTargetFrameworkVersion=2.2
+ BundledAspNetCoreAppTargetFrameworkVersion=3.0
$(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)
diff --git a/test/TemplateTests.targets.in b/test/TemplateTests.targets.in
index 5d7e98d4bb..ca3c57ba6d 100644
--- a/test/TemplateTests.targets.in
+++ b/test/TemplateTests.targets.in
@@ -57,6 +57,8 @@ Copyright (c) .NET Foundation. All rights reserved.
$(DefaultPatchVersionForAspNetCoreApp2_1)
+ $(DefaultPatchVersionForAspNetCoreApp2_2)
+ $(DefaultPatchVersionForAspNetCoreApp3_0)
@@ -81,6 +83,8 @@ Copyright (c) .NET Foundation. All rights reserved.
+
+
diff --git a/test/Templates.Test/Helpers/AspNetProcess.cs b/test/Templates.Test/Helpers/AspNetProcess.cs
index b8e9ab6b3f..b0aa3c4e85 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/Templates.Test.csproj b/test/Templates.Test/Templates.Test.csproj
index de576ce746..5d7f4e0568 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
@@ -33,7 +36,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