rename switch per API review

dotnet · Jul 17, 2023 · 5c49b26 · 5c49b26
1 parent 0dc5170
commit 5c49b26
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/libraries/System.Private.Xml/src/ILLink/ILLink.Substitutions.xml b/src/libraries/System.Private.Xml/src/ILLink/ILLink.Substitutions.xml
@@ -1,8 +1,8 @@
 <linker>
   <assembly fullname="System.Private.Xml">
     <type fullname="System.Xml.LocalAppContextSwitches">
-      <method signature="System.Boolean get_AllowResolvingUrlsByDefault()" body="stub" value="false"
-              feature="System.Xml.AllowResolvingUrlsByDefault" featurevalue="false" />
+      <method signature="System.Boolean get_IsNetworkingEnabledByDefault()" body="stub" value="false"
+              feature="System.Xml.XmlResolver.IsNetworkingEnabledByDefault" featurevalue="false" />
     </type>
   </assembly>
 </linker>
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/LocalAppContextSwitches.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/LocalAppContextSwitches.cs
@@ -36,9 +36,9 @@ internal static class LocalAppContextSwitches
             ? value : false;
 
 
-        public static bool AllowResolvingUrlsByDefault { get; } =
+        public static bool IsNetworkingEnabledByDefault { get; } =
             AppContext.TryGetSwitch(
-                switchName: "System.Xml.AllowResolvingUrlsByDefault",
+                switchName: "System.Xml.XmlResolver.IsNetworkingEnabledByDefault",
                 isEnabled: out bool value)
             ? value : true;
     }

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlReaderSettings.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlReaderSettings.cs
@@ -625,7 +625,7 @@ private XmlReader AddConformanceWrapper(XmlReader baseReader)
 
         internal static XmlResolver GetDefaultPermissiveResolver()
         {
-            return LocalAppContextSwitches.AllowResolvingUrlsByDefault ? new XmlUrlResolver() : XmlResolver.FileSystemResolver;
+            return LocalAppContextSwitches.IsNetworkingEnabledByDefault ? new XmlUrlResolver() : XmlResolver.FileSystemResolver;
         }
 
         [DoesNotReturn]

diff --git a/src/libraries/System.Private.Xml/tests/TrimmingTests/System.Private.Xml.TrimmingTests.proj b/src/libraries/System.Private.Xml/tests/TrimmingTests/System.Private.Xml.TrimmingTests.proj
@@ -8,11 +8,11 @@
                                ExtraTrimmerArgs="--enable-opt sealer" />
     <TestConsoleAppSourceFiles Include="XmlSerializer.Serialize.cs" />
     <TestConsoleAppSourceFiles Include="XslCompiledTransformTests.cs" />
-    <TestConsoleAppSourceFiles Include="XmlUrlResolverDefaults.DisallowResolvingUrlsByDefault.cs">
-      <DisabledFeatureSwitches>System.Xml.AllowResolvingUrlsByDefault</DisabledFeatureSwitches>
+    <TestConsoleAppSourceFiles Include="XmlUrlResolverDefaults.Disabled.IsNetworkingEnabledByDefault.cs">
+      <DisabledFeatureSwitches>System.Xml.XmlResolver.IsNetworkingEnabledByDefault</DisabledFeatureSwitches>
     </TestConsoleAppSourceFiles>
-    <TestConsoleAppSourceFiles Include="XmlUrlResolverDefaults.AllowResolvingUrlsByDefault.cs">
-      <EnabledFeatureSwitches>System.Xml.AllowResolvingUrlsByDefault</EnabledFeatureSwitches>
+    <TestConsoleAppSourceFiles Include="XmlUrlResolverDefaults.IsNetworkingEnabledByDefault.cs">
+      <EnabledFeatureSwitches>System.Xml.XmlResolver.IsNetworkingEnabledByDefault</EnabledFeatureSwitches>
     </TestConsoleAppSourceFiles>
   </ItemGroup>
 

diff --git a/...efaults.DisallowResolvingUrlsByDefault.cs → ....Disabled.IsNetworkingEnabledByDefault.cs b/...efaults.DisallowResolvingUrlsByDefault.cs → ....Disabled.IsNetworkingEnabledByDefault.cs
diff --git a/...erDefaults.AllowResolvingUrlsByDefault.cs → ...rDefaults.IsNetworkingEnabledByDefault.cs b/...erDefaults.AllowResolvingUrlsByDefault.cs → ...rDefaults.IsNetworkingEnabledByDefault.cs