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,19 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22609.0
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument", "src\System.Xml.XPath.XDocument.csproj", "{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument.Tests", "tests\System.Xml.XPath.XDocument.Tests.csproj", "{10D52320-17B7-476E-BBD2-A1064DD38CBF}"
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
{F44BEAB4-EDDB-497B-B15C-11E8DFB94092} = {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument", "..\System.Xml.XPath.XmlDocument\src\System.Xml.XPath.XmlDocument.csproj", "{17CB2E3C-2904-4241-94DB-3894D24F35DA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument", "ref\System.Xml.XPath.XDocument.csproj", "{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath", "..\System.Xml.XPath\src\System.Xml.XPath.csproj", "{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}"
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
@@ -21,24 +19,20 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.Build.0 = Release|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.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
{17CB2E3C-2904-4241-94DB-3894D24F35DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17CB2E3C-2904-4241-94DB-3894D24F35DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17CB2E3C-2904-4241-94DB-3894D24F35DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17CB2E3C-2904-4241-94DB-3894D24F35DA}.Release|Any CPU.Build.0 = Release|Any CPU
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{F44BEAB4-EDDB-497B-B15C-11E8DFB94092} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
EndGlobal

View File

@@ -4,5 +4,7 @@
<PropertyGroup>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<IsNETCoreApp>true</IsNETCoreApp>
<IsDesktopFacade>true</IsDesktopFacade>
<IsUAP>true</IsUAP>
</PropertyGroup>
</Project>

View File

@@ -4,6 +4,7 @@
<BuildConfigurations>
netcoreapp;
uap;
netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -1,15 +1,25 @@
<?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>{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System.Xml.XPath.XDocument.cs" />
<Compile Include="System.Xml.XPath.XDocument.Manual.cs" />
</ItemGroup>
<ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<Reference Include="mscorlib" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
<ProjectReference Include="..\..\System.Xml.XDocument\ref\System.Xml.XDocument.csproj" />
<ProjectReference Include="..\..\System.Xml.XPath\ref\System.Xml.XPath.csproj" />

View File

@@ -2,9 +2,10 @@
<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;
netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -8,24 +8,26 @@
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
</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'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System\Xml\XPath\XDocumentExtensions.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)'=='netcoreapp'">
<ItemGroup Condition="'$(TargetGroup)'=='netcoreapp' or '$(TargetGroup)'=='uap'">
<ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />
<ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)'=='net463'">
<TargetingPackReference Include="mscorlib" />
<TargetingPackReference Include="System" />
<TargetingPackReference Include="System.Xml" />
<TargetingPackReference Include="System.Xml.Linq" />
<ItemGroup Condition="'$(TargetGroup)'=='netfx'">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Diagnostics.Tools" />

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>