Skip to content

Commit 658caa2

Browse files
authored
Merge pull request #7183 from dotnet/merges/release/dev16.3-to-release/fsharp47
Merge release/dev16.3 to release/fsharp47
2 parents 017d5cf + bc4edc6 commit 658caa2

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19356.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19359.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>a65d0966dc28861394ce78cfdcb9d5dff370957c</Sha>
8+
<Sha>ef3834feb8615429a58808cdcf9ad9284d767654</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19356.1",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.1",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

src/fsharp/ast.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,7 @@ let internal internalParseAssemblyCodeInstructions s isFeatureSupported m =
18751875
FSharp.Compiler.AbstractIL.Internal.AsciiParser.ilInstrs
18761876
FSharp.Compiler.AbstractIL.Internal.AsciiLexer.token
18771877
(UnicodeLexing.StringAsLexbuf(isFeatureSupported, s))
1878-
with RecoverableParseError ->
1878+
with _ ->
18791879
errorR(Error(FSComp.SR.astParseEmbeddedILError(), m)); [||]
18801880
#endif
18811881

0 commit comments

Comments
 (0)