Compat fix for 6258 and fix deterministic flag

build/targets/NGenOrCrossGen.targets

@@ -16,9 +16,9 @@
         NGen for both 32 and 64 bit product.
         If compiling use the app config file, if present.
     -->
-    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen64)') AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true'"/>
+    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen64)') AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true' AND '$(PlatformTarget)' != 'x86'"/>
     <Exec Command='"$(PathToNGen32)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen32)') AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true'"/>
-    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen64)') AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' "/>
+    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen64)') AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' AND '$(PlatformTarget)' != 'x86' "/>
     <Exec Command='"$(PathToNGen32)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen32)') AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' "/>
   </Target>
 

src/absil/ilwrite.fs

@@ -2857,9 +2857,8 @@ and newGuid (modul: ILModuleDef) =
 
 and deterministicGuid (modul: ILModuleDef) =
     let n = 16909060
-    let m = hash n
-    let m2 = hash modul.Name
-    [| b0 m; b1 m; b2 m; b3 m; b0 m2; b1 m2; b2 m2; b3 m2; 0xa7uy; 0x45uy; 0x03uy; 0x83uy; b0 n; b1 n; b2 n; b3 n |]
+    let m2 = Seq.sum (Seq.mapi (fun i  x -> i + int x) modul.Name) // use a stable hash
+    [| b0 n; b1 n; b2 n; b3 n; b0 m2; b1 m2; b2 m2; b3 m2; 0xa7uy; 0x45uy; 0x03uy; 0x83uy; b0 n; b1 n; b2 n; b3 n |]
 
 and GetModuleAsRow (cenv:cenv) (modul: ILModuleDef) = 
     // Store the generated MVID in the environment (needed for generating debug information)

src/fsharp/fsc/fsc.fsproj

@@ -15,6 +15,10 @@
     <NGenBinary>true</NGenBinary>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\fscmain.fs">
       <Link>fscmain.fs</Link>

src/fsharp/fsi/fsi.fsproj

@@ -17,6 +17,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
+    <PlatformTarget>x86</PlatformTarget>
     <DefineConstants>$(DefineConstants);FSI_SHADOW_COPY_REFERENCES;FSI_SERVER</DefineConstants>
   </PropertyGroup>
 

tests/fsharpqa/Source/CompilerOptions/fsc/determinism/binaryCompare.fsx

@@ -13,8 +13,10 @@ let filePairsToCheck =
     |> Seq.map (fun f -> f, f.Replace("dummy","dummy2"))
 
 let compareFiles pair =
-    let correct = areSame pair = shouldBeSame
-    if not correct then 
+    let correct = (areSame pair = shouldBeSame)
+    if correct then 
+        printfn "Good, %s and %s were %s" (fst pair) (snd pair) (if shouldBeSame then "same" else "different")
+    else
         printfn "Expected %s and %s to be %s" (fst pair) (snd pair) (if shouldBeSame then "same" else "different")
     correct
 

tests/fsharpqa/Source/run.pl

@@ -424,7 +424,9 @@ sub RunCompilerCommand {
         @CommandOutput = <$remote>;
 
         print "--------------------------------------------------------\n";
-        print "Error from hosted compiler\n";
+        print "Results from hosted compiler\n";
+        print "msg: $msg\n";
+        print "cmd: $cmd\n";
         print "Exit code: $ExitCode\n";
         print "Error:     $Type\n";
         print @CommandOutput;

tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj

@@ -8,6 +8,8 @@
     <DisableOutputPathCopying>true</DisableOutputPathCopying>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(RepoRoot)tests\fsharpqa\testenv\bin</OutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
 
   <ItemGroup>

vsintegration/src/FSharp.VS.FSI/sessions.fs

@@ -66,7 +66,7 @@ let timeoutApp descr timeoutMS (f : 'a -> 'b) (arg:'a) =
     !r
 
 module SessionsProperties = 
-    let mutable useAnyCpuVersion = false
+    let mutable useAnyCpuVersion = true // 64-bit by default
     let mutable fsiArgs = "--optimize"
     let mutable fsiShadowCopy = true
     let mutable fsiDebugMode = false