diff --git a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml
index 6df895b7001..f640df74dbe 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml
@@ -84,6 +84,351 @@
 		would cause the Razor template to be last in the New Project dialog if both 1.1 and 2.x templates
 		are available. -->
 		
+		
+		<!-- Include templates for SdkVersion 8.0		-->		
+		<Condition id="AspNetCoreSdkInstalled" sdkVersion="8.0">
+			<Template
+				id="Microsoft.Web.Empty.CSharp"
+				templateId="Microsoft.Web.Empty.CSharp.8.0"
+				_overrideName="Empty"
+				_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Empty.FSharp"
+				templateId="Microsoft.Web.Empty.FSharp.8.0"
+				_overrideName="Empty"
+				_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.WebApi.CSharp"
+				templateId="Microsoft.Web.WebApi.CSharp.8.0"
+				_overrideName="API"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.WebApi.FSharp"
+				templateId="Microsoft.Web.WebApi.FSharp.8.0"
+				_overrideName="API"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="FSharpWebApi"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Worker.Empty.CSharp"
+				templateId="Microsoft.Worker.Empty.CSharp.8.0"
+				_overrideName="Worker Service"
+				_overrideDescription="An empty project template for creating a worker service."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="AspNetCoreWorker"
+				condition="UseNetCore80=true"
+				category="netcore/app/general"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.RazorPages.CSharp"
+				templateId="Microsoft.Web.RazorPages.CSharp.8.0"
+				_overrideName="Web Application"
+				_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="RazorPages"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Mvc.CSharp"
+				templateId="Microsoft.Web.Mvc.CSharp.8.0"
+				_overrideName="Web Application (Model-View-Controller)"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Mvc.FSharp"
+				templateId="Microsoft.Web.Mvc.FSharp.8.0"
+				_overrideName="Web Application (Model-View-Controller)"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Blazor.Server.CSharp"
+				templateId="Microsoft.Web.Blazor.Server.CSharp.8.0"
+				_overrideName="Blazor Server App"
+				_overrideDescription="A project template for creating a Blazor server app that runs server-side inside an ASP.NET Core app and handles user interactions over a SignalR connection. This template can be used for web apps with rich dynamic user interfaces (UIs)."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="AspNetCoreBlazor"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Razor.Library.CSharp"
+				templateId="Microsoft.Web.Razor.Library.CSharp.8.0"
+				_overrideName="Razor Class Library"
+				_overrideDescription="A project for creating a Razor class library that targets .NET Standard."
+				path="${DotNetCoreSdk.8.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Spa.Angular.CSharp"
+				templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.8.0"
+				_overrideName="Angular"
+				_overrideDescription="A project template for creating an ASP.NET Core application with Angular."
+				path="${DotNetCoreSdk.8.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Spa.React.CSharp"
+				templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.8.0"
+				_overrideName="React.js"
+				_overrideDescription="A project template for creating an ASP.NET Core application with React.js."
+				path="${DotNetCoreSdk.8.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Spa.ReactRedux.CSharp"
+				templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.8.0"
+				_overrideName="React.js and Redux"
+				_overrideDescription="A project template for creating an ASP.NET Core application with React.js and Redux."
+				path="${DotNetCoreSdk.8.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+		</Condition>
+		<!-- end of sdkVersion 8.0 templates -->
+
+		<!-- Include templates for SdkVersion 7.0		-->		
+		<Condition id="AspNetCoreSdkInstalled" sdkVersion="7.0">
+			<Template
+				id="Microsoft.Web.Empty.CSharp"
+				templateId="Microsoft.Web.Empty.CSharp.7.0"
+				_overrideName="Empty"
+				_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Empty.FSharp"
+				templateId="Microsoft.Web.Empty.FSharp.7.0"
+				_overrideName="Empty"
+				_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.WebApi.CSharp"
+				templateId="Microsoft.Web.WebApi.CSharp.7.0"
+				_overrideName="API"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.WebApi.FSharp"
+				templateId="Microsoft.Web.WebApi.FSharp.7.0"
+				_overrideName="API"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="FSharpWebApi"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Worker.Empty.CSharp"
+				templateId="Microsoft.Worker.Empty.CSharp.7.0"
+				_overrideName="Worker Service"
+				_overrideDescription="An empty project template for creating a worker service."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="AspNetCoreWorker"
+				condition="UseNetCore70=true"
+				category="netcore/app/general"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.RazorPages.CSharp"
+				templateId="Microsoft.Web.RazorPages.CSharp.7.0"
+				_overrideName="Web Application"
+				_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="RazorPages"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Mvc.CSharp"
+				templateId="Microsoft.Web.Mvc.CSharp.7.0"
+				_overrideName="Web Application (Model-View-Controller)"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Mvc.FSharp"
+				templateId="Microsoft.Web.Mvc.FSharp.7.0"
+				_overrideName="Web Application (Model-View-Controller)"
+				_overrideDescription="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."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Blazor.Server.CSharp"
+				templateId="Microsoft.Web.Blazor.Server.CSharp.7.0"
+				_overrideName="Blazor Server App"
+				_overrideDescription="A project template for creating a Blazor server app that runs server-side inside an ASP.NET Core app and handles user interactions over a SignalR connection. This template can be used for web apps with rich dynamic user interfaces (UIs)."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				supportedParameters="AspNetCoreBlazor"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Razor.Library.CSharp"
+				templateId="Microsoft.Web.Razor.Library.CSharp.7.0"
+				_overrideName="Razor Class Library"
+				_overrideDescription="A project for creating a Razor class library that targets .NET Standard."
+				path="${DotNetCoreSdk.7.0.Templates.Web.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Spa.Angular.CSharp"
+				templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.7.0"
+				_overrideName="Angular"
+				_overrideDescription="A project template for creating an ASP.NET Core application with Angular."
+				path="${DotNetCoreSdk.7.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Spa.React.CSharp"
+				templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.7.0"
+				_overrideName="React.js"
+				_overrideDescription="A project template for creating an ASP.NET Core application with React.js."
+				path="${DotNetCoreSdk.7.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+			<Template
+				id="Microsoft.Web.Spa.ReactRedux.CSharp"
+				templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.7.0"
+				_overrideName="React.js and Redux"
+				_overrideDescription="A project template for creating an ASP.NET Core application with React.js and Redux."
+				path="${DotNetCoreSdk.7.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/aspnet"
+				formatExclude="*.min.css|*.min.js|*.map"
+				defaultParameters="IncludeLaunchSettings=true" />
+		</Condition>
+		<!-- end of sdkVersion 7.0 templates -->
+		
 		<!-- Include templates for SdkVersion 6.0		-->		
 		<Condition id="AspNetCoreSdkInstalled" sdkVersion="6.0">
 			<Template
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateStringTagProvider.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateStringTagProvider.cs
index 4816c39be27..55f52f74bfc 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateStringTagProvider.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateStringTagProvider.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -38,7 +38,7 @@ namespace MonoDevelop.DotNetCore.Templating
 	[Extension]
 	class DotNetCoreProjectTemplateStringTagProvider : IStringTagProvider
 	{
-		readonly string [] SupportedSDK = { "2.1", "2.2", "3.0", "3.1", "5.0", "6.0" };
+		readonly string [] SupportedSDK = { "2.1", "2.2", "3.0", "3.1", "5.0", "6.0", "7.0", "8.0" };
 
 		public IEnumerable<StringTagDescription> GetTags (Type type)
 		{
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs
index e12599a1cdb..4988bd9104a 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs
@@ -33,6 +33,8 @@ namespace MonoDevelop.DotNetCore.Templating
 {
 	class DotNetCoreProjectTemplateWizard : TemplateWizard
 	{
+		const string defaultParameterNetCore80 = "UseNetCore80";
+		const string defaultParameterNetCore70 = "UseNetCore70";
 		const string defaultParameterNetCore60 = "UseNetCore60";
 		const string defaultParameterNetCore50 = "UseNetCore50";
 		const string defaultParameterNetCore30 = "UseNetCore30";
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs
index 29896551502..42385b1c48f 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs
@@ -64,7 +64,7 @@ public IEnumerable<TargetFramework> GetFrameworks ()
 			"2.1", "2.0", "1.6", "1.5", "1.4", "1.3", "1.2", "1.1", "1.0"
 		};
 		static string [] supportedNetCoreAppVersions = {
-			"6.0", "5.0", "3.1", "3.0", "2.2", "2.1", "2.0", "1.1", "1.0"
+			"8.0", "7.0", "6.0", "5.0", "3.1", "3.0", "2.2", "2.1", "2.0", "1.1", "1.0"
 		};
 
 		public IEnumerable<TargetFramework> GetKnownFrameworks ()
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
index 2c65d6ed3b2..6fd3f80e5a6 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
@@ -36,7 +36,7 @@ namespace MonoDevelop.DotNetCore
 	public static class DotNetCoreSdk
 	{
 		static readonly Version DotNetCoreVersion2_1 = new Version (2, 1, 0);
-		internal static readonly DotNetCoreVersion DotNetCoreUnsupportedTargetFrameworkVersion = new DotNetCoreVersion (6, 1, 0);
+		internal static readonly DotNetCoreVersion DotNetCoreUnsupportedTargetFrameworkVersion = new DotNetCoreVersion (8, 1, 0);
 
 		static DotNetCoreSdk ()
 		{
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs
index d65de6eef6b..0ff94c9981c 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs
@@ -43,6 +43,9 @@ class DotNetCoreVersion : IEquatable<DotNetCoreVersion>, IComparable, IComparabl
 		internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion50 = new DotNetCoreVersion (5, 0, 400);
 		internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion60 = new DotNetCoreVersion (6, 0, 6);
 
+		internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion70 = new DotNetCoreVersion (7, 0, 7);
+
+		internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion80 = new DotNetCoreVersion (8, 0, 8);
 		internal DotNetCoreVersion (int major, int minor, int patch)
 			: this (new Version (major, minor, patch))
 		{
@@ -254,6 +257,13 @@ public static bool IsSdkSupported (DotNetCoreVersion version)
 				return version >= MinimumSupportedSdkVersion60;
 			}
 
+			if (version.Major == 7) {
+				return version >= MinimumSupportedSdkVersion70;
+			}
+
+			if (version.Major == 8) {
+				return version >= MinimumSupportedSdkVersion80;
+			}
 
 
 			return false;
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs
index ce5ef6901d9..943c0f3dfe0 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs
@@ -39,12 +39,12 @@ static MSBuildSdks ()
 		{
 			TargetRuntime runtime = IdeApp.Preferences.DefaultTargetRuntime;
 			string binPath = runtime.GetMSBuildBinPath ("15.0");
-			if (binPath != null) {
-				string sdksPath = Path.Combine(binPath, "Sdks");
-
-				if (Directory.Exists(sdksPath)) {
-					Installed = true;
-					MSBuildSDKsPath = sdksPath;
+			if (binPath != null) {
+				string sdksPath = Path.Combine(binPath, "Sdks");
+
+				if (Directory.Exists(sdksPath)) {
+					Installed = true;
+					MSBuildSDKsPath = sdksPath;
 				}
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml b/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml
index feb072c6c8f..7ce2859ac7a 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml
+++ b/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml
@@ -340,6 +340,86 @@
 				category="netcore/app/general"/>
 		</Condition>
 		</Condition>
+
+		<!-- Include templates for dotnet-sdk-7.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="7.0">
+		<Template
+			id="Microsoft.Common.Console.CSharp"
+			templateId="Microsoft.Common.Console.CSharp.7.0"
+			_overrideName="Console Application"
+			_overrideDescription="Creates a new .NET Core console project."
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-console-project"
+			imageId="md-netcore-console-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/app/general"/>
+		<Template
+			id="Microsoft.Common.Console.FSharp"
+			templateId="Microsoft.Common.Console.FSharp.7.0"
+			_overrideName="Console Application"
+			_overrideDescription="Creates a new .NET Core console project."
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-console-project"
+			imageId="md-netcore-console-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/app/general"/>
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="Microsoft.Common.Console.VisualBasic"
+				templateId="Microsoft.Common.Console.VisualBasic.7.0"
+				_overrideName="Console Application"
+				_overrideDescription="Creates a new .NET Core console project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-netcore-console-project"
+				imageId="md-netcore-console-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/app/general"/>
+		</Condition>
+		</Condition>
+
+		<!-- Include templates for dotnet-sdk-8.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="8.0">
+		<Template
+			id="Microsoft.Common.Console.CSharp"
+			templateId="Microsoft.Common.Console.CSharp.8.0"
+			_overrideName="Console Application"
+			_overrideDescription="Creates a new .NET Core console project."
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-console-project"
+			imageId="md-netcore-console-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/app/general"/>
+		<Template
+			id="Microsoft.Common.Console.FSharp"
+			templateId="Microsoft.Common.Console.FSharp.8.0"
+			_overrideName="Console Application"
+			_overrideDescription="Creates a new .NET Core console project."
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-console-project"
+			imageId="md-netcore-console-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/app/general"/>
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="Microsoft.Common.Console.VisualBasic"
+				templateId="Microsoft.Common.Console.VisualBasic.8.0"
+				_overrideName="Console Application"
+				_overrideDescription="Creates a new .NET Core console project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-netcore-console-project"
+				imageId="md-netcore-console-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/app/general"/>
+		</Condition>
+		</Condition>
 		
 		<!--
 			.NET Standard library project in Multiplatform - Library category.
@@ -648,6 +728,92 @@
 				category="multiplat/library/general" />
 		</Condition>
 		</Condition>
+
+		<!-- Include templates for dotnet-sdk-7.0			-->
+		<Condition id="DotNetCoreSdkInstalled" requiresRuntime="false" sdkVersion="7.0">
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.CSharp"
+			templateId="Microsoft.Common.Library.CSharp.7.0"
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-crossplatform-library-project"
+			imageId="md-crossplatform-library-project"
+			supportedParameters="NetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="multiplat/library/general" />
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.FSharp"
+			templateId="Microsoft.Common.Library.FSharp.7.0"
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-crossplatform-library-project"
+			imageId="md-crossplatform-library-project"
+			supportedParameters="NetStandard;FSharpNetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="multiplat/library/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				_overrideName=".NET Standard Library"
+				_overrideDescription="Creates a new .NET Standard class library project."
+				overrideLanguage="VBNet"
+				id="Microsoft.Common.Library.VisualBasic"
+				templateId="Microsoft.Common.Library.VisualBasic.7.0"
+				path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-crossplatform-library-project"
+				imageId="md-crossplatform-library-project"
+				supportedParameters="NetStandard"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetStandard21=true"
+				category="multiplat/library/general" />
+		</Condition>
+		</Condition>
+
+		<!-- Include templates for dotnet-sdk-8.0			-->
+		<Condition id="DotNetCoreSdkInstalled" requiresRuntime="false" sdkVersion="8.0">
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.CSharp"
+			templateId="Microsoft.Common.Library.CSharp.8.0"
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-crossplatform-library-project"
+			imageId="md-crossplatform-library-project"
+			supportedParameters="NetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="multiplat/library/general" />
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.FSharp"
+			templateId="Microsoft.Common.Library.FSharp.8.0"
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-crossplatform-library-project"
+			imageId="md-crossplatform-library-project"
+			supportedParameters="NetStandard;FSharpNetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="multiplat/library/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				_overrideName=".NET Standard Library"
+				_overrideDescription="Creates a new .NET Standard class library project."
+				overrideLanguage="VBNet"
+				id="Microsoft.Common.Library.VisualBasic"
+				templateId="Microsoft.Common.Library.VisualBasic.8.0"
+				path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-crossplatform-library-project"
+				imageId="md-crossplatform-library-project"
+				supportedParameters="NetStandard"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetStandard21=true"
+				category="multiplat/library/general" />
+		</Condition>
+		</Condition>
 		
 		<!--
 			.NET Standard library project in .NET Core - Library category.
@@ -956,6 +1122,92 @@
 		</Condition>
 		</Condition>		
 
+		<!-- Include templates for dotnet-sdk-7.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="7.0">
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.CSharp"
+			templateId="Microsoft.Common.Library.CSharp.7.0"
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="NetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="netcore/library/general" />
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.FSharp"
+			templateId="Microsoft.Common.Library.FSharp.7.0"
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="NetStandard;FSharpNetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="netcore/library/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				_overrideName=".NET Standard Library"
+				_overrideDescription="Creates a new .NET Standard class library project."
+				overrideLanguage="VBNet"
+				id="Microsoft.Common.Library.VisualBasic"
+				templateId="Microsoft.Common.Library.VisualBasic.7.0"
+				path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				supportedParameters="NetStandard"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetStandard21=true"
+				category="netcore/library/general" />
+		</Condition>
+		</Condition>
+
+		<!-- Include templates for dotnet-sdk-8.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="8.0">
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.CSharp"
+			templateId="Microsoft.Common.Library.CSharp.8.0"
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="NetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="netcore/library/general" />
+		<Template
+			_overrideName=".NET Standard Library"
+			_overrideDescription="Creates a new .NET Standard class library project."
+			id="Microsoft.Common.Library.FSharp"
+			templateId="Microsoft.Common.Library.FSharp.8.0"
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="NetStandard;FSharpNetStandard"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetStandard21=true"
+			category="netcore/library/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				_overrideName=".NET Standard Library"
+				_overrideDescription="Creates a new .NET Standard class library project."
+				overrideLanguage="VBNet"
+				id="Microsoft.Common.Library.VisualBasic"
+				templateId="Microsoft.Common.Library.VisualBasic.8.0"
+				path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				supportedParameters="NetStandard"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetStandard21=true"
+				category="netcore/library/general" />
+		</Condition>
+		</Condition>
+
 		<!--
 			.NET Core class library project in .NET Core - Library category.
 			Template id and group ids have been changed to keep them unique so both
@@ -1277,6 +1529,98 @@
 		</Condition>
 		</Condition>
 
+		<!-- Include templates for dotnet-sdk-7.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="7.0">
+		<Template
+			_overrideName="Class Library"
+			_overrideDescription="Creates a new .NET Core class library project."
+			id="Microsoft.Common.Library.CSharp-netcoreapp"
+			templateId="Microsoft.Common.Library.CSharp.7.0"
+			groupId="Microsoft.Common.Library-netcoreapp"
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="NetCoreLibrary"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/library/general" />
+		<Template
+			_overrideName="Class Library"
+			_overrideDescription="Creates a new .NET Core class library project."
+			id="Microsoft.Common.Library.FSharp-netcoreapp"
+			templateId="Microsoft.Common.Library.FSharp.7.0"
+			groupId="Microsoft.Common.Library-netcoreapp"
+			path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="FSharpNetCoreLibrary;NetCoreLibrary"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/library/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				_overrideName="Class Library"
+				_overrideDescription="Creates a new .NET Core class library project."
+				overrideLanguage="VBNet"
+				id="Microsoft.Common.Library.VisualBasic-netcoreapp"
+				templateId="Microsoft.Common.Library.VisualBasic.7.0"
+				groupId="Microsoft.Common.Library-netcoreapp"
+				path="${DotNetCoreSdk.7.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				supportedParameters="NetCoreLibrary"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/library/general" />
+		</Condition>
+		</Condition>
+
+		<!-- Include templates for dotnet-sdk-8.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="8.0">
+		<Template
+			_overrideName="Class Library"
+			_overrideDescription="Creates a new .NET Core class library project."
+			id="Microsoft.Common.Library.CSharp-netcoreapp"
+			templateId="Microsoft.Common.Library.CSharp.8.0"
+			groupId="Microsoft.Common.Library-netcoreapp"
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="NetCoreLibrary"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/library/general" />
+		<Template
+			_overrideName="Class Library"
+			_overrideDescription="Creates a new .NET Core class library project."
+			id="Microsoft.Common.Library.FSharp-netcoreapp"
+			templateId="Microsoft.Common.Library.FSharp.8.0"
+			groupId="Microsoft.Common.Library-netcoreapp"
+			path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+			icon="md-netcore-empty-project"
+			imageId="md-netcore-empty-project"
+			supportedParameters="FSharpNetCoreLibrary;NetCoreLibrary"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/library/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				_overrideName="Class Library"
+				_overrideDescription="Creates a new .NET Core class library project."
+				overrideLanguage="VBNet"
+				id="Microsoft.Common.Library.VisualBasic-netcoreapp"
+				templateId="Microsoft.Common.Library.VisualBasic.8.0"
+				groupId="Microsoft.Common.Library-netcoreapp"
+				path="${DotNetCoreSdk.8.0.Templates.Common.ProjectTemplates.nupkg}"
+				icon="md-netcore-empty-project"
+				imageId="md-netcore-empty-project"
+				supportedParameters="NetCoreLibrary"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/library/general" />
+		</Condition>
+		</Condition>
+
 		<Condition id="DotNetCoreSdkInstalled" sdkVersion="1.*">
 		<Template
 			id="Microsoft.Test.xUnit.CSharp"
@@ -1899,7 +2243,7 @@
 			category="netcore/test/general" />
 		<Template
 			id="Microsoft.Test.xUnit.FSharp"
-			templateId="Microsoft.Test.xUnit.FSharp.5.0"
+			templateId="Microsoft.Test.xUnit.FSharp.6.0"
 			_overrideName="xUnit Test Project"
 			_overrideDescription="Creates a new xUnit test project."
 			path="${DotNetCoreSdk.6.0.Templates.Test.ProjectTemplates.nupkg}"
@@ -1995,6 +2339,231 @@
 				category="netcore/test/general" />
 		</Condition>
 		</Condition>
+
+		<!-- Include templates for dotnet-sdk-7.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="7.0">
+		<Template
+			id="Microsoft.Test.xUnit.CSharp"
+			templateId="Microsoft.Test.xUnit.CSharp.7.0"
+			_overrideName="xUnit Test Project"
+			_overrideDescription="Creates a new xUnit test project."
+			path="${DotNetCoreSdk.7.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/test/general" />
+		<Template
+			id="Microsoft.Test.xUnit.FSharp"
+			templateId="Microsoft.Test.xUnit.FSharp.7.0"
+			_overrideName="xUnit Test Project"
+			_overrideDescription="Creates a new xUnit test project."
+			path="${DotNetCoreSdk.7.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/test/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="Microsoft.Test.xUnit.VisualBasic"
+				templateId="Microsoft.Test.xUnit.VisualBasic.7.0"
+				_overrideName="xUnit Test Project"
+				_overrideDescription="Creates a new xUnit test project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.7.0.Templates.Test.ProjectTemplates.nupkg}"
+				icon="md-netcore-test-project"
+				imageId="md-netcore-test-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/test/general" />
+		</Condition>
+		<Template
+			id="Microsoft.Test.MSTest.CSharp"
+			templateId="Microsoft.Test.MSTest.CSharp.7.0"
+			_overrideName="MSTest Project"
+			_overrideDescription="Creates a new MSTest project."
+			path="${DotNetCoreSdk.7.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/test/general" />
+		<Template
+			id="Microsoft.Test.MSTest.FSharp"
+			templateId="Microsoft.Test.MSTest.FSharp.7.0"
+			_overrideName="MSTest Project"
+			_overrideDescription="Creates a new MSTest project."
+			path="${DotNetCoreSdk.7.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/test/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="Microsoft.Test.MSTest.VisualBasic"
+				templateId="Microsoft.Test.MSTest.VisualBasic.7.0"
+				_overrideName="MSTest Project"
+				_overrideDescription="Creates a new MSTest project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.7.0.Templates.Test.ProjectTemplates.nupkg}"
+				icon="md-netcore-test-project"
+				imageId="md-netcore-test-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/test/general" />
+		</Condition>
+		<Template
+			id="NUnit3.DotNetNew.Template.CSharp"
+			templateId="NUnit3.DotNetNew.Template.CSharp"
+			_overrideName="NUnit Test Project"
+			_overrideDescription="Creates a new NUnit test project."
+			path="${DotNetCoreSdk.7.0.Templates.NUnit3.DotNetNew.Template.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/test/general" />
+		<Template
+			id="NUnit3.DotNetNew.Template.FSharp"
+			templateId="NUnit3.DotNetNew.Template.FSharp"
+			_overrideName="NUnit Test Project"
+			_overrideDescription="Creates a new NUnit test project."
+			path="${DotNetCoreSdk.7.0.Templates.NUnit3.DotNetNew.Template.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore70=true"
+			category="netcore/test/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="NUnit3.DotNetNew.Template.VisualBasic"
+				templateId="NUnit3.DotNetNew.Template.VisualBasic"
+				_overrideName="NUnit Test Project"
+				_overrideDescription="Creates a new NUnit test project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.7.0.Templates.NUnit3.DotNetNew.Template.nupkg}"
+				icon="md-netcore-test-project"
+				imageId="md-netcore-test-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore70=true"
+				category="netcore/test/general" />
+		</Condition>
+		</Condition>
+
+		<!-- Include templates for dotnet-sdk-8.0		-->
+		<Condition id="DotNetCoreSdkInstalled" sdkVersion="8.0">
+		<Template
+			id="Microsoft.Test.xUnit.CSharp"
+			templateId="Microsoft.Test.xUnit.CSharp.8.0"
+			_overrideName="xUnit Test Project"
+			_overrideDescription="Creates a new xUnit test project."
+			path="${DotNetCoreSdk.8.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/test/general" />
+		<Template
+			id="Microsoft.Test.xUnit.FSharp"
+			templateId="Microsoft.Test.xUnit.FSharp.8.0"
+			_overrideName="xUnit Test Project"
+			_overrideDescription="Creates a new xUnit test project."
+			path="${DotNetCoreSdk.8.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/test/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="Microsoft.Test.xUnit.VisualBasic"
+				templateId="Microsoft.Test.xUnit.VisualBasic.8.0"
+				_overrideName="xUnit Test Project"
+				_overrideDescription="Creates a new xUnit test project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.8.0.Templates.Test.ProjectTemplates.nupkg}"
+				icon="md-netcore-test-project"
+				imageId="md-netcore-test-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore60=true"
+				category="netcore/test/general" />
+		</Condition>
+		<Template
+			id="Microsoft.Test.MSTest.CSharp"
+			templateId="Microsoft.Test.MSTest.CSharp.8.0"
+			_overrideName="MSTest Project"
+			_overrideDescription="Creates a new MSTest project."
+			path="${DotNetCoreSdk.8.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/test/general" />
+		<Template
+			id="Microsoft.Test.MSTest.FSharp"
+			templateId="Microsoft.Test.MSTest.FSharp.8.0"
+			_overrideName="MSTest Project"
+			_overrideDescription="Creates a new MSTest project."
+			path="${DotNetCoreSdk.8.0.Templates.Test.ProjectTemplates.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/test/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="Microsoft.Test.MSTest.VisualBasic"
+				templateId="Microsoft.Test.MSTest.VisualBasic.8.0"
+				_overrideName="MSTest Project"
+				_overrideDescription="Creates a new MSTest project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.8.0.Templates.Test.ProjectTemplates.nupkg}"
+				icon="md-netcore-test-project"
+				imageId="md-netcore-test-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/test/general" />
+		</Condition>
+		<Template
+			id="NUnit3.DotNetNew.Template.CSharp"
+			templateId="NUnit3.DotNetNew.Template.CSharp"
+			_overrideName="NUnit Test Project"
+			_overrideDescription="Creates a new NUnit test project."
+			path="${DotNetCoreSdk.8.0.Templates.NUnit3.DotNetNew.Template.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/test/general" />
+		<Template
+			id="NUnit3.DotNetNew.Template.FSharp"
+			templateId="NUnit3.DotNetNew.Template.FSharp"
+			_overrideName="NUnit Test Project"
+			_overrideDescription="Creates a new NUnit test project."
+			path="${DotNetCoreSdk.8.0.Templates.NUnit3.DotNetNew.Template.nupkg}"
+			icon="md-netcore-test-project"
+			imageId="md-netcore-test-project"
+			wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+			condition="UseNetCore80=true"
+			category="netcore/test/general" />
+		<Condition id="FeatureSwitch" name="VBNetDotnetCoreTemplates">
+			<Template
+				id="NUnit3.DotNetNew.Template.VisualBasic"
+				templateId="NUnit3.DotNetNew.Template.VisualBasic"
+				_overrideName="NUnit Test Project"
+				_overrideDescription="Creates a new NUnit test project."
+				overrideLanguage="VBNet"
+				path="${DotNetCoreSdk.8.0.Templates.NUnit3.DotNetNew.Template.nupkg}"
+				icon="md-netcore-test-project"
+				imageId="md-netcore-test-project"
+				wizard="MonoDevelop.DotNetCore.ProjectTemplateWizard"
+				condition="UseNetCore80=true"
+				category="netcore/test/general" />
+		</Condition>
+		</Condition>
+
 	</Extension>
 
 	<Extension path="/MonoDevelop/Ide/ProjectTemplateWizards">
diff --git a/start.sh b/start.sh
new file mode 100755
index 00000000000..6ed3e3977c5
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,2 @@
+#export MSBuildEnableWorkloadResolver=false
+mono ./main/build/bin/MonoDevelop.exe --no-redirect
\ No newline at end of file