[rider-tests] RIDER-132376 Update tests with 3.1 and 5.0 dotnet sdk

GitOrigin-RevId: 57dd3a295188c3806b832b977f2a7cb73f1e1426

Author: Konstantin343

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpMoveProviderExtensionTest.kt

@@ -21,10 +21,9 @@ import com.jetbrains.rider.test.scriptingApi.prepareProjectView
 import org.testng.Assert
 import org.testng.annotations.Test
 
-@Test
 class FSharpMoveProviderExtensionTest : ProjectModelBaseTest() {
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.SDK)
+  @TestSettings(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.SDK)
   @Solution("MoveProviderSolution1")
   fun testAllowPaste01_Mix() {
     doTest { provider ->
@@ -45,7 +44,7 @@ class FSharpMoveProviderExtensionTest : ProjectModelBaseTest() {
   }
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.SDK)
+  @TestSettings(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.SDK)
   @Solution("MoveProviderSolution2")
   fun testAllowPaste02_DifferentFiles() {
     doTest { provider ->
@@ -106,7 +105,7 @@ class FSharpMoveProviderExtensionTest : ProjectModelBaseTest() {
   }
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.SDK)
+  @TestSettings(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.SDK)
   @Solution("MoveProviderSolution3")
   fun testAllowPaste03_DifferentFilesInFolders() {
     doTest { provider ->

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt

@@ -15,7 +15,6 @@ import com.jetbrains.rider.test.scriptingApi.*
 import org.testng.annotations.Test
 import java.io.File
 
-@Test
 @Solution("EmptySolution")
 class FSharpProjectModelTest : ProjectModelBaseTest() {
   override fun modifyOpenSolutionParams(params: OpenSolutionParams) {
@@ -54,7 +53,7 @@ class FSharpProjectModelTest : ProjectModelBaseTest() {
   }
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_5, buildTool = BuildTool.SDK)
+  @TestSettings(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.SDK)
   @Solution("FSharpProjectTree")
   fun testFSharpProjectStructure() {
     doTestDumpProjectsView {
@@ -181,7 +180,7 @@ class FSharpProjectModelTest : ProjectModelBaseTest() {
   }
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_5, buildTool = BuildTool.SDK)
+  @TestSettings(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.SDK)
   @Solution("FsprojWithTwoFiles")
   fun testManualFsprojChange() {
     doTestDumpProjectsView {
@@ -200,7 +199,7 @@ class FSharpProjectModelTest : ProjectModelBaseTest() {
   }
 
   @Test(description = "RIDER-107198")
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_5, buildTool = BuildTool.SDK)
+  @TestSettings(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.SDK)
   @Solution("SolutionWithDuplicateTargets")
   fun doNoneItemDuplicatesTest() {
     doTestDumpProjectsView {

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt

@@ -27,25 +27,18 @@ class TypeProvidersRuntimeTest : BaseTypeProvidersTest() {
   fun framework461() = doTest(".NET Framework 4.8")
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_CORE_3_1, buildTool = BuildTool.SDK)
-  fun core31() = doTest(".NET Core 3.1")
+  @TestSettings(sdkVersion = SdkVersion.DOT_NET_8, buildTool = BuildTool.SDK)
+  fun net8() = doTest(".NET 8")
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_5, buildTool = BuildTool.SDK)
-  fun net5() = doTest(".NET 5")
-
-  @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_6, buildTool = BuildTool.SDK)
-  fun net6() = doTest(".NET 6")
+  @TestSettings(sdkVersion = SdkVersion.DOT_NET_9, buildTool = BuildTool.SDK)
+  fun net9() = doTest(".NET 9")
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_7, buildTool = BuildTool.SDK)
-  fun net7() = doTest(".NET 7")
+  @TestSettings(sdkVersion = SdkVersion.DOT_NET_10, buildTool = BuildTool.SDK)
+  fun net10() = doTest(".NET 10")
 
   @Test
-  @TestSettings(sdkVersion = SdkVersion.DOT_NET_9, buildTool = BuildTool.SDK)
-  fun net9() = doTest(".NET 9")
-
   @Mute("RIDER-103648")
   @TestSettings(sdkVersion = SdkVersion.LATEST_STABLE, buildTool = BuildTool.SDK)
   @Solution("FscTypeProviderLibrary")

rider-fsharp/src/test/testData/projectModel/FSharpMoveProviderExtensionTest/testAllowPaste01_Mix/gold/testAllowPaste01_Mix.gold

@@ -7,7 +7,7 @@
       -Implicit
        ...
      -Packages
-      FSharp.Core/4.7.2
+      FSharp.Core/8.0.403
      -Frameworks
       Microsoft.NETCore.App
    CompileBeforeFile.fs [CompileBefore]

rider-fsharp/src/test/testData/projectModel/FSharpMoveProviderExtensionTest/testAllowPaste02_DifferentFiles/gold/testAllowPaste02_DifferentFiles.gold

@@ -3,11 +3,8 @@
   -SourceProject
    -Dependencies
     -.NETCoreApp 3.1
-     -Assemblies
-      -Implicit
-       ...
      -Packages
-      FSharp.Core/4.7.2
+      FSharp.Core/8.0.403
      -Frameworks
       Microsoft.NETCore.App
    CompileBeforeFile.fs [CompileBefore]
@@ -20,7 +17,7 @@
       -Implicit
        ...
      -Packages
-      FSharp.Core/4.7.2
+      FSharp.Core/8.0.403
      -Frameworks
       Microsoft.NETCore.App
    File1.fs [CompileBefore]

rider-fsharp/src/test/testData/projectModel/FSharpMoveProviderExtensionTest/testAllowPaste03_DifferentFilesInFolders/gold/testAllowPaste03_DifferentFilesInFolders.gold

@@ -3,11 +3,8 @@
   -SourceProject
    -Dependencies
     -.NETCoreApp 3.1
-     -Assemblies
-      -Implicit
-       ...
      -Packages
-      FSharp.Core/4.7.2
+      FSharp.Core/8.0.403
      -Frameworks
       Microsoft.NETCore.App
    CompileBeforeFile.fs [CompileBefore]
@@ -20,7 +17,7 @@
       -Implicit
        ...
      -Packages
-      FSharp.Core/4.7.2
+      FSharp.Core/8.0.403
      -Frameworks
       Microsoft.NETCore.App
    -Folder1

rider-fsharp/src/test/testData/projectModel/FSharpProjectModelTest/doNoneItemDuplicatesTest/gold/doNoneItemDuplicatesTest.gold

@@ -10,7 +10,7 @@ Init
       -Implicit
        ...
      -Packages
-      FSharp.Core/5.0.0
+      FSharp.Core/8.0.403
      -Frameworks
       NETStandard.Library
    Library.fs
@@ -32,7 +32,7 @@ Project [Name:Library, GUID:GUID]
           Child items:
             Folder [Name:netstandard2.1, IsHidden:true]
               Child items:
-                ProjectFileImpl(Path : Library.AssemblyInfo.fs)[Hidden COMPILEBEFORE ]
+                ProjectFileImpl(Path : Library.AssemblyInfo.fs)[Hidden COMPILE Properties:CompileOrder=CompileBefore]
 
 Project [Name:Miscellaneous Files, GUID:GUID]
 
@@ -50,14 +50,14 @@ Content roots:
 1:obj[1]
   1:Debug[1]
     1:netstandard2.1[1]
-      1:.NETStandard,Version=v2.1.AssemblyAttributes.fs (CompileBefore)
-      2:Library.AssemblyInfo.fs (CompileBefore)
+      1:Library.AssemblyInfo.fs
+      2:.NETStandard,Version=v2.1.AssemblyAttributes.fs
 2:Library.fs
 3:host.json (None)
 
 .NETStandard,Version=v2.1
-obj/Debug/netstandard2.1/.NETStandard,Version=v2.1.AssemblyAttributes.fs
 obj/Debug/netstandard2.1/Library.AssemblyInfo.fs
+obj/Debug/netstandard2.1/.NETStandard,Version=v2.1.AssemblyAttributes.fs
 Library.fs
 host.json