Skip to content

R
Runtime

jobily / Runtime
10 个月 前同步成功

通知 1
Star 0
Fork 0
R
Runtime

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 f4421c13 编写于 作者: S Sepideh Khoshnood 提交者： GitHub
浏览文件
操作

Merge pull request dotnet/corefx#14877 from sepidehMS/FixXmlXmlLinqDesktopTestFails 

Fix Xml and Xml.Linq Desktop test failures

Commit migrated from https://github.com/dotnet/corefx/commit/49e18e5022396a7c31d902bfc65b00fa47e0542e
上级 c9377525 5c8f89aa
隐藏空白更改
内联 并排
Showing with 96 addition and 31 deletion
src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj
浏览文件 @ f4421c13
......@@ -32,6 +32,7 @@
<ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" />
<ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" />
<ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
......
src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj
浏览文件 @ f4421c13
......@@ -30,6 +30,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
......
src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj
浏览文件 @ f4421c13
......@@ -25,6 +25,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" />
<ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
......
src/libraries/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds
浏览文件 @ f4421c13
......@@ -13,8 +13,16 @@
<TestTFMs>netcore50;net46</TestTFMs>
</Project>
<Project Include="misc\System.Xml.Linq.Misc.Tests.csproj" />
<Project Include="misc\System.Xml.Linq.Misc.Tests.csproj">
<TargetGroup>netcoreapp1.1</TargetGroup>
</Project>
<Project Include="misc\System.Xml.Linq.Misc.Tests.csproj">
<OSGroup>Windows_NT</OSGroup>
<TestTFMs>net463</TestTFMs>
</Project>
<Project Include="misc\System.Xml.Linq.Misc.Tests.csproj">
<OSGroup>Windows_NT</OSGroup>
<TargetGroup>netstandard1.3</TargetGroup>
<TestTFMs>netcore50;net46</TestTFMs>
</Project>
<Project Include="Properties\System.Xml.Linq.Properties.Tests.csproj" />
......@@ -35,6 +43,7 @@
<Project Include="TreeManipulation\System.Xml.Linq.TreeManipulation.Tests.csproj" />
<Project Include="TreeManipulation\System.Xml.Linq.TreeManipulation.Tests.csproj">
<OSGroup>Windows_NT</OSGroup>
<TargetGroup>netstandard1.3</TargetGroup>
<TestTFMs>netcore50;net46</TestTFMs>
</Project>
<Project Include="XDocument.Common\XDocument.Common.csproj" />
......
src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
浏览文件 @ f4421c13
......@@ -7,7 +7,7 @@
<ProjectGuid>{10EFE488-FAB4-43DA-847D-FF057BFF52AC}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>System.Xml.Linq.TreeManipulation.Tests</AssemblyName>
<NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker>
<NuGetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
<RootNamespace>XLinqTests</RootNamespace>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
......
src/libraries/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj
浏览文件 @ f4421c13
......@@ -209,6 +209,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
......
src/libraries/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj
浏览文件 @ f4421c13
......@@ -27,6 +27,7 @@
<ItemGroup>
<ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj
浏览文件 @ f4421c13
......@@ -32,6 +32,7 @@
</ProjectReference>
<ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" />
<ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj
浏览文件 @ f4421c13
......@@ -7,7 +7,7 @@
<ProjectGuid>{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>System.Xml.Linq.Misc.Tests</AssemblyName>
<NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker>
<NuGetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
<RootNamespace>System.Xml.Linq.Tests</RootNamespace>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
......@@ -23,7 +23,7 @@
<Compile Include="XHashtable.cs" />
<Compile Include="XLinqErrata4.cs" />
<Compile Include="XNameAPI.cs" />
<Compile Include="LoadSaveAsyncTests.cs" Condition="'$(TargetGroup)'==''" />
<Compile Include="LoadSaveAsyncTests.cs" Condition="'$(TargetGroup)'=='netcoreapp1.1'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" />
......
src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
浏览文件 @ f4421c13
......@@ -34,6 +34,7 @@
<ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" />
<ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" />
<ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
......
src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj
浏览文件 @ f4421c13
......@@ -42,6 +42,7 @@
<ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" />
<ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" />
<ProjectReference Include="..\..\pkg\System.Private.Xml.Linq.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.XDocument\pkg\System.Xml.XDocument.pkgproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
......
src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
浏览文件 @ f4421c13
......@@ -28,6 +28,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
浏览文件 @ f4421c13
......@@ -28,6 +28,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
浏览文件 @ f4421c13
......@@ -29,6 +29,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
浏览文件 @ f4421c13
......@@ -32,6 +32,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
浏览文件 @ f4421c13
......@@ -44,6 +44,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
浏览文件 @ f4421c13
......@@ -27,6 +27,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
浏览文件 @ f4421c13
......@@ -27,6 +27,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
浏览文件 @ f4421c13
......@@ -35,6 +35,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
浏览文件 @ f4421c13
......@@ -63,6 +63,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj
浏览文件 @ f4421c13
......@@ -21,6 +21,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<ItemGroup>
<!-- XPath.XmlDocument navigator -->
......
src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
浏览文件 @ f4421c13
......@@ -58,6 +58,7 @@
<ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" />
<ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" />
<ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/XmlDocument/XmlAttributeCollectionTests/InsertAfterTests.cs
浏览文件 @ f4421c13
......@@ -209,6 +209,7 @@ public void InsertAfterReturnsInsertedAttr()
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] //Fix for this edge case was only made in NetCore
public void InsertAfterRemovesDupRefAttrAtTheEnd()
{
const string attributeName = "existingAttr";
......@@ -230,6 +231,28 @@ public void InsertAfterRemovesDupRefAttrAtTheEnd()
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)]
public void InsertAfterThrowsArgumentOutOfRangeExceptionForDupRefAttrAtTheEnd_OldBehavior()
{
const string attributeName = "existingAttr";
const string attributeUri = "some:existingUri";
XmlDocument doc = CreateDocumentWithElement();
XmlElement element = doc.DocumentElement;
XmlAttribute anotherAttr1 = element.Attributes.Append(doc.CreateAttribute("attr1", "some:uri1"));
XmlAttribute anotherAttr2 = element.Attributes.Append(doc.CreateAttribute("attr2", "some:uri2"));
XmlAttribute refAttr = element.Attributes.Append(doc.CreateAttribute(attributeName, attributeUri)); //dup
XmlAttribute newAttr = doc.CreateAttribute(attributeName, attributeUri);
XmlAttributeCollection target = element.Attributes;
Assert.Throws<ArgumentOutOfRangeException> (() => target.InsertAfter(newAttr, refAttr));
Assert.Equal(2, target.Count);
Assert.Same(anotherAttr1, target[0]);
Assert.Same(anotherAttr2, target[1]);
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] //Fix for this edge case was only made in NetCore
public void InsertAfterReplacesDupRefAttr()
{
const string attributeName = "existingAttr";
......@@ -252,6 +275,30 @@ public void InsertAfterReplacesDupRefAttr()
Assert.Same(anotherAttr3, target[3]);
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)]
public void InsertAfterDoesNotReplaceDupRefAttr_OldBehavior()
{
const string attributeName = "existingAttr";
const string attributeUri = "some:existingUri";
XmlDocument doc = CreateDocumentWithElement();
XmlElement element = doc.DocumentElement;
XmlAttribute anotherAttr1 = element.Attributes.Append(doc.CreateAttribute("attr1", "some:uri1"));
XmlAttribute anotherAttr2 = element.Attributes.Append(doc.CreateAttribute("attr2", "some:uri2"));
XmlAttribute refAttr = element.Attributes.Append(doc.CreateAttribute(attributeName, attributeUri)); //dup
XmlAttribute anotherAttr3 = element.Attributes.Append(doc.CreateAttribute("attr3", "some:uri3"));
XmlAttribute newAttr = doc.CreateAttribute(attributeName, attributeUri);
XmlAttributeCollection target = element.Attributes;
target.InsertAfter(newAttr, refAttr);
Assert.Equal(4, target.Count);
Assert.Same(anotherAttr1, target[0]);
Assert.Same(anotherAttr2, target[1]);
Assert.Same(anotherAttr3, target[2]);
Assert.Same(newAttr, target[3]);
}
[Fact]
public void InsertAfterRemovesDupRefAttrAfterAttrAndTheRef()
{
......
src/libraries/System.Private.Xml/tests/XmlDocument/XmlAttributeCollectionTests/SetNamedItemTests.cs
浏览文件 @ f4421c13
......@@ -16,6 +16,7 @@ private XmlDocument CreateDocumentWithElement()
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full Framework does not check for null argument in XmlAttributeCollection.SetNamedItem")]
public void SetNamedItemWithNullReturnsNull()
{
XmlDocument doc = CreateDocumentWithElement();
......
src/libraries/System.Private.Xml/tests/XmlDocument/XmlNamedNodeMapTests/SetNamedItemTests.cs
浏览文件 @ f4421c13
......@@ -26,6 +26,7 @@ public static void NamedItemDoesNotExist()
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full Framework does not check for null argument in XmlAttributeCollection.SetNamedItem")]
public static void NamedItemIsNull()
{
var xmlDocument = new XmlDocument();
......
src/libraries/System.Private.Xml/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj
浏览文件 @ f4421c13
......@@ -73,6 +73,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/XmlReader/Tests/AsyncReaderLateInitTests.cs
浏览文件 @ f4421c13
......@@ -67,8 +67,8 @@ public static void ReadAfterInitializationWithTextReaderOnAsyncReaderDoesNotThro
}
[Fact]
[Trait("a", "b")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetcoreUwp)] //[ActiveIssue(13121)] // Path cannot be resolved in UWP
[SkipOnTargetFramework(TargetFrameworkMonikers.NetcoreUwp | //[ActiveIssue(13121)] // Path cannot be resolved in UWP
TargetFrameworkMonikers.NetFramework)] // Full framework uses XmlUrlResolver instead of SystemPathResolver (which doesn't allow access to this path)
public static void ReadAsyncAfterInitializationWithUriThrows()
{
using (XmlReader reader = XmlReader.Create("http://test.test/test.html", new XmlReaderSettings() { Async = true }))
......@@ -78,7 +78,8 @@ public static void ReadAsyncAfterInitializationWithUriThrows()
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetcoreUwp)] //[ActiveIssue(13121)] // Path cannot be resolved in UWP
[SkipOnTargetFramework(TargetFrameworkMonikers.NetcoreUwp | //[ActiveIssue(13121)] // Path cannot be resolved in UWP
TargetFrameworkMonikers.NetFramework)] // Full framework uses XmlUrlResolver instead of SystemPathResolver (which doesn't allow access to this path)
public static void ReadAfterInitializationWithUriOnAsyncReaderTrows()
{
using (XmlReader reader = XmlReader.Create("http://test.test/test.html", new XmlReaderSettings() { Async = true }))
......
src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
浏览文件 @ f4421c13
......@@ -24,6 +24,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj
浏览文件 @ f4421c13
......@@ -23,6 +23,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/XmlSystemPathResolverTests.cs
浏览文件 @ f4421c13
......@@ -86,7 +86,8 @@ public static void TestResolveInvalidPaths()
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetcoreUwp)] //[ActiveIssue(13121)] // Access to path is denied in UWP
[SkipOnTargetFramework(TargetFrameworkMonikers.NetcoreUwp | //[ActiveIssue(13121)] // Access to path is denied in UWP
TargetFrameworkMonikers.NetFramework)] // Full framework uses XmlUrlResolver instead of SystemPathResolver (which doesn't allow access to this path)
public static void TestResolveInvalidPath()
{
AssertInvalidPath("ftp://www.bing.com");
......
src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj
浏览文件 @ f4421c13
......@@ -26,6 +26,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" />
<ProjectReference Include="..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
\ No newline at end of file
src/libraries/System.Private.Xml/tests/XmlWriter/WriteWithInvalidSurrogate.cs
浏览文件 @ f4421c13
......@@ -37,7 +37,7 @@ public static void XmlWriterChecksLowerBoundOfLowerSurrogate()
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcore50)] // Switch to throw expception was introduced in NetStandard1.7
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework | TargetFrameworkMonikers.Netcore50)] // Switch to throw expception was introduced in NetStandard1.7
public static void XmlWriterChecksUpperBoundOfLowerSurrogate_newBehavior()
{
// Turn the switch off to get the new behavior in case the platform has it on by default
......
src/libraries/System.Xml.XDocument/src/ApiCompatBaseline.net463.txt 已删除 100644 → 0
浏览文件 @ c9377525
Compat issues with assembly System.Xml.XDocument:
MembersMustExist : Member 'System.Xml.Linq.XCData.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XComment.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocument.LoadAsync(System.IO.Stream, System.Xml.Linq.LoadOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocument.LoadAsync(System.IO.TextReader, System.Xml.Linq.LoadOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocument.LoadAsync(System.Xml.XmlReader, System.Xml.Linq.LoadOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocument.SaveAsync(System.IO.Stream, System.Xml.Linq.SaveOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocument.SaveAsync(System.IO.TextWriter, System.Xml.Linq.SaveOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocument.SaveAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocument.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XDocumentType.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XElement.LoadAsync(System.IO.Stream, System.Xml.Linq.LoadOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XElement.LoadAsync(System.IO.TextReader, System.Xml.Linq.LoadOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XElement.LoadAsync(System.Xml.XmlReader, System.Xml.Linq.LoadOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XElement.SaveAsync(System.IO.Stream, System.Xml.Linq.SaveOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XElement.SaveAsync(System.IO.TextWriter, System.Xml.Linq.SaveOptions, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XElement.SaveAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XElement.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XNode.ReadFromAsync(System.Xml.XmlReader, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XNode.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XProcessingInstruction.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Xml.Linq.XText.WriteToAsync(System.Xml.XmlWriter, System.Threading.CancellationToken)' does not exist in the implementation but it does exist in the contract.
Total Issues: 21
\ No newline at end of file
src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj
浏览文件 @ f4421c13
......@@ -14,6 +14,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == 'net463'">
<ContractProject Include="..\ref\System.Xml.XDocument.csproj">
<TargetGroup>netstandard1.7</TargetGroup>
</ContractProject>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'net463'">
<ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" />
<ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或