Skip to content
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

Sync with the ultimate master #247

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Sync with the ultimate master #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
297d104
Bump constants to 251
Oct 15, 2024
96fce9e
[efcore]: Fix RIDER-118684: Support .NET 9 projects
seclerp Oct 15, 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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ publishChannel=default
# Release: 2020.2
# Nightly: 2020.3-SNAPSHOT
# EAP: 2020.3-EAP2-SNAPSHOT
productVersion=2024.3-SNAPSHOT
productVersion=2025.1-SNAPSHOT

# Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
# https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default
Expand Down
1 change: 1 addition & 0 deletions src/dotnet/Rider.Plugins.EfCore/Compatibility/SupportedMigrationsProjectsProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ private static bool IsSupportedInMigrationsProject(TargetFrameworkId targetFrame
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net6)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net7)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net8)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net9)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.NetCore31)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.NetStandard20)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.NetStandard21);
Expand Down
1 change: 1 addition & 0 deletions src/dotnet/Rider.Plugins.EfCore/Compatibility/SupportedStartupProjectsProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ private static bool IsSupportedInStartupProject(TargetFrameworkId targetFramewor
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net6)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net7)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net8)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.Net9)
|| targetFrameworkId.UniqueString.StartsWith(SupportedTargetFrameworks.NetCore31);
}
}
1 change: 1 addition & 0 deletions src/dotnet/Rider.Plugins.EfCore/Compatibility/SupportedTargetFrameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public static class SupportedTargetFrameworks
public const string Net6 = "net6.0";
public const string Net7 = "net7.0";
public const string Net8 = "net8.0";
public const string Net9 = "net9.0";
public const string NetCore31 = ".NETCoreApp,Version=v3.1";
public const string NetStandard20 = ".NETStandard,Version=v2.0";
public const string NetStandard21 = ".NETStandard,Version=v2.1";
Expand Down
Loading