Make desktop the default again (#12170)

* Make desktop the default again

* Fix typo

Author: KevinRansom

src/fsharp/FSharp.Build/Microsoft.FSharp.Targets

@@ -61,6 +61,12 @@ this file.
 
       If Shim helpers are present then the values are valid and set by the Microsoft.FSharp.Helpers.props
     -->
+
+    <!-- Here we set the default value to true when nothing is set, it will be removed in a future release when we default to the net sdk compiler -->
+    <PropertyGroup Condition="'$(FSharp_Shim_Present)' == 'true'">
+        <FSharpPreferNetFrameworkTools Condition="'$(FSharpPreferNetFrameworkTools)' == ''">true</FSharpPreferNetFrameworkTools>
+    </PropertyGroup>
+
     <PropertyGroup Condition="'$(FSharp_Shim_Present)' == 'true' and '$(FSharpPreferNetFrameworkTools)' == 'true'">
         <FscToolPath>$(Fsc_NetFramework_ToolPath)</FscToolPath>
         <FscToolExe Condition="'$(FSharpPrefer64BitTools)' != 'false'">$(Fsc_NetFramework_AnyCpu_ToolExe)</FscToolExe>

tests/fsharp/SDKTests/tests/WhichFSharpCompiler - Default Settings.proj

@@ -9,9 +9,9 @@
   <PropertyGroup>
     <ExpectedFSharpShimPresent>true</ExpectedFSharpShimPresent>
     <ExpectedFSharpCompilerPath>/Common7/IDE/CommonExtensions/Microsoft/FSharp/Tools/</ExpectedFSharpCompilerPath>
-    <ExpectedFscToolExe>dotnet.exe</ExpectedFscToolExe>
-    <ExpectedFscToolPath>/_NetCoreRoot_/</ExpectedFscToolPath>
-    <ExpectedDotnetFscCompilerPath>/FSharp/fsc.dll</ExpectedDotnetFscCompilerPath>
+    <ExpectedFscToolExe>fscAnyCpu.exe</ExpectedFscToolExe>
+    <ExpectedFscToolPath>_VsInstallRoot_/Common7/IDE/CommonExtensions/Microsoft/FSharp/Tools/</ExpectedFscToolPath>
+    <ExpectedDotnetFscCompilerPath></ExpectedDotnetFscCompilerPath>
   </PropertyGroup>
 
   <Import Project="ToolsTest.props" />