Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@@ -6,6 +6,5 @@
<AssemblyKey>MSFT</AssemblyKey>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
<IsNetFxNETStandard>true</IsNetFxNETStandard>
</PropertyGroup>
</Project>

View File

@@ -3,7 +3,6 @@
<PropertyGroup>
<BuildConfigurations>
netcoreapp;
netfx;
uap;
</BuildConfigurations>
</PropertyGroup>

View File

@@ -7,8 +7,6 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Release|AnyCPU'" />
<ItemGroup>

View File

@@ -6,7 +6,6 @@
netcoreapp-Windows_NT;
netcoreapp-Unix;
uap-Windows_NT;
netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -16,8 +16,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">

View File

@@ -198,7 +198,7 @@ namespace System.Diagnostics
if (peReader.TryOpenAssociatedPortablePdb(assemblyPath, TryOpenFile, out provider, out pdbPath))
{
// TODO:
// Consider caching the provider in a global cache (accross stack traces) if the PDB is embedded (pdbPath == null),
// Consider caching the provider in a global cache (across stack traces) if the PDB is embedded (pdbPath == null),
// as decompressing embedded PDB takes some time.
return provider;
}

View File

@@ -24,6 +24,7 @@ namespace System.Diagnostics.Tests
VerifyStackFrame(stackFrame, false, 0, typeof(StackFrameTests).GetMethod(nameof(Ctor_Default)), isCurrentFrame: true);
}
[ActiveIssue(23796, TargetFrameworkMonikers.NetFramework)]
[Theory]
[InlineData(true)]
[InlineData(false)]
@@ -43,6 +44,7 @@ namespace System.Diagnostics.Tests
VerifyStackFrame(stackFrame, true, skipFrames, typeof(StackFrameTests).GetMethod(nameof(Ctor_SkipFrames)), isCurrentFrame: skipFrames == 0);
}
[ActiveIssue(23796, TargetFrameworkMonikers.NetFramework)]
[Theory]
[InlineData(StackFrame.OFFSET_UNKNOWN, true)]
[InlineData(0, true)]

View File

@@ -142,6 +142,7 @@ namespace System.Diagnostics.Tests
Assert.Null(stackTrace.GetFrame(0));
}
[ActiveIssue(23796, TargetFrameworkMonikers.NetFramework)]
[Theory]
[InlineData(0)]
[InlineData(1)]
@@ -191,6 +192,7 @@ namespace System.Diagnostics.Tests
Assert.Null(stackTrace.GetFrame(0));
}
[ActiveIssue(23796, TargetFrameworkMonikers.NetFramework)]
[Theory]
[InlineData(0, true)]
[InlineData(1, true)]

View File

@@ -17,9 +17,6 @@
<Compile Include="SymbolTokenTests.cs" />
<Compile Include="StackFrameTests.cs" />
<Compile Include="StackFrameExtensionsTests.cs" Condition="'$(TargetGroup)' != 'netfx'" />
<Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
<Link>Common\System\PlatformDetection.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<ReferenceFromRuntime Include="System.Runtime.InteropServices.RuntimeInformation" />