Skip to content

Draft: Support Net7 and Net8 #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Draft: Support Net7 and Net8 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e26105e
net7
MakiWolf Aug 30, 2023
67ac368
net 8 and 7
MakiWolf Aug 30, 2023
0fd5519
add templates
MakiWolf Sep 1, 2023
0c71deb
add 8
MakiWolf Sep 1, 2023
99d320b
fix typo
MakiWolf Sep 2, 2023
61a733d
Merge branch 'dotdevelop:main' into net7
MakiWolf Sep 13, 2023
c4b5b65
Merge branch 'dotdevelop:main' into net7
MakiWolf Nov 26, 2023
0958a61
update
MakiWolf Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
345 changes: 345 additions & 0 deletions main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...otNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateStringTagProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down
2 changes: 2 additions & 0 deletions ...noDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...noDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down
2 changes: 1 addition & 1 deletion main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
{
Expand Down
10 changes: 10 additions & 0 deletions main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
Loading
Loading