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,90 +7,44 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom.Tests", "tes
{53D09AF4-0C13-4197-B8AD-9746F0374E88} = {53D09AF4-0C13-4197-B8AD-9746F0374E88}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{350C956A-B4ED-4376-9B04-2908528D10FF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom", "ref\System.CodeDom.csproj", "{14FAFC3A-8266-45C7-8604-8C2CB567E50D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827B5CCD-073A-4A75-9661-73D54F0A3528}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{096E7AD0-17A2-4EAF-9AC5-2F0FC67A4112}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom", "src\System.CodeDom.csproj", "{53D09AF4-0C13-4197-B8AD-9746F0374E88}"
ProjectSection(ProjectDependencies) = postProject
{4CF42F1E-B5AC-4834-AE24-A1F285091377} = {4CF42F1E-B5AC-4834-AE24-A1F285091377}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom", "ref\System.CodeDom.csproj", "{4CF42F1E-B5AC-4834-AE24-A1F285091377}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|AnyCPU = Debug|AnyCPU
DebugNETCoreAppnet461netstandard|AnyCPU = DebugNETCoreAppnet461netstandard|AnyCPU
DebugNETCoreAppnetstandardnetstandard|AnyCPU = DebugNETCoreAppnetstandardnetstandard|AnyCPU
net461-Debug|AnyCPU = net461-Debug|AnyCPU
net461-Release|AnyCPU = net461-Release|AnyCPU
netstandard-Debug|AnyCPU = netstandard-Debug|AnyCPU
netstandard-Release|AnyCPU = netstandard-Release|AnyCPU
ReleaseNETCoreAppnet461netstandard|AnyCPU = ReleaseNETCoreAppnet461netstandard|AnyCPU
ReleaseNETCoreAppnetstandardnetstandard|AnyCPU = ReleaseNETCoreAppnetstandardnetstandard|AnyCPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|AnyCPU.Build.0 = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.DebugNETCoreAppnet461netstandard|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.DebugNETCoreAppnet461netstandard|AnyCPU.Build.0 = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.DebugNETCoreAppnetstandardnetstandard|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.DebugNETCoreAppnetstandardnetstandard|AnyCPU.Build.0 = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.net461-Debug|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.net461-Debug|AnyCPU.Build.0 = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.net461-Release|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.net461-Release|AnyCPU.Build.0 = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.netstandard-Debug|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.netstandard-Debug|AnyCPU.Build.0 = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.netstandard-Release|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.netstandard-Release|AnyCPU.Build.0 = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.ReleaseNETCoreAppnet461netstandard|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.ReleaseNETCoreAppnet461netstandard|AnyCPU.Build.0 = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.ReleaseNETCoreAppnetstandardnetstandard|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.ReleaseNETCoreAppnetstandardnetstandard|AnyCPU.Build.0 = netstandard-Release|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.DebugNETCoreAppnet461netstandard|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.DebugNETCoreAppnet461netstandard|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.DebugNETCoreAppnetstandardnetstandard|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.DebugNETCoreAppnetstandardnetstandard|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.net461-Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.net461-Debug|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.net461-Release|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.net461-Release|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.netstandard-Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.netstandard-Debug|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.netstandard-Release|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.netstandard-Release|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.ReleaseNETCoreAppnet461netstandard|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.ReleaseNETCoreAppnet461netstandard|AnyCPU.Build.0 = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.ReleaseNETCoreAppnetstandardnetstandard|AnyCPU.ActiveCfg = Debug|Any CPU
{14FAFC3A-8266-45C7-8604-8C2CB567E50D}.ReleaseNETCoreAppnetstandardnetstandard|AnyCPU.Build.0 = Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|AnyCPU.Build.0 = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.DebugNETCoreAppnet461netstandard|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.DebugNETCoreAppnet461netstandard|AnyCPU.Build.0 = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.DebugNETCoreAppnetstandardnetstandard|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.DebugNETCoreAppnetstandardnetstandard|AnyCPU.Build.0 = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.net461-Debug|AnyCPU.ActiveCfg = net461-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.net461-Debug|AnyCPU.Build.0 = net461-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.net461-Release|AnyCPU.ActiveCfg = net461-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.net461-Release|AnyCPU.Build.0 = net461-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.netstandard-Debug|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.netstandard-Debug|AnyCPU.Build.0 = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.netstandard-Release|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.netstandard-Release|AnyCPU.Build.0 = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.ReleaseNETCoreAppnet461netstandard|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.ReleaseNETCoreAppnet461netstandard|AnyCPU.Build.0 = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.ReleaseNETCoreAppnetstandardnetstandard|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.ReleaseNETCoreAppnetstandardnetstandard|AnyCPU.Build.0 = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726} = {096E7AD0-17A2-4EAF-9AC5-2F0FC67A4112}
{14FAFC3A-8266-45C7-8604-8C2CB567E50D} = {350C956A-B4ED-4376-9B04-2908528D10FF}
{53D09AF4-0C13-4197-B8AD-9746F0374E88} = {827B5CCD-073A-4A75-9661-73D54F0A3528}
{0D1E2954-A5C7-4B8C-932A-31EB4A96A726} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{53D09AF4-0C13-4197-B8AD-9746F0374E88} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{4CF42F1E-B5AC-4834-AE24-A1F285091377} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
EndGlobal

View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
</PropertyGroup>
</Project>
</Project>

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.CodeDom.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>

View File

@@ -5,7 +5,7 @@
<ProjectReference Include="..\ref\System.CodeDom.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.CodeDom.builds" />
<ProjectReference Include="..\src\System.CodeDom.csproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

View File

@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<ProjectGuid>{4CF42F1E-B5AC-4834-AE24-A1F285091377}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>

View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
net461;
netfx;
netstandard;
</BuildConfigurations>
</PropertyGroup>

View File

@@ -1 +1 @@
242a60a2e88b9c75624608ae9b14ba1bef696784
e180cb5c5ae74aba136635e15db40031c56ba552

View File

@@ -1434,7 +1434,7 @@ namespace Microsoft.VisualBasic
string eventName = e.Name;
if (e.PrivateImplementationType != null)
{
string impl = GetBaseTypeOutput(e.PrivateImplementationType);
string impl = GetBaseTypeOutput(e.PrivateImplementationType, preferBuiltInTypes: false);
impl = impl.Replace('.', '_');
e.Name = impl + "_" + e.Name;
}
@@ -1561,7 +1561,7 @@ namespace Microsoft.VisualBasic
string methodName = e.Name;
if (e.PrivateImplementationType != null)
{
string impl = GetBaseTypeOutput(e.PrivateImplementationType);
string impl = GetBaseTypeOutput(e.PrivateImplementationType, preferBuiltInTypes: false);
impl = impl.Replace('.', '_');
e.Name = impl + "_" + e.Name;
}
@@ -1714,7 +1714,7 @@ namespace Microsoft.VisualBasic
string propName = e.Name;
if (e.PrivateImplementationType != null)
{
string impl = GetBaseTypeOutput(e.PrivateImplementationType);
string impl = GetBaseTypeOutput(e.PrivateImplementationType, preferBuiltInTypes: false);
impl = impl.Replace('.', '_');
e.Name = impl + "_" + e.Name;
}
@@ -2040,7 +2040,7 @@ namespace Microsoft.VisualBasic
}
// In VB, constraints are put right after the type paramater name.
// In C#, there is a seperate "where" statement
// In C#, there is a separate "where" statement
private void OutputTypeParameterConstraints(CodeTypeParameter typeParameter)
{
CodeTypeReferenceCollection constraints = typeParameter.Constraints;
@@ -2399,80 +2399,56 @@ namespace Microsoft.VisualBasic
return name;
}
private string GetBaseTypeOutput(CodeTypeReference typeRef)
private string GetBaseTypeOutput(CodeTypeReference typeRef, bool preferBuiltInTypes = true)
{
string baseType = typeRef.BaseType;
if (baseType.Length == 0)
if (preferBuiltInTypes)
{
return "Void";
if (baseType.Length == 0)
{
return "Void";
}
string lowerCaseString = baseType.ToLowerInvariant();
switch (lowerCaseString)
{
case "system.byte":
return "Byte";
case "system.sbyte":
return "SByte";
case "system.int16":
return "Short";
case "system.int32":
return "Integer";
case "system.int64":
return "Long";
case "system.uint16":
return "UShort";
case "system.uint32":
return "UInteger";
case "system.uint64":
return "ULong";
case "system.string":
return "String";
case "system.datetime":
return "Date";
case "system.decimal":
return "Decimal";
case "system.single":
return "Single";
case "system.double":
return "Double";
case "system.boolean":
return "Boolean";
case "system.char":
return "Char";
case "system.object":
return "Object";
}
}
else if (string.Equals(baseType, "System.Byte", StringComparison.OrdinalIgnoreCase))
{
return "Byte";
}
else if (string.Equals(baseType, "System.SByte", StringComparison.OrdinalIgnoreCase))
{
return "SByte";
}
else if (string.Equals(baseType, "System.Int16", StringComparison.OrdinalIgnoreCase))
{
return "Short";
}
else if (string.Equals(baseType, "System.Int32", StringComparison.OrdinalIgnoreCase))
{
return "Integer";
}
else if (string.Equals(baseType, "System.Int64", StringComparison.OrdinalIgnoreCase))
{
return "Long";
}
else if (string.Equals(baseType, "System.UInt16", StringComparison.OrdinalIgnoreCase))
{
return "UShort";
}
else if (string.Equals(baseType, "System.UInt32", StringComparison.OrdinalIgnoreCase))
{
return "UInteger";
}
else if (string.Equals(baseType, "System.UInt64", StringComparison.OrdinalIgnoreCase))
{
return "ULong";
}
else if (string.Equals(baseType, "System.String", StringComparison.OrdinalIgnoreCase))
{
return "String";
}
else if (string.Equals(baseType, "System.DateTime", StringComparison.OrdinalIgnoreCase))
{
return "Date";
}
else if (string.Equals(baseType, "System.Decimal", StringComparison.OrdinalIgnoreCase))
{
return "Decimal";
}
else if (string.Equals(baseType, "System.Single", StringComparison.OrdinalIgnoreCase))
{
return "Single";
}
else if (string.Equals(baseType, "System.Double", StringComparison.OrdinalIgnoreCase))
{
return "Double";
}
else if (string.Equals(baseType, "System.Boolean", StringComparison.OrdinalIgnoreCase))
{
return "Boolean";
}
else if (string.Equals(baseType, "System.Char", StringComparison.OrdinalIgnoreCase))
{
return "Char";
}
else if (string.Equals(baseType, "System.Object", StringComparison.OrdinalIgnoreCase))
{
return "Object";
}
else
{
var sb = new StringBuilder(baseType.Length + 10);
if ((typeRef.Options & CodeTypeReferenceOptions.GlobalReference) != 0)
{
@@ -2525,7 +2501,6 @@ namespace Microsoft.VisualBasic
}
return sb.ToString();
}
}
private string GetTypeOutputWithoutArrayPostFix(CodeTypeReference typeRef)

View File

@@ -1,64 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
@@ -173,7 +114,7 @@
<value>{unknown}</value>
</data>
<data name="AutoGen_Comment_Line1" xml:space="preserve">
<value>auto-generated></value>
<value>auto-generated&gt;</value>
</data>
<data name="AutoGen_Comment_Line2" xml:space="preserve">
<value>This code was generated by a tool.</value>
@@ -187,7 +128,4 @@
<data name="AutoGen_Comment_Line5" xml:space="preserve">
<value>the code is regenerated.</value>
</data>
<data name="NullOrEmpty_Value_in_Property" xml:space="preserve">
<value>The '{0}' property cannot contain null or empty strings.</value>
</data>
</root>

View File

@@ -4,12 +4,12 @@
<PropertyGroup>
<ProjectGuid>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</ProjectGuid>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly>
<DefineConstants>$(DefineConstants);CODEDOM</DefineConstants>
</PropertyGroup>
<!-- Default configurations to help VS understand the options -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net461-Release|AnyCPU'" />
<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 Condition="'$(TargetGroup)' == 'netstandard'">
@@ -132,8 +132,9 @@
<Compile Include="System\Collections\Specialized\FixedStringLookup.cs" />
<Compile Include="$(CommonPath)\System\CSharpHelpers.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net461'">
<TargetingPackReference Include="System" />
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<Reference Include="mscorlib" />
<Reference Include="System" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

View File

@@ -10,12 +10,12 @@ namespace System.CodeDom
[Serializable]
public class CodeNamespaceImportCollection : IList
{
private readonly List<CodeNamespaceImport> _data = new List<CodeNamespaceImport>();
private readonly ArrayList _data = new ArrayList(); // not List<CodeNamespaceImport> to provide desktop-consistent semantics for CopyTo
private readonly Dictionary<string, CodeNamespaceImport> _keys = new Dictionary<string, CodeNamespaceImport>(StringComparer.OrdinalIgnoreCase);
public CodeNamespaceImport this[int index]
{
get { return _data[index]; }
get { return (CodeNamespaceImport)_data[index]; }
set
{
_data[index] = value;
@@ -84,15 +84,15 @@ namespace System.CodeDom
object ICollection.SyncRoot => null;
void ICollection.CopyTo(Array array, int index) => ((IList)_data).CopyTo(array, index);
void ICollection.CopyTo(Array array, int index) => _data.CopyTo(array, index);
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
int IList.Add(object value) => ((IList)_data).Add((CodeNamespaceImport)value);
int IList.Add(object value) => _data.Add((CodeNamespaceImport)value);
void IList.Clear() => Clear();
bool IList.Contains(object value) => ((IList)_data).Contains(value);
bool IList.Contains(object value) => _data.Contains(value);
int IList.IndexOf(object value) => _data.IndexOf((CodeNamespaceImport)value);

View File

@@ -103,7 +103,7 @@ namespace System.CodeDom.Compiler
public override bool Equals(object o)
{
CompilerInfo other = o as CompilerInfo;
if (o == null)
if (other == null)
{
return false;
}

View File

@@ -0,0 +1,22 @@
// 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.Security.Policy;
namespace System.CodeDom.Compiler
{
public partial class CompilerParameters
{
[NonSerialized]
private Evidence _evidence;
[Obsolete("CAS policy is obsolete and will be removed in a future release of the .NET Framework."
+ " Please see http://go2.microsoft.com/fwlink/?LinkId=131738 for more information.")]
public Evidence Evidence
{
get { return _evidence?.Clone(); }
set { _evidence = value?.Clone(); }
}
}
}

View File

@@ -7,7 +7,7 @@ using System.Collections.Specialized;
namespace System.CodeDom.Compiler
{
[Serializable]
public class CompilerParameters
public partial class CompilerParameters
{
private readonly StringCollection _assemblyNames = new StringCollection();
private readonly StringCollection _embeddedResources = new StringCollection();

View File

@@ -0,0 +1,20 @@
// 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.Security.Policy;
namespace System.CodeDom.Compiler
{
public partial class CompilerResults
{
private Evidence _evidence;
[Obsolete("CAS policy is obsolete and will be removed in a future release of the .NET Framework. Please see http://go2.microsoft.com/fwlink/?LinkId=131738 for more information.")]
public Evidence Evidence
{
get { return _evidence?.Clone(); }
set { _evidence = value?.Clone(); }
}
}
}

View File

@@ -8,18 +8,31 @@ using System.Reflection;
namespace System.CodeDom.Compiler
{
[Serializable]
public class CompilerResults
public partial class CompilerResults
{
private readonly CompilerErrorCollection _errors = new CompilerErrorCollection();
private readonly StringCollection _output = new StringCollection();
private Assembly _compiledAssembly;
[NonSerialized]
private TempFileCollection _tempFiles;
public CompilerResults(TempFileCollection tempFiles)
{
TempFiles = tempFiles;
_tempFiles = tempFiles;
}
public TempFileCollection TempFiles { get; set; }
public TempFileCollection TempFiles
{
get
{
return _tempFiles;
}
set
{
_tempFiles = value;
}
}
public Assembly CompiledAssembly
{

View File

@@ -1 +1 @@
bc36ebccafa57c6c54ece0fc81f1be69cdb646f3
38777f60e431949573ca11c45803f43c13d07dc7

View File

@@ -17,11 +17,11 @@ namespace System.CodeDom.Tests
protected override bool NullAllowed => false;
protected override bool Enumerator_Current_UndefinedOperation_Throws => true;
protected override bool IList_CurrentAfterAdd_Throws => false;
protected override bool ICollection_NonGeneric_HasNullSyncRoot => true;
protected override Type ICollection_NonGeneric_CopyTo_NonZeroLowerBound_ThrowType => typeof(ArgumentOutOfRangeException);
protected override Type ICollection_NonGeneric_CopyTo_ArrayOfEnumType_ThrowType => typeof(ArgumentException);
protected override Type ICollection_NonGeneric_CopyTo_ArrayOfIncorrectReferenceType_ThrowType => typeof(InvalidCastException);
protected override Type ICollection_NonGeneric_CopyTo_ArrayOfIncorrectValueType_ThrowType => typeof(InvalidCastException);
[Fact]
public void Add()

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.CodeDom.Tests.csproj" />
<Project Include="System.CodeDom.Tests.csproj">
<OSGroup>Windows_NT</OSGroup>
<TestTFMs>net463</TestTFMs>
</Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>

View File

@@ -1 +1 @@
43e752c1b9c431bf6411ac697bcb43289759c018
619694b8ba9d38cca6c3af3d4c1d07d6a90c1e46