From 0a90022667ff1f5e9cb2f9ddf3c1ce4a32efd07b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2019 16:51:20 -0700
Subject: [PATCH 1/2] [master] Update dependencies from dotnet/arcade (#7162)
* Update dependencies from https://github.com/dotnet/arcade build 20190708.1
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19358.1
* Update dependencies from https://github.com/dotnet/arcade build 20190709.1
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19359.1
---
eng/Version.Details.xml | 4 ++--
global.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4ff41132076..cb67136ddce 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- a65d0966dc28861394ce78cfdcb9d5dff370957c
+ ef3834feb8615429a58808cdcf9ad9284d767654
diff --git a/global.json b/global.json
index 71a3f7705a3..733aa27d45a 100644
--- a/global.json
+++ b/global.json
@@ -10,7 +10,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19356.1",
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
}
}
From e057f09a57448f15980048118b4a36842c9e3bb4 Mon Sep 17 00:00:00 2001
From: Will Smith
Date: Tue, 9 Jul 2019 18:11:36 -0700
Subject: [PATCH 2/2] Always recover when trying to parse inline IL (#7167)
---
src/fsharp/ast.fs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs
index 3c341131fba..46bb6b1420e 100644
--- a/src/fsharp/ast.fs
+++ b/src/fsharp/ast.fs
@@ -1982,7 +1982,7 @@ let ParseAssemblyCodeInstructions s m =
try FSharp.Compiler.AbstractIL.Internal.AsciiParser.ilInstrs
FSharp.Compiler.AbstractIL.Internal.AsciiLexer.token
(UnicodeLexing.StringAsLexbuf s)
- with RecoverableParseError ->
+ with _ ->
errorR(Error(FSComp.SR.astParseEmbeddedILError(), m)); [| |]
#endif