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,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<IsDesktopFacade>true</IsDesktopFacade>
<AssemblyVersion>4.0.1.0</AssemblyVersion>
<AssemblyKey>Open</AssemblyKey>
</PropertyGroup>
</Project>

View File

@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netstandard;
netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -3,13 +3,20 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<ProjectGuid>{4CF42F1E-B5AC-4834-AE24-A1F285091377}</ProjectGuid>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System.CodeDom.cs" />
</ItemGroup>
<ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<Reference Include="mscorlib" />
<Reference Include="System" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
<ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

View File

@@ -4,7 +4,6 @@
namespace System.CodeDom
{
[Serializable]
public enum CodeBinaryOperatorType
{
Add,

View File

@@ -30,8 +30,6 @@ namespace System.CodeDom
Name = name;
}
private CodeNamespace(SerializationInfo info, StreamingContext context) { }
public CodeTypeDeclarationCollection Types
{
get

View File

@@ -4,7 +4,6 @@
namespace System.CodeDom
{
[Serializable]
public enum CodeRegionMode
{
None = 0,

View File

@@ -215,7 +215,10 @@ namespace System.CodeDom.Compiler
private sealed class ConfigurationErrorsException : SystemException
{
public ConfigurationErrorsException(string message) : base(message) { }
public ConfigurationErrorsException(SerializationInfo info, StreamingContext context) : base(info, context) { }
public ConfigurationErrorsException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
}
}
}

View File

@@ -4,7 +4,6 @@
namespace System.CodeDom.Compiler
{
[Serializable]
[Flags]
public enum GeneratorSupport
{

View File

@@ -4,7 +4,6 @@
namespace System.CodeDom.Compiler
{
[Serializable]
[Flags]
public enum LanguageOptions
{

View File

@@ -4,7 +4,6 @@
namespace System.CodeDom
{
[Serializable]
public enum FieldDirection
{
In,

View File

@@ -4,7 +4,6 @@
namespace System.CodeDom
{
[Serializable]
public enum MemberAttributes
{
Abstract = 0x0001,

View File

@@ -1 +1 @@
38777f60e431949573ca11c45803f43c13d07dc7
01442cc94b0a9560697739eba0aa9d4cc89f4e5c

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;
@@ -82,21 +83,21 @@ namespace System.CodeDom.Tests
[Fact]
public void AddRange_Null_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("value", () => CtorArray(null));
Assert.Throws<ArgumentNullException>("value", () => CtorCollection(null));
AssertExtensions.Throws<ArgumentNullException>("value", () => CtorArray(null));
AssertExtensions.Throws<ArgumentNullException>("value", () => CtorCollection(null));
var collection = Ctor();
Assert.Throws<ArgumentNullException>("value", () => AddRange(collection, (TItem[])null));
Assert.Throws<ArgumentNullException>("value", () => AddRange(collection, (TCollection)null));
AssertExtensions.Throws<ArgumentNullException>("value", () => AddRange(collection, (TItem[])null));
AssertExtensions.Throws<ArgumentNullException>("value", () => AddRange(collection, (TCollection)null));
}
[Fact]
public void AddRange_NullObjectInValue_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("value", () => CtorArray(new TItem[] { null }));
AssertExtensions.Throws<ArgumentNullException>("value", () => CtorArray(new TItem[] { null }));
var collection = Ctor();
Assert.Throws<ArgumentNullException>("value", () => AddRange(collection, new TItem[] { null }));
AssertExtensions.Throws<ArgumentNullException>("value", () => AddRange(collection, new TItem[] { null }));
}
[Fact]
@@ -125,7 +126,7 @@ namespace System.CodeDom.Tests
public void Add_Null_ThrowsArgumentNullException()
{
var collection = Ctor();
Assert.Throws<ArgumentNullException>("value", () => Add(collection, null));
AssertExtensions.Throws<ArgumentNullException>("value", () => Add(collection, null));
}
[Theory]
@@ -134,21 +135,21 @@ namespace System.CodeDom.Tests
public void Insert_InvalidIndex_ThrowsArgumentOutOfRangeException(int index)
{
var collection = Ctor();
Assert.Throws<ArgumentOutOfRangeException>("index", () => Insert(collection, index, new TItem()));
AssertExtensions.Throws<ArgumentOutOfRangeException>("index", () => Insert(collection, index, new TItem()));
}
[Fact]
public void Insert_Null_ThrowsArgumentNullException()
{
var collection = Ctor();
Assert.Throws<ArgumentNullException>("value", () => Insert(collection, 0, null));
AssertExtensions.Throws<ArgumentNullException>("value", () => Insert(collection, 0, null));
}
[Fact]
public void Remove_Null_ThrowsArgumentNullException()
{
var collection = Ctor();
Assert.Throws<ArgumentNullException>("value", () => Remove(collection, null));
AssertExtensions.Throws<ArgumentNullException>("value", () => Remove(collection, null));
}
[Fact]
@@ -180,8 +181,8 @@ namespace System.CodeDom.Tests
public void Item_InvalidIndex_ThrowsArgumentOutOfRangeException(int index)
{
var collection = Ctor();
Assert.Throws<ArgumentOutOfRangeException>("index", () => GetItem(collection, index));
Assert.Throws<ArgumentOutOfRangeException>("index", () => SetItem(collection, index, new TItem()));
AssertExtensions.Throws<ArgumentOutOfRangeException>("index", () => GetItem(collection, index));
AssertExtensions.Throws<ArgumentOutOfRangeException>("index", () => SetItem(collection, index, new TItem()));
}
[Fact]

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;
using System.Collections.Generic;
using System.Collections.Tests;
@@ -79,8 +80,8 @@ namespace System.CodeDom.Tests
public void AddRange_Null_ThrowsArgumentNullException()
{
var collection = new CodeNamespaceImportCollection();
Assert.Throws<ArgumentNullException>("value", () => collection.AddRange(null));
Assert.Throws<ArgumentNullException>("value", () => collection.AddRange(null));
AssertExtensions.Throws<ArgumentNullException>("value", () => collection.AddRange(null));
AssertExtensions.Throws<ArgumentNullException>("value", () => collection.AddRange(null));
}
[Fact]
@@ -96,8 +97,8 @@ namespace System.CodeDom.Tests
public void Item_InvalidIndex_ThrowsArgumentOutOfRangeException(int index)
{
var collection = new CodeNamespaceCollection();
Assert.Throws<ArgumentOutOfRangeException>("index", () => collection[index]);
Assert.Throws<ArgumentOutOfRangeException>("index", () => collection[index] = new CodeNamespace());
AssertExtensions.Throws<ArgumentOutOfRangeException>("index", () => collection[index]);
AssertExtensions.Throws<ArgumentOutOfRangeException>("index", () => collection[index] = new CodeNamespace());
}
[Fact]

View File

@@ -1,4 +1,4 @@
// 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.
@@ -55,7 +55,7 @@ namespace System.CodeDom.Tests
public void Add_NullType_ThrowsArgumentNullException()
{
var collection = new CodeTypeReferenceCollection();
Assert.Throws<ArgumentNullException>("type", () => collection.Add((Type)null));
AssertExtensions.Throws<ArgumentNullException>("type", () => collection.Add((Type)null));
}
}
}

View File

@@ -1,4 +1,4 @@
// 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.
@@ -121,8 +121,8 @@ namespace System.CodeDom.Tests
{
using (var collection = new TempFileCollection())
{
Assert.Throws<ArgumentException>("fileExtension", () => collection.AddExtension(fileExtension));
Assert.Throws<ArgumentException>("fileExtension", () => collection.AddExtension(fileExtension, keepFile: false));
AssertExtensions.Throws<ArgumentException>("fileExtension", () => collection.AddExtension(fileExtension));
AssertExtensions.Throws<ArgumentException>("fileExtension", () => collection.AddExtension(fileExtension, keepFile: false));
}
}
@@ -204,7 +204,7 @@ namespace System.CodeDom.Tests
{
using (var collection = new TempFileCollection())
{
Assert.Throws<ArgumentException>("fileName", () => collection.AddFile(fileName, keepFile: false));
AssertExtensions.Throws<ArgumentException>("fileName", () => collection.AddFile(fileName, keepFile: false));
}
}
@@ -215,10 +215,10 @@ namespace System.CodeDom.Tests
{
const string FileName = "FileName";
collection.AddFile(FileName, keepFile: false);
Assert.Throws<ArgumentException>("fileName", () => collection.AddFile(FileName, keepFile: false));
AssertExtensions.Throws<ArgumentException>("fileName", () => collection.AddFile(FileName, keepFile: false));
// Case insensitive
Assert.Throws<ArgumentException>("fileName", () => collection.AddFile(FileName.ToLowerInvariant(), keepFile: false));
AssertExtensions.Throws<ArgumentException>("fileName", () => collection.AddFile(FileName.ToLowerInvariant(), keepFile: false));
}
}

View File

@@ -1,4 +1,4 @@
// 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.
@@ -194,26 +194,26 @@ namespace System.CodeDom.Tests
[Fact]
public void Ctor_NullType_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("type", () => new CodeArrayCreateExpression((Type)null, new CodePrimitiveExpression()));
Assert.Throws<ArgumentNullException>("type", () => new CodeArrayCreateExpression((Type)null, new CodePrimitiveExpression[0]));
Assert.Throws<ArgumentNullException>("type", () => new CodeArrayCreateExpression((Type)null, 0));
AssertExtensions.Throws<ArgumentNullException>("type", () => new CodeArrayCreateExpression((Type)null, new CodePrimitiveExpression()));
AssertExtensions.Throws<ArgumentNullException>("type", () => new CodeArrayCreateExpression((Type)null, new CodePrimitiveExpression[0]));
AssertExtensions.Throws<ArgumentNullException>("type", () => new CodeArrayCreateExpression((Type)null, 0));
}
[Fact]
public void Ctor_NullTypeInitializers_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression("", (CodePrimitiveExpression[])null));
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(typeof(void), (CodePrimitiveExpression[])null));
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(new CodeTypeReference(), (CodePrimitiveExpression[])null));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression("", (CodePrimitiveExpression[])null));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(typeof(void), (CodePrimitiveExpression[])null));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(new CodeTypeReference(), (CodePrimitiveExpression[])null));
}
[Fact]
public void Ctor_NullTypeInInitalizers_ThrowsArgumentNullException()
{
CodePrimitiveExpression[] initializers = new CodePrimitiveExpression[] { null };
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression("", initializers));
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(typeof(void), initializers));
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(new CodeTypeReference(), initializers));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression("", initializers));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(typeof(void), initializers));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayCreateExpression(new CodeTypeReference(), initializers));
}
[Theory]

View File

@@ -1,4 +1,4 @@
// 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.
@@ -36,13 +36,13 @@ namespace System.CodeDom.Tests
[Fact]
public void Ctor_NullIndices_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayIndexerExpression(new CodeExpression(), null));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayIndexerExpression(new CodeExpression(), null));
}
[Fact]
public void Ctor_NullObjectInIndices_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("value", () => new CodeArrayIndexerExpression(new CodeExpression(), new CodeExpression[] { null }));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeArrayIndexerExpression(new CodeExpression(), new CodeExpression[] { null }));
}
[Theory]

View File

@@ -1,4 +1,4 @@
// 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.
@@ -47,14 +47,14 @@ namespace System.CodeDom.Tests
[Fact]
public void Ctor_NullParameters_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("value", () => new CodeDelegateInvokeExpression(new CodePrimitiveExpression("Hello"), null));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeDelegateInvokeExpression(new CodePrimitiveExpression("Hello"), null));
}
[Fact]
public void Ctor_NullObjectInParameters_ThrowsArgumentNullException()
{
CodeExpression[] parameters = new CodeExpression[] { null };
Assert.Throws<ArgumentNullException>("value", () => new CodeDelegateInvokeExpression(new CodePrimitiveExpression("Hello"), parameters));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeDelegateInvokeExpression(new CodePrimitiveExpression("Hello"), parameters));
}
[Theory]

View File

@@ -1,4 +1,4 @@
// 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.
@@ -37,14 +37,14 @@ namespace System.CodeDom.Tests
[Fact]
public void Ctor_NullIndices_ThrowsArgumentNullException()
{
Assert.Throws<ArgumentNullException>("value", () => new CodeIndexerExpression(new CodePrimitiveExpression("Hello"), null));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeIndexerExpression(new CodePrimitiveExpression("Hello"), null));
}
[Fact]
public void Ctor_NullObjectInIndices_ThrowsArgumentNullException()
{
CodeExpression[] parameters = new CodeExpression[] { null };
Assert.Throws<ArgumentNullException>("value", () => new CodeIndexerExpression(new CodePrimitiveExpression("Hello"), parameters));
AssertExtensions.Throws<ArgumentNullException>("value", () => new CodeIndexerExpression(new CodePrimitiveExpression("Hello"), parameters));
}
[Theory]

Some files were not shown because too many files have changed in this diff Show More