Merge commit '5f482ecb55b68c52d338c72eea2457af2351edd1' into dev/arpit/release_1b

Author: arpitmathur

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework.cs

@@ -11407,13 +11407,20 @@ public void CancelAsync() { }
         public static System.Xaml.XamlSchemaContext GetWpfSchemaContext() { throw null; }
         public static object Load(System.IO.Stream stream) { throw null; }
         public static object Load(System.IO.Stream stream, System.Windows.Markup.ParserContext parserContext) { throw null; }
+        public static object Load(System.IO.Stream stream, System.Windows.Markup.ParserContext parserContext, bool useRestrictiveXamlReader) { throw null; }
         public static object Load(System.Xaml.XamlReader reader) { throw null; }
         public static object Load(System.Xml.XmlReader reader) { throw null; }
+        public static object Load(System.Xml.XmlReader reader, bool useRestrictiveXamlReader) { throw null; }
         public object LoadAsync(System.IO.Stream stream) { throw null; }
+        public object LoadAsync(System.IO.Stream stream, bool useRestrictiveXamlReader) { throw null; }
         public object LoadAsync(System.IO.Stream stream, System.Windows.Markup.ParserContext parserContext) { throw null; }
+        public object LoadAsync(System.IO.Stream stream, System.Windows.Markup.ParserContext parserContext, bool useRestrictiveXamlReader) { throw null; }
         public object LoadAsync(System.Xml.XmlReader reader) { throw null; }
+        public object LoadAsync(System.Xml.XmlReader reader, bool useRestrictiveXamlReader) { throw null; }
         public static object Parse(string xamlText) { throw null; }
+        public static object Parse(string xamlText, bool useRestrictiveXamlReader) { throw null; }
         public static object Parse(string xamlText, System.Windows.Markup.ParserContext parserContext) { throw null; }
+        public static object Parse(string xamlText, System.Windows.Markup.ParserContext parserContext, bool useRestrictiveXamlReader) { throw null; }
     }
     public partial class XamlTypeMapper
     {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Controls/StickyNote/StickyNoteContentControl.cs

@@ -234,7 +234,7 @@ public override void Load(XmlNode node)
                 RichTextBox richTextBox = (RichTextBox)InnerControl;
 
                 FlowDocument document = new FlowDocument();
-                TextRange rtbRange = new TextRange(document.ContentStart, document.ContentEnd);
+                TextRange rtbRange = new TextRange(document.ContentStart, document.ContentEnd, useRestrictiveXamlXmlReader: true);
                 using (MemoryStream buffer = new MemoryStream(Convert.FromBase64String(node.InnerText)))
                 {
                     rtbRange.Load(buffer, DataFormats.Xaml);

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextRange.cs

@@ -65,6 +65,24 @@ public TextRange(TextPointer position1, TextPointer position2) :
         internal TextRange(ITextPointer position1, ITextPointer position2)
             : this(position1, position2, false /* ignoreTextUnitBoundaries */)
         {
+        }
+
+        /// <summary>
+        /// Creates a new TextRange instance.
+        /// </summary>
+        /// <param name="position1">
+        /// </param>
+        /// TextPointer specifying the static end of the new TextRange.
+        /// <param name="position2">
+        /// TextPointer specifying the dynamic end of the new TextRange.
+        /// </param>
+        /// <param name="useRestrictiveXamlXmlReader">
+        /// Boolean flag. False by default, set to true to disable external xaml loading in specific scenarios like StickyNotes annotation loading
+        /// </param>
+        internal TextRange(TextPointer position1, TextPointer position2, bool useRestrictiveXamlXmlReader) :
+            this((ITextPointer)position1, (ITextPointer)position2)
+        {
+            _useRestrictiveXamlXmlReader = useRestrictiveXamlXmlReader;
         }
 
         // ignoreTextUnitBoundaries - true if normalization should ignore text
@@ -1366,7 +1384,7 @@ internal string Xml
                 try
                 {
                     // Parse the fragment into a separate subtree
-                    object xamlObject = XamlReader.Load(new XmlTextReader(new System.IO.StringReader(value)));
+                    object xamlObject = XamlReader.Load(new XmlTextReader(new System.IO.StringReader(value)), _useRestrictiveXamlXmlReader);
                     TextElement fragment = xamlObject as TextElement;
 
                     if (fragment != null)
@@ -1900,6 +1918,9 @@ private enum Flags
         // Boolean flags, set with Flags enum.
         private Flags _flags;
 
+        // Boolean flag, set to true via constructor when you want to use the RestrictiveXamlXmlReader  
+        private bool _useRestrictiveXamlXmlReader;
+
         #endregion Private Fields
     }
 }