Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 85bb52a

Browse files
committed
Fix System.Xml.XPath.XmlDocument tests conflict
These were failing to build because the referenced an older version of Xml.XPath then the library. This was due to the library using a project reference instead of a package reference.
1 parent e550015 commit 85bb52a

File tree

3 files changed

+54
-8
lines changed

3 files changed

+54
-8
lines changed

src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,5 @@
8787
<ItemGroup>
8888
<None Include="project.json" />
8989
</ItemGroup>
90-
<ItemGroup>
91-
<ProjectReference Include="..\..\System.Xml.XPath\src\System.Xml.XPath.csproj">
92-
<Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project>
93-
<Name>System.Xml.XPath</Name>
94-
</ProjectReference>
95-
</ItemGroup>
9690
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
9791
</Project>

src/System.Xml.XPath.XmlDocument/src/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"System.Runtime.Extensions": "4.0.10",
1212
"System.Threading": "4.0.10",
1313
"System.Xml.ReaderWriter": "4.0.10",
14-
"System.Xml.XmlDocument": "4.0.0"
14+
"System.Xml.XmlDocument": "4.0.0",
15+
"System.Xml.XPath": "4.0.0"
1516
},
1617
"frameworks": {
1718
"dnxcore50": {}

src/System.Xml.XPath.XmlDocument/src/project.lock.json

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,25 @@
300300
"runtime": {
301301
"lib/dotnet/System.Xml.XmlDocument.dll": {}
302302
}
303+
},
304+
"System.Xml.XPath/4.0.0": {
305+
"dependencies": {
306+
"System.Runtime": "4.0.20",
307+
"System.IO": "4.0.10",
308+
"System.Xml.ReaderWriter": "4.0.10",
309+
"System.Resources.ResourceManager": "4.0.0",
310+
"System.Collections": "4.0.10",
311+
"System.Globalization": "4.0.10",
312+
"System.Diagnostics.Debug": "4.0.10",
313+
"System.Runtime.Extensions": "4.0.10",
314+
"System.Threading": "4.0.10"
315+
},
316+
"compile": {
317+
"ref/dotnet/System.Xml.XPath.dll": {}
318+
},
319+
"runtime": {
320+
"lib/dotnet/System.Xml.XPath.dll": {}
321+
}
303322
}
304323
}
305324
},
@@ -1021,6 +1040,37 @@
10211040
"ref/xamarinios10/_._",
10221041
"ref/xamarinmac20/_._"
10231042
]
1043+
},
1044+
"System.Xml.XPath/4.0.0": {
1045+
"serviceable": true,
1046+
"sha512": "jalVwhZSwErcW28NZOE3Dqb6B1XA4DAsL15JvykYIKXtXYQU8PI5GXssjF5G0bLm8/6Gko2e1SOjRs/MoeAKrw==",
1047+
"files": [
1048+
"System.Xml.XPath.4.0.0.nupkg",
1049+
"System.Xml.XPath.4.0.0.nupkg.sha512",
1050+
"System.Xml.XPath.nuspec",
1051+
"lib/dotnet/System.Xml.XPath.dll",
1052+
"lib/MonoAndroid10/_._",
1053+
"lib/MonoTouch10/_._",
1054+
"lib/net46/System.Xml.XPath.dll",
1055+
"lib/xamarinios10/_._",
1056+
"lib/xamarinmac20/_._",
1057+
"ref/dotnet/System.Xml.XPath.dll",
1058+
"ref/dotnet/System.Xml.XPath.xml",
1059+
"ref/dotnet/de/System.Xml.XPath.xml",
1060+
"ref/dotnet/es/System.Xml.XPath.xml",
1061+
"ref/dotnet/fr/System.Xml.XPath.xml",
1062+
"ref/dotnet/it/System.Xml.XPath.xml",
1063+
"ref/dotnet/ja/System.Xml.XPath.xml",
1064+
"ref/dotnet/ko/System.Xml.XPath.xml",
1065+
"ref/dotnet/ru/System.Xml.XPath.xml",
1066+
"ref/dotnet/zh-hans/System.Xml.XPath.xml",
1067+
"ref/dotnet/zh-hant/System.Xml.XPath.xml",
1068+
"ref/MonoAndroid10/_._",
1069+
"ref/MonoTouch10/_._",
1070+
"ref/net46/System.Xml.XPath.dll",
1071+
"ref/xamarinios10/_._",
1072+
"ref/xamarinmac20/_._"
1073+
]
10241074
}
10251075
},
10261076
"projectFileDependencyGroups": {
@@ -1036,7 +1086,8 @@
10361086
"System.Runtime.Extensions >= 4.0.10",
10371087
"System.Threading >= 4.0.10",
10381088
"System.Xml.ReaderWriter >= 4.0.10",
1039-
"System.Xml.XmlDocument >= 4.0.0"
1089+
"System.Xml.XmlDocument >= 4.0.0",
1090+
"System.Xml.XPath >= 4.0.0"
10401091
],
10411092
"DNXCore,Version=v5.0": []
10421093
}

0 commit comments

Comments
 (0)