diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-02-01 00:56:21 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-02-01 05:43:08 +0300 |
| commit | 44df137ce0a9e38883d8f9a1149bdf01e54c8956 (patch) | |
| tree | 2646d13d87ae50cc3813d5cfbb417aaaaa6f8b57 /src/System.Xml.XPath.XmlDocument | |
| parent | 83b3046e1f63c752ee0d69e8b847d633724d90b1 (diff) | |
Make netfx build work
This fixes all src and ref projects to build when TargetGroup=netfx.
Diffstat (limited to 'src/System.Xml.XPath.XmlDocument')
4 files changed, 12 insertions, 7 deletions
diff --git a/src/System.Xml.XPath.XmlDocument/ref/Configurations.props b/src/System.Xml.XPath.XmlDocument/ref/Configurations.props index c701755863..192309fce5 100644 --- a/src/System.Xml.XPath.XmlDocument/ref/Configurations.props +++ b/src/System.Xml.XPath.XmlDocument/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; + netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj b/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj index 44d8de3505..af3b085a55 100644 --- a/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj +++ b/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj @@ -8,7 +8,11 @@ <ItemGroup> <Compile Include="System.Xml.XPath.XmlDocument.Manual.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="..\..\System.Xml.XmlDocument\ref\System.Xml.XmlDocument.csproj" /> <ProjectReference Include="..\..\System.Xml.XPath\ref\System.Xml.XPath.csproj" /> diff --git a/src/System.Xml.XPath.XmlDocument/src/Configurations.props b/src/System.Xml.XPath.XmlDocument/src/Configurations.props index ec7ff74950..eda43be76a 100644 --- a/src/System.Xml.XPath.XmlDocument/src/Configurations.props +++ b/src/System.Xml.XPath.XmlDocument/src/Configurations.props @@ -2,8 +2,8 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - net461-Windows_NT; uap-Windows_NT; + netfx-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; </BuildConfigurations> diff --git a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj b/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj index 15f4c2a64c..4612656d3a 100644 --- a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj +++ b/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj @@ -7,17 +7,17 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-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)' == 'uap-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == 'net461'"> - <TargetingPackReference Include="mscorlib" /> - <TargetingPackReference Include="System.Xml" /> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <Compile Include="System\Xml\XmlDocumentXPathExtensions.cs" /> |