Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

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 (master) #23563

Merged
stephentoub merged 3 commits into from
Aug 31, 2017
Merged

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 (master) #23563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a25b6d0
Update CoreClr, CoreFx, CoreSetup, External, ProjectNTfs, ProjectNTfs…
dotnet-maestro-bot Aug 31, 2017
f4b098d
Update AsSpan to AsReadOnlySpan to fix break with latest coreclr
stephentoub Aug 31, 2017
1c50204
Fix UAP build break
jkotas Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>9a19a5852cedb164108dfece6d0a6de9f89f0c44</CoreFxCurrentRef>
<CoreClrCurrentRef>9a19a5852cedb164108dfece6d0a6de9f89f0c44</CoreClrCurrentRef>
<CoreSetupCurrentRef>1504defe064b46f3a4bcd276a3b5afcf3f7a279e</CoreSetupCurrentRef>
<ExternalCurrentRef>dbce6b2140b3334a0d3d7d095b3b267e9c45af9f</ExternalCurrentRef>
<ProjectNTfsCurrentRef>e29dbcca1c9e94726df624caf512bcb8cbfdabdf</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>e29dbcca1c9e94726df624caf512bcb8cbfdabdf</ProjectNTfsTestILCCurrentRef>
<CoreFxCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</CoreFxCurrentRef>
<CoreClrCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</CoreClrCurrentRef>
<CoreSetupCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>9a19a5852cedb164108dfece6d0a6de9f89f0c44</StandardCurrentRef>
<StandardCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</StandardCurrentRef>
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<PlatformPackageVersion>2.1.0-preview2-25625-02</PlatformPackageVersion>
<CoreFxExpectedPrerelease>preview2-25625-02</CoreFxExpectedPrerelease>
<CoreClrPackageVersion>2.1.0-preview2-25625-02</CoreClrPackageVersion>
<ExternalExpectedPrerelease>beta-25624-00</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25625-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-25625-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-25625-00</ProjectNTfsTestILCPackageVersion>
<NETStandardPackageVersion>2.1.0-preview1-25625-01</NETStandardPackageVersion>
<PlatformPackageVersion>2.1.0-preview2-25631-02</PlatformPackageVersion>
<CoreFxExpectedPrerelease>preview2-25631-02</CoreFxExpectedPrerelease>
<CoreClrPackageVersion>2.1.0-preview2-25631-03</CoreClrPackageVersion>
<ExternalExpectedPrerelease>beta-25627-00</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25630-04</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-25630-04</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-25630-04</ProjectNTfsTestILCPackageVersion>
<NETStandardPackageVersion>2.1.0-preview1-25631-01</NETStandardPackageVersion>
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-25624-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-25631-01</MicrosoftNETCoreAppPackageVersion>
<!-- Use the SNI runtime package -->
<SniPackageVersion>4.4.0</SniPackageVersion>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions external/test-runtime/optional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Memory/src/System/SpanExtensions.Fast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static partial class SpanExtensions
/// </summary>
/// <param name="text">The target string.</param>
/// <exception cref="System.ArgumentNullException">Thrown when <paramref name="text"/> is null.</exception>
public static ReadOnlySpan<char> AsReadOnlySpan(this string text) => Span.AsSpan(text);
public static ReadOnlySpan<char> AsReadOnlySpan(this string text) => Span.AsReadOnlySpan(text);

/// <summary>
/// Casts a Span of one primitive type <typeparamref name="TFrom"/> to another primitive type <typeparamref name="TTo"/>.
Expand Down
18 changes: 9 additions & 9 deletions src/System.Runtime.WindowsRuntime/src/System/IO/NetFxToWinRtStreamAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -234,22 +234,22 @@ public IAsyncOperationWithProgress<IBuffer, UInt32> 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;
}

if (!(options == InputStreamOptions.None || options == InputStreamOptions.Partial || options == InputStreamOptions.ReadAhead))
{
ArgumentOutOfRangeException ex = new ArgumentOutOfRangeException(nameof(options),
SR.ArgumentOutOfRange_InvalidInputStreamOptionsEnumValue);
ex.SetErrorCode(HResults.E_INVALIDARG);
ex.SetErrorCode(__HResults.E_INVALIDARG);
throw ex;
}

Expand Down Expand Up @@ -300,7 +300,7 @@ public IAsyncOperationWithProgress<UInt32, UInt32> 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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/HResults.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace System.Runtime.InteropServices
/// <summary>
/// HRESULT values used in this assembly.
/// </summary>
internal static class HResults
internal static class __HResults
{
internal const Int32 S_OK = unchecked((Int32)0x00000000);
internal const Int32 E_BOUNDS = unchecked((Int32)0x8000000B);
Expand Down
4 changes: 2 additions & 2 deletions ....WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down
10 changes: 5 additions & 5 deletions src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/TaskToAsyncInfoAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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
{
Expand Down