resolve merge conflict

Author: mikeebowen

src/DocumentFormat.OpenXml.Framework/OpenXmlPartReader.cs

@@ -12,6 +12,9 @@
 using System.Linq;
 using System.Text;
 using System.Xml;
+#if NET6_0_OR_GREATER
+using System.Threading.Tasks;
+#endif
 
 namespace DocumentFormat.OpenXml
 {
@@ -97,7 +100,11 @@ public OpenXmlPartReader(Stream partStream, IFeatureCollection features, OpenXml
 
             _resolver = features.GetRequired<IOpenXmlNamespaceResolver>();
             _rootElements = features.GetRequired<IRootElementFeature>();
+#if NET6_0_OR_GREATER
+            _xmlReader = CreateReader(partStream, options, out bool? standalone, out string? encoding);
+#else
             _xmlReader = CreateReader(partStream, options.CloseStream, options.MaxCharactersInPart, ignoreWhitespace: options.IgnoreWhitespace, out bool? standalone, out string? encoding);
+#endif
             _openXmlPartReaderState = new OpenXmlPartReaderState(standalone, encoding);
         }
 
@@ -712,6 +719,61 @@ private XmlReader CreateReader(Stream partStream, bool closeInput, long maxChara
             return xmlReader;
         }
 
+        private XmlReader CreateReader(Stream partStream, OpenXmlPartReaderOptions options, out bool? standalone, out string? encoding)
+        {
+            XmlReaderSettings settings = new()
+            {
+                MaxCharactersInDocument = options.MaxCharactersInPart,
+                CloseInput = options.CloseStream,
+                IgnoreWhitespace = options.IgnoreWhitespace,
+#if NET35
+                ProhibitDtd = true,
+#else
+                DtdProcessing = DtdProcessing.Prohibit,
+#endif
+#if NET6_0_OR_GREATER
+                Async = options.Async,
+#endif
+            };
+
+
+#if NET6_0_OR_GREATER
+            XmlReader xmlReader = XmlConvertingReaderFactory.CreateAsync(partStream, _resolver, settings);
+            //XmlReader xmlReader = XmlReader.Create(partStream, settings);
+            xmlReader.ReadAsync();
+#else
+            var xmlReader = XmlConvertingReaderFactory.Create(partStream, _resolver, settings);
+            xmlReader.Read();
+#endif
+
+            if (xmlReader.NodeType == XmlNodeType.XmlDeclaration)
+            {
+                encoding = xmlReader["encoding"];
+
+                var standaloneRaw = xmlReader["standalone"];
+
+                if (string.Equals("yes", standaloneRaw, StringComparison.Ordinal))
+                {
+                    standalone = true;
+                }
+                else if (string.Equals("no", standaloneRaw, StringComparison.Ordinal))
+                {
+                    standalone = false;
+                }
+                else
+                {
+                    standalone = null;
+                }
+            }
+            else
+            {
+                encoding = null;
+                standalone = null;
+            }
+
+            return xmlReader;
+        }
+
         private bool ReadRoot()
         {
             Debug.Assert(_elementState == ElementState.Null);
@@ -880,6 +942,20 @@ private OpenXmlElement CreateChildElement()
             return element.ElementFactory(_xmlReader);
         }
 
+        #region Async methods
+
+#if NET6_0_OR_GREATER
+        /// <summary>
+        /// Asynchronously reads the next element.
+        /// </summary>
+        /// <returns>A task that represents the asynchronous read operation. The value of the TResult parameter contains true if the next element was read successfully; false if there are no more elements to read.</returns>
+        public override Task<bool> ReadAsync()
+        {
+            return _xmlReader.ReadAsync();
+        }
+#endif
+#endregion
+
         private void ThrowIfNull()
         {
             if (_elementState == ElementState.Null)

src/DocumentFormat.OpenXml.Framework/OpenXmlPartReaderOptions.cs

@@ -31,11 +31,21 @@ public struct OpenXmlPartReaderOptions
     /// </summary>
     public bool CloseStream { get; set; }
 
+#if NET6_0_OR_GREATER
+    /// <summary>
+    /// Gets or sets a value indicating whether asynchronous reading is enabled.
+    /// </summary>
+    public bool Async { get; set; }
+#endif
+
     internal OpenXmlPartReaderOptions UpdateForPart(OpenXmlPart part) => new()
     {
         ReadMiscellaneousNodes = ReadMiscellaneousNodes,
         MaxCharactersInPart = MaxCharactersInPart != 0 ? MaxCharactersInPart : part.MaxCharactersInPart,
         IgnoreWhitespace = IgnoreWhitespace,
         CloseStream = true,
+#if NET6_0_OR_GREATER
+        Async = Async,
+#endif
     };
 }

src/DocumentFormat.OpenXml.Framework/OpenXmlReader.cs

@@ -7,6 +7,9 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Xml;
+#if NET6_0_OR_GREATER
+using System.Threading.Tasks;
+#endif
 
 namespace DocumentFormat.OpenXml
 {
@@ -246,6 +249,22 @@ protected virtual void ThrowIfObjectDisposed()
             }
         }
 
+        #region Async methods
+
+#if NET6_0_OR_GREATER
+        /// <summary>
+        /// Asynchronously reads the next element.
+        /// </summary>
+        /// <returns>A task that represents the asynchronous read operation. The value of the TResult parameter contains true if the next element was read successfully; false if there are no more elements to read.</returns>
+        public virtual Task<bool> ReadAsync()
+        {
+            bool res = Read();
+
+            return Task.FromResult(res);
+        }
+#endif
+        #endregion
+
         /// <summary>
         /// Closes the reader, and releases all resources.
         /// </summary>

src/DocumentFormat.OpenXml.Framework/PublicAPI/PublicAPI.Shipped.txt

@@ -1009,3 +1009,9 @@ DocumentFormat.OpenXml.OpenXmlPartWriterSettings.Encoding.set -> void
 DocumentFormat.OpenXml.OpenXmlPartWriterSettings.OpenXmlPartWriterSettings() -> void
 DocumentFormat.OpenXml.OpenXmlPartWriter.OpenXmlPartWriter(DocumentFormat.OpenXml.Packaging.OpenXmlPart! openXmlPart, DocumentFormat.OpenXml.OpenXmlPartWriterSettings! settings) -> void
 DocumentFormat.OpenXml.OpenXmlPartWriter.OpenXmlPartWriter(System.IO.Stream! partStream, DocumentFormat.OpenXml.OpenXmlPartWriterSettings! settings) -> void
+
+
+DocumentFormat.OpenXml.OpenXmlPartReaderOptions.Async.get -> bool
+DocumentFormat.OpenXml.OpenXmlPartReaderOptions.Async.set -> void
+virtual DocumentFormat.OpenXml.OpenXmlReader.ReadAsync() -> System.Threading.Tasks.Task<bool>!
+override DocumentFormat.OpenXml.OpenXmlReader.ReadAsync() -> System.Threading.Tasks.Task<bool>!

src/DocumentFormat.OpenXml.Framework/XmlConvertingReaderFactory.cs

@@ -39,5 +39,19 @@ public static XmlReader Create(TextReader textReader, IOpenXmlNamespaceResolver
 
             return new XmlConvertingReader(xmlReader, resolver, true);
         }
+
+#if NET6_0_OR_GREATER
+        public static XmlReader CreateAsync(Stream partStream, IOpenXmlNamespaceResolver resolver, XmlReaderSettings settings)
+        {
+            return CreateAsync(partStream, resolver, settings, true);
+        }
+
+        public static XmlReader CreateAsync(Stream partStream, IOpenXmlNamespaceResolver resolver, XmlReaderSettings settings, bool strictRelationshipFound)
+        {
+            var xmlReader = XmlReader.Create(partStream, settings);
+
+            return new XmlConvertingReader(xmlReader, resolver, strictRelationshipFound);
+        }
+#endif
     }
 }