From e26105e12d18b4c653b53c1303c5df968961b4e8 Mon Sep 17 00:00:00 2001 From: MakiWolf Date: Wed, 30 Aug 2023 16:57:17 +0200 Subject: [PATCH 1/6] net7 --- ...NetCoreProjectTemplateStringTagProvider.cs | 4 +- .../DotNetCoreProjectTemplateWizard.cs | 1 + ...NetCoreProjectSupportedTargetFrameworks.cs | 2 +- .../MonoDevelop.DotNetCore/DotNetCoreSdk.cs | 2 +- .../DotNetCoreVersion.cs | 5 +++ .../MonoDevelop.DotNetCore.addin.xml | 40 +++++++++++++++++++ 6 files changed, 50 insertions(+), 4 deletions(-) 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..667f26f3bf0 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" }; public IEnumerable 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..41a30ab2f70 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,7 @@ namespace MonoDevelop.DotNetCore.Templating { class DotNetCoreProjectTemplateWizard : TemplateWizard { + 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..5451932bf33 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 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" + "7.0", "6.0", "5.0", "3.1", "3.0", "2.2", "2.1", "2.0", "1.1", "1.0" }; public IEnumerable 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..252f5728706 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 (7, 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..58f8983614b 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs @@ -43,6 +43,7 @@ class DotNetCoreVersion : IEquatable, 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 DotNetCoreVersion (int major, int minor, int patch) : this (new Version (major, minor, patch)) { @@ -254,6 +255,10 @@ public static bool IsSdkSupported (DotNetCoreVersion version) return version >= MinimumSupportedSdkVersion60; } + if (version.Major == 7) { + return version >= MinimumSupportedSdkVersion70; + } + return false; 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..9346cacd2f9 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,46 @@ category="netcore/app/general"/> + + + +