Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -7,9 +7,6 @@
<OutputType>Library</OutputType>
<ProjectGuid>{45A617DF-FEC7-59C8-FD0D-BD27938DC940}</ProjectGuid>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- Ignore the CLSCompliance of the generated cs files we are using here -->
<NoWarn>$(NoWarn);3003</NoWarn>
<CLSCompliant>false</CLSCompliant>
</PropertyGroup>
<!-- Default configurations to help VS understand the options -->

View File

@@ -10,7 +10,7 @@
<RootNamespace>System.Private.Reflection.Metadata.Tests</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker>
<TestTFM>netcoreapp1.0</TestTFM>
<TestTFM>netcoreapp1.1</TestTFM>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

View File

@@ -1,7 +1,7 @@
{
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Platforms": "1.0.2-beta-24522-03",
"NETStandard.Library": "1.6.1",
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03",
"test-runtime": {
"target": "project",
@@ -12,6 +12,6 @@
"netstandard1.3": { }
},
"supports": {
"coreFx.Test.netcoreapp1.0": { }
"coreFx.Test.netcoreapp1.1": { }
}
}