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

Make desktop the default again #12170

Merged
merged 2 commits into from
Sep 20, 2021
Merged

Make desktop the default again #12170

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
c3ebea3
Make desktop the default again
KevinRansom Sep 20, 2021
3e7bde2
Fix typo
KevinRansom Sep 20, 2021
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
6 changes: 6 additions & 0 deletions src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions tests/fsharp/SDKTests/tests/WhichFSharpCompiler - Default Settings.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down