Skip to content

Commit f88a219

Browse files
committed
remove #if SIVLERLIGHT
1 parent 89f5d1c commit f88a219

File tree

5 files changed

+0
-29
lines changed

5 files changed

+0
-29
lines changed

samples/FsiExe/fsimain.fs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,13 @@ let StartServer (fsiSession : FsiEvaluationSession) (fsiServerName) =
116116
// GUI runCodeOnMainThread
117117
//----------------------------------------------------------------------------
118118

119-
#if SILVERLIGHT
120-
#else
121-
122119
let internal TrySetUnhandledExceptionMode() =
123120
let i = ref 0 // stop inlining
124121
try
125122
Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException)
126123
with _ ->
127124
decr i;()
128125

129-
#endif // SILVERLIGHT
130-
131126
// Mark the main thread as STAThread since it is a GUI thread
132127
[<EntryPoint>]
133128
[<STAThread()>]

src/fsharp/fsi/fsi.fs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,13 +2329,8 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i
23292329
// tcConfig - build the initial config
23302330
//----------------------------------------------------------------------------
23312331

2332-
#if SILVERLIGHT
2333-
let defaultFSharpBinariesDir = "."
2334-
let currentDirectory = "."
2335-
#else
23362332
let defaultFSharpBinariesDir = System.AppDomain.CurrentDomain.BaseDirectory
23372333
let currentDirectory = Directory.GetCurrentDirectory()
2338-
#endif
23392334
// When used as part of FCS we cannot assume the current process is fsi.exe
23402335
// So we try to fallback to the default compiler dir.
23412336
let defaultFSharpBinariesDir =
@@ -2805,11 +2800,7 @@ module Settings =
28052800
let mutable evLoop = (new SimpleEventLoop() :> IEventLoop)
28062801
let mutable showIDictionary = true
28072802
let mutable showDeclarationValues = true
2808-
#if SILVERLIGHT
2809-
let mutable args : string[] = [| |]
2810-
#else
28112803
let mutable args = Environment.GetCommandLineArgs()
2812-
#endif
28132804
let mutable fpfmt = "g10"
28142805
let mutable fp = (CultureInfo.InvariantCulture :> System.IFormatProvider)
28152806
let mutable printWidth = 78

src/fsharp/vs/SimpleServices.fs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,8 @@ namespace Microsoft.FSharp.Compiler.SimpleSourceCodeServices
210210
// Set the output streams, if requested
211211
match execute with
212212
| Some (writer,error) ->
213-
#if SILVERLIGHT
214-
Microsoft.FSharp.Core.Printf.setWriter writer
215-
Microsoft.FSharp.Core.Printf.setError error
216-
#else
217213
System.Console.SetOut writer
218214
System.Console.SetError error
219-
#endif
220215
| None -> ()
221216

222217

src/fsharp/vs/service.fs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,12 +2789,9 @@ type FSharpChecker(projectCacheSize, keepAssemblyContents, keepAllBackgroundReso
27892789
LoadTime = loadedTimeStamp
27902790
UnresolvedReferences = None }
27912791

2792-
#if SILVERLIGHT
2793-
#else
27942792
#if FX_ATLEAST_45
27952793
member ic.GetProjectOptionsFromProjectFile(_ : string, ?_a : (string * string) list, ?_b : System.DateTime) : FSharpProjectOptions =
27962794
failwithf "This method has been removed."
2797-
#endif
27982795
#endif
27992796

28002797
/// Begin background parsing the given project.
@@ -2936,11 +2933,7 @@ module DebuggerEnvironment =
29362933
/// Return the language ID, which is the expression evaluator id that the
29372934
/// debugger will use.
29382935
let GetLanguageID() =
2939-
#if SILVERLIGHT
2940-
System.Guid(0xAB4F38C9, 0xB6E6s, 0x43bas, 0xBEuy, 0x3Buy, 0x58uy, 0x08uy, 0x0Buy, 0x2Cuy, 0xCCuy, 0xE3uy)
2941-
#else
29422936
System.Guid(0xAB4F38C9u, 0xB6E6us, 0x43baus, 0xBEuy, 0x3Buy, 0x58uy, 0x08uy, 0x0Buy, 0x2Cuy, 0xCCuy, 0xE3uy)
2943-
#endif
29442937

29452938
module PrettyNaming =
29462939
let IsIdentifierPartCharacter x = Microsoft.FSharp.Compiler.PrettyNaming.IsIdentifierPartCharacter x

src/fsharp/vs/service.fsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,6 @@ type FSharpChecker =
554554
/// so that references are re-resolved.</param>
555555
member GetProjectOptionsFromCommandLineArgs : projectFileName: string * argv: string[] * ?loadedTimeStamp: DateTime -> FSharpProjectOptions
556556
557-
#if SILVERLIGHT
558-
#else
559557
#if FX_ATLEAST_45
560558
/// <summary>
561559
/// <para>Get the project options implied by a standard F# project file in the xbuild/msbuild format.</para>
@@ -567,7 +565,6 @@ type FSharpChecker =
567565
/// so that an 'unload' and 'reload' action will cause the project to be considered as a new project.</param>
568566
[<Obsolete("This functionality has been moved to the new NuGet package 'FSharp.Compiler.Service.ProjectCracker'", true)>]
569567
member GetProjectOptionsFromProjectFile : projectFileName: string * ?properties : (string * string) list * ?loadedTimeStamp: DateTime -> FSharpProjectOptions
570-
#endif
571568
#endif
572569

573570
[<Obsolete("This member has been renamed to 'GetProjectOptionsFromScript'")>]

0 commit comments

Comments
 (0)