Skip to content

Commit 5d2bd22

Browse files
KevinRansombaronfel
authored andcommitted
cleanup FX_LCIDFROMCODEPAGE (#7509)
1 parent 60074cb commit 5d2bd22

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

FSharp.Profiles.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
77
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
88
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
9-
<DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
109
</PropertyGroup>
1110

1211
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">

src/fsharp/fsc.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,15 +1774,13 @@ let main0(ctok, argv, legacyReferenceResolver, bannerAlreadyPrinted,
17741774
exiter: Exiter, errorLoggerProvider : ErrorLoggerProvider, disposables : DisposablesTracker) =
17751775

17761776
// See Bug 735819
1777-
let lcidFromCodePage =
1778-
#if FX_LCIDFROMCODEPAGE
1777+
let lcidFromCodePage =
17791778
if (Console.OutputEncoding.CodePage <> 65001) &&
17801779
(Console.OutputEncoding.CodePage <> Thread.CurrentThread.CurrentUICulture.TextInfo.OEMCodePage) &&
17811780
(Console.OutputEncoding.CodePage <> Thread.CurrentThread.CurrentUICulture.TextInfo.ANSICodePage) then
17821781
Thread.CurrentThread.CurrentUICulture <- new CultureInfo("en-US")
17831782
Some 1033
17841783
else
1785-
#endif
17861784
None
17871785

17881786
let directoryBuildingFrom = Directory.GetCurrentDirectory()

0 commit comments

Comments
 (0)