mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.16.0.100

Browse Source 
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
external/corefx/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj vendored
View File

@@ -94,8 +94,8 @@
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
<Link>Common\Interop\Windows\Interop.Errors.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\IO\Win32Marshal.cs">
<Link>Common\System\IO\Win32Marshal.cs</Link>
<Compile Include="$(CommonPath)\CoreLib\System\IO\Win32Marshal.cs">
<Link>Common\CoreLib\System\IO\Win32Marshal.cs</Link>
</Compile>
<Compile Include="System\IO\HANDLE_ACCESS_OPTIONS.cs" />
<Compile Include="System\IO\HANDLE_CREATION_OPTIONS.cs" />
@@ -130,4 +130,4 @@
<Compile Include="System\Windows\UI\Color.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>

10
external/corefx/src/System.Runtime.WindowsRuntime/src/System/InternalHelpers.cs vendored
View File

@@ -2,8 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Threading.Tasks;
using System.Threading;
using System.Runtime.InteropServices;
namespace System
{
@@ -11,12 +10,7 @@ namespace System
{
internal static void SetErrorCode(this Exception ex, int code)
{
// Stub, until COM interop guys fix the exception logic
}
internal static void TryDeregister(this CancellationTokenRegistration ctr)
{
//nothing to do for projectN
InteropExtensions.SetExceptionErrorCode(ex, code);
}
}
}

4
external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreCLR.cs vendored
View File

@@ -70,7 +70,7 @@ namespace System.Threading.Tasks
}
if (disposeOfCtr)
ctr.TryDeregister();
ctr.Unregister();
}
}
catch (Exception ex)
@@ -150,7 +150,7 @@ namespace System.Threading.Tasks
ctr = _ctr; // under lock to avoid torn reads
_ctr = default(CancellationTokenRegistration);
}
ctr.TryDeregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop.
ctr.Unregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop.
try
{

9
external/corefx/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.CoreRT.cs vendored
View File

@@ -2,16 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Internal.Interop;
using Internal.Threading.Tasks;
using System.ComponentModel;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Runtime.InteropServices;
using System.Threading;
using Windows.Foundation;
namespace System.Threading.Tasks
@@ -68,7 +63,7 @@ namespace System.Threading.Tasks
}
if (disposeOfCtr)
ctr.TryDeregister();
ctr.Unregister();
}
}
catch (Exception ex)
@@ -151,7 +146,7 @@ namespace System.Threading.Tasks
ctr = _ctr; // under lock to avoid torn reads
_ctr = default(CancellationTokenRegistration);
}
ctr.TryDeregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop.
ctr.Unregister(); // It's ok if we end up unregistering a not-initialized registration; it'll just be a nop.
try
{