From cf675ceaa852e2b1c472ec5a139e243faefa4925 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 07:24:05 +0000
Subject: [PATCH 1/7] Initial plan


From a580ccd63f8650e2fd4bf319edc388fd9a0d4d2e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 08:05:33 +0000
Subject: [PATCH 2/7] Add SYSLIB0062 obsoletion for XsltSettings.EnableScript

Co-authored-by: jeffhandley <1031940+jeffhandley@users.noreply.github.com>
---
 docs/project/list-of-diagnostics.md                            | 1 +
 src/libraries/Common/src/System/Obsoletions.cs                 | 3 +++
 src/libraries/Directory.Build.targets                          | 3 ++-
 .../src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs                 | 2 ++
 .../src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs                  | 2 ++
 .../System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs   | 2 ++
 .../System.Private.Xml/src/System/Xml/Xslt/XsltSettings.cs     | 1 +
 .../System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs     | 1 +
 8 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/project/list-of-diagnostics.md b/docs/project/list-of-diagnostics.md
index 0b3da600c53b13..a2c723876088e2 100644
--- a/docs/project/list-of-diagnostics.md
+++ b/docs/project/list-of-diagnostics.md
@@ -116,6 +116,7 @@ The PR that reveals the implementation of the `<IncludeInternalObsoleteAttribute
 |  __`SYSLIB0059`__ | SystemEvents.EventsThreadShutdown callbacks are not run before the process exits. Use AppDomain.ProcessExit instead. |
 |  __`SYSLIB0060`__ | The constructors on Rfc2898DeriveBytes are obsolete. Use the static Pbkdf2 method instead. |
 |  __`SYSLIB0061`__ | The Queryable MinBy and MaxBy taking an IComparer\<TSource\> are obsolete. Use the new ones that take an IComparer\<TKey\>. |
+|  __`SYSLIB0062`__ | XSLT Script blocks are not supported on .NET Core or .NET 5 or later. |
 
 ## Analyzer Warnings
 
diff --git a/src/libraries/Common/src/System/Obsoletions.cs b/src/libraries/Common/src/System/Obsoletions.cs
index cbba37ed07be17..be347c5e9390a7 100644
--- a/src/libraries/Common/src/System/Obsoletions.cs
+++ b/src/libraries/Common/src/System/Obsoletions.cs
@@ -195,6 +195,9 @@ internal static class Obsoletions
         internal const string QueryableMinByMaxByTSourceObsoleteMessage = "The Queryable MinBy and MaxBy taking an IComparer<TSource> are obsolete. Use the new ones that take an IComparer<TKey>.";
         internal const string QueryableMinByMaxByTSourceObsoleteDiagId = "SYSLIB0061";
 
+        internal const string XsltSettingsEnableScriptMessage = "XSLT Script blocks are not supported on .NET Core or .NET 5 or later.";
+        internal const string XsltSettingsEnableScriptDiagId = "SYSLIB0062";
+
         // When adding a new diagnostic ID, add it to the table in docs\project\list-of-diagnostics.md as well.
         // Keep new const identifiers above this comment.
     }
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 9998e676c5870e..4cd519598057b6 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -31,8 +31,9 @@
          SYSLIB0025: SuppressIldasmAttribute.
          SYSLIB0032: HandleProcessCorruptedStateExceptionsAttribute.
          SYSLIB0036: Regex.CompileToAssembly
+         SYSLIB0062: XsltSettings.EnableScript
     -->
-    <NoWarn Condition="'$(IsPartialFacadeAssembly)' == 'true'">$(NoWarn);SYSLIB0003;SYSLIB0004;SYSLIB0015;SYSLIB0017;SYSLIB0021;SYSLIB0022;SYSLIB0023;SYSLIB0025;SYSLIB0032;SYSLIB0036</NoWarn>
+    <NoWarn Condition="'$(IsPartialFacadeAssembly)' == 'true'">$(NoWarn);SYSLIB0003;SYSLIB0004;SYSLIB0015;SYSLIB0017;SYSLIB0021;SYSLIB0022;SYSLIB0023;SYSLIB0025;SYSLIB0032;SYSLIB0036;SYSLIB0062</NoWarn>
 
     <!-- Ignore analyzers that recommend APIs introduced in .NET Core when targeting frameworks that lack those APIs
          to avoid issues with multitargeting.
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
index 30e32b4fe6169c..a413c6eb62354c 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
@@ -213,7 +213,9 @@ QilNode IXPathEnvironment.ResolveFunction(string prefix, string name, IList<QilN
                 for (int i = 0; i < args.Count; i++)
                     args[i] = _f.SafeDocOrderDistinct(args[i]);
 
+#pragma warning disable SYSLIB0062 // XsltSettings.EnableScript is obsolete
                 if (_compiler.Settings.EnableScript)
+#pragma warning restore SYSLIB0062
                 {
                     XmlExtensionFunction? scrFunc = _compiler.Scripts.ResolveFunction(name, ns, args.Count, (IErrorHelper)this);
                     if (scrFunc != null)
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
index 50ab46a11a5ca4..16f4d8268da43a 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
@@ -1134,7 +1134,9 @@ public XslFlags Function(string prefix, string name, IList<XslFlags> args)
                     {
                         // Unknown function. Can be script function or extension function
                         funcFlags = XslFlags.AnyType;
+#pragma warning disable SYSLIB0062 // XsltSettings.EnableScript is obsolete
                         if (_compiler.Settings.EnableScript && ns != null)
+#pragma warning restore SYSLIB0062
                         {
                             XmlExtensionFunction? scrFunc = _compiler.Scripts.ResolveFunction(name, ns, args.Count, default(NullErrorHelper));
                             if (scrFunc != null)
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs
index 7148aacf2294df..2ebce1bf7ceac8 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs
@@ -1309,7 +1309,9 @@ private void LoadMsScript(NsDecl? stylesheetNsList)
             scriptNs ??= _compiler.CreatePhantomNamespace();
             ParseStringAttribute(1, "language");
 
+#pragma warning disable SYSLIB0062 // XsltSettings.EnableScript is obsolete
             if (!_compiler.Settings.EnableScript)
+#pragma warning restore SYSLIB0062
             {
                 _compiler.Scripts.ScriptClasses[scriptNs] = null;
                 _input.SkipNode();
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xslt/XsltSettings.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xslt/XsltSettings.cs
index f2cb3a4e0b9266..30ca53a9999403 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xslt/XsltSettings.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xslt/XsltSettings.cs
@@ -39,6 +39,7 @@ public bool EnableDocumentFunction
             set { _enableDocumentFunction = value; }
         }
 
+        [Obsolete(Obsoletions.XsltSettingsEnableScriptMessage, DiagnosticId = Obsoletions.XsltSettingsEnableScriptDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
         public bool EnableScript
         {
             get { return _enableScript; }
diff --git a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs
index aa881c6a805c8a..e0012d88f4f34d 100644
--- a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs
+++ b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs
@@ -2942,6 +2942,7 @@ public XsltSettings() { }
         public XsltSettings(bool enableDocumentFunction, bool enableScript) { }
         public static System.Xml.Xsl.XsltSettings Default { get { throw null; } }
         public bool EnableDocumentFunction { get { throw null; } set { } }
+        [System.ObsoleteAttribute("XSLT Script blocks are not supported on .NET Core or .NET 5 or later.", DiagnosticId = "SYSLIB0062", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
         public bool EnableScript { get { throw null; } set { } }
         public static System.Xml.Xsl.XsltSettings TrustedXslt { get { throw null; } }
     }

From a3432dc11d795d093ac854d6d6c2d80c3c8f592f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 16:44:18 +0000
Subject: [PATCH 3/7] Update SYSLIB0062 message to be more concise and fix test
 warnings

Co-authored-by: jeffhandley <1031940+jeffhandley@users.noreply.github.com>
---
 docs/project/list-of-diagnostics.md                             | 2 +-
 src/libraries/Common/src/System/Obsoletions.cs                  | 2 +-
 .../tests/Xslt/XslCompiledTransformApi/XsltSettings.cs          | 2 ++
 .../System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs      | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/project/list-of-diagnostics.md b/docs/project/list-of-diagnostics.md
index a2c723876088e2..6104526156b2c4 100644
--- a/docs/project/list-of-diagnostics.md
+++ b/docs/project/list-of-diagnostics.md
@@ -116,7 +116,7 @@ The PR that reveals the implementation of the `<IncludeInternalObsoleteAttribute
 |  __`SYSLIB0059`__ | SystemEvents.EventsThreadShutdown callbacks are not run before the process exits. Use AppDomain.ProcessExit instead. |
 |  __`SYSLIB0060`__ | The constructors on Rfc2898DeriveBytes are obsolete. Use the static Pbkdf2 method instead. |
 |  __`SYSLIB0061`__ | The Queryable MinBy and MaxBy taking an IComparer\<TSource\> are obsolete. Use the new ones that take an IComparer\<TKey\>. |
-|  __`SYSLIB0062`__ | XSLT Script blocks are not supported on .NET Core or .NET 5 or later. |
+|  __`SYSLIB0062`__ | XSLT Script blocks are not supported. |
 
 ## Analyzer Warnings
 
diff --git a/src/libraries/Common/src/System/Obsoletions.cs b/src/libraries/Common/src/System/Obsoletions.cs
index be347c5e9390a7..45a552749a9614 100644
--- a/src/libraries/Common/src/System/Obsoletions.cs
+++ b/src/libraries/Common/src/System/Obsoletions.cs
@@ -195,7 +195,7 @@ internal static class Obsoletions
         internal const string QueryableMinByMaxByTSourceObsoleteMessage = "The Queryable MinBy and MaxBy taking an IComparer<TSource> are obsolete. Use the new ones that take an IComparer<TKey>.";
         internal const string QueryableMinByMaxByTSourceObsoleteDiagId = "SYSLIB0061";
 
-        internal const string XsltSettingsEnableScriptMessage = "XSLT Script blocks are not supported on .NET Core or .NET 5 or later.";
+        internal const string XsltSettingsEnableScriptMessage = "XSLT Script blocks are not supported.";
         internal const string XsltSettingsEnableScriptDiagId = "SYSLIB0062";
 
         // When adding a new diagnostic ID, add it to the table in docs\project\list-of-diagnostics.md as well.
diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs
index 17eec0aec40a7b..a14896236f8cd1 100644
--- a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltSettings.cs
@@ -208,7 +208,9 @@ public void XsltSettings1_2(object param0, object param1, object param2, object
             _xsl.Load(_xslFile, xs, new XmlUrlResolver());
 
             xs.EnableDocumentFunction = (bool)param5;
+#pragma warning disable SYSLIB0062 // XsltSettings.EnableScript is obsolete
             xs.EnableScript = (bool)param6;
+#pragma warning restore SYSLIB0062
             _xsl.Load(_xslFile, xs, new XmlUrlResolver());
 
             try
diff --git a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs
index e0012d88f4f34d..b839aba44ee077 100644
--- a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs
+++ b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs
@@ -2942,7 +2942,7 @@ public XsltSettings() { }
         public XsltSettings(bool enableDocumentFunction, bool enableScript) { }
         public static System.Xml.Xsl.XsltSettings Default { get { throw null; } }
         public bool EnableDocumentFunction { get { throw null; } set { } }
-        [System.ObsoleteAttribute("XSLT Script blocks are not supported on .NET Core or .NET 5 or later.", DiagnosticId = "SYSLIB0062", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
+        [System.ObsoleteAttribute("XSLT Script blocks are not supported.", DiagnosticId = "SYSLIB0062", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
         public bool EnableScript { get { throw null; } set { } }
         public static System.Xml.Xsl.XsltSettings TrustedXslt { get { throw null; } }
     }

From 9d99d1ce8bc2a7dd087c61713c71c84a6f69fba1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 18:43:40 +0000
Subject: [PATCH 4/7] Remove SYSLIB0062 from blanket NoWarn list for partial
 facade assemblies

Co-authored-by: tannergooding <10487869+tannergooding@users.noreply.github.com>
---
 src/libraries/Directory.Build.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 4cd519598057b6..9998e676c5870e 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -31,9 +31,8 @@
          SYSLIB0025: SuppressIldasmAttribute.
          SYSLIB0032: HandleProcessCorruptedStateExceptionsAttribute.
          SYSLIB0036: Regex.CompileToAssembly
-         SYSLIB0062: XsltSettings.EnableScript
     -->
-    <NoWarn Condition="'$(IsPartialFacadeAssembly)' == 'true'">$(NoWarn);SYSLIB0003;SYSLIB0004;SYSLIB0015;SYSLIB0017;SYSLIB0021;SYSLIB0022;SYSLIB0023;SYSLIB0025;SYSLIB0032;SYSLIB0036;SYSLIB0062</NoWarn>
+    <NoWarn Condition="'$(IsPartialFacadeAssembly)' == 'true'">$(NoWarn);SYSLIB0003;SYSLIB0004;SYSLIB0015;SYSLIB0017;SYSLIB0021;SYSLIB0022;SYSLIB0023;SYSLIB0025;SYSLIB0032;SYSLIB0036</NoWarn>
 
     <!-- Ignore analyzers that recommend APIs introduced in .NET Core when targeting frameworks that lack those APIs
          to avoid issues with multitargeting.

From de14cc248aa72baa12e2b22b3809bf1a9aae0c59 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 19:34:07 +0000
Subject: [PATCH 5/7] Move pragma warning restore to encompass entire obsolete
 API usage blocks

Co-authored-by: jeffhandley <1031940+jeffhandley@users.noreply.github.com>
---
 .../src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs                  | 2 +-
 .../src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
index a413c6eb62354c..f63f1f3371d99d 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
@@ -215,7 +215,6 @@ QilNode IXPathEnvironment.ResolveFunction(string prefix, string name, IList<QilN
 
 #pragma warning disable SYSLIB0062 // XsltSettings.EnableScript is obsolete
                 if (_compiler.Settings.EnableScript)
-#pragma warning restore SYSLIB0062
                 {
                     XmlExtensionFunction? scrFunc = _compiler.Scripts.ResolveFunction(name, ns, args.Count, (IErrorHelper)this);
                     if (scrFunc != null)
@@ -223,6 +222,7 @@ QilNode IXPathEnvironment.ResolveFunction(string prefix, string name, IList<QilN
                         return GenerateScriptCall(_f.QName(name, ns, prefix), scrFunc, args);
                     }
                 }
+#pragma warning restore SYSLIB0062
                 else
                 {
                     if (_compiler.Scripts.ScriptClasses.ContainsKey(ns))
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
index 16f4d8268da43a..5ebf1ef7ea872e 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
@@ -1136,7 +1136,6 @@ public XslFlags Function(string prefix, string name, IList<XslFlags> args)
                         funcFlags = XslFlags.AnyType;
 #pragma warning disable SYSLIB0062 // XsltSettings.EnableScript is obsolete
                         if (_compiler.Settings.EnableScript && ns != null)
-#pragma warning restore SYSLIB0062
                         {
                             XmlExtensionFunction? scrFunc = _compiler.Scripts.ResolveFunction(name, ns, args.Count, default(NullErrorHelper));
                             if (scrFunc != null)
@@ -1176,6 +1175,7 @@ public XslFlags Function(string prefix, string name, IList<XslFlags> args)
                                 }
                             }
                         }
+#pragma warning restore SYSLIB0062
                         funcFlags |= XslFlags.SideEffects;
                     }
                 }

From 5542b8d3ed3c4be471afff9e5d4b4844cee1a003 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 20:05:42 +0000
Subject: [PATCH 6/7] Obsolete Scripts field and move pragma warnings to
 encompass entire obsolete API usage blocks

Co-authored-by: jeffhandley <1031940+jeffhandley@users.noreply.github.com>
---
 .../System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs    | 3 +++
 .../src/System/Xml/Xsl/Xslt/QilGenerator.cs                   | 4 ++++
 .../src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs                | 2 +-
 .../src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs                 | 2 +-
 .../System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs  | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs
index 918dfa58a2cd7a..7a1fa4864783d2 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs
@@ -42,6 +42,7 @@ internal sealed class Compiler
         public int CurrentPrecedence;  // Decreases by 1 with each import
         public XslNode? StartApplyTemplates;
         public RootLevel? Root;
+        [System.ObsoleteAttribute("XSLT Script blocks are not supported.", DiagnosticId = "SYSLIB0062", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
         public Scripts Scripts;
         public Output Output = new Output();
         public List<VarPar> ExternalPars = new List<VarPar>();
@@ -67,7 +68,9 @@ public Compiler(XsltSettings settings, bool debug, string? scriptAssemblyPath)
             ScriptAssemblyPath = scriptAssemblyPath;
 
             CompilerErrorColl = new CompilerErrorCollection();
+#pragma warning disable SYSLIB0062 // Scripts field is obsolete
             Scripts = new Scripts(this);
+#pragma warning restore SYSLIB0062
         }
 
         public CompilerErrorCollection Compile(object stylesheet, XmlResolver? xmlResolver, XmlResolver? origResolver, out QilExpression qil)
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs
index 4b7a35946a2864..5aa907f9325958 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs
@@ -195,7 +195,9 @@ private QilExpression Compile(Compiler compiler)
             }
 
             // Create list of all early bound objects
+#pragma warning disable SYSLIB0062 // Scripts field is obsolete
             Scripts.TrimSafeDictionary scriptClasses = compiler.Scripts.ScriptClasses;
+#pragma warning restore SYSLIB0062
             List<EarlyBoundInfo> ebTypes = new List<EarlyBoundInfo>(scriptClasses.Count);
             foreach (string key in scriptClasses.Keys)
             {
@@ -261,10 +263,12 @@ private void CompileInitializationCode()
             }
 
             // Register all script namespaces
+#pragma warning disable SYSLIB0062 // Scripts field is obsolete
             foreach (string scriptNs in _compiler.Scripts.ScriptClasses.Keys)
             {
                 init = _f.Add(init, _f.InvokeCheckScriptNamespace(scriptNs));
             }
+#pragma warning restore SYSLIB0062
 
             if (init.NodeType == QilNodeType.Add)
             {
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
index f63f1f3371d99d..f0410142b8ca5a 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs
@@ -222,7 +222,6 @@ QilNode IXPathEnvironment.ResolveFunction(string prefix, string name, IList<QilN
                         return GenerateScriptCall(_f.QName(name, ns, prefix), scrFunc, args);
                     }
                 }
-#pragma warning restore SYSLIB0062
                 else
                 {
                     if (_compiler.Scripts.ScriptClasses.ContainsKey(ns))
@@ -231,6 +230,7 @@ QilNode IXPathEnvironment.ResolveFunction(string prefix, string name, IList<QilN
                         return _f.Error(_lastScope!.SourceLine, SR.Xslt_ScriptsProhibited);
                     }
                 }
+#pragma warning restore SYSLIB0062
 
                 return _f.XsltInvokeLateBound(_f.QName(name, ns, prefix), args);
             }
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
index 5ebf1ef7ea872e..d80549303bd54d 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs
@@ -1175,8 +1175,8 @@ public XslFlags Function(string prefix, string name, IList<XslFlags> args)
                                 }
                             }
                         }
-#pragma warning restore SYSLIB0062
                         funcFlags |= XslFlags.SideEffects;
+#pragma warning restore SYSLIB0062
                     }
                 }
 
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs
index 2ebce1bf7ceac8..16aed658c26b9e 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/XsltLoader.cs
@@ -1311,12 +1311,12 @@ private void LoadMsScript(NsDecl? stylesheetNsList)
 
 #pragma warning disable SYSLIB0062 // XsltSettings.EnableScript is obsolete
             if (!_compiler.Settings.EnableScript)
-#pragma warning restore SYSLIB0062
             {
                 _compiler.Scripts.ScriptClasses[scriptNs] = null;
                 _input.SkipNode();
                 return;
             }
+#pragma warning restore SYSLIB0062
 
             throw new PlatformNotSupportedException(SR.CompilingScriptsNotSupported); // Not adding any scripts as script compilation is not available
         }

From 7687f8f578ae4b8e85cab928b14679873142a552 Mon Sep 17 00:00:00 2001
From: Jeff Handley <jeffhandley@users.noreply.github.com>
Date: Sun, 20 Jul 2025 15:45:32 -0700
Subject: [PATCH 7/7] Use Obsoletions constants

---
 .../System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs
index 7a1fa4864783d2..7c9b91a292df5d 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs
@@ -42,7 +42,7 @@ internal sealed class Compiler
         public int CurrentPrecedence;  // Decreases by 1 with each import
         public XslNode? StartApplyTemplates;
         public RootLevel? Root;
-        [System.ObsoleteAttribute("XSLT Script blocks are not supported.", DiagnosticId = "SYSLIB0062", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
+        [Obsolete(Obsoletions.XsltSettingsEnableScriptMessage, DiagnosticId = Obsoletions.XsltSettingsEnableScriptDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
         public Scripts Scripts;
         public Output Output = new Output();
         public List<VarPar> ExternalPars = new List<VarPar>();