From 927396b0ffcc04a33885cff48f73c00b682acdc2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 18 Aug 2026 00:49:41 +0000
Subject: [PATCH 1/3] Initial plan


From 98862fde68fb408d9700fa98e066daddcb2655e1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 18 Aug 2026 00:51:16 +0000
Subject: [PATCH 2/3] Document GetXamlType null type exception

Co-authored-by: gewarren <24882762+gewarren@users.noreply.github.com>
---
 xml/System.Xaml/XamlSchemaContext.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/System.Xaml/XamlSchemaContext.xml b/xml/System.Xaml/XamlSchemaContext.xml
index 1dfaea04537..90057c1371e 100644
--- a/xml/System.Xaml/XamlSchemaContext.xml
+++ b/xml/System.Xaml/XamlSchemaContext.xml
@@ -467,7 +467,7 @@
 
  ]]></format>
         </remarks>
-        <exception cref="T:System.ArgumentNullException">
+        <exception cref="T:System.NullReferenceException">
           <paramref name="type" /> is <see langword="null" />.</exception>
       </Docs>
     </Member>

From 1ce353bae3a716b03cb24d24d00975c2debd3c3d Mon Sep 17 00:00:00 2001
From: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
Date: Tue, 18 Aug 2026 08:59:01 -0700
Subject: [PATCH 3/3] Update exception handling documentation in
 XamlSchemaContext

---
 xml/System.Xaml/XamlSchemaContext.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xml/System.Xaml/XamlSchemaContext.xml b/xml/System.Xaml/XamlSchemaContext.xml
index 90057c1371e..903c0ff6344 100644
--- a/xml/System.Xaml/XamlSchemaContext.xml
+++ b/xml/System.Xaml/XamlSchemaContext.xml
@@ -467,8 +467,8 @@
 
  ]]></format>
         </remarks>
-        <exception cref="T:System.NullReferenceException">
-          <paramref name="type" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.ArgumentNullException">.NET 5+ only: <paramref name="type" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.NullReferenceException">.NET Framework only: <paramref name="type" /> is <see langword="null" />.</exception>
       </Docs>
     </Member>
     <Member MemberName="GetXamlType">