diff options
author | Sepideh Khoshnood <sekho@microsoft.com> | 2016-09-28 21:28:10 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-28 21:28:10 +0300 |
commit | 25152c3eb1333087daf06b33c8706e78c958c44e (patch) | |
tree | 8bd7d2cdcbe3845eefaa1a9a0de4eb4a486a12e2 /src/System.Private.Xml/tests/Xslt/XslTransformApi | |
parent | 0e96e251f0935aca6d3f569150cd1a18a13471ea (diff) |
Add System.Xml ref assembly (#12017)
* Add System.Xml.Schema and initial Core types in System.Xml.RW contract
* Change XmlException to inherit from SystemException instead of Exception
* Add System.Xml.Xsl in System.Xml.RW contract
* Update System.Xml.XmlDocument and System.Xml.XmlSerializer
* Update System.Xml.XPath and System.Xml.Serialization
* Add remaining types in System.Xml.RW and remove System.Xml.Xsl.Runtime namespace (not supposed to be in netstandard2.0)
* Update System.Xml.XDocument and System.Private.Xml.Linq
* Fix Schema and Xslt test builds
* Replace csproj references with pkgproj in Xml test projects
* Update dependencies
* Fix TestTFM default conditions bug in dir.props
* Fix merge conflict leftover
* Fix build and Remove unused workaround files
* Revert dir.props changes
* Address feedback
* Make final changes for Xml surface area to match that of netstandard2.0
* Add few comments and add P2P references for System.Net.Requests temporarily
Diffstat (limited to 'src/System.Private.Xml/tests/Xslt/XslTransformApi')
5 files changed, 9 insertions, 12 deletions
diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXmlCache.cs b/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXmlCache.cs index 32086f4416..ef551cd67b 100644 --- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXmlCache.cs +++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXmlCache.cs @@ -1328,7 +1328,7 @@ public class ChecksumWriter : TextWriter _nPosition++; } - public void Close() + override public void Close() { _nPosition = 0; _dResult = 0; @@ -1418,7 +1418,7 @@ public class BufferWriter : TextWriter _rgchBuffer[_nBufferUsed++] = ch; } - public void Close() + override public void Close() { //Set nBufferUsed to 0, so we start writing from the beginning of the buffer. _nBufferUsed = 0; diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs b/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs index ddbc0b3d45..ef7617626e 100644 --- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs +++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXslTransform.cs @@ -8,7 +8,6 @@ using System; using System.Collections; using System.IO; using System.Security; -using System.Security.Policy; using System.Xml; using System.Xml.XPath; using System.Xml.Xsl; diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj index 8ce0c5190c..db201b1af2 100644 --- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj @@ -8,7 +8,7 @@ <OutputType>Library</OutputType> <AssemblyName>System.Xml.Xsl.XslTransformApi.Tests</AssemblyName> <RootNamespace>System.Xml.Tests</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> <KeepAllProjectReferences>true</KeepAllProjectReferences> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -40,8 +40,8 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\xmlDiff\XmlDiff.csproj" /> - <ProjectReference Include="..\..\..\src\System.Private.Xml.csproj" /> - <ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\src\System.Xml.ReaderWriter.csproj" /> + <ProjectReference Include="..\..\..\..\System.Xml.ReaderWriter\pkg\System.Xml.ReaderWriter.pkgproj" /> + <ProjectReference Include="..\..\..\..\System.Xml.XPath\pkg\System.Xml.XPath.pkgproj" /> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs b/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs index 6c677f36d4..be9b075461 100644 --- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs +++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/XSLTransform.cs @@ -7,7 +7,6 @@ using Xunit.Abstractions; using System; using System.IO; using System.Net; -using System.Security.Policy; using System.Text; using System.Xml; using System.Xml.XmlDiff; diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/project.json b/src/System.Private.Xml/tests/Xslt/XslTransformApi/project.json index 18b49bd6e6..079209ca22 100644 --- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/project.json +++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/project.json @@ -3,6 +3,7 @@ "Microsoft.NETCore.Platforms": "1.0.2-beta-24522-03", "System.Collections.NonGeneric": "4.3.0-beta-24522-03", "System.Collections.Specialized": "4.3.0-beta-24522-03", + "System.Globalization": "4.3.0-beta-24522-03", "System.IO": "4.3.0-beta-24522-03", "System.IO.FileSystem": "4.3.0-beta-24522-03", "System.IO.FileSystem.Primitives": "4.3.0-beta-24522-03", @@ -14,6 +15,7 @@ "System.Reflection.TypeExtensions": "4.3.0-beta-24522-03", "System.Runtime": "4.3.0-beta-24522-03", "System.Runtime.Extensions": "4.3.0-beta-24522-03", + "System.Text.Encoding": "4.3.0-beta-24522-03", "System.Threading": "4.3.0-beta-24522-03", "System.Threading.Thread": "4.3.0-beta-24522-03", "System.Threading.Tasks": "4.3.0-beta-24522-03", @@ -25,13 +27,10 @@ "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03" }, "frameworks": { - "netstandard1.3": {} + "netstandard1.7": {} }, "supports": { - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, + "coreFx.Test.netcoreapp1.1": {}, "coreFx.Test.net463": {} } } |