Merge pull request #33301 from dotnet-maestro-bot/master-UpdateDepend…

…encies

Update BuildTools, CoreClr, CoreFx, CoreFxOptimizationData, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-03406-03, preview-27107-01, preview.18557.4, master-20181107-0043, preview-27107-01, beta-27106-00, beta-27107-00, respectively (master)

eng/dependencies.props

@@ -9,16 +9,16 @@
        These ref versions are pulled from https://github.com/dotnet/versions.
   -->
   <PropertyGroup>
-    <CoreFxCurrentRef>f01b0c7cf0de6f0a60da4e4063251b4a068021a6</CoreFxCurrentRef>
-    <CoreClrCurrentRef>77defa0164d7c10c4df9c6d03d56a16853eb2663</CoreClrCurrentRef>
-    <CoreSetupCurrentRef>72abc2cc019570b5c7892bdfc7b43d623484ad75</CoreSetupCurrentRef>
+    <CoreFxCurrentRef>a2663f25b9c72a398db229a7994dc79242d4ad63</CoreFxCurrentRef>
+    <CoreClrCurrentRef>a2663f25b9c72a398db229a7994dc79242d4ad63</CoreClrCurrentRef>
+    <CoreSetupCurrentRef>a2663f25b9c72a398db229a7994dc79242d4ad63</CoreSetupCurrentRef>
     <ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
-    <ProjectNTfsCurrentRef>f6b3cca774b30078871d15c4020c151d189033b8</ProjectNTfsCurrentRef>
-    <ProjectNTfsTestILCCurrentRef>f6b3cca774b30078871d15c4020c151d189033b8</ProjectNTfsTestILCCurrentRef>
+    <ProjectNTfsCurrentRef>a2663f25b9c72a398db229a7994dc79242d4ad63</ProjectNTfsCurrentRef>
+    <ProjectNTfsTestILCCurrentRef>a2663f25b9c72a398db229a7994dc79242d4ad63</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
     <StandardCurrentRef>9004703a1923e5c5582ceb8d79712df777412446</StandardCurrentRef>
-    <BuildToolsCurrentRef>1ccc8cf922acbb3645020c882f1ec849fc1eb9aa</BuildToolsCurrentRef>
-    <CoreFxOptimizationDataCurrentRef>f6b3cca774b30078871d15c4020c151d189033b8</CoreFxOptimizationDataCurrentRef>
+    <BuildToolsCurrentRef>a2663f25b9c72a398db229a7994dc79242d4ad63</BuildToolsCurrentRef>
+    <CoreFxOptimizationDataCurrentRef>a2663f25b9c72a398db229a7994dc79242d4ad63</CoreFxOptimizationDataCurrentRef>
   </PropertyGroup>
 
   <!-- Product dependency versions. -->
@@ -32,16 +32,16 @@
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>preview1.18530.5</CoreFxExpectedPrerelease>
-    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1.18530.5</MicrosoftNETCorePlatformsPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-27101-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview1-27101-02</MicrosoftNetCoreIlasmPackageVersion>
-    <ProjectNTfsExpectedPrerelease>beta-27101-00</ProjectNTfsExpectedPrerelease>
-    <ProjectNTfsTestILCExpectedPrerelease>beta-27101-00</ProjectNTfsTestILCExpectedPrerelease>
-    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-27101-00</ProjectNTfsTestILCPackageVersion>
-    <MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview1-27031-02</MicrosoftNETCoreDotNetHostPackageVersion>
-    <MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview1-27031-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-27031-02</MicrosoftNETCoreAppPackageVersion>
+    <CoreFxExpectedPrerelease>preview.18557.4</CoreFxExpectedPrerelease>
+    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.18557.4</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27107-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27107-01</MicrosoftNetCoreIlasmPackageVersion>
+    <ProjectNTfsExpectedPrerelease>beta-27106-00</ProjectNTfsExpectedPrerelease>
+    <ProjectNTfsTestILCExpectedPrerelease>beta-27106-00</ProjectNTfsTestILCExpectedPrerelease>
+    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-27106-00</ProjectNTfsTestILCPackageVersion>
+    <MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview-27107-01</MicrosoftNETCoreDotNetHostPackageVersion>
+    <MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview-27107-01</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27107-01</MicrosoftNETCoreAppPackageVersion>
 
     <!-- CoreFX-built SNI identity package -->
     <RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
@@ -59,16 +59,16 @@
     <TestILCArmretPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCArmretPackageVersion>
     <TestILCX86retPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCX86retPackageVersion>
     <OptimizationDataVersion>2.0.0-rc-61101-17</OptimizationDataVersion>
-    <CoreFxOptimizationDataVersion>99.99.99-master-20181101-0044</CoreFxOptimizationDataVersion>
+    <CoreFxOptimizationDataVersion>99.99.99-master-20181107-0043</CoreFxOptimizationDataVersion>
   </PropertyGroup>
 
   <!-- Package versions used as toolsets -->
   <PropertyGroup>
     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
-    <FeedTasksPackageVersion>3.0.0-preview1-03330-01</FeedTasksPackageVersion>
+    <FeedTasksPackageVersion>3.0.0-preview1-03406-03</FeedTasksPackageVersion>
 
     <BuildToolsPackage>microsoft.dotnet.buildtools</BuildToolsPackage>
-    <BuildToolsPackageVersion>3.0.0-preview1-03330-01</BuildToolsPackageVersion>
+    <BuildToolsPackageVersion>3.0.0-preview1-03406-03</BuildToolsPackageVersion>
   </PropertyGroup>
 
   <!-- Publish symbol build task package -->

global.json

@@ -4,6 +4,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18531.9",
-    "Microsoft.NET.Sdk.IL": "3.0.0-preview1-27101-02"
+    "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01"
   }
 }

src/System.Diagnostics.Debug/tests/DebugTests.cs

@@ -41,7 +41,7 @@ protected void VerifyLogged(Action test, string expectedOutput)
 
             // First use our test logger to verify the output
             var originalWriteCoreHook = writeCoreHook.GetValue(null);
-            writeCoreHook.SetValue(null, new Action<string>(WriteLogger.s_instance.MockWrite));
+            writeCoreHook.SetValue(null, new Action<string>(WriteLogger.s_instance.WriteCore));
 
             try
             {
@@ -62,11 +62,12 @@ protected void VerifyLogged(Action test, string expectedOutput)
         protected void VerifyAssert(Action test, params string[] expectedOutputStrings)
         {
             FieldInfo writeCoreHook = typeof(DebugProvider).GetField("s_WriteCore", BindingFlags.Static | BindingFlags.NonPublic);
-            s_defaultProvider = Debug.SetProvider(WriteLogger.s_instance);
-            WriteLogger.s_instance.OriginalProvider = s_defaultProvider;
-
             var originalWriteCoreHook = writeCoreHook.GetValue(null);
-            writeCoreHook.SetValue(null, new Action<string>(WriteLogger.s_instance.MockWrite));
+            writeCoreHook.SetValue(null, new Action<string>(WriteLogger.s_instance.WriteCore));
+
+            FieldInfo failCoreHook = typeof(DebugProvider).GetField("s_FailCore", BindingFlags.Static | BindingFlags.NonPublic);
+            var originalFailCoreHook = failCoreHook.GetValue(null);
+            failCoreHook.SetValue(null, new Action<string, string, string, string>(WriteLogger.s_instance.FailCore));
 
             try
             {
@@ -82,19 +83,16 @@ protected void VerifyAssert(Action test, params string[] expectedOutputStrings)
             finally
             {
                 writeCoreHook.SetValue(null, originalWriteCoreHook);
-                Debug.SetProvider(s_defaultProvider);
+                failCoreHook.SetValue(null, originalFailCoreHook);
             }
         }
 
-        private static DebugProvider s_defaultProvider;
-        private class WriteLogger : DebugProvider
+        internal class WriteLogger
         {
             public static readonly WriteLogger s_instance = new WriteLogger();
 
             private WriteLogger() { }
 
-            public DebugProvider OriginalProvider { get; set; }
-
             public string LoggedOutput { get; private set; }
 
             public string AssertUIOutput { get; private set; }
@@ -105,24 +103,12 @@ public void Clear()
                 AssertUIOutput = string.Empty;
             }
 
-            public override void ShowDialog(string stackTrace, string message, string detailMessage, string errorSource)
+            public void FailCore(string stackTrace, string message, string detailMessage, string errorSource)
             {
                 AssertUIOutput += stackTrace + message + detailMessage + errorSource;
             }
 
-            public override void OnIndentLevelChanged(int indentLevel)
-            {
-                OriginalProvider.OnIndentLevelChanged(indentLevel);
-            }
-
-            public override void OnIndentSizeChanged(int indentSize)
-            {
-                OriginalProvider.OnIndentLevelChanged(indentSize);
-            }
-            public override void Write(string message) { OriginalProvider.Write(message); }
-            public override void WriteLine(string message) { OriginalProvider.WriteLine(message); }
-
-            public void MockWrite(string message)
+            public void WriteCore(string message)
             {
                 Assert.NotNull(message);
                 LoggedOutput += message;

src/System.Diagnostics.Debug/tests/DebugTestsUsingListeners.cs

@@ -244,5 +244,62 @@ public void TraceWriteLineIf()
             VerifyLogged(() => Trace.WriteLineIf(true, "logged", "category"), "category: logged" + Environment.NewLine);
             VerifyLogged(() => Trace.WriteLineIf(false, "logged", "category"), "");     
         }
+
+        [Fact]
+        public void Trace_AssertUiEnabledFalse_SkipsFail()
+        {
+            var initialListener = (DefaultTraceListener)Trace.Listeners[0];
+            Trace.Listeners.Clear();
+            Trace.Fail("Skips fail fast");
+            Debug.Fail("Skips fail fast");
+
+            initialListener.AssertUiEnabled = false;
+            Trace.Listeners.Add(initialListener);
+            Debug.Fail("Skips fail fast");
+            Trace.Fail("Skips fail fast");
+
+            var myListener = new MyTraceListener();
+            string expectedDialog = $"Mock dialog - message: short, detailed message: long";
+            Trace.Listeners.Clear();
+            Trace.Listeners.Add(myListener);
+
+            try
+            {
+                myListener.AssertUiEnabled = false;
+                Debug.Fail("short", "long");
+                Assert.Equal("", myListener.OutputString);
+                Trace.Fail("short", "long");
+                Assert.Equal("", myListener.OutputString);
+
+                myListener.AssertUiEnabled = true;
+                Debug.Fail("short", "long");
+                Assert.Equal(expectedDialog, myListener.OutputString);
+                Trace.Fail("short", "long");
+                Assert.Equal(expectedDialog + expectedDialog, myListener.OutputString);
+            }
+            finally
+            {
+                Trace.Listeners.Clear();
+                Trace.Listeners.Add(initialListener);
+            }
+        }
+
+        class MyTraceListener : DefaultTraceListener
+        {
+            private void FailCore(string stackTrace, string message, string detailMessage, string errorSource) 
+            {
+                OutputString += $"Mock dialog - message: {message}, detailed message: {detailMessage}";
+            }
+            public string OutputString { get; private set; } = string.Empty;
+
+            public override void Fail(string message, string detailMessage)
+            {
+                WriteLine(message, detailMessage);
+                if (AssertUiEnabled)
+                {
+                    FailCore(string.Empty, message, detailMessage, "Assertion Failed");
+                }
+            }
+        }
     }
 }

src/System.Diagnostics.TraceSource/src/System/Diagnostics/DefaultTraceListener.cs

@@ -89,16 +89,10 @@ public override void Fail(string message, string detailMessage)
             {
                 stackTrace = "";
             }
-            // Tracked by #32955: WriteAssert should write "stackTrace" rather than string.Empty. 
-            WriteAssert(string.Empty, message, detailMessage);
+            WriteAssert(stackTrace, message, detailMessage);
             if (AssertUiEnabled)
             {
-                // Tracked by #32955: Currently AssertUiEnabled is true by default but we are not calling Enviroment.FailFast as Debug.Fail does 
-                // s_provider.ShowDialog(stackTrace, message, detailMessage, "Assertion Failed");
-            }
-            if (Debugger.IsAttached)
-            {
-                Debugger.Break();
+                DebugProvider.FailCore(stackTrace, message, detailMessage, "Assertion Failed");
             }
         }
 

src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs

@@ -13,6 +13,7 @@ internal static class TraceInternal
     {
         private class TraceProvider : DebugProvider
         {
+            public override void Fail(string message, string detailMessage) { TraceInternal.Fail(message, detailMessage); }
             public override void OnIndentLevelChanged(int indentLevel)
             {
                 lock (TraceInternal.critSec)

src/System.Memory/tests/MemoryMarshal/CreateFromPinnedArray.cs

@@ -36,67 +36,61 @@ public static void CreateFromPinnedArrayString()
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "This unit test relies on internal implementation details of Memory<T> on netcoreapp.")]
         public static void CreateFromPinnedArrayIntSliceRemainsPinned()
         {
             int[] a = { 90, 91, 92, 93, 94, 95, 96, 97, 98 };
             Memory<int> pinnedMemory = MemoryMarshal.CreateFromPinnedArray(a, 3, 5);
             pinnedMemory.Validate(93, 94, 95, 96, 97);
 
-            TestMemory<int> testPinnedMemory = Unsafe.As<Memory<int>, TestMemory<int>>(ref pinnedMemory);
-
             Memory<int> slice = pinnedMemory.Slice(0);
             TestMemory<int> testSlice = Unsafe.As<Memory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index, testSlice._index);
-            Assert.Equal(testPinnedMemory._length, testSlice._length);
+            Assert.Equal(3 | (1 << 31), testSlice._index);
+            Assert.Equal(5, testSlice._length);
 
             slice = pinnedMemory.Slice(0, pinnedMemory.Length);
             testSlice = Unsafe.As<Memory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index, testSlice._index);
-            Assert.Equal(testPinnedMemory._length, testSlice._length);
+            Assert.Equal(3 | (1 << 31), testSlice._index);
+            Assert.Equal(5, testSlice._length);
 
-            int expectedLength = testPinnedMemory._length - 1;
             slice = pinnedMemory.Slice(1);
             testSlice = Unsafe.As<Memory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index + 1, testSlice._index);
-            Assert.Equal(expectedLength, testSlice._length);
+            Assert.Equal(4 | (1 << 31), testSlice._index);
+            Assert.Equal(4, testSlice._length);
 
-            expectedLength = 2 | (1 << 31);
             slice = pinnedMemory.Slice(1, 2);
             testSlice = Unsafe.As<Memory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index + 1, testSlice._index);
-            Assert.Equal(expectedLength, testSlice._length);
+            Assert.Equal(4 | (1 << 31), testSlice._index);
+            Assert.Equal(2, testSlice._length);
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "This unit test relies on internal implementation details of Memory<T> on netcoreapp.")]
         public static void CreateFromPinnedArrayIntReadOnlyMemorySliceRemainsPinned()
         {
             int[] a = { 90, 91, 92, 93, 94, 95, 96, 97, 98 };
             ReadOnlyMemory<int> pinnedMemory = MemoryMarshal.CreateFromPinnedArray(a, 3, 5);
             pinnedMemory.Validate(93, 94, 95, 96, 97);
 
-            TestMemory<int> testPinnedMemory = Unsafe.As<ReadOnlyMemory<int>, TestMemory<int>>(ref pinnedMemory);
-
             ReadOnlyMemory<int> slice = pinnedMemory.Slice(0);
             TestMemory<int> testSlice = Unsafe.As<ReadOnlyMemory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index, testSlice._index);
-            Assert.Equal(testPinnedMemory._length, testSlice._length);
+            Assert.Equal(3 | (1 << 31), testSlice._index);
+            Assert.Equal(5, testSlice._length);
 
             slice = pinnedMemory.Slice(0, pinnedMemory.Length);
             testSlice = Unsafe.As<ReadOnlyMemory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index, testSlice._index);
-            Assert.Equal(testPinnedMemory._length, testSlice._length);
+            Assert.Equal(3 | (1 << 31), testSlice._index);
+            Assert.Equal(5, testSlice._length);
 
-            int expectedLength = testPinnedMemory._length - 1;
             slice = pinnedMemory.Slice(1);
             testSlice = Unsafe.As<ReadOnlyMemory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index + 1, testSlice._index);
-            Assert.Equal(expectedLength, testSlice._length);
+            Assert.Equal(4 | (1 << 31), testSlice._index);
+            Assert.Equal(4, testSlice._length);
 
-            expectedLength = 2 | (1 << 31);
             slice = pinnedMemory.Slice(1, 2);
             testSlice = Unsafe.As<ReadOnlyMemory<int>, TestMemory<int>>(ref slice);
-            Assert.Equal(testPinnedMemory._index + 1, testSlice._index);
-            Assert.Equal(expectedLength, testSlice._length);
+            Assert.Equal(4 | (1 << 31), testSlice._index);
+            Assert.Equal(2, testSlice._length);
         }
 
         [Fact]