Merge staging-next into staging

2020-11-11 16:00:34 +01:00
parent fad425cfbb f70be9a3d1
commit 4076ffe580
155 changed files with 1569 additions and 801 deletions
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
    ./fsharp-IsPathRooted-type-inference.patch
    ./fsharp-string-switchName.patch
    ./fsharp-path-overloads.patch
+    ./fsharp-GetFileNameWithoutExtension-type-inference.patch
  ];

  configurePhase = ''
@@ -0,0 +1,13 @@
+diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx
+index 0bee9b79e..e6ceda11e 100644
+--- a/src/scripts/fssrgen.fsx
+++ b/src/scripts/fssrgen.fsx
+@@ -329,7 +329,7 @@ let StringBoilerPlate filename =
+     // END BOILERPLATE        
+ "            
+ 
+-let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) =
+let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) =
+     try
+         let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename)
+         if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then