Merge pull request #592 from matthid/fix_coreclr_embedded_resources

Properly embed 'FSIstrings' resource, fixes #591

Author: dsyme

build.sh

@@ -1,20 +1,37 @@
 #!/bin/bash
-
-if [[ ! -e ~/.config/.mono/certs ]];
+if test "$OS" = "Windows_NT"
 then
-    mozroots --import --sync --quiet
-fi
+  # use .Net
+  .paket/paket.bootstrapper.exe
+  exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+    exit $exit_code
+  fi
 
-mono .paket/paket.bootstrapper.exe
-exit_code=$?
-if [ $exit_code -ne 0 ]; then
-	exit $exit_code
-fi
+  .paket/paket.exe restore
+  exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+    exit $exit_code
+  fi
 
-mono .paket/paket.exe restore
-exit_code=$?
-if [ $exit_code -ne 0 ]; then
-	exit $exit_code
-fi
+  packages/FAKE/tools/FAKE.exe build.fsx $@
+else
+  # use mono
+  if [[ ! -e ~/.config/.mono/certs ]]; then
+    mozroots --import --sync --quiet
+  fi
+  
+  mono .paket/paket.bootstrapper.exe
+  exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+    exit $exit_code
+  fi
 
-mono --runtime=v4.0 packages/FAKE/tools/FAKE.exe build.fsx -d:MONO "$@"
+  mono .paket/paket.exe restore
+  exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+    exit $exit_code
+  fi
+  
+  mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
+fi

src/fsharp/FSharp.Compiler.Service.netcore/project.json

@@ -192,7 +192,8 @@
     "embed": {
       "mappings": {
         "FSComp": "FSComp.resx",
-        "FSStrings": "../FSStrings.resx"
+        "FSStrings": "../FSStrings.resx",
+        "FSIstrings": "FSIstrings.resx"
       }
     },
     "define": [