Use PROGRAMFILES(X86) in tests

Author: Omar Tawfik

tests/service/Common.fs

@@ -38,7 +38,8 @@ let getBackgroundCheckResultsForScriptText (input) =
 
 let sysLib nm = 
     if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then // file references only valid on Windows 
-        @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\" + nm + ".dll"
+        let programFilesx86Folder = System.Environment.GetEnvironmentVariable("PROGRAMFILES(X86)")
+        programFilesx86Folder + @"\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\" + nm + ".dll"
     else
         let sysDir = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
         let (++) a b = System.IO.Path.Combine(a,b)
@@ -53,7 +54,8 @@ module Helpers =
 let fsCoreDefaultReference() = 
     PathRelativeToTestAssembly "FSharp.Core.dll"
     // if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then // file references only valid on Windows 
-    //    @"C:\Program Files (x86)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll"  
+    //    let programFilesx86Folder = System.Environment.GetEnvironmentVariable("PROGRAMFILES(X86)")
+    //    programFilesx86Folder + @"\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll"  
     //else 
     //    sysLib "FSharp.Core"
 

tests/service/FileSystemTests.fs

@@ -75,6 +75,7 @@ let UseMyFileSystem() =
 let ``FileSystem compilation test``() = 
   if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then // file references only valid on Windows 
     use myFileSystem =  UseMyFileSystem()
+    let programFilesx86Folder = System.Environment.GetEnvironmentVariable("PROGRAMFILES(X86)")
 
     let projectOptions = 
         let allFlags = 
@@ -88,9 +89,9 @@ let ``FileSystem compilation test``() =
                yield "--fullpaths"; 
                yield "--flaterrors"; 
                yield "--target:library"; 
-               for r in [ @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll"; 
-                          @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll"; 
-                          @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll"] do 
+               for r in [ programFilesx86Folder + @"\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll"; 
+                          programFilesx86Folder + @"\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll"; 
+                          programFilesx86Folder + @"\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll"] do 
                      yield "-r:" + r |]
 
         { ProjectFileName = @"c:\mycode\compilation.fsproj" // Make a name that is unique in this directory.

tests/service/ProjectOptionsTests.fs

@@ -412,10 +412,11 @@ let ``Project file parsing -- space in file name``() =
 
 [<Test>]
 let ``Project file parsing -- report files``() =
+  let programFilesx86Folder = System.Environment.GetEnvironmentVariable("PROGRAMFILES(X86)")
   if not runningOnMono then
-   for f in Directory.EnumerateFiles(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\FSharp\","*",SearchOption.AllDirectories) do 
+   for f in Directory.EnumerateFiles(programFilesx86Folder + @"\Reference Assemblies\Microsoft\FSharp\","*",SearchOption.AllDirectories) do 
      printfn "File: %s" f
-   for f in Directory.EnumerateFiles(@"C:\Program Files (x86)\Microsoft SDKs\F#\4.0\","*",SearchOption.AllDirectories) do 
+   for f in Directory.EnumerateFiles(programFilesx86Folder + @"\Microsoft SDKs\F#\4.1\","*",SearchOption.AllDirectories) do 
      printfn "File: %s" f
 
 #endif