When AppContext switch caching is disabled, default switch value was …

…not stored, we were lucky with switches that have "false" as a default
dotnet · Nov 14, 2024 · cb302c4 · cb302c4
1 parent 91a2ac3
commit cb302c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...em.Windows.Forms.Primitives/src/System/LocalAppContextSwitches/LocalAppContextSwitches.cs b/...em.Windows.Forms.Primitives/src/System/LocalAppContextSwitches/LocalAppContextSwitches.cs
@@ -96,6 +96,10 @@ private static bool GetSwitchValue(string switchName, ref int cachedSwitchValue)
         {
             cachedSwitchValue = isSwitchEnabled ? 1 /*true*/ : -1 /*false*/;
         }
+        else if (!hasSwitch)
+        {
+            AppContext.SetSwitch(switchName, isSwitchEnabled);
+        }
 
         return isSwitchEnabled;
 
@@ -256,7 +260,6 @@ public static bool ClipboardDragDropEnableUnsafeBinaryFormatterSerialization
     public static bool ClipboardDragDropEnableNrbfSerialization
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        get =>
-            GetCachedSwitchValue(ClipboardDragDropEnableNrbfSerializationSwitchName, ref s_clipboardDragDropEnableNrbfSerialization);
+        get => GetCachedSwitchValue(ClipboardDragDropEnableNrbfSerializationSwitchName, ref s_clipboardDragDropEnableNrbfSerialization);
     }
 }
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ClipboardTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ClipboardTests.cs
@@ -659,6 +659,8 @@ public void Clipboard_BinaryFormatter_AppContextSwitch()
         {
             LocalAppContextSwitches.ClipboardDragDropEnableUnsafeBinaryFormatterSerialization.Should().BeFalse();
         }
+
+        LocalAppContextSwitches.ClipboardDragDropEnableUnsafeBinaryFormatterSerialization.Should().BeFalse();
     }
 
     [WinFormsFact]
@@ -678,6 +680,8 @@ public void Clipboard_NrbfSerializer_AppContextSwitch()
         {
             LocalAppContextSwitches.ClipboardDragDropEnableNrbfSerialization.Should().BeTrue();
         }
+
+        LocalAppContextSwitches.ClipboardDragDropEnableNrbfSerialization.Should().BeTrue();
     }
 
     [WinFormsFact]