From 1ce65be7a9b1c0dc5339c80381d9172e29546ea3 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Wed, 5 Feb 2025 10:41:37 +0100 Subject: [PATCH 1/2] Update FCS GitOrigin-RevId: 5442e805d25c00b874cdbd43ea430e20173af2a7 --- .../src/FSharp.TypeProviders.Host/PackagesLock.targets | 2 +- ReSharper.FSharp/src/FSharp/PackagesLock.targets | 2 +- ReSharper.FSharp/test/src/PackagesLock.targets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets b/ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets index 4457a44751..8dfb4bc3ae 100644 --- a/ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets +++ b/ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets @@ -3,7 +3,7 @@ - + diff --git a/ReSharper.FSharp/src/FSharp/PackagesLock.targets b/ReSharper.FSharp/src/FSharp/PackagesLock.targets index e070ffa1d0..74f7fefe3c 100644 --- a/ReSharper.FSharp/src/FSharp/PackagesLock.targets +++ b/ReSharper.FSharp/src/FSharp/PackagesLock.targets @@ -6,7 +6,7 @@ - + diff --git a/ReSharper.FSharp/test/src/PackagesLock.targets b/ReSharper.FSharp/test/src/PackagesLock.targets index a47160b4a6..29df7eb349 100644 --- a/ReSharper.FSharp/test/src/PackagesLock.targets +++ b/ReSharper.FSharp/test/src/PackagesLock.targets @@ -3,7 +3,7 @@ - + From 54761648881432bcc01d2e49db3d35b4053df416 Mon Sep 17 00:00:00 2001 From: Konstantin Krukhmalev Date: Wed, 5 Feb 2025 13:25:41 +0200 Subject: [PATCH 2/2] [rider] Use LATEST_STABLE instead of DOT_NET_CORE_3_1 where possible GitOrigin-RevId: f013052a7d1d31ca8ece398b23f36dff96f4823a --- .../test/cases/typeProviders/GenerativeTypeProvidersTest.kt | 2 +- .../fsharp/test/cases/typeProviders/TypeProvidersCacheTest.kt | 2 +- .../test/cases/typeProviders/TypeProvidersRuntimeTest.kt | 4 ++-- .../test/cases/typeProviders/TypeProvidersSettingTest.kt | 2 +- .../fsharp/test/cases/typeProviders/TypeProvidersTest.kt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/GenerativeTypeProvidersTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/GenerativeTypeProvidersTest.kt index af77ca20b6..442aee3ce4 100644 --- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/GenerativeTypeProvidersTest.kt +++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/GenerativeTypeProvidersTest.kt @@ -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]) diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersCacheTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersCacheTest.kt index 2ddd5bd15d..b2c0013b42 100644 --- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersCacheTest.kt +++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersCacheTest.kt @@ -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" diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt index 55d9fa8732..c67c1fa2b4 100644 --- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt +++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt @@ -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] ) @@ -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") diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersSettingTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersSettingTest.kt index b280ab9b59..f981ed5fdc 100644 --- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersSettingTest.kt +++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersSettingTest.kt @@ -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() { diff --git a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt index 19ef24e242..451c0e9ff0 100644 --- a/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt +++ b/rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt @@ -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])