Sync with the ultimate master

ReSharper.FSharp/Directory.Build.props

@@ -1,11 +1,11 @@
 <Project>
   <Sdk Name="JetBrains.Build.VersionLockFileTargets" Version="0.0.4" />
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and '$(Configuration)'!='Release'">
     <DefineConstants>TRACE;DEBUG;JET_MODE_ASSERT</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and '$(Configuration)'=='Release'">
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
 

rider-fsharp/build.gradle.kts

@@ -66,6 +66,7 @@ dependencies {
     bundledModule("intellij.platform.langInjection")
     bundledPlugin("org.jetbrains.plugins.textmate")
     bundledPlugin("rider.intellij.plugin.appender")
+    bundledPlugin("com.intellij.moduleSet.structureView")
     bundledModule("intellij.resharper.assist")
     instrumentationTools()
     // TODO: Temporary I hope hope hope

rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/runScript/FSharpScriptConfiguration.kt

@@ -8,10 +8,10 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.JDOMExternalizerUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.jetbrains.rdclient.util.idea.toVirtualFile
-import com.jetbrains.rider.debugger.DotNetAsyncRunnableConfiguration
 import com.jetbrains.rider.debugger.IRiderDebuggable
 import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.FSharpScriptFileType
 import com.jetbrains.rider.plugins.fsharp.FSharpBundle
+import com.jetbrains.rider.run.IRiderRunnable
 import com.jetbrains.rider.run.configurations.DotProfilingAwareRunConfiguration
 import com.jetbrains.rider.run.configurations.RiderAsyncRunConfiguration
 import org.jdom.Element
@@ -25,7 +25,7 @@ class FSharpScriptConfiguration(name: String,
                              project,
                              factory,
                              { FSharpScriptConfigurationEditor(it) },
-                             FSharpScriptExecutorFactory()), DotNetAsyncRunnableConfiguration, IRiderDebuggable, DotProfilingAwareRunConfiguration {
+                             FSharpScriptExecutorFactory()), IRiderRunnable, IRiderDebuggable, DotProfilingAwareRunConfiguration {
   companion object {
     private const val SCRIPT_PATH = "SCRIPT_PATH"
   }

rider-fsharp/src/main/resources/META-INF/plugin.xml

@@ -15,6 +15,7 @@
   <depends>com.intellij.modules.rider</depends>
   <depends>rider.intellij.plugin.appender</depends>
   <depends>com.intellij.rider.rdclient.spellchecker</depends>
+  <depends>com.intellij.moduleSet.structureView</depends>
 
   <content>
     <module name="intellij.rider.plugins.fsharp.injections" />

rider-fsharp/src/test/resources/intellij.rider.plugins.fsharp.test.cases.xml

@@ -12,6 +12,7 @@
       <module name="intellij.libraries.gson"/>
       <module name="intellij.libraries.kotlin.reflect"/>
       <module name="intellij.libraries.kotlinx.coroutines.core"/>
+      <module name="intellij.libraries.teamcity.service.messages"/>
       <module name="intellij.platform.analysis"/>
       <module name="intellij.platform.analysis.impl"/>
       <module name="intellij.platform.codeStyle"/>

rider-fsharp/src/test/testData/templates/net10/Net10/XUnitProjectTemplateTest/projectModel/gold/projectModel.gold

@@ -11,7 +11,7 @@ Opened
        ...
      -Packages
       coverlet.collector/6.0.4
-      FSharp.Core/10.0.100
+      FSharp.Core/10.1.202
       Microsoft.NET.Test.Sdk/17.14.1
       xunit.runner.visualstudio/3.1.4
       xunit/2.9.3
@@ -39,6 +39,7 @@ Project [Name:UnitTestProject, GUID:GUID]
           Child items:
             Folder [Name:net10.0, IsHidden:true]
               Child items:
+                ProjectFileImpl(Path : ILLink.Substitutions.xml)[Hidden EMBEDDEDRESOURCE Properties:LogicalName=ILLink.Substitutions.xml]
                 ProjectFileImpl(Path : UnitTestProject.AssemblyInfo.fs)[Hidden COMPILE Properties:CompileOrder=CompileBefore]
     ProjectFileImpl(Path : xunit.abstractions.dll (.nuget/packages))[Hidden NONE ]
     ProjectFileImpl(Path : xunit.runner.visualstudio.testadapter.dll (.nuget/packages))[Hidden NONE ]