Merge pull request #7230 from dotnet/merges/master-to-release/dev16.3

Merge master to release/dev16.3

Author: KevinRansom

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19361.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19362.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f1b09644408f45f43f5835786b3e4bdfd2e78141</Sha>
+      <Sha>15f50ca6a9d0b441c9927421657fb9dc91206cc9</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

global.json

@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19361.7",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19362.5",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

src/fsharp/IlxGen.fs

@@ -2540,7 +2540,8 @@ and GenAllocUnionCase cenv cgbuf eenv (c,tyargs,args,m) sequel =
     GenSequel cenv eenv.cloc cgbuf sequel
 
 and GenLinearExpr cenv cgbuf eenv sp expr sequel canProcessSequencePoint (contf: FakeUnit -> FakeUnit) =
-    match stripExpr expr with 
+    let expr = stripExpr expr
+    match expr with 
     | LinearOpExpr (TOp.UnionCase c, tyargs, argsFront, argLast, m) ->
         GenExprs cenv cgbuf eenv argsFront
         GenLinearExpr cenv cgbuf eenv SPSuppress argLast Continue (* canProcessSequencePoint *) true (contf << (fun Fake -> 

tests/fsharp/Compiler/CompilerAssert.fs

@@ -167,6 +167,9 @@ module CompilerAssert =
             let errors = p.StandardError.ReadToEnd ()
             if not (String.IsNullOrWhiteSpace errors) then
                 Assert.Fail errors
+
+            if p.ExitCode <> 0 then
+                Assert.Fail(sprintf "Program exited with exit code %d" p.ExitCode)
         )
 
     let CompileLibraryAndVerifyIL (source: string) (f: ILVerifier -> unit) =

tests/fsharp/Compiler/ErrorMessages/AccessOfTypeAbbreviationTests.fs

@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Compiler.UnitTests
+
+open NUnit.Framework
+open FSharp.Compiler.SourceCodeServices
+
+[<TestFixture>]
+module ``Access Of Type Abbreviation`` =
+
+    [<Test>]
+    let ``Test1``() =
+        CompilerAssert.TypeCheckSingleError
+            """
+module Library =
+  type private Hidden = Hidden of unit
+  type Exported = Hidden
+            """
+            FSharpErrorSeverity.Warning
+            44
+            (4, 8, 4, 16)
+            "This construct is deprecated. The type 'Hidden' is less accessible than the value, member or type 'Exported' it is used in.\r\nAs of F# 4.1, the accessibility of type abbreviations is checked at compile-time. Consider changing the accessibility of the type abbreviation. Ignoring this warning might lead to runtime errors."
+
+    [<Test>]
+    let ``Test2``() =
+        CompilerAssert.Pass
+            """
+module Library =
+  type internal Hidden = Hidden of unit
+  type internal Exported = Hidden
+            """
+
+    [<Test>]
+    let ``Test3``() =
+        CompilerAssert.TypeCheckSingleError
+            """
+module Library =
+  type internal Hidden = Hidden of unit
+  type Exported = Hidden
+            """
+            FSharpErrorSeverity.Warning
+            44
+            (4, 8, 4, 16)
+            "This construct is deprecated. The type 'Hidden' is less accessible than the value, member or type 'Exported' it is used in.\r\nAs of F# 4.1, the accessibility of type abbreviations is checked at compile-time. Consider changing the accessibility of the type abbreviation. Ignoring this warning might lead to runtime errors."
+
+    [<Test>]
+    let ``Test4``() =
+        CompilerAssert.TypeCheckSingleError
+            """
+module Library =
+  type private Hidden = Hidden of unit
+  type internal Exported = Hidden
+            """
+            FSharpErrorSeverity.Warning
+            44
+            (4, 17, 4, 25)
+            "This construct is deprecated. The type 'Hidden' is less accessible than the value, member or type 'Exported' it is used in.\r\nAs of F# 4.1, the accessibility of type abbreviations is checked at compile-time. Consider changing the accessibility of the type abbreviation. Ignoring this warning might lead to runtime errors."
+
+    [<Test>]
+    let ``Test5``() =
+        CompilerAssert.Pass
+            """
+module Library =
+  type private Hidden = Hidden of unit
+  type private Exported = Hidden
+            """
+
+    [<Test>]
+    let ``Test6``() =
+        CompilerAssert.Pass
+            """
+module Library =
+  type Hidden = Hidden of unit
+  type Exported = Hidden
+            """

tests/fsharp/FSharpSuite.Tests.fsproj

@@ -33,6 +33,7 @@
     <Compile Include="tests.fs" />
     <Compile Include="Compiler\ILChecker.fs" />
     <Compile Include="Compiler\CompilerAssert.fs" />
+    <Compile Include="Compiler\ErrorMessages\AccessOfTypeAbbreviationTests.fs" />
     <Compile Include="Compiler\ErrorMessages\ElseBranchHasWrongTypeTests.fs" />
     <Compile Include="Compiler\ErrorMessages\MissingElseBranch.fs" />
     <Compile Include="Compiler\SourceTextTests.fs" />