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

@@ -2238,8 +2238,6 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.indexer.regclas
memberClassStatus = MemberClass.t_status;
}
Assert.Equal(0, Verify());
}
private static int Verify()
@@ -2276,8 +2274,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.indexer.regclas
RequireLifetimesEnded();
GC.Collect();
GC.WaitForPendingFinalizers();
GC.Collect();
GC.WaitForPendingFinalizers();
Assert.Equal(0, Verify());
}
}
//</Code>

View File

@@ -921,10 +921,6 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.method.genmetho
}
}
public void Foo()
{
}
private static int Verify()
{
lock (Test.locker)
@@ -943,7 +939,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.method.genmetho
{
Test t = new Test();
Test.s_field = "Field";
t.Foo();
GC.KeepAlive(t);
}
[Fact]

View File

@@ -1755,10 +1755,6 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.operate.regclas
}
}
public void Foo()
{
}
private static int Verify()
{
lock (Test.locker)
@@ -1783,7 +1779,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.operate.regclas
{
Test t = new Test();
Test.s_field = null;
t.Foo();
GC.KeepAlive(t);
}
[Fact]
@@ -3437,10 +3433,6 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.operate.regclas
}
}
public void Foo()
{
}
private static int Verify()
{
lock (Test.locker)
@@ -3465,7 +3457,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.operate.regclas
{
Test t = new Test();
Test.s_field = null;
t.Foo();
GC.KeepAlive(t);
}
[Fact]

View File

@@ -498,10 +498,6 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.property.autopr
}
}
public void Foo()
{
}
private static int Verify()
{
lock (Test.locker)
@@ -520,7 +516,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.context.property.autopr
{
Test t = new Test();
Test.s_field = "Field";
t.Foo();
GC.KeepAlive(t);
}
[Fact]

View File

@@ -8,7 +8,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.namedandoptional.decl.o
{
// <Area>Declaration of Methods with Optional Parameters</Area>
// <Title>Declaration of Optional Params</Title>
// <Description>Simple Declaration of a an Extension method with optional parameters</Description>
// <Description>Simple Declaration of an Extension method with optional parameters</Description>
// <Expects status=success></Expects>
// <Code>
public static class Extension
@@ -46,7 +46,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.namedandoptional.decl.o
{
// <Area>Declaration of Methods with Optional Parameters</Area>
// <Title>Declaration of Optional Params</Title>
// <Description>Simple Declaration of a an Extension method with optional parameters</Description>
// <Description>Simple Declaration of an Extension method with optional parameters</Description>
// <Expects status=success></Expects>
// <Code>
public static class Extension
@@ -95,7 +95,7 @@ namespace ManagedTests.DynamicCSharp.Conformance.dynamic.namedandoptional.decl.o
{
// <Area>Declaration of Methods with Optional Parameters</Area>
// <Title>Declaration of Optional Params</Title>
// <Description>Simple Declaration of a an Extension method with optional parameters</Description>
// <Description>Simple Declaration of an Extension method with optional parameters</Description>
// <Expects status=success></Expects>
// <Code>
public static class Extension

View File

@@ -156,9 +156,6 @@
<Compile Include="Dynamic.Variance\Conformance.dynamic.Variance.implem.cs" />
<Compile Include="Common.cs" />
<Compile Include="ErrorVerifier.cs" />
<Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
<Link>Common\System\PlatformDetection.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />