Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
<AssemblyKey>MSFT</AssemblyKey>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
</PropertyGroup>

View File

@@ -6,8 +6,6 @@
<AssemblyName>System.Dynamic.Runtime</AssemblyName>
<RootNamespace>System.Dynamic.Runtime</RootNamespace>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<!-- Disable binplacing for now since we need to use the uapaot version of this assembly -->
<BinPlaceILCInputFolder>false</BinPlaceILCInputFolder>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />

View File

@@ -1,7 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// 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;
using System.Collections.Generic;
using Xunit;
@@ -12,8 +13,8 @@ namespace System.Dynamic.Runtime.Tests
[Fact]
public void NullNames()
{
Assert.Throws<ArgumentNullException>("argNames", () => new CallInfo(0, default(string[])));
Assert.Throws<ArgumentNullException>("argNames", () => new CallInfo(0, default(IEnumerable<string>)));
AssertExtensions.Throws<ArgumentNullException>("argNames", () => new CallInfo(0, default(string[])));
AssertExtensions.Throws<ArgumentNullException>("argNames", () => new CallInfo(0, default(IEnumerable<string>)));
}
[Fact]
@@ -25,7 +26,7 @@ namespace System.Dynamic.Runtime.Tests
[Fact]
public void NullName()
{
Assert.Throws<ArgumentNullException>("argNames[1]", () => new CallInfo(3, "a", null, "c"));
AssertExtensions.Throws<ArgumentNullException>("argNames[1]", () => new CallInfo(3, "a", null, "c"));
}
[Fact]

View File

@@ -1351,7 +1351,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.operate.genclas
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod());

View File

@@ -1658,7 +1658,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.operate.regclas
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod());

View File

@@ -1 +1 @@
e918ba9894eebed5eee638684082089a97fb68f9
eedc8040104d52a4fe208e109909104846949f3b

View File

@@ -3384,7 +3384,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.returnType.
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));

View File

@@ -23,7 +23,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));
@@ -78,7 +78,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));
@@ -119,7 +119,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
{
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));
@@ -161,7 +161,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
{
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));
@@ -203,7 +203,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
{
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));
@@ -480,7 +480,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
{
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));
@@ -1708,7 +1708,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));
@@ -1756,7 +1756,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.dynamicType.statements.
public class Test
{
[ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod(null));

View File

@@ -1 +1 @@
fcd80f99f4659ca4717eb9502b622c9c87582324
fbe7f9de7e89f809065bcc6f36b2da60570edbe8

View File

@@ -19,7 +19,6 @@ namespace SampleDynamicTests
private delegate T Create<out T>();
[Fact]
[ActiveIssue(16748)]
public static void VarianceTest_RunTest()
{
dynamic d1 = (Create<Tiger>)(() => new Tiger());

View File

@@ -0,0 +1,9 @@
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
<Library>
<Type Name="System.Func&lt;&gt;" Dynamic="Required Public" />
<Type Name="System.Func&lt;,&gt;" Dynamic="Required Public" />
<Type Name="System.Func&lt;,,,&gt;" Dynamic="Required Public" />
<Type Name="System.TimeoutException" Dynamic="Required Public" />
</Library>
</Directives>

View File

@@ -156,9 +156,15 @@
<Compile Include="Dynamic.Variance\Conformance.dynamic.Variance.implem.cs" />
<Compile Include="Common.cs" />
<Compile Include="ErrorVerifier.cs" />
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
<Link>Common\System\AssertExtensions.cs</Link>
</Compile>
<Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
<Link>Common\System\PlatformDetection.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>