From a25b6d066701f37b3a4198663f6226cb77990d30 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 31 Aug 2017 10:45:29 -0700 Subject: [PATCH 1/3] Update CoreClr, CoreFx, CoreSetup, External, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-25631-03, preview2-25631-02, preview2-25631-01, beta-25627-00, beta-25630-04, beta-25630-04, preview1-25631-01, respectively --- dependencies.props | 32 ++++++++++++++--------------- external/test-runtime/optional.json | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dependencies.props b/dependencies.props index bbe8742a3f81..6fa3c4943479 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,28 +9,28 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 9a19a5852cedb164108dfece6d0a6de9f89f0c44 - 9a19a5852cedb164108dfece6d0a6de9f89f0c44 - 1504defe064b46f3a4bcd276a3b5afcf3f7a279e - dbce6b2140b3334a0d3d7d095b3b267e9c45af9f - e29dbcca1c9e94726df624caf512bcb8cbfdabdf - e29dbcca1c9e94726df624caf512bcb8cbfdabdf + 96dc7805f5df4a70a55783964ce69dcd91bfca80 + 96dc7805f5df4a70a55783964ce69dcd91bfca80 + 96dc7805f5df4a70a55783964ce69dcd91bfca80 + 96dc7805f5df4a70a55783964ce69dcd91bfca80 + 96dc7805f5df4a70a55783964ce69dcd91bfca80 + 96dc7805f5df4a70a55783964ce69dcd91bfca80 8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd - 9a19a5852cedb164108dfece6d0a6de9f89f0c44 + 96dc7805f5df4a70a55783964ce69dcd91bfca80 - 2.1.0-preview2-25625-02 - preview2-25625-02 - 2.1.0-preview2-25625-02 - beta-25624-00 - beta-25625-00 - beta-25625-00 - 1.0.0-beta-25625-00 - 2.1.0-preview1-25625-01 + 2.1.0-preview2-25631-02 + preview2-25631-02 + 2.1.0-preview2-25631-03 + beta-25627-00 + beta-25630-04 + beta-25630-04 + 1.0.0-beta-25630-04 + 2.1.0-preview1-25631-01 NETStandard.Library - 2.1.0-preview2-25624-02 + 2.1.0-preview2-25631-01 4.4.0 diff --git a/external/test-runtime/optional.json b/external/test-runtime/optional.json index afd0ecf042ba..c3a5a2a2d324 100644 --- a/external/test-runtime/optional.json +++ b/external/test-runtime/optional.json @@ -3,9 +3,9 @@ "net45": { "dependencies": { "Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001", - "TestILC.amd64ret": "1.0.0-beta-25625-00", - "TestILC.armret": "1.0.0-beta-25625-00", - "TestILC.x86ret": "1.0.0-beta-25625-00" + "TestILC.amd64ret": "1.0.0-beta-25630-04", + "TestILC.armret": "1.0.0-beta-25630-04", + "TestILC.x86ret": "1.0.0-beta-25630-04" } } } From f4b098d4170e74e84d1530f4a40d821fe0f97cda Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Thu, 31 Aug 2017 14:45:29 -0400 Subject: [PATCH 2/3] Update AsSpan to AsReadOnlySpan to fix break with latest coreclr --- src/System.Memory/src/System/SpanExtensions.Fast.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Memory/src/System/SpanExtensions.Fast.cs b/src/System.Memory/src/System/SpanExtensions.Fast.cs index 1795296373d1..364427b7a86a 100644 --- a/src/System.Memory/src/System/SpanExtensions.Fast.cs +++ b/src/System.Memory/src/System/SpanExtensions.Fast.cs @@ -45,7 +45,7 @@ public static partial class SpanExtensions /// /// The target string. /// Thrown when is null. - public static ReadOnlySpan AsReadOnlySpan(this string text) => Span.AsSpan(text); + public static ReadOnlySpan AsReadOnlySpan(this string text) => Span.AsReadOnlySpan(text); /// /// Casts a Span of one primitive type to another primitive type . From 1c502040a69bcd3a256131f6005feed36122926c Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Thu, 31 Aug 2017 12:33:34 -0700 Subject: [PATCH 3/3] Fix UAP build break S.R.WindowsRuntime is a friend with CoreLib. HResults definition in CoreLib has changed and it is colliding local HResults definition in S.R.WindowsRuntime now. --- .../src/System/IO/NetFxToWinRtStreamAdapter.cs | 18 +++++++++--------- .../System/Runtime/InteropServices/HResults.cs | 2 +- .../WindowsRuntime/WindowsRuntimeBuffer.cs | 4 ++-- .../Threading/Tasks/TaskToAsyncInfoAdapter.cs | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/System.Runtime.WindowsRuntime/src/System/IO/NetFxToWinRtStreamAdapter.cs b/src/System.Runtime.WindowsRuntime/src/System/IO/NetFxToWinRtStreamAdapter.cs index 52ac81080112..4bbf2fc978f0 100644 --- a/src/System.Runtime.WindowsRuntime/src/System/IO/NetFxToWinRtStreamAdapter.cs +++ b/src/System.Runtime.WindowsRuntime/src/System/IO/NetFxToWinRtStreamAdapter.cs @@ -193,7 +193,7 @@ private Stream EnsureNotDisposed() if (str == null) { ObjectDisposedException ex = new ObjectDisposedException(SR.ObjectDisposed_CannotPerformOperation); - ex.SetErrorCode(HResults.RO_E_CLOSED); + ex.SetErrorCode(__HResults.RO_E_CLOSED); throw ex; } @@ -234,14 +234,14 @@ public IAsyncOperationWithProgress ReadAsync(IBuffer buffer, UI if (count < 0 || Int32.MaxValue < count) { ArgumentOutOfRangeException ex = new ArgumentOutOfRangeException(nameof(count)); - ex.SetErrorCode(HResults.E_INVALIDARG); + ex.SetErrorCode(__HResults.E_INVALIDARG); throw ex; } if (buffer.Capacity < count) { ArgumentException ex = new ArgumentException(SR.Argument_InsufficientBufferCapacity); - ex.SetErrorCode(HResults.E_INVALIDARG); + ex.SetErrorCode(__HResults.E_INVALIDARG); throw ex; } @@ -249,7 +249,7 @@ public IAsyncOperationWithProgress ReadAsync(IBuffer buffer, UI { ArgumentOutOfRangeException ex = new ArgumentOutOfRangeException(nameof(options), SR.ArgumentOutOfRange_InvalidInputStreamOptionsEnumValue); - ex.SetErrorCode(HResults.E_INVALIDARG); + ex.SetErrorCode(__HResults.E_INVALIDARG); throw ex; } @@ -300,7 +300,7 @@ public IAsyncOperationWithProgress WriteAsync(IBuffer buffer) if (buffer.Capacity < buffer.Length) { ArgumentException ex = new ArgumentException(SR.Argument_BufferLengthExceedsCapacity); - ex.SetErrorCode(HResults.E_INVALIDARG); + ex.SetErrorCode(__HResults.E_INVALIDARG); throw ex; } @@ -335,7 +335,7 @@ public void Seek(UInt64 position) if (position > Int64.MaxValue) { ArgumentException ex = new ArgumentException(SR.IO_CannotSeekBeyondInt64MaxValue); - ex.SetErrorCode(HResults.E_INVALIDARG); + ex.SetErrorCode(__HResults.E_INVALIDARG); throw ex; } @@ -400,7 +400,7 @@ public UInt64 Size if (value > Int64.MaxValue) { ArgumentException ex = new ArgumentException(SR.IO_CannotSetSizeBeyondInt64MaxValue); - ex.SetErrorCode(HResults.E_INVALIDARG); + ex.SetErrorCode(__HResults.E_INVALIDARG); throw ex; } @@ -412,7 +412,7 @@ public UInt64 Size if (!str.CanWrite) { InvalidOperationException ex = new InvalidOperationException(SR.InvalidOperation_CannotSetStreamSizeCannotWrite); - ex.SetErrorCode(HResults.E_ILLEGAL_METHOD_CALL); + ex.SetErrorCode(__HResults.E_ILLEGAL_METHOD_CALL); throw ex; } @@ -441,7 +441,7 @@ public UInt64 Size private static void ThrowCloningNotSupported(String methodName) { NotSupportedException nse = new NotSupportedException(SR.Format(SR.NotSupported_CloningNotSupported, methodName)); - nse.SetErrorCode(HResults.E_NOTIMPL); + nse.SetErrorCode(__HResults.E_NOTIMPL); throw nse; } diff --git a/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/HResults.cs b/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/HResults.cs index f1f0fce6fdd4..c131895da8ae 100644 --- a/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/HResults.cs +++ b/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/HResults.cs @@ -9,7 +9,7 @@ namespace System.Runtime.InteropServices /// /// HRESULT values used in this assembly. /// - internal static class HResults + internal static class __HResults { internal const Int32 S_OK = unchecked((Int32)0x00000000); internal const Int32 E_BOUNDS = unchecked((Int32)0x8000000B); diff --git a/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeBuffer.cs b/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeBuffer.cs index 0c01d7ebd87f..070b2b6adf6b 100644 --- a/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeBuffer.cs +++ b/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeBuffer.cs @@ -89,7 +89,7 @@ private static void EnsureHasMarshalProxy() Int32 hr = Interop.mincore.RoGetBufferMarshaler(out proxy); t_winRtMarshalProxy = proxy; - if (hr != HResults.S_OK) + if (hr != __HResults.S_OK) { Exception ex = new Exception(String.Format("{0} ({1}!RoGetBufferMarshaler)", SR.WinRtCOM_Error, WinTypesDLL)); ex.SetErrorCode(hr); @@ -242,7 +242,7 @@ UInt32 IBuffer.Length if (value > ((IBuffer)this).Capacity) { ArgumentOutOfRangeException ex = new ArgumentOutOfRangeException(nameof(value), SR.Argument_BufferLengthExceedsCapacity); - ex.SetErrorCode(HResults.E_BOUNDS); + ex.SetErrorCode(__HResults.E_BOUNDS); throw ex; } diff --git a/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/TaskToAsyncInfoAdapter.cs b/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/TaskToAsyncInfoAdapter.cs index 2483156cb7d2..9b9c8880b812 100644 --- a/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/TaskToAsyncInfoAdapter.cs +++ b/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/TaskToAsyncInfoAdapter.cs @@ -77,7 +77,7 @@ private static InvalidOperationException CreateCannotGetResultsFromIncompleteOpe InvalidOperationException ex = (cause == null) ? new InvalidOperationException(SR.InvalidOperation_CannotGetResultsFromIncompleteOperation) : new InvalidOperationException(SR.InvalidOperation_CannotGetResultsFromIncompleteOperation, cause); - ex.SetErrorCode(HResults.E_ILLEGAL_METHOD_CALL); + ex.SetErrorCode(__HResults.E_ILLEGAL_METHOD_CALL); return ex; } @@ -397,7 +397,7 @@ internal void EnsureNotClosed() return; ObjectDisposedException ex = new ObjectDisposedException(SR.ObjectDisposed_AsyncInfoIsClosed); - ex.SetErrorCode(HResults.E_ILLEGAL_METHOD_CALL); + ex.SetErrorCode(__HResults.E_ILLEGAL_METHOD_CALL); throw ex; } @@ -857,7 +857,7 @@ public virtual TCompletedHandler Completed if (handlerBefore != null) { InvalidOperationException ex = new InvalidOperationException(SR.InvalidOperation_CannotSetCompletionHanlderMoreThanOnce); - ex.SetErrorCode(HResults.E_ILLEGAL_DELEGATE_ASSIGNMENT); + ex.SetErrorCode(__HResults.E_ILLEGAL_DELEGATE_ASSIGNMENT); throw ex; } @@ -940,7 +940,7 @@ public virtual void Close() if (0 != (_state & STATEMASK_SELECT_ANY_ASYNC_STATE)) { InvalidOperationException ex = new InvalidOperationException(SR.InvalidOperation_IllegalStateChange); - ex.SetErrorCode(HResults.E_ILLEGAL_STATE_CHANGE); + ex.SetErrorCode(__HResults.E_ILLEGAL_STATE_CHANGE); throw ex; } } @@ -981,7 +981,7 @@ public virtual Exception ErrorCode if (aggregateException == null) { error = new Exception(SR.WinRtCOM_Error); - error.SetErrorCode(HResults.E_FAIL); + error.SetErrorCode(__HResults.E_FAIL); } else {