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

@@ -1,45 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument", "src\System.Xml.XDocument.csproj", "{442C5A88-29C2-4B00-B1DF-730D646D3861}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.Axes.Tests", "tests\axes\System.Xml.XDocument.Axes.Tests.csproj", "{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDocument.Common", "tests\XDocument.Common\XDocument.Common.csproj", "{52666206-B6C9-49FA-A1D7-D0A0C68807B0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.Events.Tests", "tests\events\System.Xml.XDocument.Events.Tests.csproj", "{C560E194-5B14-4112-ABC6-3208491E53E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDocument.Test.ModuleCore", "tests\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj", "{979510CE-9042-4F8D-9C74-EE03B89194CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.Misc.Tests", "tests\misc\System.Xml.XDocument.Misc.Tests.csproj", "{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.Properties.Tests", "tests\Properties\System.Xml.XDocument.Properties.Tests.csproj", "{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.SDMSample.Tests", "tests\SDMSample\System.Xml.XDocument.SDMSample.Tests.csproj", "{F6C73170-9333-4B52-B3FA-A536C5EA6A48}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.Streaming.Tests", "tests\Streaming\System.Xml.XDocument.Streaming.Tests.csproj", "{CB11B315-2567-4574-977D-89E3135243C4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.TreeManipulation.Tests", "tests\TreeManipulation\System.Xml.XDocument.TreeManipulation.Tests.csproj", "{10EFE488-FAB4-43DA-847D-FF057BFF52AC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.xNodeReader.Tests", "tests\xNodeReader\System.Xml.XDocument.xNodeReader.Tests.csproj", "{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlDiff", "..\Common\tests\System\Xml\XmlDiff\XmlDiff.csproj", "{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlCoreTest", "..\Common\tests\System\Xml\XmlCoreTest\XmlCoreTest.csproj", "{89701565-F68B-46D9-BD78-95B0F052C50B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModuleCore", "..\Common\tests\System\Xml\ModuleCore\ModuleCore.csproj", "{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF6DABDD-5158-4CAF-88B0-B823EE173E53}"
ProjectSection(SolutionItems) = preProject
.nuget\packages.Windows_NT.config = .nuget\packages.Windows_NT.config
ProjectSection(ProjectDependencies) = postProject
{506A8ECB-E5B4-4F10-8419-26A0EC7AB225} = {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.xNodeBuilder.Tests", "tests\xNodeBuilder\System.Xml.XDocument.xNodeBuilder.Tests.csproj", "{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument", "ref\System.Xml.XDocument.csproj", "{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2B620568-877B-4A96-919B-F24B0B3E761D}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{613870EF-97E7-4D29-9EF2-ABB7E81CE232}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,89 +19,20 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.Build.0 = Debug|Any CPU
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.ActiveCfg = Release|Any CPU
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.Build.0 = Release|Any CPU
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU
{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.Build.0 = Release|Any CPU
{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.Build.0 = Release|Any CPU
{C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.Build.0 = Release|Any CPU
{979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.Build.0 = Release|Any CPU
{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.Build.0 = Release|Any CPU
{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.Build.0 = Release|Any CPU
{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.Build.0 = Release|Any CPU
{CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.Build.0 = Release|Any CPU
{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.Build.0 = Release|Any CPU
{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.Build.0 = Release|Any CPU
{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}.Release|Any CPU.Build.0 = Release|Any CPU
{89701565-F68B-46D9-BD78-95B0F052C50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89701565-F68B-46D9-BD78-95B0F052C50B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89701565-F68B-46D9-BD78-95B0F052C50B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89701565-F68B-46D9-BD78-95B0F052C50B}.Release|Any CPU.Build.0 = Release|Any CPU
{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}.Release|Any CPU.Build.0 = Release|Any CPU
{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.Build.0 = Release|Any CPU
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{52666206-B6C9-49FA-A1D7-D0A0C68807B0} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{C560E194-5B14-4112-ABC6-3208491E53E6} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{979510CE-9042-4F8D-9C74-EE03B89194CC} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{D24E2563-7A46-4368-94D4-B3A39E9EF1B5} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{F6C73170-9333-4B52-B3FA-A536C5EA6A48} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{CB11B315-2567-4574-977D-89E3135243C4} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{10EFE488-FAB4-43DA-847D-FF057BFF52AC} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE} = {613870EF-97E7-4D29-9EF2-ABB7E81CE232}
{89701565-F68B-46D9-BD78-95B0F052C50B} = {613870EF-97E7-4D29-9EF2-ABB7E81CE232}
{3CF0CC76-4CE0-460A-BA37-657CFED39AB0} = {613870EF-97E7-4D29-9EF2-ABB7E81CE232}
{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{613870EF-97E7-4D29-9EF2-ABB7E81CE232} = {2B620568-877B-4A96-919B-F24B0B3E761D}
{442C5A88-29C2-4B00-B1DF-730D646D3861} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{506A8ECB-E5B4-4F10-8419-26A0EC7AB225} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
EndGlobal

View File

@@ -4,5 +4,6 @@
<PropertyGroup>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
</PropertyGroup>
</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>{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />

View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
net463-Windows_NT;
uap-Windows_NT;
netcoreapp-Windows_NT;
netcoreapp-Unix;
</BuildConfigurations>

View File

@@ -9,25 +9,16 @@
<ResourcesSourceOutputDirectory>None</ResourcesSourceOutputDirectory>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == 'net463'">
<ContractProject Include="..\ref\System.Xml.XDocument.csproj">
<TargetGroup>netcoreapp1.7</TargetGroup>
</ContractProject>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<ItemGroup>
<ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" />
<ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net463'">
<TargetingPackReference Include="mscorlib" />
<TargetingPackReference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
</ItemGroup>

View File

@@ -1,7 +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>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>