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 #806

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Sync with the ultimate master #806

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
1ce65be
Update FCS
auduchinok Feb 5, 2025
5476164
[rider] Use LATEST_STABLE instead of DOT_NET_CORE_3_1 where possible
Konstantin343 Feb 5, 2025
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 ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ItemGroup>
<PackageLock Include="FSharp.Core" Version="9.0.100-beta.24466.6" />
<PackageLock Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.2" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2024.3.0" />
<PackageLock Include="JetBrains.RdFramework" Version="2024.3.0" />
<PackageLock Include="Microsoft.NETCore.Platforms" Version="1.1.1" />
Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/src/FSharp/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PackageLock Include="FSharp.Core" Version="9.0.100-beta.24466.6" />
<PackageLock Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageLock Include="JetBrains.Build.Platform.DistributedCache" Version="1.1.20250130.230" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.2" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.3" />
<PackageLock Include="JetBrains.HabitatDetector" Version="1.4.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2024.3.0" />
<PackageLock Include="JetBrains.NuGet.Packaging" Version="6.12.20250115.147" />
Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/test/src/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ItemGroup>
<PackageLock Include="Fantomas.Core" Version="6.3.15" />
<PackageLock Include="FSharp.Core" Version="9.0.100-beta.24466.6" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.2" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2024.3.0" />
<PackageLock Include="JetBrains.NuGet.Frameworks" Version="6.12.20250115.147" />
<PackageLock Include="JetBrains.NuGet.Packaging" Version="6.12.20250115.147" />
Expand Down
2 changes: 1 addition & 1 deletion ...om/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/GenerativeTypeProvidersTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import org.testng.annotations.Test
import java.time.Duration

@Solution("TypeProviderLibrary")
@TestEnvironment(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.FULL)
@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.FULL)
class GenerativeTypeProvidersTest : BaseTypeProvidersTest() {
@Test
@Mute("RIDER-111885", platforms = [PlatformType.LINUX_ALL, PlatformType.MAC_OS_ALL])
Expand Down
2 changes: 1 addition & 1 deletion ...lin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersCacheTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.testng.annotations.Test
import java.io.File

@Solution("TypeProviderLibrary")
@TestEnvironment(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.FULL)
@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.FULL)
class TypeProvidersCacheTest : BaseTypeProvidersTest() {
private val defaultSourceFile = "TypeProviderLibrary/Caches.fs"

Expand Down
4 changes: 2 additions & 2 deletions ...n/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import org.testng.annotations.Test
class TypeProvidersRuntimeTest : BaseTypeProvidersTest() {
@Test
@TestEnvironment(
sdkVersion = SdkVersion.DOT_NET_CORE_3_1,
sdkVersion = SdkVersion.LATEST_STABLE,
buildTool = BuildTool.FULL,
platform = [PlatformType.WINDOWS_ALL]
)
Expand Down Expand Up @@ -48,7 +48,7 @@ class TypeProvidersRuntimeTest : BaseTypeProvidersTest() {
fun net9() = doTest(".NET 9")

@Mute("RIDER-103648")
@TestEnvironment(sdkVersion = SdkVersion.DOT_NET_CORE_3_1)
@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE)
@Solution("FscTypeProviderLibrary")
fun fsc() = doTest(".NET Framework 4.8")

Expand Down
2 changes: 1 addition & 1 deletion ...n/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersSettingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import com.jetbrains.rider.test.scriptingApi.withOpenedEditor
import org.testng.annotations.Test

@Solution("TypeProviderLibrary")
@TestEnvironment(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.FULL)
@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.FULL)
class TypeProvidersSettingTest : BaseTypeProvidersTest() {
@Test
fun disabledTypeProvidersSetting() {
Expand Down
2 changes: 1 addition & 1 deletion ...t/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import com.jetbrains.rider.test.scriptingApi.withOpenedEditor
import org.testng.annotations.Test

@Solution("TypeProviderLibrary")
@TestEnvironment(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.FULL)
@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.FULL)
class TypeProvidersTest : BaseTypeProvidersTest() {
@Test
@Mute("RIDER-111885", platforms = [PlatformType.LINUX_ALL, PlatformType.MAC_OS_ALL])
Expand Down
Loading