From b014750bd08ba4d267a3b93ded2256e951b855b0 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Sat, 30 May 2026 02:05:23 -0700
Subject: [PATCH 01/50] Add feature promp,

---
 .../Application.SystemTextAwareness.md        | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 .github/Feature-Prompts/Net11/Application.SystemTextAwareness'/Application.SystemTextAwareness.md

diff --git a/.github/Feature-Prompts/Net11/Application.SystemTextAwareness'/Application.SystemTextAwareness.md b/.github/Feature-Prompts/Net11/Application.SystemTextAwareness'/Application.SystemTextAwareness.md
new file mode 100644
index 00000000000..da7edcf854e
--- /dev/null
+++ b/.github/Feature-Prompts/Net11/Application.SystemTextAwareness'/Application.SystemTextAwareness.md
@@ -0,0 +1,180 @@
+# Task: Create a new API — `Application` system-text-size awareness — and the respective API proposal
+
+## What to do
+
+Create a **new API proposal / API review issue in the upstream `dotnet/winforms` repo**
+(`origin` = my fork, `upstream` = the Microsoft repo where this lands). Write it per the
+WinForms repo conventions and the relevant skills for authoring new-API issues. Apply the
+skills; don't ask me for boilerplate.
+
+This proposal introduces **runtime awareness of the Windows Accessibility text-size
+setting** at the `Application` level, plus a per-`Form` change notification. It is the
+**foundation** proposal; a companion `TreeView.NodeLeading` proposal references this one.
+
+## Before you implement anything
+
+**Verify every premise below against current source before committing to the design.**
+Verify, don't trust. If any premise is wrong, stop and tell me. Key files (VMR @
+`96982699e0dd8c046f397541dc0eb235ea8a4958`):
+
+- `src/winforms/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs`
+- `src/winforms/src/System.Windows.Forms/System/Windows/Forms/Application.cs`
+- `src/winforms/src/System.Windows.Forms/System/Windows/Forms/Application.ThreadContext.cs`
+- `src/winforms/src/System.Windows.Forms/System/Windows/Forms/Application.ParkingWindow.cs`
+- `src/runtime/src/libraries/Microsoft.Win32.SystemEvents/...` (SystemEvents / UserPreferenceCategory)
+
+## Rationale — surface and complete an existing partial implementation
+
+This is **not** a net-new feature; it **finishes a half-built one**. WinForms already reads
+the Accessibility text-size setting, but only once and only for the default font:
+
+`ScaleHelper.ScaleToSystemTextSize(Font?)` reads
+`HKEY_CURRENT_USER\Software\Microsoft\Accessibility` → value `TextScaleFactor`
+(REG_DWORD, clamped 100–225), and returns the font scaled by `TextScaleFactor / 100`
+(or `null` if 100, if the font `IsSystemFont`, or if the OS is < Windows 10 1507). It is
+documented in-source as the **Settings → Display → Make Text Bigger** setting.
+
+The gaps: (1) the value is **never surfaced** to developers; (2) it is read **once**, at
+default-font construction, and the app **never reacts** when the user changes the setting at
+runtime; (3) there is **no notification** mechanism. This proposal fills those three gaps.
+
+## Three-knob disambiguation (MANDATORY callout — reviewers will conflate these)
+
+Windows surfaces three *different* sizing mechanisms; the Settings UI even puts two on one
+page (`System → Display → Custom scaling` shows a "Custom scaling 100–500%" box AND a
+"Text size" link). The proposal MUST state plainly which one it targets:
+
+1. **Display / Custom scaling (100–500%)** → this is **DPI**. Already handled by
+   `HighDpiMode` and the DPI events (`WM_DPICHANGED`, `Control.DpiChanged*`). **NOT** this
+   proposal.
+2. **Accessibility → Text size (100–225%)** → registry `TextScaleFactor` under
+   `HKCU\Software\Microsoft\Accessibility`; WinRT `UISettings.TextScaleFactor` /
+   `TextScaleFactorChanged`. **THIS is the target.** Independent of DPI.
+3. **Legacy pre-Win10 per-element text sizing** (title bars/menus) → **removed** in Windows
+   10 1703; the Accessibility slider replaced it. Mentioned only to close the loop.
+
+State explicitly that `Application.SystemTextSize` reflects **#2 only**, and is orthogonal to
+DPI (#1).
+
+## Proposed API
+
+### `Application` (process-static)
+
+- **`public static double SystemTextSize { get; }`** — the current Accessibility text-scale
+  factor (1.0–2.25; i.e. `TextScaleFactor / 100`). **Live getter** — re-reads the value, does
+  not cache, because it is a system setting that changes at runtime. Well-defined regardless
+  of whether any `Form` exists or how many UI threads are running (it is process-global).
+- **`public static SystemTextSizeAwareness SystemTextSizeAwareness { get; set; }`** — the
+  mode. **Enum, not bool**, deliberately, to reserve room for a future `Automatic`:
+  - `Unaware` (default) — no notification raised; fully back-compatible, nothing changes.
+  - `Notify` — raise change notifications (see below); the app decides how to respond.
+  - *(reserved, NOT implemented now: `Automatic` — framework re-flows for you. Reserving the
+    enum slot now avoids a future breaking bool→enum change, the same lesson `HighDpiMode`
+    learned.)*
+- **`public static event EventHandler? SystemTextSizeChanged`** — fires once per process when
+  the setting changes (only when awareness is `Notify`).
+
+### `Form` (instance)
+
+- **`public event EventHandler? SystemTextSizeChanged`** — instance event, raised on each
+  top-level `Form` when the setting changes.
+- **`protected virtual void OnSystemTextSizeChanged(EventArgs e)`** — overridable, fires the
+  instance event via the `EventHandlerList` pattern (`Events[s_systemTextSizeChangedEvent]`).
+
+## The trigger architecture (the leak-critical part — get this exactly right)
+
+A naive design — a static `Application.SystemTextSizeChanged` that `Form`s/`Control`s
+subscribe to — **leaks**: the static event strongly roots every subscriber, so no `Form`
+that subscribes is ever collected. Avoid this by **mirroring the DPI architecture**, where
+`Control`/`Form` learn of DPI changes from their **own `WndProc`** (`WM_DPICHANGED` →
+`OnDpiChanged` → instance event via `EventHandlerList`), **not** from a static subscription.
+
+Verified facts that constrain the design:
+
+- **`WM_SETTINGCHANGE` is broadcast** (`HWND_BROADCAST`) and delivered directly to top-level
+  windows' `WndProc`s — it bypasses the thread message queue, so **`IMessageFilter` does NOT
+  see it.** Do not use a message filter.
+- **The WinForms parking window is message-only** (`CreateParams.Parent = HWND_MESSAGE`).
+  Message-only windows are **excluded from broadcasts**, so the parking window **cannot**
+  receive `WM_SETTINGCHANGE`. Do not use it.
+- **`Application` has no `MainForm`.** The main form lives on `ApplicationContext` (per-run,
+  per-UI-thread), can be `null` (tray/loop-only apps), and is mutable (splash→main handoff).
+  So the main form is **not** a reliable receiver. Do not anchor the app-level event to it.
+- **`SystemEvents` already owns a hidden top-level broadcast-receiving window** (its
+  `.NET-BroadcastEventWindow`), and exposes `UserPreferenceChanged` with a
+  `UserPreferenceCategory` (the relevant value is `Accessibility`, which is **coarse** — it
+  covers any accessibility change, so you must re-read `TextScaleFactor` and diff to confirm
+  it was text-scale).
+
+**Resulting design:**
+
+- **App-level:** `Application` makes **one internal, process-lifetime** subscription to
+  `SystemEvents.UserPreferenceChanged`, filters `Category == Accessibility`, re-reads
+  `TextScaleFactor`, diffs against the cached value, and if changed raises the static
+  `SystemTextSizeChanged`. This is a single framework-static→framework-static link — it does
+  **not** root any user object, so it is **not** the leak hazard. Reuses the existing hidden
+  broadcast window; **no new HWND** required.
+- **Form-level:** each top-level `Form` handles `WM_SETTINGCHANGE` in its **own `WndProc`**
+  (it is a broadcast — every top-level window receives it), re-reads + diffs, and raises its
+  **instance** `SystemTextSizeChanged` via `OnSystemTextSizeChanged`. `Form`s do **not**
+  subscribe to `Application` — no rooting, lifetime = the window.
+
+Caveat to document: there is **no dedicated `WM_TEXTSCALECHANGED`** message. Both paths must
+recognize a *relevant* change by re-reading `TextScaleFactor` and comparing, not by the
+message alone.
+
+## Aids vs. leave-it-to-the-user
+
+**Notify-only. No automatic re-layout / font-rescaling aids in this proposal.** Reasons:
+text scale interacts with `AutoScaleMode`, anchored/docked layout, and explicitly-set fonts
+in app-specific ways; a generic "scale all fonts by the factor" helper breaks more than it
+fixes. The reserved `Automatic` enum value is exactly where such behavior would live later.
+`Notify` gives the developer the factor and the event; they decide. (Consistent with the
+companion `NodeLeading` proposal's conservative-default philosophy.)
+
+## Why this matters across controls (evidence — include the matrix)
+
+Multiple text-measuring controls derive item/row/tile extents from a `Font` that today only
+reacts to the text-size setting once at startup (via `ScaleToSystemTextSize` on the default
+font) and never again. So **any single cached height scalar is wrong the moment text size
+changes at runtime** — which is the core argument for runtime awareness:
+
+- **ListBox / ComboBox** — have `MeasureItem` + `OwnerDrawVariable` (a real per-item measure
+  hatch) and `ItemHeight`. Their gap is the legacy default base calc + the missing runtime
+  text-scale reaction — i.e. exactly this proposal.
+- **TreeView** — has neither `MeasureItem` nor a wrapped native height API; only a uniform
+  native item height. Worst-positioned for a managed fix; addressed by the companion
+  `TreeView.NodeLeading` proposal, which depends on this one.
+- **ListView (Details)** — no `MeasureItem`, no native row-height message; row height is
+  comctl-computed from `SmallImageList` + control font, while per-item/subitem fonts are
+  honored via `NM_CUSTOMDRAW` (`CDRF_NEWFONT`). Userland workarounds (phantom `SmallImageList`;
+  `LVS_OWNERDRAWFIXED` + one-shot reflected `WM_MEASUREITEM`; "inflate control font / shrink
+  item fonts") each have holes (header leak, set-once, exhaustive per-item font setting,
+  owner-draw-all). **No clean complete userland solution exists** — strengthening the case
+  that text-size reaction belongs in the framework.
+
+## XML doc requirements
+
+- Document that `SystemTextSize` is the **Accessibility text-size** factor (Settings →
+  Display → Make Text Bigger), **not** DPI/display scaling, and is process-global / live.
+- Document the `Unaware`/`Notify` semantics and that `Automatic` is reserved for future use.
+- Document the no-rooting design note on the static event (so consumers understand instance
+  vs. static).
+
+## Open questions for review
+
+- Should `SystemTextSize` be `double` (1.0–2.25) or expose the raw int percent (100–225)?
+- Behavior on OS < Windows 10 1507 (where `ScaleToSystemTextSize` no-ops): `SystemTextSize`
+  returns 1.0 and no events fire?
+- Whether to also expose the value/event on `Application` only, leaving `Form` consumers to
+  use their own `WndProc` override — or provide the `Form` instance event as proposed
+  (recommended, for parity with the DPI event model).
+
+## Output
+
+The upstream issue per the skills: summary; the "complete a partial implementation"
+rationale; the mandatory three-knob disambiguation; the proposed API; the leak-safe trigger
+architecture with the four verified constraints (broadcast vs. IMessageFilter, message-only
+parking window, no MainForm on Application, SystemEvents reuse); Notify-only stance; the
+cross-control matrix; XML-doc requirements; open questions. Flag anything the source
+contradicts.

From 91e42a28361bfbb4d168018d62762db7b0e509cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 17:32:14 -0700
Subject: [PATCH 02/50] Factor system text scale lookup

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Windows/Forms/Internals/ScaleHelper.cs    | 58 +++++++++++++++----
 1 file changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs
index 764a35ca3a1..be410c24340 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs
@@ -30,6 +30,12 @@ internal static partial class ScaleHelper
     private static bool s_processPerMonitorAware;
     private static Size? s_logicalSmallSystemIconSize;
 
+    private const string AccessibilityRegistryKeyPath = "Software\\Microsoft\\Accessibility";
+    private const string TextScaleFactorValueName = "TextScaleFactor";
+    private const int MinSystemTextScalePercent = 100;
+    private const int MaxSystemTextScalePercent = 225;
+    private const double DefaultSystemTextScaleFactor = 1.0;
+
     /// <summary>
     ///  The initial primary monitor DPI (logical pixels per inch) for the process.
     /// </summary>
@@ -227,20 +233,50 @@ internal static Bitmap ScaleToDpi(Bitmap logicalBitmap, int dpi, bool disposeBit
             return null;
         }
 
-        // The default(100) and max(225) text scale factor is value what Settings display text scale
-        // applies and also clamps the text scale factor value between 100 and 225 value.
-        // See https://docs.microsoft.com/windows/uwp/design/input/text-scaling.
-        const int MinTextScaleValue = 100;
-        const int MaxTextScaleValue = 225;
+        if (!TryGetSystemTextScaleFactor(out double textScaleFactor) || textScaleFactor == DefaultSystemTextScaleFactor)
+        {
+            return null;
+        }
+
+        return font.WithSize(font.Size * (float)textScaleFactor);
+    }
+
+    /// <summary>
+    ///  Gets the current Windows Accessibility text-scale factor as a multiplier.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Returns <c>1.0</c> when text scaling is unsupported or when the setting cannot be read.
+    ///  </para>
+    /// </remarks>
+    internal static double GetSystemTextScaleFactor()
+        => TryGetSystemTextScaleFactor(out double textScaleFactor) ? textScaleFactor : DefaultSystemTextScaleFactor;
+
+    /// <summary>
+    ///  Attempts to get the current Windows Accessibility text-scale factor as a multiplier.
+    /// </summary>
+    /// <param name="textScaleFactor">The current text-scale factor.</param>
+    /// <returns>
+    ///  <see langword="true"/> if the value was read successfully; otherwise, <see langword="false"/>.
+    /// </returns>
+    internal static bool TryGetSystemTextScaleFactor(out double textScaleFactor)
+    {
+        textScaleFactor = DefaultSystemTextScaleFactor;
+
+        if (!OsVersion.IsWindows10_1507OrGreater())
+        {
+            return false;
+        }
 
         try
         {
-            // Retrieve the text scale factor, which is set via Settings > Display > Make Text Bigger.
-            using RegistryKey? key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Accessibility");
-            if (key is not null && key.GetValue("TextScaleFactor") is int textScale)
+            // Retrieve the text scale factor, which is set via Settings > Accessibility > Text size.
+            using RegistryKey? key = Registry.CurrentUser.OpenSubKey(AccessibilityRegistryKeyPath);
+            if (key is not null && key.GetValue(TextScaleFactorValueName) is int textScale)
             {
-                textScale = Math.Clamp(textScale, MinTextScaleValue, MaxTextScaleValue);
-                return textScale == 100 ? null : font.WithSize(font.Size * (textScale / 100.0f));
+                textScale = Math.Clamp(textScale, MinSystemTextScalePercent, MaxSystemTextScalePercent);
+                textScaleFactor = textScale / 100.0;
+                return true;
             }
         }
         catch
@@ -251,7 +287,7 @@ internal static Bitmap ScaleToDpi(Bitmap logicalBitmap, int dpi, bool disposeBit
 #endif
         }
 
-        return null;
+        return false;
     }
 
     /// <summary>

From d29effaee34384324721ee489bdfaf5aa29133b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:16:39 -0700
Subject: [PATCH 03/50] Add system text size APIs

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI.Unshipped.txt                   |   9 ++
 src/System.Windows.Forms/Resources/SR.resx    |   3 +
 .../Resources/xlf/SR.cs.xlf                   |   5 +
 .../Resources/xlf/SR.de.xlf                   |   5 +
 .../Resources/xlf/SR.es.xlf                   |   5 +
 .../Resources/xlf/SR.fr.xlf                   |   5 +
 .../Resources/xlf/SR.it.xlf                   |   5 +
 .../Resources/xlf/SR.ja.xlf                   |   5 +
 .../Resources/xlf/SR.ko.xlf                   |   5 +
 .../Resources/xlf/SR.pl.xlf                   |   5 +
 .../Resources/xlf/SR.pt-BR.xlf                |   5 +
 .../Resources/xlf/SR.ru.xlf                   |   5 +
 .../Resources/xlf/SR.tr.xlf                   |   5 +
 .../Resources/xlf/SR.zh-Hans.xlf              |   5 +
 .../Resources/xlf/SR.zh-Hant.xlf              |   5 +
 .../Forms/Application.SystemTextSize.cs       | 131 ++++++++++++++++++
 .../Windows/Forms/Form.SystemTextSize.cs      |  72 ++++++++++
 .../System/Windows/Forms/Form.cs              |   5 +
 .../Windows/Forms/SystemTextSizeAwareness.cs  |  31 +++++
 19 files changed, 316 insertions(+)
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Application.SystemTextSize.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Form.SystemTextSize.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/SystemTextSizeAwareness.cs

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index e69de29bb2d..5e0f2b1693c 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -0,0 +1,9 @@
+static System.Windows.Forms.Application.SetSystemTextSizeAwareness(System.Windows.Forms.SystemTextSizeAwareness awareness) -> void
+static System.Windows.Forms.Application.SystemTextSize.get -> double
+static System.Windows.Forms.Application.SystemTextSizeAwareness.get -> System.Windows.Forms.SystemTextSizeAwareness
+static System.Windows.Forms.Application.SystemTextSizeChanged -> System.EventHandler?
+System.Windows.Forms.Form.SystemTextSizeChanged -> System.EventHandler?
+System.Windows.Forms.SystemTextSizeAwareness
+System.Windows.Forms.SystemTextSizeAwareness.Notify = 1 -> System.Windows.Forms.SystemTextSizeAwareness
+System.Windows.Forms.SystemTextSizeAwareness.Unaware = 0 -> System.Windows.Forms.SystemTextSizeAwareness
+virtual System.Windows.Forms.Form.OnSystemTextSizeChanged(System.EventArgs! e) -> void
\ No newline at end of file
diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index 53d5073b748..d826674f28a 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -6568,6 +6568,9 @@ Stack trace where the illegal operation occurred was:
   <data name="FormOnDpiChangedDescr" xml:space="preserve">
     <value>Occurs when form is moved to a monitor with a different resolution and scaling level, or when form's monitor scaling level is changed in the Windows settings.</value>
   </data>
+  <data name="FormOnSystemTextSizeChangedDescr" xml:space="preserve">
+    <value>Occurs when the Windows Accessibility text size setting changes for this top-level form.</value>
+  </data>
   <data name="MDIChildSystemMenuItemAccessibleName" xml:space="preserve">
     <value>System</value>
   </data>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
index ce2bc9260f9..6ea1726da67 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
@@ -5600,6 +5600,11 @@ Chcete ho nahradit?</target>
         <target state="translated">Vyvolá se při prvním zobrazení formuláře.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">Míra průhlednosti ovládacího prvku v procentech</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
index b5cf47b1170..02fafa68f4e 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
@@ -5600,6 +5600,11 @@ Möchten Sie den Pfad ersetzen?</target>
         <target state="translated">Tritt ein, wenn das Formular anfangs angezeigt wird.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">Der Prozentsatz der Durchlässigkeit des Steuerelements. </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
index 82eb0cd40bb..fd53492b44e 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
@@ -5600,6 +5600,11 @@ Do you want to replace it?</source>
         <target state="translated">Tiene lugar cuando el formulario se muestra por primera vez.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">Porcentaje de la opacidad del control. </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
index f02c36b8e65..69cf8fcbf5a 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
@@ -5600,6 +5600,11 @@ Voulez-vous le remplacer ?</target>
         <target state="translated">Se produit lorsque le formulaire est affiché la première fois.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">Le pourcentage d'opacité du contrôle. </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
index fc9f709a0be..eae22352b89 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
@@ -5600,6 +5600,11 @@ Sostituirlo?</target>
         <target state="translated">Generato alla prima visualizzazione del form.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">La percentuale di opacità del controllo. </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
index 4511ba6cf76..3029942e7b5 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
@@ -5600,6 +5600,11 @@ Do you want to replace it?</source>
         <target state="translated">フォームが最初に表示されたときに発生します。</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">コントロールの不透明度の割合です。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
index 2924f72aab7..d51a633204e 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
@@ -5600,6 +5600,11 @@ Do you want to replace it?</source>
         <target state="translated">폼이 처음 표시될 때마다 발생합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">컨트롤의 불투명도(%)입니다.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
index f86297cb7f6..1d081c2fa93 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
@@ -5600,6 +5600,11 @@ Czy chcesz zastąpić?</target>
         <target state="translated">Występuje zawsze, gdy formant jest pokazywany jako pierwszy.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">Stopień nieprzezroczystości formantu. </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
index 5dcda8ac793..92a16e85591 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
@@ -5600,6 +5600,11 @@ Deseja substituí-lo?</target>
         <target state="translated">Ocorre sempre que o formulário é mostrado pela primeira vez.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">A porcentagem de opacidade do controle. </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
index 89af4e75583..8ea7ed5da2b 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
@@ -5600,6 +5600,11 @@ Do you want to replace it?</source>
         <target state="translated">Возникает при первом отображении формы.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">Степень прозрачности элемента управления (в процентах). </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
index 9e72305a890..517ae78a795 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
@@ -5600,6 +5600,11 @@ Değiştirmek istiyor musunuz?</target>
         <target state="translated">Formun her ilk görüntülenişinde gerçekleşir.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">Formun donukluk yüzdesi. </target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
index 6827f20269f..ad8da4c70db 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
@@ -5600,6 +5600,11 @@ Do you want to replace it?</source>
         <target state="translated">每当窗体第一次显示时发生。</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">控件的不透明度百分比。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
index 15f5f06c126..739e72d38a4 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
@@ -5600,6 +5600,11 @@ Do you want to replace it?</source>
         <target state="translated">當第一次顯示表單時發生。</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormOnSystemTextSizeChangedDescr">
+        <source>Occurs when the Windows Accessibility text size setting changes for this top-level form.</source>
+        <target state="new">Occurs when the Windows Accessibility text size setting changes for this top-level form.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormOpacityDescr">
         <source>The opacity percentage of the control. </source>
         <target state="translated">控制項的透明度百分比。</target>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.SystemTextSize.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.SystemTextSize.cs
new file mode 100644
index 00000000000..136be5d5cc7
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.SystemTextSize.cs
@@ -0,0 +1,131 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using Microsoft.Win32;
+
+namespace System.Windows.Forms;
+
+public sealed partial class Application
+{
+#if NET11_0_OR_GREATER
+    private static readonly object s_eventSystemTextSizeChanged = new();
+
+    private static SystemTextSizeAwareness s_systemTextSizeAwareness;
+    private static double s_lastSystemTextSize = 1.0;
+    private static bool s_systemTextSizeNotificationsInitialized;
+
+    /// <summary>
+    ///  Gets the current Windows Accessibility text-scale factor
+    ///  (Settings → Accessibility → Text size), as a multiplier in the range 1.0–2.25.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Live getter — re-reads the underlying system value on every access; does not cache.
+    ///  </para>
+    ///  <para>
+    ///   This property is orthogonal to display DPI; see <see cref="HighDpiMode"/> for the DPI-scaling story.
+    ///  </para>
+    ///  <para>
+    ///   On operating systems earlier than Windows 10 version 1507, this property returns <c>1.0</c>.
+    ///  </para>
+    /// </remarks>
+    public static double SystemTextSize => ScaleHelper.GetSystemTextScaleFactor();
+
+    /// <summary>
+    ///  Gets the application's mode for reacting to changes in the Windows Accessibility text-scale setting.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Use <see cref="SetSystemTextSizeAwareness(SystemTextSizeAwareness)"/> to change this value.
+    ///  </para>
+    /// </remarks>
+    public static SystemTextSizeAwareness SystemTextSizeAwareness => s_systemTextSizeAwareness;
+
+    /// <summary>
+    ///  Occurs once per process when the Windows Accessibility text-scale setting changes,
+    ///  while <see cref="SystemTextSizeAwareness"/> is <see cref="SystemTextSizeAwareness.Notify"/>.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   WinForms detects relevant changes by re-reading the underlying text-scale factor when Windows reports an
+    ///   accessibility preference change. Because there is no dedicated text-scale notification, unrelated accessibility
+    ///   changes do not raise this event unless the factor actually changed.
+    ///  </para>
+    ///  <para>
+    ///   The framework listens through a single internal <see cref="SystemEvents.UserPreferenceChanged"/> subscription.
+    ///   Individual <see cref="Form"/> instances receive their own <see cref="Form.SystemTextSizeChanged"/>
+    ///   notifications from their window procedures and do not subscribe to this static event, avoiding framework-managed
+    ///   static-event rooting of forms.
+    ///  </para>
+    /// </remarks>
+    public static event EventHandler? SystemTextSizeChanged
+    {
+        add => AddEventHandler(s_eventSystemTextSizeChanged, value);
+        remove => RemoveEventHandler(s_eventSystemTextSizeChanged, value);
+    }
+
+    /// <summary>
+    ///  Sets the application's mode for reacting to changes in the Windows Accessibility text-scale setting.
+    /// </summary>
+    /// <param name="awareness">
+    ///  One of the enumeration values that specifies how the application reacts to Accessibility text-scale changes.
+    /// </param>
+    /// <exception cref="InvalidEnumArgumentException">
+    ///  <paramref name="awareness"/> is not a valid <see cref="SystemTextSizeAwareness"/> value.
+    /// </exception>
+    public static void SetSystemTextSizeAwareness(SystemTextSizeAwareness awareness)
+    {
+        SourceGenerated.EnumValidator.Validate(awareness, nameof(awareness));
+
+        lock (s_internalSyncObject)
+        {
+            EnsureSystemTextSizeNotificationsInitialized();
+            s_systemTextSizeAwareness = awareness;
+        }
+    }
+
+    private static void EnsureSystemTextSizeNotificationsInitialized()
+    {
+        lock (s_internalSyncObject)
+        {
+            if (s_systemTextSizeNotificationsInitialized)
+            {
+                return;
+            }
+
+            s_lastSystemTextSize = ScaleHelper.GetSystemTextScaleFactor();
+            SystemEvents.UserPreferenceChanged += OnSystemTextSizeUserPreferenceChanged;
+            s_systemTextSizeNotificationsInitialized = true;
+        }
+    }
+
+    private static void OnSystemTextSizeUserPreferenceChanged(object? sender, UserPreferenceChangedEventArgs e)
+    {
+        if (e.Category != UserPreferenceCategory.Accessibility
+            || !ScaleHelper.TryGetSystemTextScaleFactor(out double systemTextSize))
+        {
+            return;
+        }
+
+        EventHandler? handler = null;
+
+        lock (s_internalSyncObject)
+        {
+            if (systemTextSize == s_lastSystemTextSize)
+            {
+                return;
+            }
+
+            s_lastSystemTextSize = systemTextSize;
+
+            if (s_systemTextSizeAwareness == SystemTextSizeAwareness.Notify)
+            {
+                handler = s_eventHandlers?[s_eventSystemTextSizeChanged] as EventHandler;
+            }
+        }
+
+        handler?.Invoke(null, EventArgs.Empty);
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Form.SystemTextSize.cs b/src/System.Windows.Forms/System/Windows/Forms/Form.SystemTextSize.cs
new file mode 100644
index 00000000000..38c36b8a999
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Form.SystemTextSize.cs
@@ -0,0 +1,72 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+
+namespace System.Windows.Forms;
+
+public partial class Form
+{
+#if NET11_0_OR_GREATER
+    private static readonly object s_systemTextSizeChangedEvent = new();
+
+    private double _lastSystemTextSize = ScaleHelper.GetSystemTextScaleFactor();
+
+    /// <summary>
+    ///  Occurs on this top-level <see cref="Form"/> when the Windows Accessibility text-scale setting changes,
+    ///  while <see cref="Application.SystemTextSizeAwareness"/> is <see cref="SystemTextSizeAwareness.Notify"/>.
+    /// </summary>
+    [SRCategory(nameof(SR.CatLayout))]
+    [SRDescription(nameof(SR.FormOnSystemTextSizeChangedDescr))]
+    public event EventHandler? SystemTextSizeChanged
+    {
+        add => Events.AddHandler(s_systemTextSizeChangedEvent, value);
+        remove => Events.RemoveHandler(s_systemTextSizeChangedEvent, value);
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="SystemTextSizeChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    /// <remarks>
+    ///  <para>
+    ///   WinForms raises this event only after re-reading the current Windows Accessibility text-scale factor and
+    ///   confirming that the underlying value actually changed. There is no dedicated Windows message for text-scale
+    ///   changes.
+    ///  </para>
+    /// </remarks>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    protected virtual void OnSystemTextSizeChanged(EventArgs e)
+    {
+        if (Events[s_systemTextSizeChangedEvent] is EventHandler handler)
+        {
+            handler(this, e);
+        }
+    }
+
+    /// <summary>
+    ///  Handles the WM_SETTINGCHANGE message.
+    /// </summary>
+    private void WmSettingChange(ref Message m)
+    {
+        base.WndProc(ref m);
+
+        if (!GetTopLevel() || !ScaleHelper.TryGetSystemTextScaleFactor(out double systemTextSize))
+        {
+            return;
+        }
+
+        if (systemTextSize == _lastSystemTextSize)
+        {
+            return;
+        }
+
+        _lastSystemTextSize = systemTextSize;
+
+        if (Application.SystemTextSizeAwareness == SystemTextSizeAwareness.Notify)
+        {
+            OnSystemTextSizeChanged(EventArgs.Empty);
+        }
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Form.cs b/src/System.Windows.Forms/System/Windows/Forms/Form.cs
index c3900d09c6b..a924b13fb3b 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Form.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Form.cs
@@ -7225,6 +7225,11 @@ protected override void WndProc(ref Message m)
             case PInvokeCore.WM_DPICHANGED:
                 WmDpiChanged(ref m);
                 break;
+#if NET11_0_OR_GREATER
+            case PInvokeCore.WM_SETTINGCHANGE:
+                WmSettingChange(ref m);
+                break;
+#endif
             default:
                 base.WndProc(ref m);
                 break;
diff --git a/src/System.Windows.Forms/System/Windows/Forms/SystemTextSizeAwareness.cs b/src/System.Windows.Forms/System/Windows/Forms/SystemTextSizeAwareness.cs
new file mode 100644
index 00000000000..2c8ab20ca1f
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/SystemTextSizeAwareness.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Specifies how the application reacts to changes in the Windows Accessibility text-scale setting.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The current implementation supports only <see cref="Unaware"/> and <see cref="Notify"/>. A future release may add
+///   an automatic reaction mode.
+///  </para>
+/// </remarks>
+public enum SystemTextSizeAwareness
+{
+    /// <summary>
+    ///  Default. The application does not raise any text-scale-change notification.
+    ///  Fully back-compatible behavior.
+    /// </summary>
+    Unaware = 0,
+
+    /// <summary>
+    ///  The application raises <see cref="Application.SystemTextSizeChanged"/> and
+    ///  <see cref="Form.SystemTextSizeChanged"/> when the setting changes.
+    ///  The application decides how to respond.
+    /// </summary>
+    Notify = 1
+}
+#endif

From a16e387b9daa8ee83cab504b62186fa0d30a3c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:16:49 -0700
Subject: [PATCH 04/50] Add system text size tests

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Forms/ApplicationTests.SystemTextSize.cs  | 58 +++++++++++++++++++
 .../System/Windows/Forms/ApplicationTests.cs  |  2 +-
 .../Windows/Forms/FormTests.SystemTextSize.cs | 38 ++++++++++++
 .../System/Windows/Forms/FormTests.cs         |  2 +-
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.SystemTextSize.cs
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.SystemTextSize.cs

diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.SystemTextSize.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.SystemTextSize.cs
new file mode 100644
index 00000000000..5847634d332
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.SystemTextSize.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.ComponentModel;
+using Microsoft.DotNet.RemoteExecutor;
+
+namespace System.Windows.Forms.Tests;
+
+public partial class ApplicationTests
+{
+#if NET11_0_OR_GREATER
+    [WinFormsFact]
+    public void Application_SystemTextSize_GetReturnsExpected()
+    {
+        Assert.InRange(Application.SystemTextSize, 1.0, 2.25);
+    }
+
+    [WinFormsFact]
+    public void Application_SystemTextSizeAwareness_DefaultValueIsUnaware()
+    {
+        RemoteExecutor.Invoke(() =>
+        {
+            Assert.Equal(SystemTextSizeAwareness.Unaware, Application.SystemTextSizeAwareness);
+        }).Dispose();
+    }
+
+    [WinFormsTheory]
+    [EnumData<SystemTextSizeAwareness>]
+    public void Application_SystemTextSizeAwareness_Set_GetReturnsExpected(SystemTextSizeAwareness value)
+    {
+        SystemTextSizeAwareness originalValue = Application.SystemTextSizeAwareness;
+
+        try
+        {
+            Application.SetSystemTextSizeAwareness(value);
+            Assert.Equal(value, Application.SystemTextSizeAwareness);
+
+            Application.SetSystemTextSizeAwareness(value);
+            Assert.Equal(value, Application.SystemTextSizeAwareness);
+        }
+        finally
+        {
+            Application.SetSystemTextSizeAwareness(originalValue);
+        }
+    }
+
+    [WinFormsTheory]
+    [InvalidEnumData<SystemTextSizeAwareness>]
+    public void Application_SetSystemTextSizeAwareness_InvalidValue_ThrowsInvalidEnumArgumentException(SystemTextSizeAwareness value)
+    {
+        Assert.Throws<InvalidEnumArgumentException>(
+            "awareness",
+            () => Application.SetSystemTextSizeAwareness(value));
+    }
+#endif
+}
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
index 47013617e97..bf2346ae060 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
@@ -12,7 +12,7 @@
 
 namespace System.Windows.Forms.Tests;
 
-public class ApplicationTests
+public partial class ApplicationTests
 {
     [WinFormsFact]
     public void Application_CurrentCulture_Get_ReturnsExpected()
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.SystemTextSize.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.SystemTextSize.cs
new file mode 100644
index 00000000000..9209f9a36f8
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.SystemTextSize.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+namespace System.Windows.Forms.Tests;
+
+public partial class FormTests
+{
+#if NET11_0_OR_GREATER
+    [WinFormsTheory]
+    [NewAndDefaultData<EventArgs>]
+    public void Form_OnSystemTextSizeChanged_Invoke_CallsSystemTextSizeChanged(EventArgs eventArgs)
+    {
+        using SubForm control = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(control, sender);
+            Assert.Same(eventArgs, e);
+            callCount++;
+        };
+
+        control.SystemTextSizeChanged += handler;
+        control.OnSystemTextSizeChanged(eventArgs);
+        Assert.Equal(1, callCount);
+
+        control.SystemTextSizeChanged -= handler;
+        control.OnSystemTextSizeChanged(eventArgs);
+        Assert.Equal(1, callCount);
+    }
+
+    public partial class SubForm
+    {
+        public new void OnSystemTextSizeChanged(EventArgs e) => base.OnSystemTextSizeChanged(e);
+    }
+#endif
+}
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.cs
index 26574491052..d7bae89dd1a 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.cs
@@ -2793,7 +2793,7 @@ public ParentingForm(Form targetForm)
         }
     }
 
-    public class SubForm : Form
+    public partial class SubForm : Form
     {
         public new const int ScrollStateAutoScrolling = ScrollableControl.ScrollStateAutoScrolling;
 

From 781716c2193f0fcaf4da1952822f6ce921e2f568 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Wed, 8 Jul 2026 14:57:47 -0700
Subject: [PATCH 05/50] Add WinRT UISettings accent-color interop to Core

Hand-author the IUISettings3 / UIColor / UIColorType WinRT ABI types and generate the RoActivateInstance / WindowsCreateString / WindowsDeleteString / IInspectable / HSTRING Win32 bindings via CsWin32. The WinRT ABI types are excluded from the .NET Framework build, which does not consume them.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/Microsoft.Private.Windows.Core.csproj |  4 ++
 .../src/NativeMethods.txt                     |  5 ++
 .../Win32/UI/ViewManagement/IUISettings3.cs   | 63 ++++++++++++++++++
 .../Win32/UI/ViewManagement/UIColor.cs        | 37 +++++++++++
 .../Win32/UI/ViewManagement/UIColorType.cs    | 66 +++++++++++++++++++
 5 files changed, 175 insertions(+)
 create mode 100644 src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/IUISettings3.cs
 create mode 100644 src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColor.cs
 create mode 100644 src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColorType.cs

diff --git a/src/System.Private.Windows.Core/src/Microsoft.Private.Windows.Core.csproj b/src/System.Private.Windows.Core/src/Microsoft.Private.Windows.Core.csproj
index 028ddf0be71..f63dbaa5496 100644
--- a/src/System.Private.Windows.Core/src/Microsoft.Private.Windows.Core.csproj
+++ b/src/System.Private.Windows.Core/src/Microsoft.Private.Windows.Core.csproj
@@ -58,6 +58,10 @@
     <Compile Remove="Windows\Win32\System\Com\IDispatch.Interface.cs" />
     <Compile Remove="Windows\Win32\System\Com\GlobalInterfaceTable.UnknownStrategy.cs" />
     <Compile Remove="Windows\Win32\System\Com\IComCallableWrapper.cs" />
+    <!-- WinRT accent-color interop is only consumed by the modern .NET build of System.Windows.Forms. -->
+    <Compile Remove="Windows\Win32\UI\ViewManagement\IUISettings3.cs" />
+    <Compile Remove="Windows\Win32\UI\ViewManagement\UIColor.cs" />
+    <Compile Remove="Windows\Win32\UI\ViewManagement\UIColorType.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/System.Private.Windows.Core/src/NativeMethods.txt b/src/System.Private.Windows.Core/src/NativeMethods.txt
index cc17c7c0a45..4dc96ffb830 100644
--- a/src/System.Private.Windows.Core/src/NativeMethods.txt
+++ b/src/System.Private.Windows.Core/src/NativeMethods.txt
@@ -150,6 +150,7 @@ HINSTANCE
 HPEN
 HPROPSHEETPAGE
 HRGN
+HSTRING
 HWND
 HWND_*
 IDataObject
@@ -164,6 +165,7 @@ IDropTargetHelper
 IEnumFORMATETC
 IEnumUnknown
 IGlobalInterfaceTable
+IInspectable
 ImageFormat*
 ImageLockMode
 INK_SERIALIZED_FORMAT
@@ -230,6 +232,7 @@ ReleaseDC
 ReleaseStgMedium
 RestoreDC
 RevokeDragDrop
+RoActivateInstance
 RPC_E_CHANGED_MODE
 RPC_E_DISCONNECTED
 RPC_E_SERVERFAULT
@@ -277,5 +280,7 @@ WIN32_ERROR
 WINCODEC_ERR_*
 WINDOW_LONG_PTR_INDEX
 WindowFromDC
+WindowsCreateString
+WindowsDeleteString
 WM_*
 WPARAM
\ No newline at end of file
diff --git a/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/IUISettings3.cs b/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/IUISettings3.cs
new file mode 100644
index 00000000000..15028e00045
--- /dev/null
+++ b/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/IUISettings3.cs
@@ -0,0 +1,63 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Windows.Win32.UI.ViewManagement;
+
+/// <summary>
+///  WinRT ABI for <c>Windows.UI.ViewManagement.IUISettings3</c>.
+/// </summary>
+/// <remarks>
+///  <para>
+///   Manually defined as the type lives in WinRT metadata, not Win32 metadata,
+///   and we do not want a CsWinRT projection dependency. Slots 3-5 are the
+///   <c>IInspectable</c> methods.
+///  </para>
+/// </remarks>
+internal unsafe struct IUISettings3 : IComIID
+{
+    private readonly void** _vtbl;
+
+    // {03021BE4-5254-4781-8194-5168F7D06D7B}
+    public static Guid IID_Guid { get; } = new(0x03021be4, 0x5254, 0x4781, 0x81, 0x94, 0x51, 0x68, 0xf7, 0xd0, 0x6d, 0x7b);
+
+    static ref readonly Guid IComIID.Guid
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get
+        {
+            ReadOnlySpan<byte> data =
+            [
+                // 0x03021be4, 0x5254, 0x4781, 0x81, 0x94, 0x51, 0x68, 0xf7, 0xd0, 0x6d, 0x7b
+                0xe4, 0x1b, 0x02, 0x03, 0x54, 0x52, 0x81, 0x47, 0x81, 0x94, 0x51, 0x68, 0xf7, 0xd0, 0x6d, 0x7b
+            ];
+
+            return ref Unsafe.As<byte, Guid>(ref MemoryMarshal.GetReference(data));
+        }
+    }
+
+    public HRESULT QueryInterface(Guid* riid, void** ppvObject)
+    {
+        fixed (IUISettings3* pThis = &this)
+            return ((delegate* unmanaged[Stdcall]<IUISettings3*, Guid*, void**, HRESULT>)_vtbl[0])(pThis, riid, ppvObject);
+    }
+
+    public uint AddRef()
+    {
+        fixed (IUISettings3* pThis = &this)
+            return ((delegate* unmanaged[Stdcall]<IUISettings3*, uint>)_vtbl[1])(pThis);
+    }
+
+    public uint Release()
+    {
+        fixed (IUISettings3* pThis = &this)
+            return ((delegate* unmanaged[Stdcall]<IUISettings3*, uint>)_vtbl[2])(pThis);
+    }
+
+    // Slots 3-5: IInspectable::GetIids, GetRuntimeClassName, GetTrustLevel (unused).
+
+    public HRESULT GetColorValue(UIColorType desiredColor, UIColor* value)
+    {
+        fixed (IUISettings3* pThis = &this)
+            return ((delegate* unmanaged[Stdcall]<IUISettings3*, UIColorType, UIColor*, HRESULT>)_vtbl[6])(pThis, desiredColor, value);
+    }
+}
diff --git a/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColor.cs b/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColor.cs
new file mode 100644
index 00000000000..94c3036ca5b
--- /dev/null
+++ b/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColor.cs
@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Windows.Win32.UI.ViewManagement;
+
+/// <summary>
+///  WinRT ABI for <c>Windows.UI.Color</c>, the value returned by
+///  <see cref="IUISettings3.GetColorValue(UIColorType, UIColor*)"/>.
+/// </summary>
+/// <remarks>
+///  <para>
+///   Manually defined to mirror the WinRT ABI layout (four sequential bytes: alpha, red, green, blue)
+///   without taking a CsWinRT projection dependency.
+///  </para>
+/// </remarks>
+internal struct UIColor
+{
+    /// <summary>
+    ///  The alpha channel of the color.
+    /// </summary>
+    public byte A;
+
+    /// <summary>
+    ///  The red channel of the color.
+    /// </summary>
+    public byte R;
+
+    /// <summary>
+    ///  The green channel of the color.
+    /// </summary>
+    public byte G;
+
+    /// <summary>
+    ///  The blue channel of the color.
+    /// </summary>
+    public byte B;
+}
diff --git a/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColorType.cs b/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColorType.cs
new file mode 100644
index 00000000000..9725700b888
--- /dev/null
+++ b/src/System.Private.Windows.Core/src/Windows/Win32/UI/ViewManagement/UIColorType.cs
@@ -0,0 +1,66 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Windows.Win32.UI.ViewManagement;
+
+/// <summary>
+///  WinRT ABI for <c>Windows.UI.ViewManagement.UIColorType</c>, identifying which system color to
+///  retrieve through <see cref="IUISettings3.GetColorValue(UIColorType, UIColor*)"/>.
+/// </summary>
+/// <remarks>
+///  <para>
+///   Manually defined to mirror the WinRT enumeration without taking a CsWinRT projection dependency.
+///  </para>
+/// </remarks>
+internal enum UIColorType
+{
+    /// <summary>
+    ///  The background color.
+    /// </summary>
+    Background = 0,
+
+    /// <summary>
+    ///  The foreground color.
+    /// </summary>
+    Foreground = 1,
+
+    /// <summary>
+    ///  The darkest of the three accent shades.
+    /// </summary>
+    AccentDark3 = 2,
+
+    /// <summary>
+    ///  The second darkest accent shade.
+    /// </summary>
+    AccentDark2 = 3,
+
+    /// <summary>
+    ///  The lightest of the three dark accent shades.
+    /// </summary>
+    AccentDark1 = 4,
+
+    /// <summary>
+    ///  The base accent color.
+    /// </summary>
+    Accent = 5,
+
+    /// <summary>
+    ///  The darkest of the three light accent shades.
+    /// </summary>
+    AccentLight1 = 6,
+
+    /// <summary>
+    ///  The second lightest accent shade.
+    /// </summary>
+    AccentLight2 = 7,
+
+    /// <summary>
+    ///  The lightest of the three accent shades.
+    /// </summary>
+    AccentLight3 = 8,
+
+    /// <summary>
+    ///  The complement of the accent color.
+    /// </summary>
+    Complement = 9,
+}

From f6eb1880169dca1cf84b57981343ee9c4c39044a Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Wed, 8 Jul 2026 14:57:48 -0700
Subject: [PATCH 06/50] Add Application.GetWindowsAccentColor()

Expose the user's current Windows accent color by activating the Windows.UI.ViewManagement.UISettings runtime component and reading UIColorType.Accent. When no accent color is set, Windows returns an OS-defined default, so the method always yields a usable color.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI.Unshipped.txt                   |  1 +
 .../Forms/Application.WindowsAccentColor.cs   | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Application.WindowsAccentColor.cs

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 5e0f2b1693c..be22f5f4e2f 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -1,3 +1,4 @@
+static System.Windows.Forms.Application.GetWindowsAccentColor() -> System.Drawing.Color
 static System.Windows.Forms.Application.SetSystemTextSizeAwareness(System.Windows.Forms.SystemTextSizeAwareness awareness) -> void
 static System.Windows.Forms.Application.SystemTextSize.get -> double
 static System.Windows.Forms.Application.SystemTextSizeAwareness.get -> System.Windows.Forms.SystemTextSizeAwareness
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.WindowsAccentColor.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.WindowsAccentColor.cs
new file mode 100644
index 00000000000..0fbce5b214b
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.WindowsAccentColor.cs
@@ -0,0 +1,52 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Windows.Win32.System.WinRT;
+using Windows.Win32.UI.ViewManagement;
+
+namespace System.Windows.Forms;
+
+public sealed partial class Application
+{
+    /// <summary>
+    ///  Gets the user's current Windows accent color.
+    /// </summary>
+    /// <returns>
+    ///  The accent color the user has selected in the Windows personalization settings.
+    /// </returns>
+    /// <remarks>
+    ///  <para>
+    ///   The value is read from the Windows <c>UISettings</c> runtime component and reflects the color the
+    ///   user picked (or that Windows derived automatically from the desktop background). If the user has not
+    ///   chosen an accent color, Windows returns a default accent color defined by the operating system, so
+    ///   this method always yields a usable color rather than throwing or returning an empty value.
+    ///  </para>
+    /// </remarks>
+    public static unsafe Color GetWindowsAccentColor()
+    {
+        HSTRING className = default;
+
+        fixed (char* pClassName = "Windows.UI.ViewManagement.UISettings")
+        {
+            PInvokeCore.WindowsCreateString((PCWSTR)pClassName, 36u, &className).ThrowOnFailure();
+        }
+
+        try
+        {
+            using ComScope<IInspectable> inspectable = new(null);
+            PInvokeCore.RoActivateInstance(className, inspectable).ThrowOnFailure();
+
+            using ComScope<IUISettings3> settings = inspectable.TryQuery<IUISettings3>(out HRESULT hr);
+            hr.ThrowOnFailure();
+
+            UIColor color;
+            settings.Value->GetColorValue(UIColorType.Accent, &color).ThrowOnFailure();
+
+            return Color.FromArgb(color.A, color.R, color.G, color.B);
+        }
+        finally
+        {
+            PInvokeCore.WindowsDeleteString(className);
+        }
+    }
+}

From 3c120aa9f7bbf5284f05389a004550f1a2d79cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 17:45:32 -0700
Subject: [PATCH 07/50] Add TreeView.NodeLeading API

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI.Unshipped.txt                   |   6 +-
 src/System.Windows.Forms/Resources/SR.resx    |   6 +
 .../Resources/xlf/SR.cs.xlf                   |  10 +
 .../Resources/xlf/SR.de.xlf                   |  10 +
 .../Resources/xlf/SR.es.xlf                   |  10 +
 .../Resources/xlf/SR.fr.xlf                   |  10 +
 .../Resources/xlf/SR.it.xlf                   |  10 +
 .../Resources/xlf/SR.ja.xlf                   |  10 +
 .../Resources/xlf/SR.ko.xlf                   |  10 +
 .../Resources/xlf/SR.pl.xlf                   |  10 +
 .../Resources/xlf/SR.pt-BR.xlf                |  10 +
 .../Resources/xlf/SR.ru.xlf                   |  10 +
 .../Resources/xlf/SR.tr.xlf                   |  10 +
 .../Resources/xlf/SR.zh-Hans.xlf              |  10 +
 .../Resources/xlf/SR.zh-Hant.xlf              |  10 +
 .../Forms/Controls/TreeView/TreeView.cs       | 249 ++++++++++++++++--
 16 files changed, 374 insertions(+), 17 deletions(-)

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index be22f5f4e2f..0b3d7fac665 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -7,4 +7,8 @@ System.Windows.Forms.Form.SystemTextSizeChanged -> System.EventHandler?
 System.Windows.Forms.SystemTextSizeAwareness
 System.Windows.Forms.SystemTextSizeAwareness.Notify = 1 -> System.Windows.Forms.SystemTextSizeAwareness
 System.Windows.Forms.SystemTextSizeAwareness.Unaware = 0 -> System.Windows.Forms.SystemTextSizeAwareness
-virtual System.Windows.Forms.Form.OnSystemTextSizeChanged(System.EventArgs! e) -> void
\ No newline at end of file
+virtual System.Windows.Forms.Form.OnSystemTextSizeChanged(System.EventArgs! e) -> void
+System.Windows.Forms.TreeView.NodeLeading.get -> float
+System.Windows.Forms.TreeView.NodeLeading.set -> void
+System.Windows.Forms.TreeView.NodeLeadingChanged -> System.EventHandler?
+virtual System.Windows.Forms.TreeView.OnNodeLeadingChanged(System.EventArgs! e) -> void
\ No newline at end of file
diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index d826674f28a..9794e8910e2 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -6319,6 +6319,9 @@ Stack trace where the illegal operation occurred was:
   <data name="TreeViewLineColorDescr" xml:space="preserve">
     <value>The color of the lines that connect the nodes of the TreeView.</value>
   </data>
+  <data name="TreeViewNodeLeadingDescr" xml:space="preserve">
+    <value>The uniform row-height leading factor applied to all nodes.</value>
+  </data>
   <data name="TreeViewNodeMouseClickDescr" xml:space="preserve">
     <value>Occurs when a node is clicked with the mouse.</value>
   </data>
@@ -6334,6 +6337,9 @@ Stack trace where the illegal operation occurred was:
   <data name="TreeViewNodeSorterDescr" xml:space="preserve">
     <value>The sorting comparer for the TreeView.</value>
   </data>
+  <data name="TreeViewOnNodeLeadingChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the NodeLeading property changes.</value>
+  </data>
   <data name="TreeViewPathSeparatorDescr" xml:space="preserve">
     <value>The string delimiter used for the path returned by a node's FullPath property.</value>
   </data>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
index 6ea1726da67..436c5db8aa3 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
@@ -11024,6 +11024,11 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Barva čar spojujících uzly ovládacího prvku TreeView</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Vyvolá se při kliknutí myší na uzel.</target>
@@ -11049,6 +11054,11 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Kořenové uzly v ovládacím prvku TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Oddělovač řetězců použitý pro cesty vracené vlastností FullPath uzlu.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
index 02fafa68f4e..273d2f75887 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
@@ -11024,6 +11024,11 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Die Farbe der Linien, die die Knoten der TreeView verbinden.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Tritt auf, wenn mit der Maus auf einen Knoten geklickt wird.</target>
@@ -11049,6 +11054,11 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Die Stammknoten im TreeView-Steuerelement.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Das Zeichenfolgen-Trennzeichen für den Pfad, der von der FullPath-Eigenschaft eines Knotens zurückgegeben wird.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
index fd53492b44e..5a71457bfe7 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
@@ -11024,6 +11024,11 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">Color de las líneas que conectan los nodos en TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Tiene lugar cuando se hace clic con el mouse en un nodo.</target>
@@ -11049,6 +11054,11 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">Nodos raíz en el control TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Delimitador de cadena utilizado para la ruta de acceso devuelta por la propiedad FullPath de un nodo.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
index 69cf8fcbf5a..497705cc659 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
@@ -11024,6 +11024,11 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">La couleur des lignes qui connectent les nœuds du TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Se produit lors d'un clic de souris sur un nœud.</target>
@@ -11049,6 +11054,11 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">Les nœuds racine dans le contrôle TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Le délimiteur de chaîne utilisé pour le chemin d'accès retourné par la propriété FullPath d'un nœud.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
index eae22352b89..0f9f746eb32 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
@@ -11024,6 +11024,11 @@ Analisi dello stack dove si è verificata l'operazione non valida:
         <target state="translated">Il colore delle righe che connettono i nodi del controllo TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Generato quando si fa clic con il mouse su un nodo.</target>
@@ -11049,6 +11054,11 @@ Analisi dello stack dove si è verificata l'operazione non valida:
         <target state="translated">I nodi radice nel controllo TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Il delimitatore di stringa utilizzato per il percorso restituito dalla proprietà FullPath di un nodo.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
index 3029942e7b5..5c1e01f3e14 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
@@ -11024,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">ツリー ビューのノード間を接続する線の色です。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">ノードがマウスでクリックされたときに発生します。</target>
@@ -11049,6 +11054,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">TreeView コントロールのルートのノードです。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">ノードの FullPath プロパティにより返されるパスで使用する、文字列の区切り文字です。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
index d51a633204e..36ae814250f 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
@@ -11024,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">TreeView의 노드를 연결하는 줄의 색입니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">마우스로 노드를 클릭할 때 발생합니다.</target>
@@ -11049,6 +11054,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">TreeView 컨트롤의 루트 노드입니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">노드의 FullPath 속성으로 반환된 경로에 사용되는 문자열 구분 기호입니다.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
index 1d081c2fa93..cf5ec9f4e94 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
@@ -11024,6 +11024,11 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Kolor linii łączących węzły elementu TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Występuje, gdy węzeł zostanie kliknięty przy użyciu myszy.</target>
@@ -11049,6 +11054,11 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Węzły główne w formancie TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Ogranicznik ciągu używany w ścieżce zwracanej przez właściwość FullPath węzła.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
index 92a16e85591..3a5790e5f7a 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
@@ -11024,6 +11024,11 @@ O rastreamento de pilha em que a operação ilegal ocorreu foi:
         <target state="translated">A cor das linhas que conectam os nós de TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Ocorre quando o usuário clica com o mouse em um nó.</target>
@@ -11049,6 +11054,11 @@ O rastreamento de pilha em que a operação ilegal ocorreu foi:
         <target state="translated">Nós raiz no controle TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">O delimitador de cadeia de caracteres usado para o caminho retornado pela propriedade FullPath de um nó.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
index 8ea7ed5da2b..26aa4b68c8d 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
@@ -11024,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Цвет линий, соединяющих узлы в TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Возникает при щелчке мыши на узле.</target>
@@ -11049,6 +11054,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Корневые узлы в элементе управления TreeView.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Разделитель строк в пути, возвращаемом свойством FullPath узла.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
index 517ae78a795..07f04f08733 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
@@ -11024,6 +11024,11 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">TreeView'in düğümlerini bağlayan çizgilerin rengi.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">Öğe fareyle tıklatıldığında gerçekleşir.</target>
@@ -11049,6 +11054,11 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">TreeView denetiminde kök düğümler.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">Düğümün FullPath özelliği tarafından döndürülen yol için kullanılan dize sınırlayıcı.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
index ad8da4c70db..4981ca37d4b 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
@@ -11024,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">连接树视图节点的线条的颜色。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">用鼠标单击节点时发生。</target>
@@ -11049,6 +11054,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">TreeView 控件中的根节点。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">用于由节点的 FullPath 属性返回的路径的字符串分隔符。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
index 739e72d38a4..ae4bca12121 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
@@ -11024,6 +11024,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">連接樹狀檢視節點的線條色彩。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewNodeLeadingDescr">
+        <source>The uniform row-height leading factor applied to all nodes.</source>
+        <target state="new">The uniform row-height leading factor applied to all nodes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewNodeMouseClickDescr">
         <source>Occurs when a node is clicked with the mouse.</source>
         <target state="translated">以滑鼠按一下節點時發生。</target>
@@ -11049,6 +11054,11 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">TreeView 控制項中的根節點。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TreeViewOnNodeLeadingChangedDescr">
+        <source>Occurs when the value of the NodeLeading property changes.</source>
+        <target state="new">Occurs when the value of the NodeLeading property changes.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TreeViewPathSeparatorDescr">
         <source>The string delimiter used for the path returned by a node's FullPath property.</source>
         <target state="translated">節點 FullPath 屬性用來傳回路徑的字串分隔符號。</target>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.cs
index 4d6a3c53602..5a68e10a41f 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.cs
@@ -43,6 +43,7 @@ public partial class TreeView : Control
     private TreeViewEventHandler? _onAfterSelect;
     private ItemDragEventHandler? _onItemDrag;
     private TreeNodeMouseHoverEventHandler? _onNodeMouseHover;
+    private EventHandler? _onNodeLeadingChanged;
     private EventHandler? _onRightToLeftLayoutChanged;
 
     internal TreeNode? _selectedNode;
@@ -78,6 +79,7 @@ public partial class TreeView : Control
     private Collections.Specialized.BitVector32 _treeViewState; // see TREEVIEWSTATE_ constants above
 
     private static bool s_isScalingInitialized;
+    private static readonly int s_nodeLeadingProperty = PropertyStore.CreateKey();
     private static Size? s_stateImageSize;
     private static Size? StateImageSize
     {
@@ -117,6 +119,30 @@ internal ImageList.Indexer SelectedImageIndexer
         }
     }
 
+    private bool RequiresNonEvenHeightStyle
+    {
+        get
+        {
+#if NET11_0_OR_GREATER
+            return _setOddHeight || UsesNodeLeading;
+#else
+            return _setOddHeight;
+#endif
+        }
+    }
+
+    private bool UsesNodeLeading
+    {
+        get
+        {
+#if NET11_0_OR_GREATER
+            return NodeLeading != 0.0f;
+#else
+            return false;
+#endif
+        }
+    }
+
     private ImageList? _imageList;
     private int _indent = -1;
     private int _itemHeight = -1;
@@ -170,6 +196,11 @@ public TreeView()
         SetStyle(ControlStyles.UserPaint, false);
         SetStyle(ControlStyles.StandardClick, false);
         SetStyle(ControlStyles.UseTextForAccessibility, false);
+
+#if NET11_0_OR_GREATER
+        FontChanged += HandleNodeLeadingMetricChanged;
+        DpiChangedAfterParent += HandleNodeLeadingMetricChanged;
+#endif
     }
 
     internal override void ReleaseUiaProvider(HWND handle)
@@ -366,7 +397,7 @@ protected override CreateParams CreateParams
                 cp.Style |= (int)PInvoke.TVS_FULLROWSELECT;
             }
 
-            if (_setOddHeight)
+            if (RequiresNonEvenHeightStyle)
             {
                 cp.Style |= (int)PInvoke.TVS_NONEVENHEIGHT;
             }
@@ -760,6 +791,79 @@ public int Indent
         }
     }
 
+#if NET11_0_OR_GREATER
+    /// <summary>
+    ///  Gets or sets the per-node vertical leading factor applied on top of the live <see cref="Control.Font"/> height.
+    ///  Default <c>0.0f</c> selects legacy behavior.
+    /// </summary>
+    /// <value>
+    ///  A non-negative <see cref="float"/>. <c>0.0f</c> (default) selects legacy behavior.
+    ///  <c>1.0f</c> opts in to the honest row-height calculation. Values greater than <c>1.0f</c> add extra leading.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   This property applies uniformly to all nodes in the control. It is not a per-node knob, and per-node row
+    ///   heights are not supported by the native <see cref="TreeView"/> control.
+    ///  </para>
+    ///  <para>
+    ///   <c>0.0f</c> keeps the legacy <see cref="ItemHeight"/> behavior, including the managed <c>FontHeight + 3</c>
+    ///   estimate and the default even-height rounding. <c>1.0f</c> opts in to a row height derived from the live
+    ///   <see cref="Control.Font"/> height with <c>TVS_NONEVENHEIGHT</c> enabled. Other positive values scale the
+    ///   honest base for denser or airier rows.
+    ///  </para>
+    ///  <para>
+    ///   The factor is dimensionless. The resulting pixels scale with <see cref="Control.Font"/>, whose height already
+    ///   carries the current DPI, so the factor itself does not scale with DPI.
+    ///  </para>
+    ///  <para>
+    ///   "Leading" (pronounced "ledding") is a typesetting term from the strips of lead metal once placed between
+    ///   lines of type to add vertical spacing; it is unrelated to leading or guiding.
+    ///  </para>
+    /// </remarks>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  The value is negative or not finite.
+    /// </exception>
+    [SRCategory(nameof(SR.CatAppearance))]
+    [DefaultValue(0.0f)]
+    [SRDescription(nameof(SR.TreeViewNodeLeadingDescr))]
+    public float NodeLeading
+    {
+        get => Properties.GetValueOrDefault(s_nodeLeadingProperty, 0.0f);
+        set
+        {
+            if (!float.IsFinite(value))
+            {
+                throw new ArgumentOutOfRangeException(nameof(value));
+            }
+
+            ArgumentOutOfRangeException.ThrowIfNegative(value);
+
+            float oldValue = NodeLeading;
+            if (oldValue != value)
+            {
+                bool oldUsesNodeLeading = oldValue != 0.0f;
+                bool newUsesNodeLeading = value != 0.0f;
+
+                Properties.AddOrRemoveValue(s_nodeLeadingProperty, value, defaultValue: 0.0f);
+
+                if (IsHandleCreated)
+                {
+                    if (oldUsesNodeLeading != newUsesNodeLeading)
+                    {
+                        RecreateHandle();
+                    }
+                    else if (newUsesNodeLeading)
+                    {
+                        ApplyItemHeightFromCurrentSettings();
+                    }
+                }
+
+                OnNodeLeadingChanged(EventArgs.Empty);
+            }
+        }
+    }
+#endif
+
     /// <summary>
     ///  The height of every item in the tree view, in pixels.
     /// </summary>
@@ -769,6 +873,18 @@ public int ItemHeight
     {
         get
         {
+#if NET11_0_OR_GREATER
+            if (UsesNodeLeading)
+            {
+                if (IsHandleCreated)
+                {
+                    return (int)PInvokeCore.SendMessage(this, PInvoke.TVM_GETITEMHEIGHT);
+                }
+
+                return GetNodeLeadingItemHeight();
+            }
+#endif
+
             if (_itemHeight != -1)
             {
                 return _itemHeight;
@@ -798,21 +914,28 @@ public int ItemHeight
                 _itemHeight = value;
                 if (IsHandleCreated)
                 {
-                    if (_itemHeight % 2 != 0)
+                    if (UsesNodeLeading)
                     {
-                        _setOddHeight = true;
-                        try
-                        {
-                            RecreateHandle();
-                        }
-                        finally
+                        ApplyItemHeightFromCurrentSettings();
+                    }
+                    else
+                    {
+                        if (_itemHeight % 2 != 0)
                         {
-                            _setOddHeight = false;
+                            _setOddHeight = true;
+                            try
+                            {
+                                RecreateHandle();
+                            }
+                            finally
+                            {
+                                _setOddHeight = false;
+                            }
                         }
-                    }
 
-                    PInvokeCore.SendMessage(this, PInvoke.TVM_SETITEMHEIGHT, (WPARAM)value);
-                    _itemHeight = (int)PInvokeCore.SendMessage(this, PInvoke.TVM_GETITEMHEIGHT);
+                        PInvokeCore.SendMessage(this, PInvoke.TVM_SETITEMHEIGHT, (WPARAM)value);
+                        _itemHeight = (int)PInvokeCore.SendMessage(this, PInvoke.TVM_GETITEMHEIGHT);
+                    }
                 }
             }
         }
@@ -1481,6 +1604,19 @@ public event EventHandler? RightToLeftLayoutChanged
         remove => _onRightToLeftLayoutChanged -= value;
     }
 
+#if NET11_0_OR_GREATER
+    /// <summary>
+    ///  Occurs when the value of <see cref="NodeLeading"/> changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.TreeViewOnNodeLeadingChangedDescr))]
+    public event EventHandler? NodeLeadingChanged
+    {
+        add => _onNodeLeadingChanged += value;
+        remove => _onNodeLeadingChanged -= value;
+    }
+#endif
+
     /// <summary>
     ///  Disables redrawing of the tree view. A call to beginUpdate() must be
     ///  balanced by a following call to endUpdate(). Following a call to
@@ -1796,6 +1932,16 @@ private void StateImageListChangedHandle(object? sender, EventArgs e)
         }
     }
 
+#if NET11_0_OR_GREATER
+    private void HandleNodeLeadingMetricChanged(object? sender, EventArgs e)
+    {
+        if (UsesNodeLeading)
+        {
+            ApplyItemHeightFromCurrentSettings();
+        }
+    }
+#endif
+
     /// <summary>
     ///  Overridden to handle RETURN key.
     /// </summary>
@@ -1913,10 +2059,7 @@ protected override void OnHandleCreated(EventArgs e)
             PInvokeCore.SendMessage(this, PInvoke.TVM_SETINDENT, (WPARAM)_indent);
         }
 
-        if (_itemHeight != -1)
-        {
-            PInvokeCore.SendMessage(this, PInvoke.TVM_SETITEMHEIGHT, (WPARAM)ItemHeight);
-        }
+        ApplyItemHeightFromCurrentSettings();
 
         // Essentially we are setting the width to be infinite so that the
         // TreeView never thinks it needs a scrollbar when the first node is created
@@ -1954,6 +2097,7 @@ protected override void OnHandleCreated(EventArgs e)
                     flags);
             }
         }
+
         finally
         {
             _treeViewState[TREEVIEWSTATE_stopResizeWindowMsgs] = false;
@@ -2319,6 +2463,23 @@ protected virtual void OnRightToLeftLayoutChanged(EventArgs e)
         _onRightToLeftLayoutChanged?.Invoke(this, e);
     }
 
+#if NET11_0_OR_GREATER
+    /// <summary>
+    ///  Raises the <see cref="NodeLeadingChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    protected virtual void OnNodeLeadingChanged(EventArgs e)
+    {
+        if (GetAnyDisposingInHierarchy())
+        {
+            return;
+        }
+
+        _onNodeLeadingChanged?.Invoke(this, e);
+    }
+#endif
+
     // Refresh the nodes by clearing the tree and adding the nodes back again
     //
     private void RefreshNodes()
@@ -2349,6 +2510,13 @@ private void ResetItemHeight()
         RecreateHandle();
     }
 
+#if NET11_0_OR_GREATER
+    /// <summary>
+    ///  This resets the node leading factor to the legacy default.
+    /// </summary>
+    private void ResetNodeLeading() => NodeLeading = 0.0f;
+#endif
+
     /// <summary>
     ///  Retrieves true if the indent should be persisted in code gen.
     /// </summary>
@@ -2359,6 +2527,10 @@ private void ResetItemHeight()
     /// </summary>
     private bool ShouldSerializeItemHeight() => (_itemHeight != -1);
 
+#if NET11_0_OR_GREATER
+    private bool ShouldSerializeNodeLeading() => Properties.ContainsKey(s_nodeLeadingProperty);
+#endif
+
     private bool ShouldSerializeSelectedImageIndex()
     {
         if (_imageList is not null)
@@ -2379,6 +2551,51 @@ private bool ShouldSerializeImageIndex()
         return ImageIndex != ImageList.Indexer.DefaultIndex;
     }
 
+    private void ApplyItemHeightFromCurrentSettings()
+    {
+        if (!IsHandleCreated)
+        {
+            return;
+        }
+
+#if NET11_0_OR_GREATER
+        if (UsesNodeLeading)
+        {
+            int itemHeight = GetNodeLeadingItemHeight();
+            if ((int)PInvokeCore.SendMessage(this, PInvoke.TVM_GETITEMHEIGHT) != itemHeight)
+            {
+                PInvokeCore.SendMessage(this, PInvoke.TVM_SETITEMHEIGHT, (WPARAM)itemHeight);
+            }
+
+            return;
+        }
+#endif
+
+        if (_itemHeight != -1)
+        {
+            PInvokeCore.SendMessage(this, PInvoke.TVM_SETITEMHEIGHT, (WPARAM)ItemHeight);
+        }
+    }
+
+#if NET11_0_OR_GREATER
+    private int GetNodeLeadingItemHeight()
+    {
+        double itemHeight = Math.Ceiling(NodeLeading * Font.Height);
+
+        if (itemHeight < 1)
+        {
+            return 1;
+        }
+
+        if (itemHeight >= short.MaxValue)
+        {
+            return short.MaxValue - 1;
+        }
+
+        return (int)itemHeight;
+    }
+#endif
+
     /// <summary>
     ///  Updated the sorted order
     /// </summary>

From 59869f70eee50d40c3e2634a5413ba34c4b7d78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 17:45:47 -0700
Subject: [PATCH 08/50] Add TreeView.NodeLeading tests

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../System/Windows/Forms/TreeViewTests.cs     | 256 ++++++++++++++++++
 1 file changed, 256 insertions(+)

diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/TreeViewTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/TreeViewTests.cs
index 230d7b81490..74f0944d9b5 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/TreeViewTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/TreeViewTests.cs
@@ -2731,6 +2731,258 @@ public void ItemHeight_Get_ReturnsExpected(Font font, bool checkBoxes, TreeViewD
         Assert.Equal(expectedHeight, treeView.ItemHeight);
     }
 
+#if NET11_0_OR_GREATER
+    public static IEnumerable<object[]> NodeLeading_Set_TestData()
+    {
+        yield return new object[] { 0.25f };
+        yield return new object[] { 1.0f };
+        yield return new object[] { 1.25f };
+    }
+
+    public static IEnumerable<object[]> NodeLeading_SetWithHandle_TestData()
+    {
+        yield return new object[] { 1.0f };
+        yield return new object[] { 1.25f };
+    }
+
+    public static IEnumerable<object[]> NodeLeading_SetInvalid_TestData()
+    {
+        yield return new object[] { -0.1f };
+        yield return new object[] { float.NaN };
+        yield return new object[] { float.PositiveInfinity };
+        yield return new object[] { float.NegativeInfinity };
+    }
+
+    [WinFormsFact]
+    public void TreeView_NodeLeading_DefaultValue()
+    {
+        using SubTreeView control = new();
+
+        Assert.Equal(0.0f, control.NodeLeading);
+        Assert.Equal(0, control.CreateParams.Style & (int)PInvoke.TVS_NONEVENHEIGHT);
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsTheory]
+    [MemberData(nameof(ItemHeight_Get_TestData))]
+    public void TreeView_NodeLeadingDefault_ItemHeightGet_ReturnsLegacyExpected(Font font, bool checkBoxes, TreeViewDrawMode drawMode, int expectedHeight)
+    {
+        using TreeView control = new()
+        {
+            Font = font,
+            CheckBoxes = checkBoxes,
+            DrawMode = drawMode,
+            NodeLeading = 0.0f
+        };
+
+        Assert.Equal(expectedHeight, control.ItemHeight);
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsTheory]
+    [MemberData(nameof(NodeLeading_Set_TestData))]
+    public void TreeView_NodeLeading_Set_GetReturnsExpected(float value)
+    {
+        using SubTreeView control = new()
+        {
+            NodeLeading = value
+        };
+
+        Assert.Equal(value, control.NodeLeading);
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(control.Font, value), control.ItemHeight);
+        Assert.Equal((int)PInvoke.TVS_NONEVENHEIGHT, control.CreateParams.Style & (int)PInvoke.TVS_NONEVENHEIGHT);
+        Assert.False(control.IsHandleCreated);
+
+        control.NodeLeading = value;
+        Assert.Equal(value, control.NodeLeading);
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(control.Font, value), control.ItemHeight);
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsTheory]
+    [MemberData(nameof(NodeLeading_SetWithHandle_TestData))]
+    public void TreeView_NodeLeading_SetWithHandle_GetReturnsExpected(float value)
+    {
+        using SubTreeView control = new();
+        Assert.NotEqual(IntPtr.Zero, control.Handle);
+        int invalidatedCallCount = 0;
+        control.Invalidated += (sender, e) => invalidatedCallCount++;
+        int styleChangedCallCount = 0;
+        control.StyleChanged += (sender, e) => styleChangedCallCount++;
+        int createdCallCount = 0;
+        control.HandleCreated += (sender, e) => createdCallCount++;
+
+        control.NodeLeading = value;
+        Assert.Equal(value, control.NodeLeading);
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(control.Font, value), control.ItemHeight);
+        Assert.Equal((int)PInvoke.TVS_NONEVENHEIGHT, control.CreateParams.Style & (int)PInvoke.TVS_NONEVENHEIGHT);
+        Assert.True(control.IsHandleCreated);
+        Assert.Equal(0, invalidatedCallCount);
+        Assert.Equal(0, styleChangedCallCount);
+        Assert.Equal(1, createdCallCount);
+
+        control.NodeLeading = value;
+        Assert.Equal(value, control.NodeLeading);
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(control.Font, value), control.ItemHeight);
+        Assert.True(control.IsHandleCreated);
+        Assert.Equal(0, invalidatedCallCount);
+        Assert.Equal(0, styleChangedCallCount);
+        Assert.Equal(1, createdCallCount);
+    }
+
+    [WinFormsTheory]
+    [MemberData(nameof(NodeLeading_SetInvalid_TestData))]
+    public void TreeView_NodeLeading_SetInvalid_ThrowsArgumentOutOfRangeException(float value)
+    {
+        using TreeView control = new();
+        Assert.Throws<ArgumentOutOfRangeException>("value", () => control.NodeLeading = value);
+    }
+
+    [WinFormsFact]
+    public void TreeView_NodeLeading_SetWithHandler_CallsNodeLeadingChanged()
+    {
+        using TreeView control = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(control, sender);
+            Assert.Same(EventArgs.Empty, e);
+            callCount++;
+        };
+
+        control.NodeLeadingChanged += handler;
+
+        control.NodeLeading = 1.0f;
+        Assert.Equal(1, callCount);
+
+        control.NodeLeading = 1.0f;
+        Assert.Equal(1, callCount);
+
+        control.NodeLeading = 1.25f;
+        Assert.Equal(2, callCount);
+
+        control.NodeLeadingChanged -= handler;
+        control.NodeLeading = 0.0f;
+        Assert.Equal(2, callCount);
+    }
+
+    [WinFormsTheory]
+    [NewAndDefaultData<EventArgs>]
+    public void TreeView_OnNodeLeadingChanged_Invoke_CallsNodeLeadingChanged(EventArgs eventArgs)
+    {
+        using SubTreeView control = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(control, sender);
+            Assert.Same(eventArgs, e);
+            callCount++;
+        };
+
+        control.NodeLeadingChanged += handler;
+        control.OnNodeLeadingChanged(eventArgs);
+        Assert.Equal(1, callCount);
+        Assert.False(control.IsHandleCreated);
+
+        control.NodeLeadingChanged -= handler;
+        control.OnNodeLeadingChanged(eventArgs);
+        Assert.Equal(1, callCount);
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsFact]
+    public void TreeView_NodeLeading_PrecedesItemHeightWithHandle()
+    {
+        using SubTreeView control = new()
+        {
+            ItemHeight = 42
+        };
+        Assert.NotEqual(IntPtr.Zero, control.Handle);
+        int createdCallCount = 0;
+        control.HandleCreated += (sender, e) => createdCallCount++;
+
+        control.NodeLeading = 1.0f;
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(control.Font, 1.0f), control.ItemHeight);
+        Assert.Equal((int)PInvoke.TVS_NONEVENHEIGHT, control.CreateParams.Style & (int)PInvoke.TVS_NONEVENHEIGHT);
+        Assert.Equal(1, createdCallCount);
+
+        control.ItemHeight = 24;
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(control.Font, 1.0f), control.ItemHeight);
+        Assert.Equal(1, createdCallCount);
+
+        control.NodeLeading = 0.0f;
+        Assert.Equal(24, control.ItemHeight);
+        Assert.Equal(0, control.CreateParams.Style & (int)PInvoke.TVS_NONEVENHEIGHT);
+        Assert.Equal(2, createdCallCount);
+    }
+
+    [WinFormsFact]
+    public void TreeView_NodeLeading_SetFontWithHandle_UpdatesItemHeight()
+    {
+        using Font initialFont = new(FontFamily.GenericSansSerif, 8.0f);
+        using Font updatedFont = new(FontFamily.GenericSansSerif, 20.0f);
+        using TreeView control = new()
+        {
+            Font = initialFont,
+            NodeLeading = 1.25f
+        };
+        Assert.NotEqual(IntPtr.Zero, control.Handle);
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(initialFont, 1.25f), control.ItemHeight);
+
+        control.Font = updatedFont;
+        Assert.Equal(GetExpectedNodeLeadingItemHeight(updatedFont, 1.25f), control.ItemHeight);
+    }
+
+    [WinFormsFact]
+    public void TreeView_ResetNodeLeading_Invoke_Success()
+    {
+        using TreeView treeView = new()
+        {
+            NodeLeading = 1.25f
+        };
+
+        var accessor = treeView.TestAccessor;
+        accessor.Dynamic.ResetNodeLeading();
+
+        Assert.Equal(0.0f, treeView.NodeLeading);
+    }
+
+    [WinFormsFact]
+    public void TreeView_ShouldSerializeNodeLeading_Invoke_ReturnsExpected()
+    {
+        using TreeView treeView = new();
+
+        var accessor = treeView.TestAccessor;
+        bool result = accessor.Dynamic.ShouldSerializeNodeLeading();
+        Assert.False(result);
+
+        treeView.NodeLeading = 1.25f;
+        result = accessor.Dynamic.ShouldSerializeNodeLeading();
+        Assert.True(result);
+
+        accessor.Dynamic.ResetNodeLeading();
+        result = accessor.Dynamic.ShouldSerializeNodeLeading();
+        Assert.False(result);
+    }
+
+    private static int GetExpectedNodeLeadingItemHeight(Font font, float nodeLeading)
+    {
+        double itemHeight = Math.Ceiling(nodeLeading * font.Height);
+
+        if (itemHeight < 1)
+        {
+            return 1;
+        }
+
+        if (itemHeight >= short.MaxValue)
+        {
+            return short.MaxValue - 1;
+        }
+
+        return (int)itemHeight;
+    }
+#endif
+
     public static IEnumerable<object[]> ItemHeight_Set_TestData()
     {
         yield return new object[] { -1, Control.DefaultFont.Height + 3 };
@@ -7671,6 +7923,10 @@ private class SubTreeView : TreeView
 
         public new void OnNodeMouseDoubleClick(TreeNodeMouseClickEventArgs e) => base.OnNodeMouseDoubleClick(e);
 
+#if NET11_0_OR_GREATER
+        public new void OnNodeLeadingChanged(EventArgs e) => base.OnNodeLeadingChanged(e);
+#endif
+
         public new void OnNodeMouseHover(TreeNodeMouseHoverEventArgs e) => base.OnNodeMouseHover(e);
 
         public new void OnRightToLeftLayoutChanged(EventArgs e) => base.OnRightToLeftLayoutChanged(e);

From d85ab158ca2c71ef9d0e2fbadea1eacbc7c5f5fd Mon Sep 17 00:00:00 2001
From: Klaus Loffelmann <klloeffe@microsoft.com>
Date: Wed, 20 May 2026 13:53:19 -0700
Subject: [PATCH 09/50] Add the prompts for the new
 Suspend-Positioning-Painting-Form-Apearance API.

---
 Winforms.sln                                  |  3 -
 .../Create-Github-API-Proposal-Prompt.md      |  0
 ...elocationAndPainting-API-Feature-Prompt.md | 76 +++++++++++++++++++
 3 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/Create-Github-API-Proposal-Prompt.md
 create mode 100644 docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/SuspendRelocationAndPainting-API-Feature-Prompt.md

diff --git a/Winforms.sln b/Winforms.sln
index fef423d18a4..b469fab8e51 100644
--- a/Winforms.sln
+++ b/Winforms.sln
@@ -197,9 +197,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Windows.GdiPlus", "src\System.Private.Windows.GdiPlus\System.Private.Windows.GdiPlus.csproj", "{442C867C-51C0-8CE5-F067-DF065008E3DA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Copilot", "Copilot", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-	ProjectSection(SolutionItems) = preProject
-		.github\copilot-instructions.md = .github\copilot-instructions.md
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GDI", "GDI", "{D619FF8C-D99A-48AB-B16B-2F0E819B46D5}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/Create-Github-API-Proposal-Prompt.md b/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/Create-Github-API-Proposal-Prompt.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/SuspendRelocationAndPainting-API-Feature-Prompt.md b/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/SuspendRelocationAndPainting-API-Feature-Prompt.md
new file mode 100644
index 00000000000..bcff8090eff
--- /dev/null
+++ b/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/SuspendRelocationAndPainting-API-Feature-Prompt.md
@@ -0,0 +1,76 @@
+# Copilot Prompt 2 — Implement the flicker-free UI mutation APIs
+
+## Prerequisite
+
+This prompt consumes the **approved API suggestion** produced by Prompt 1 (and refined
+through API review). Before implementing, read that proposal in full and treat its final
+`API Proposal` section as the contract. Where the approved proposal and this prompt
+disagree, the **approved proposal wins** — note any such conflict explicitly rather than
+silently picking one.
+
+## Your task
+
+Implement the three sub-features in **dotnet/winforms**, production quality, against the
+approved API surface. You have engineering latitude on *internals* — the public surface
+is fixed by the proposal, the implementation is yours to do well.
+
+## Scope
+
+### A — `ISupportSuspendPainting` / `ISupportSuspendRelocation`
+- The two interfaces, `System.Windows.Forms` namespace.
+- `Control` implementation: refcounted painting suspension; lazy refcount state via the
+  existing property-store slot pattern (follow the established `Control` precedent — do
+  not add an eager field). Layout-suspension methods forward to existing
+  `SuspendLayout` / `ResumeLayout`.
+- Overrides on `ListView`, `ListBox`, `ComboBox`, `TreeView`, `RichTextBox` forwarding
+  the painting methods to their existing `BeginUpdate` / `EndUpdate`. The existing public
+  `BeginUpdate` / `EndUpdate` signatures and behavior MUST NOT change.
+- The user-facing scope type(s) and extension methods, exactly as the approved proposal
+  specifies them (`ref struct` vs `class` per the proposal's final decision).
+- Unbalanced `End*` must match `ResumeLayout` precedent (the proposal will have settled
+  throw-vs-no-op; follow it).
+
+### B — `DeferLocationChange` + `DeferWindowPos` batching
+- The scope and its overloads per the approved proposal.
+- Win32 batching via `BeginDeferWindowPos` / `DeferWindowPos` / `EndDeferWindowPos`.
+  Capture and thread the returned `HDWP` correctly on every `DeferWindowPos` call.
+- `Dispose` must handle a `NULL` HDWP coherently and must not leak on exception unwind.
+- Compose paint suppression from sub-feature A; do not duplicate `WM_SETREDRAW` logic.
+
+### C — `Application.SetFormAppearanceMode` + `FormAppearanceMode`
+- The enum (`Classic = 0`, `Deferred = 1`) and the `Application` configuration API.
+- `Deferred` is the runtime default when the API is never called; `Classic` restores
+  pre-.NET 11 behavior.
+- DWM cloaking at top-level form handle creation; uncloak per the timing strategy the
+  approved proposal settled on.
+- Must be inert / safe when the OS does not support the relevant DWM attributes.
+
+## Engineering requirements
+
+- Target the C# language version and runtime of the current dotnet/winforms `main`.
+- NRTs enabled; assume the repo's global usings.
+- Match dotnet/winforms code style, P/Invoke conventions (CsWin32-generated `PInvoke`
+  surface), and the existing interop patterns — do not hand-roll `DllImport` if a
+  generated entry point exists.
+- All public API gets XML docs. For `FormAppearanceMode.Deferred`, the flash-elimination
+  benefit goes in `<summary>`; the "background only, deep child trees may still update"
+  caveat goes in `<remarks>`.
+- Public API additions require matching entries in the `*.cs` reference-assembly /
+  public-API-baseline files the repo uses.
+- Thread affinity: all of this assumes the UI thread; add debug assertions where the
+  repo already does, and do not let them affect release behavior.
+
+## Tests
+
+- Unit tests for refcount balance, including nesting and unbalanced-`End`.
+- Tests that `ListView` et al. route through their native path and do not double-suspend.
+- Tests for `DeferLocationChange` correctness including the `NULL`-HDWP fallback and
+  exception-unwind path.
+- For `FormAppearanceMode`, tests for `Classic` (no behavior change) and `Deferred`
+  (cloak/uncloak lifecycle), plus the OS-unsupported fallback.
+
+## Deliverable
+
+A pull request (or a clear set of commits) implementing the above, with a PR description
+that summarizes the change, links the API suggestion, and calls out any place the
+implementation revealed a problem with the approved design that review should revisit.

From ba281ad943350ed379dc901d6bfbe0c9820c787d Mon Sep 17 00:00:00 2001
From: Klaus Loffelmann <klloeffe@microsoft.com>
Date: Wed, 20 May 2026 14:38:34 -0700
Subject: [PATCH 10/50] Add flicker-free mutation API proposal prompt

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Create-Github-API-Proposal-Prompt.md      | 155 ++++++++++++++++++
 1 file changed, 155 insertions(+)

diff --git a/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/Create-Github-API-Proposal-Prompt.md b/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/Create-Github-API-Proposal-Prompt.md
index e69de29bb2d..bc73ee83449 100644
--- a/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/Create-Github-API-Proposal-Prompt.md
+++ b/docs/Feature-Prompts/SuspendRelocationPaintingFlashPreventing/Create-Github-API-Proposal-Prompt.md
@@ -0,0 +1,155 @@
+# Copilot Prompt 1 — Author the WinForms API Suggestion (GitHub issue)
+
+## Your task
+
+Write a complete API suggestion for the **dotnet/winforms** repository, ready to be filed
+as a GitHub issue with the `api-suggestion` label. The issue covers one cohesive feature
+area — *flicker-free UI mutation in WinForms* — composed of **three severable sub-features**.
+
+You are not transcribing a settled spec. You are an experienced WinForms/.NET API designer
+collaborating on this. The sections below give you **settled facts** and **current thinking
+with reasoning**. Treat them differently (see "How to treat this briefing").
+
+## How to treat this briefing
+
+- **Settled — do not change:** the three sub-features and their scope; the public API
+  *names* and *enum values* listed under "Settled API surface" below. These were
+  argued through already.
+- **Current thinking — challenge freely:** every *mechanism*, *risk framing*,
+  *implementation strategy*, and *open question* below is our current lean with our
+  reasoning attached. If you find a stronger argument, pivot — and say why. Pitch
+  approaches as approaches, not gospel. We expect the API review board (and likely
+  Stephen Toub) to pressure-test the mechanism choices; pre-empt that.
+- **Actively look for what we missed.** Compatibility hazards, interaction with existing
+  WinForms subsystems (data binding, `BindingSource`, `TableLayoutPanel`, MDI, DPI
+  changes, `Control.RecreateHandle`, accessibility/UIA, designer surface), threading,
+  trimming/AOT. If something here is wrong or naive, the most useful thing you can do
+  is say so.
+
+## Deliverable
+
+A single Markdown document structured as a fileable `api-suggestion` issue, using exactly
+these sections (this is the dotnet/winforms house format):
+
+- `## Rationale`
+- `## API Proposal` (C# signatures in fenced blocks, `namespace` declared)
+- `## API Usage`
+- `## Alternative Designs`
+- `## Risks`
+- `## Will this feature affect UI controls?`
+- `### Status Checklist` (the standard api-suggestion checklist)
+
+If during drafting you conclude the three sub-features should be filed as separate issues
+rather than one, say so explicitly at the top and structure accordingly — that is a
+legitimate pivot.
+
+---
+
+## Sub-feature A — `ISupportSuspendPainting` / `ISupportSuspendRelocation`
+
+### Settled API surface
+- Two free-standing public interfaces, `System.Windows.Forms` namespace:
+  `ISupportSuspendPainting` with `BeginSuspendPainting()` / `EndSuspendPainting()`;
+  `ISupportSuspendRelocation` with `BeginSuspendRelocation()` / `EndSuspendRelocation()`.
+- `Control` implements both.
+- `ListView`, `ListBox`, `ComboBox`, `TreeView`, `RichTextBox` override the *painting*
+  methods to forward to their existing public `BeginUpdate` / `EndUpdate` (which remain
+  unchanged in shape and behavior — source and binary compat).
+- User-facing scope objects + extension methods (`SuspendPainting()`,
+  `SuspendRelocation()`).
+
+### Current thinking — challenge freely
+- **Default `Control` painting suspension** via `WM_SETREDRAW`, refcounted; resume edge
+  calls `Invalidate(true)`. Layout suspension forwards to existing
+  `SuspendLayout` / `ResumeLayout`.
+- **Refcount state** lives lazily on `Control` via the existing property-store slot
+  pattern (zero cost until used). We considered default interface methods to avoid
+  touching `Control`; rejected because `WM_SETREDRAW` is not reentrant and DIMs cannot
+  hold per-instance state without a `ConditionalWeakTable` indirection that is strictly
+  worse. Re-test this conclusion.
+- **Not tied to `IArrangedElement`** — deliberately. `IArrangedElement` is internal, and
+  `ToolStripItem` (an implementer) has no meaningful painting-suspension story. Future
+  HWND-less "visuals" should implement these interfaces directly with their own
+  mechanism. Evaluate whether the *relocation* interface specifically has a better home.
+- **Scope type — our lean, expect pushback:** make the scopes `readonly ref struct`
+  (pattern-based `Dispose`, works with `using`) rather than `class : IDisposable`.
+  Reasoning: `ref struct` makes "forgot the `using`" / leaked-scope a *compile error*,
+  which is what lets us honestly downgrade the unbalanced-refcount risk. Tradeoff: no
+  `async`/iterator/lambda-capture/field storage, and you lose polymorphic `IDisposable`
+  return. We think that tradeoff is fine for synchronous "mutate now" code paths.
+  **This is a recommendation we expect to be pressure-tested in review — present both
+  options with the tradeoff and recommend, do not assert.**
+- **Refcount risk framing:** even with `ref struct` scopes, the interface methods stay
+  `public` (designer-generated `InitializeComponent` must call them, and that code lives
+  in the user's assembly). So a developer *can* call them directly. The honest claim is
+  "the ergonomic path makes imbalance hard to hit accidentally; the refcount remains the
+  correctness backstop" — not "the risk is eliminated." Nested scopes are supported by
+  design, so the counter is necessary regardless.
+
+## Sub-feature B — `DeferLocationChange` + `DeferWindowPos` batching
+
+### Settled API surface
+- A recommended user-facing entry point `DeferLocationChange()` returning a disposable
+  scope, with multi-arg overloads to opt out of individual bundled behaviors
+  (`suppressRender`, `suspendLayout`).
+
+### Current thinking — challenge freely
+- The scope bundles three things for a "I'm about to move many children" code path:
+  Win32 `BeginDeferWindowPos` / `DeferWindowPos` / `EndDeferWindowPos` batching;
+  `SuspendLayout` / `ResumeLayout`; and paint suppression (compose this from
+  sub-feature A rather than duplicating `WM_SETREDRAW` logic).
+- **Perf claim — be precise, do not overclaim.** `DeferWindowPos` improves *throughput*:
+  one synchronized native move pass instead of N `SetWindowPos` calls, each with its own
+  `WM_WINDOWPOSCHANGED`/`WM_SIZE`/invalidation/intermediate repaint. The
+  `SuspendLayout` bundling separately improves *computation*: N `PerformLayout`
+  invocations collapse to one. Neither speeds up the `LayoutEngine` algorithm itself.
+  The proposal must keep these two wins distinct and must NOT claim "the layout engine
+  got faster."
+- **`HDWP` lifetime is the sharpest mechanical edge.** `BeginDeferWindowPos` allocates;
+  each `DeferWindowPos` *returns a new HDWP* (must be captured/threaded); on failure it
+  returns `NULL` and the *entire batch is lost*. The scope's `Dispose` must handle a
+  `NULL` HDWP coherently (fall back to individual `SetWindowPos`, or abort cleanly —
+  never `EndDeferWindowPos` on `NULL`) and must not leak a half-built HDWP if an
+  exception unwinds through the `using` body. This deserves its own risk bullet.
+- Same `ref struct` recommendation as A applies to this scope. Note: if the scope is
+  `ref struct` it cannot be returned as `IDisposable` — evaluate whether the
+  multi-overload story still works (it should; `using` is pattern-based).
+
+## Sub-feature C — `Application.SetFormAppearanceMode` (deferred form display)
+
+### Settled API surface
+- `Application.SetFormAppearanceMode(FormAppearanceMode mode)` — process-wide
+  configuration API, called early (before the first form), consistent in pattern and
+  lifecycle with `Application.SetColorMode` and `Application.SetHighDpiMode`.
+- `enum FormAppearanceMode { Classic = 0, Deferred = 1 }`.
+- `Classic` = pre-.NET 11 behavior (opt-out). `Deferred` = .NET 11 default.
+- Note the deliberate split: `Classic` is the enum's *zero value* (conservative
+  `default`), while `Deferred` is the *runtime default* applied when the API is never
+  called. Call this out so review does not read it as a contradiction.
+
+### Current thinking — challenge freely
+- Mechanism: cloak top-level forms via DWM (`DWMWA_CLOAK`) at handle creation, uncloak
+  once the background has been painted, so the form is revealed in one step instead of
+  flashing a default (white) background — most visible in dark mode.
+- **Uncloak timing is genuinely open — this is the part most likely to need a better
+  idea.** Our naive lean is "uncloak after the first `WM_PAINT` that paints the form
+  background." Uncloak too early → still flashes; too late → window appears slow to
+  open. Unlike Edge, WinForms has no single universal "first real frame ready" signal —
+  it depends on double-buffering, custom `OnPaintBackground`, late-painting child
+  controls. Evaluate alternatives and recommend; flag remaining uncertainty honestly.
+- **Honesty caveat that must survive into the docs:** deferral applies to the *form
+  background*. A deep tree of late-painting child controls can still produce visible
+  updates after reveal. The XML doc / proposal must state this so a late-child blink is
+  not later mis-filed as a regression. (The flash-elimination benefit belongs in the
+  XML `<summary>`; the caveat in `<remarks>`.)
+- Evaluate interaction with: MDI child forms, `Form.Show` vs `ShowDialog`, splash
+  screens / forms that *want* to appear instantly, owned/tool windows, per-monitor DPI
+  changes during creation, and `Form.Opacity` / layered windows.
+
+## Filing instruction
+
+If your final assessment is that the design is sound, produce the issue body ready to
+file with the `api-suggestion` label. If you found a reason to pivot on anything outside
+the settled API surface, lead with a short "Deviations from the briefing" note
+explaining what you changed and why, then give the proposal. Either way, the proposal
+itself is the deliverable.

From e4e094846cdfb2466f362bf000c1deca9f371ae0 Mon Sep 17 00:00:00 2001
From: Klaus Loffelmann <klloeffe@microsoft.com>
Date: Wed, 20 May 2026 14:38:45 -0700
Subject: [PATCH 11/50] Add flicker-free UI mutation APIs

Implements suspend painting and relocation scopes, deferred child positioning, and form appearance mode infrastructure for .NET 11.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/NativeMethods.txt                     |   6 +-
 .../PublicAPI.Unshipped.txt                   |  50 +++-
 .../System/Windows/Forms/Application.cs       |  40 ++++
 .../Windows/Forms/Control.SuspendMutation.cs  | 105 +++++++++
 .../System/Windows/Forms/Control.cs           |  28 ++-
 .../Forms/ControlMutationExtensions.cs        |  28 +++
 .../ComboBox/ComboBox.SuspendMutation.cs      |  25 ++
 .../ListBoxes/ListBox.SuspendMutation.cs      |  25 ++
 .../ListView/ListView.SuspendMutation.cs      |  25 ++
 .../RichTextBox.SuspendMutation.cs            |  25 ++
 .../TreeView/TreeView.SuspendMutation.cs      |  25 ++
 .../Windows/Forms/DeferLocationChangeScope.cs | 221 ++++++++++++++++++
 .../Windows/Forms/Form.AppearanceMode.cs      |  64 +++++
 .../System/Windows/Forms/Form.cs              |  16 ++
 .../Windows/Forms/FormAppearanceMode.cs       |  28 +++
 .../Windows/Forms/ISupportSuspendPainting.cs  |  22 ++
 .../Forms/ISupportSuspendRelocation.cs        |  22 ++
 .../Windows/Forms/SuspendPaintingScope.cs     |  29 +++
 .../Windows/Forms/SuspendRelocationScope.cs   |  29 +++
 19 files changed, 804 insertions(+), 9 deletions(-)
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/ControlMutationExtensions.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Form.AppearanceMode.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/FormAppearanceMode.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendPainting.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendRelocation.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs

diff --git a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
index a56634792b1..751a668cde2 100644
--- a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
+++ b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
@@ -7,6 +7,7 @@ ADVF
 AreDpiAwarenessContextsEqual
 ARW_*
 AUTOCOMPLETEOPTIONS
+BeginDeferWindowPos
 BFFM_*
 BIF_*
 BITMAP
@@ -62,6 +63,7 @@ DATETIMEPICK_CLASS
 DeactivateActCtx
 DefFrameProc
 DefMDIChildProc
+DeferWindowPos
 DESKTOP_ACCESS_FLAGS
 DestroyAcceleratorTable
 DestroyCursor
@@ -92,6 +94,7 @@ DTM_*
 DTN_*
 DTS_*
 DuplicateHandle
+DWMWINDOWATTRIBUTE
 DWM_WINDOW_CORNER_PREFERENCE
 DwmGetWindowAttribute
 DwmSetWindowAttribute
@@ -104,6 +107,7 @@ EN_*
 EnableMenuItem
 EnableScrollBar
 EnableWindow
+EndDeferWindowPos
 EndDialog
 ENM_*
 EnumDisplaySettings
@@ -697,4 +701,4 @@ WINEVENT_INCONTEXT
 WSF_VISIBLE
 XBUTTON1
 XBUTTON2
-XFORMCOORDS
\ No newline at end of file
+XFORMCOORDS
diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 0b3d7fac665..c5de23a9f99 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -11,4 +11,52 @@ virtual System.Windows.Forms.Form.OnSystemTextSizeChanged(System.EventArgs! e) -
 System.Windows.Forms.TreeView.NodeLeading.get -> float
 System.Windows.Forms.TreeView.NodeLeading.set -> void
 System.Windows.Forms.TreeView.NodeLeadingChanged -> System.EventHandler?
-virtual System.Windows.Forms.TreeView.OnNodeLeadingChanged(System.EventArgs! e) -> void
\ No newline at end of file
+virtual System.Windows.Forms.TreeView.OnNodeLeadingChanged(System.EventArgs! e) -> void
+System.Windows.Forms.ControlMutationExtensions
+static System.Windows.Forms.ControlMutationExtensions.SuspendPainting(this System.Windows.Forms.ISupportSuspendPainting! target) -> System.Windows.Forms.SuspendPaintingScope
+static System.Windows.Forms.ControlMutationExtensions.SuspendRelocation(this System.Windows.Forms.ISupportSuspendRelocation! target) -> System.Windows.Forms.SuspendRelocationScope
+System.Windows.Forms.FormAppearanceMode
+System.Windows.Forms.FormAppearanceMode.Classic = 0 -> System.Windows.Forms.FormAppearanceMode
+System.Windows.Forms.FormAppearanceMode.Deferred = 1 -> System.Windows.Forms.FormAppearanceMode
+System.Windows.Forms.ISupportSuspendPainting
+System.Windows.Forms.ISupportSuspendPainting.BeginSuspendPainting() -> void
+System.Windows.Forms.ISupportSuspendPainting.EndSuspendPainting() -> void
+System.Windows.Forms.ISupportSuspendRelocation
+System.Windows.Forms.ISupportSuspendRelocation.BeginSuspendRelocation() -> void
+System.Windows.Forms.ISupportSuspendRelocation.EndSuspendRelocation() -> void
+System.Windows.Forms.SuspendPaintingScope
+System.Windows.Forms.SuspendPaintingScope.Dispose() -> void
+System.Windows.Forms.SuspendPaintingScope.SuspendPaintingScope() -> void
+System.Windows.Forms.SuspendPaintingScope.SuspendPaintingScope(System.Windows.Forms.ISupportSuspendPainting? target) -> void
+System.Windows.Forms.SuspendRelocationScope
+System.Windows.Forms.SuspendRelocationScope.Dispose() -> void
+System.Windows.Forms.SuspendRelocationScope.SuspendRelocationScope() -> void
+System.Windows.Forms.SuspendRelocationScope.SuspendRelocationScope(System.Windows.Forms.ISupportSuspendRelocation? target) -> void
+override System.Windows.Forms.ComboBox.BeginSuspendPainting() -> void
+override System.Windows.Forms.ComboBox.EndSuspendPainting() -> void
+override System.Windows.Forms.ListBox.BeginSuspendPainting() -> void
+override System.Windows.Forms.ListBox.EndSuspendPainting() -> void
+override System.Windows.Forms.ListView.BeginSuspendPainting() -> void
+override System.Windows.Forms.ListView.EndSuspendPainting() -> void
+override System.Windows.Forms.RichTextBox.BeginSuspendPainting() -> void
+override System.Windows.Forms.RichTextBox.EndSuspendPainting() -> void
+override System.Windows.Forms.TreeView.BeginSuspendPainting() -> void
+override System.Windows.Forms.TreeView.EndSuspendPainting() -> void
+static System.Windows.Forms.Application.FormAppearanceMode.get -> System.Windows.Forms.FormAppearanceMode
+static System.Windows.Forms.Application.SetFormAppearanceMode(System.Windows.Forms.FormAppearanceMode mode) -> void
+System.Windows.Forms.Control.DeferLocationChange() -> System.Windows.Forms.DeferLocationChangeScope
+System.Windows.Forms.Control.DeferLocationChange(bool suppressRender) -> System.Windows.Forms.DeferLocationChangeScope
+System.Windows.Forms.Control.DeferLocationChange(bool suppressRender, bool suspendLayout) -> System.Windows.Forms.DeferLocationChangeScope
+System.Windows.Forms.DeferLocationChangeScope
+System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope() -> void
+System.Windows.Forms.DeferLocationChangeScope.Defer(System.Windows.Forms.Control! control, int x, int y) -> void
+System.Windows.Forms.DeferLocationChangeScope.Defer(System.Windows.Forms.Control! control, int x, int y, int width, int height) -> void
+System.Windows.Forms.DeferLocationChangeScope.Defer(System.Windows.Forms.Control! control, System.Drawing.Rectangle bounds) -> void
+System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope(System.Windows.Forms.Control! parent) -> void
+System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope(System.Windows.Forms.Control! parent, bool suppressRender) -> void
+System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope(System.Windows.Forms.Control! parent, bool suppressRender, bool suspendLayout) -> void
+System.Windows.Forms.DeferLocationChangeScope.Dispose() -> void
+virtual System.Windows.Forms.Control.BeginSuspendPainting() -> void
+virtual System.Windows.Forms.Control.BeginSuspendRelocation() -> void
+virtual System.Windows.Forms.Control.EndSuspendPainting() -> void
+virtual System.Windows.Forms.Control.EndSuspendRelocation() -> void
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
index aab496c2744..fd1fc9ba89c 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
@@ -44,6 +44,9 @@ public sealed partial class Application
     private static bool s_useWaitCursor;
 
     private static SystemColorMode? s_colorMode;
+#if NET11_0_OR_GREATER
+    private static FormAppearanceMode? s_formAppearanceMode;
+#endif
 
     private const string DarkModeKeyPath = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
     private const string DarkModeKey = "AppsUseLightTheme";
@@ -249,6 +252,21 @@ internal static bool CustomThreadExceptionHandlerAttached
     /// </remarks>
     public static SystemColorMode ColorMode => s_colorMode ?? SystemColorMode.Classic;
 
+#if NET11_0_OR_GREATER
+    /// <summary>
+    ///  Gets the configured form appearance mode for the application.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   If no mode has been configured with <see cref="SetFormAppearanceMode(FormAppearanceMode)"/>,
+    ///   WinForms uses <see cref="FormAppearanceMode.Deferred"/>.
+    ///  </para>
+    /// </remarks>
+    public static FormAppearanceMode FormAppearanceMode
+        => s_formAppearanceMode ?? FormAppearanceMode.Deferred;
+
+#endif
+
     /// <summary>
     ///  True if the <see cref="ColorMode"/> has been set at least once.
     /// </summary>
@@ -381,6 +399,28 @@ static void NotifySystemEventsOfColorChange()
         }
     }
 
+#if NET11_0_OR_GREATER
+    /// <summary>
+    ///  Sets the process-wide form appearance mode.
+    /// </summary>
+    /// <param name="mode">The form appearance mode to use for newly created forms.</param>
+    /// <remarks>
+    ///  <para>
+    ///   Set the form appearance mode before creating UI to ensure newly created forms use the intended
+    ///   startup presentation behavior.
+    ///  </para>
+    /// </remarks>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="mode"/> is not a valid <see cref="FormAppearanceMode"/> value.
+    /// </exception>
+    public static void SetFormAppearanceMode(FormAppearanceMode mode)
+    {
+        SourceGenerated.EnumValidator.Validate(mode, nameof(mode));
+        s_formAppearanceMode = mode;
+    }
+
+#endif
+
     internal static Font DefaultFont => s_defaultFontScaled ?? s_defaultFont!;
 
     /// <summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs
new file mode 100644
index 00000000000..bd4c5c3398d
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs
@@ -0,0 +1,105 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+public unsafe partial class Control :
+    ISupportSuspendPainting,
+    ISupportSuspendRelocation
+#else
+public unsafe partial class Control
+#endif
+{
+#if NET11_0_OR_GREATER
+    /// <summary>
+    ///  Defers child-control location changes until the returned scope is disposed.
+    /// </summary>
+    /// <returns>A scope that applies deferred location changes when disposed.</returns>
+    public DeferLocationChangeScope DeferLocationChange()
+        => new(this);
+
+    /// <summary>
+    ///  Defers child-control location changes until the returned scope is disposed.
+    /// </summary>
+    /// <param name="suppressRender">
+    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
+    ///  <see langword="false"/>.
+    /// </param>
+    /// <returns>A scope that applies deferred location changes when disposed.</returns>
+    public DeferLocationChangeScope DeferLocationChange(bool suppressRender)
+        => new(this, suppressRender);
+
+    /// <summary>
+    ///  Defers child-control location changes until the returned scope is disposed.
+    /// </summary>
+    /// <param name="suppressRender">
+    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
+    ///  <see langword="false"/>.
+    /// </param>
+    /// <param name="suspendLayout">
+    ///  <see langword="true"/> to suspend layout while changes are deferred; otherwise,
+    ///  <see langword="false"/>.
+    /// </param>
+    /// <returns>A scope that applies deferred location changes when disposed.</returns>
+    public DeferLocationChangeScope DeferLocationChange(bool suppressRender, bool suspendLayout)
+        => new(this, suppressRender, suspendLayout);
+
+    /// <summary>
+    ///  Begins a painting suspension region for this control.
+    /// </summary>
+    public virtual void BeginSuspendPainting()
+    {
+        BeginSuspendPaintingScope();
+        BeginUpdateInternal();
+    }
+
+    /// <summary>
+    ///  Ends a painting suspension region for this control.
+    /// </summary>
+    public virtual void EndSuspendPainting()
+    {
+        if (EndSuspendPaintingScope())
+        {
+            EndUpdateInternal(invalidate: true);
+        }
+    }
+
+    /// <summary>
+    ///  Begins a relocation suspension region for this control.
+    /// </summary>
+    public virtual void BeginSuspendRelocation() => SuspendLayout();
+
+    /// <summary>
+    ///  Ends a relocation suspension region for this control.
+    /// </summary>
+    public virtual void EndSuspendRelocation() => ResumeLayout();
+
+    internal bool BeginSuspendPaintingScope()
+    {
+        int suspendPaintingCount = Properties.GetValueOrDefault(s_suspendPaintingCountProperty, 0);
+        Properties.AddOrRemoveValue(
+            s_suspendPaintingCountProperty,
+            suspendPaintingCount + 1,
+            defaultValue: 0);
+
+        return true;
+    }
+
+    internal bool EndSuspendPaintingScope()
+    {
+        int suspendPaintingCount = Properties.GetValueOrDefault(s_suspendPaintingCountProperty, 0);
+        if (suspendPaintingCount == 0)
+        {
+            return false;
+        }
+
+        Properties.AddOrRemoveValue(
+            s_suspendPaintingCountProperty,
+            suspendPaintingCount - 1,
+            defaultValue: 0);
+
+        return true;
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
index 14efc5014ff..f4961ae73d6 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
@@ -227,6 +227,10 @@ public unsafe partial class Control :
 
     private static readonly int s_deviceDpiInternal = PropertyStore.CreateKey();
     private static readonly int s_originalDeviceDpiInternal = PropertyStore.CreateKey();
+#if NET11_0_OR_GREATER
+    private static readonly int s_suspendPaintingCountProperty = PropertyStore.CreateKey();
+#endif
+    private static readonly int s_updateCountProperty = PropertyStore.CreateKey();
 
     private static bool s_needToLoadComCtl = true;
 
@@ -268,7 +272,6 @@ public unsafe partial class Control :
     // bits 0-4: BoundsSpecified stored in RequiredScaling property. Bit 5: RequiredScalingEnabled property.
     private byte _requiredScaling;
     private TRACKMOUSEEVENT _trackMouseEvent;
-    private short _updateCount;
     private LayoutEventArgs? _cachedLayoutEventArgs;
     private Queue<ThreadMethodEntry>? _threadCallbackList;
 
@@ -4379,12 +4382,16 @@ internal void BeginUpdateInternal()
             return;
         }
 
-        if (_updateCount == 0)
+        int updateCount = Properties.GetValueOrDefault(s_updateCountProperty, 0);
+        if (updateCount == 0)
         {
             PInvokeCore.SendMessage(this, PInvokeCore.WM_SETREDRAW, (WPARAM)(BOOL)false);
         }
 
-        _updateCount++;
+        Properties.AddOrRemoveValue(
+            s_updateCountProperty,
+            updateCount + 1,
+            defaultValue: 0);
     }
 
     /// <summary>
@@ -5070,11 +5077,17 @@ public void DrawToBitmap(Bitmap bitmap, Rectangle targetBounds)
 
     internal bool EndUpdateInternal(bool invalidate)
     {
-        if (_updateCount > 0)
+        int updateCount = Properties.GetValueOrDefault(s_updateCountProperty, 0);
+        if (updateCount > 0)
         {
             Debug.Assert(IsHandleCreated, "Handle should be created by now");
-            _updateCount--;
-            if (_updateCount == 0)
+            updateCount--;
+            Properties.AddOrRemoveValue(
+                s_updateCountProperty,
+                updateCount,
+                defaultValue: 0);
+
+            if (updateCount == 0)
             {
                 PInvokeCore.SendMessage(this, PInvokeCore.WM_SETREDRAW, (WPARAM)(BOOL)true);
                 if (invalidate)
@@ -5349,7 +5362,8 @@ private static bool IsFocusManagingContainerControl(Control ctl)
     ///  by calling "WM_SETREDRAW" even if the control in "Begin - End" update cycle. Using this Function we can guard
     ///  against repetitively redrawing the control.
     /// </summary>
-    internal bool IsUpdating() => _updateCount > 0;
+    internal bool IsUpdating()
+        => Properties.GetValueOrDefault(s_updateCountProperty, 0) > 0;
 
     /// <summary>
     ///  This is a helper method that is called by ScaleControl to retrieve the bounds
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ControlMutationExtensions.cs b/src/System.Windows.Forms/System/Windows/Forms/ControlMutationExtensions.cs
new file mode 100644
index 00000000000..3d2a87fcf82
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/ControlMutationExtensions.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Provides extension methods for batching synchronous WinForms UI mutations.
+/// </summary>
+public static class ControlMutationExtensions
+{
+    /// <summary>
+    ///  Suspends painting for the specified target until the returned scope is disposed.
+    /// </summary>
+    /// <param name="target">The target whose painting should be suspended.</param>
+    /// <returns>A scope that resumes painting when disposed.</returns>
+    public static SuspendPaintingScope SuspendPainting(this ISupportSuspendPainting target)
+        => new(target);
+
+    /// <summary>
+    ///  Suspends relocation work for the specified target until the returned scope is disposed.
+    /// </summary>
+    /// <param name="target">The target whose relocation work should be suspended.</param>
+    /// <returns>A scope that resumes relocation work when disposed.</returns>
+    public static SuspendRelocationScope SuspendRelocation(this ISupportSuspendRelocation target)
+        => new(target);
+}
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs
new file mode 100644
index 00000000000..348ab18cb24
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+public partial class ComboBox
+{
+#if NET11_0_OR_GREATER
+    /// <inheritdoc/>
+    public override void BeginSuspendPainting()
+    {
+        BeginSuspendPaintingScope();
+        BeginUpdate();
+    }
+
+    /// <inheritdoc/>
+    public override void EndSuspendPainting()
+    {
+        if (EndSuspendPaintingScope())
+        {
+            EndUpdate();
+        }
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs
new file mode 100644
index 00000000000..cd21cc7e8ee
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+public partial class ListBox
+{
+#if NET11_0_OR_GREATER
+    /// <inheritdoc/>
+    public override void BeginSuspendPainting()
+    {
+        BeginSuspendPaintingScope();
+        BeginUpdate();
+    }
+
+    /// <inheritdoc/>
+    public override void EndSuspendPainting()
+    {
+        if (EndSuspendPaintingScope())
+        {
+            EndUpdate();
+        }
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs
new file mode 100644
index 00000000000..dbee7d27836
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+public partial class ListView
+{
+#if NET11_0_OR_GREATER
+    /// <inheritdoc/>
+    public override void BeginSuspendPainting()
+    {
+        BeginSuspendPaintingScope();
+        BeginUpdate();
+    }
+
+    /// <inheritdoc/>
+    public override void EndSuspendPainting()
+    {
+        if (EndSuspendPaintingScope())
+        {
+            EndUpdate();
+        }
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs
new file mode 100644
index 00000000000..213ee92a195
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+public partial class RichTextBox
+{
+#if NET11_0_OR_GREATER
+    /// <inheritdoc/>
+    public override void BeginSuspendPainting()
+    {
+        BeginSuspendPaintingScope();
+        BeginUpdateInternal();
+    }
+
+    /// <inheritdoc/>
+    public override void EndSuspendPainting()
+    {
+        if (EndSuspendPaintingScope())
+        {
+            EndUpdateInternal();
+        }
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs
new file mode 100644
index 00000000000..16817872b60
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+public partial class TreeView
+{
+#if NET11_0_OR_GREATER
+    /// <inheritdoc/>
+    public override void BeginSuspendPainting()
+    {
+        BeginSuspendPaintingScope();
+        BeginUpdate();
+    }
+
+    /// <inheritdoc/>
+    public override void EndSuspendPainting()
+    {
+        if (EndSuspendPaintingScope())
+        {
+            EndUpdate();
+        }
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs b/src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs
new file mode 100644
index 00000000000..c310dbb9e9d
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs
@@ -0,0 +1,221 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Drawing;
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Batches child-control location changes until the scope is disposed.
+/// </summary>
+/// <remarks>
+///  <para>
+///   This scope uses the Win32 deferred window-position API when possible. If a deferred native batch
+///   cannot be created or is lost, the collected changes are applied individually when the scope is disposed.
+///  </para>
+/// </remarks>
+public readonly ref struct DeferLocationChangeScope
+{
+    private readonly State? _state;
+    private readonly SuspendPaintingScope _paintingScope;
+    private readonly SuspendRelocationScope _relocationScope;
+
+    /// <summary>
+    ///  Initializes a new instance of the <see cref="DeferLocationChangeScope"/> struct.
+    /// </summary>
+    /// <param name="parent">The parent control whose child-control location changes should be deferred.</param>
+    public DeferLocationChangeScope(Control parent)
+        : this(parent, suppressRender: true, suspendLayout: true)
+    {
+    }
+
+    /// <summary>
+    ///  Initializes a new instance of the <see cref="DeferLocationChangeScope"/> struct.
+    /// </summary>
+    /// <param name="parent">The parent control whose child-control location changes should be deferred.</param>
+    /// <param name="suppressRender">
+    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
+    ///  <see langword="false"/>.
+    /// </param>
+    public DeferLocationChangeScope(Control parent, bool suppressRender)
+        : this(parent, suppressRender, suspendLayout: true)
+    {
+    }
+
+    /// <summary>
+    ///  Initializes a new instance of the <see cref="DeferLocationChangeScope"/> struct.
+    /// </summary>
+    /// <param name="parent">The parent control whose child-control location changes should be deferred.</param>
+    /// <param name="suppressRender">
+    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
+    ///  <see langword="false"/>.
+    /// </param>
+    /// <param name="suspendLayout">
+    ///  <see langword="true"/> to suspend layout while changes are deferred; otherwise,
+    ///  <see langword="false"/>.
+    /// </param>
+    public DeferLocationChangeScope(Control parent, bool suppressRender, bool suspendLayout)
+    {
+        ArgumentNullException.ThrowIfNull(parent);
+
+        _state = new(parent);
+        _paintingScope = suppressRender
+            ? new SuspendPaintingScope(parent)
+            : default;
+        _relocationScope = suspendLayout
+            ? new SuspendRelocationScope(parent)
+            : default;
+    }
+
+    /// <summary>
+    ///  Defers moving a control to the specified location.
+    /// </summary>
+    /// <param name="control">The control to move.</param>
+    /// <param name="x">The deferred x-coordinate.</param>
+    /// <param name="y">The deferred y-coordinate.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="control"/> is <see langword="null"/>.</exception>
+    public void Defer(Control control, int x, int y)
+    {
+        ArgumentNullException.ThrowIfNull(control);
+        Size size = control.Size;
+        _state?.Defer(control, new Rectangle(x, y, size.Width, size.Height));
+    }
+
+    /// <summary>
+    ///  Defers moving and resizing a control to the specified bounds.
+    /// </summary>
+    /// <param name="control">The control to move and resize.</param>
+    /// <param name="x">The deferred x-coordinate.</param>
+    /// <param name="y">The deferred y-coordinate.</param>
+    /// <param name="width">The deferred width.</param>
+    /// <param name="height">The deferred height.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="control"/> is <see langword="null"/>.</exception>
+    public void Defer(Control control, int x, int y, int width, int height)
+    {
+        ArgumentNullException.ThrowIfNull(control);
+        _state?.Defer(control, new Rectangle(x, y, width, height));
+    }
+
+    /// <summary>
+    ///  Defers moving and resizing a control to the specified bounds.
+    /// </summary>
+    /// <param name="control">The control to move and resize.</param>
+    /// <param name="bounds">The deferred bounds.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="control"/> is <see langword="null"/>.</exception>
+    public void Defer(Control control, Rectangle bounds)
+    {
+        ArgumentNullException.ThrowIfNull(control);
+        _state?.Defer(control, bounds);
+    }
+
+    /// <summary>
+    ///  Applies the deferred location changes and resumes any bundled suspension scopes.
+    /// </summary>
+    public void Dispose()
+    {
+        _state?.Dispose();
+        _relocationScope.Dispose();
+        _paintingScope.Dispose();
+    }
+
+    /// <summary>
+    ///  Holds mutable deferred-position state for <see cref="DeferLocationChangeScope"/>.
+    /// </summary>
+    private sealed class State
+    {
+        private readonly Control _parent;
+        private readonly List<DeferredWindowPosition> _deferredPositions = [];
+        private HDWP _hdwp;
+        private bool _batchFailed;
+
+        public State(Control parent)
+        {
+            _parent = parent;
+            _hdwp = parent.IsHandleCreated && parent.Controls.Count > 0
+                ? PInvoke.BeginDeferWindowPos(parent.Controls.Count)
+                : HDWP.Null;
+            _batchFailed = _hdwp.IsNull || !parent.IsHandleCreated;
+        }
+
+        public void Defer(Control control, Rectangle bounds)
+        {
+            DeferredWindowPosition deferredPosition = new(control, bounds);
+            _deferredPositions.Add(deferredPosition);
+
+            if (_batchFailed)
+            {
+                return;
+            }
+
+            if (!control.IsHandleCreated)
+            {
+                _batchFailed = true;
+
+                return;
+            }
+
+            HDWP hdwp = PInvoke.DeferWindowPos(
+                _hdwp,
+                (HWND)control.Handle,
+                HWND.Null,
+                bounds.X,
+                bounds.Y,
+                bounds.Width,
+                bounds.Height,
+                SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE | SET_WINDOW_POS_FLAGS.SWP_NOZORDER);
+
+            if (hdwp.IsNull)
+            {
+                _hdwp = HDWP.Null;
+                _batchFailed = true;
+
+                return;
+            }
+
+            _hdwp = hdwp;
+        }
+
+        public void Dispose()
+        {
+            if (!_batchFailed && !_hdwp.IsNull && PInvoke.EndDeferWindowPos(_hdwp))
+            {
+                return;
+            }
+
+            if (_batchFailed && !_hdwp.IsNull)
+            {
+                PInvoke.EndDeferWindowPos(_hdwp);
+            }
+
+            foreach (DeferredWindowPosition deferredPosition in _deferredPositions)
+            {
+                Control control = deferredPosition.Control;
+                Rectangle bounds = deferredPosition.Bounds;
+                if (control.IsHandleCreated)
+                {
+                    PInvoke.SetWindowPos(
+                        control,
+                        HWND.Null,
+                        bounds.X,
+                        bounds.Y,
+                        bounds.Width,
+                        bounds.Height,
+                        SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE | SET_WINDOW_POS_FLAGS.SWP_NOZORDER);
+                }
+                else
+                {
+                    control.Bounds = bounds;
+                }
+            }
+
+            _parent.Invalidate(invalidateChildren: true);
+        }
+    }
+
+    /// <summary>
+    ///  Represents a deferred window-position request.
+    /// </summary>
+    private readonly record struct DeferredWindowPosition(Control Control, Rectangle Bounds);
+}
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Form.AppearanceMode.cs b/src/System.Windows.Forms/System/Windows/Forms/Form.AppearanceMode.cs
new file mode 100644
index 00000000000..853bdd55346
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Form.AppearanceMode.cs
@@ -0,0 +1,64 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Windows.Win32.Graphics.Dwm;
+
+namespace System.Windows.Forms;
+
+public partial class Form
+{
+#if NET11_0_OR_GREATER
+    private bool DeferredAppearanceCloaked
+    {
+        get => Properties.GetValueOrDefault(s_propFormAppearanceCloaked, false);
+        set => Properties.AddOrRemoveValue(s_propFormAppearanceCloaked, value, defaultValue: false);
+    }
+
+    private void CloakForDeferredAppearanceIfNeeded()
+    {
+        if (!ShouldUseDeferredAppearanceCloak())
+        {
+            return;
+        }
+
+        if (SetDwmCloak(cloaked: true))
+        {
+            DeferredAppearanceCloaked = true;
+        }
+    }
+
+    private void UncloakDeferredAppearanceIfNeeded()
+    {
+        if (!DeferredAppearanceCloaked)
+        {
+            return;
+        }
+
+        if (SetDwmCloak(cloaked: false))
+        {
+            DeferredAppearanceCloaked = false;
+        }
+    }
+
+    private void ClearDeferredAppearanceCloakState() => DeferredAppearanceCloaked = false;
+
+    private bool ShouldUseDeferredAppearanceCloak()
+        => Application.FormAppearanceMode == FormAppearanceMode.Deferred
+            && TopLevel
+            && !IsMdiChild
+            && Visible
+            && IsHandleCreated;
+
+    private unsafe bool SetDwmCloak(bool cloaked)
+    {
+        BOOL cloak = cloaked;
+        HRESULT result = PInvoke.DwmSetWindowAttribute(
+            HWND,
+            DWMWINDOWATTRIBUTE.DWMWA_CLOAK,
+            &cloak,
+            (uint)sizeof(BOOL));
+
+        return result.Succeeded;
+    }
+#endif
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Form.cs b/src/System.Windows.Forms/System/Windows/Forms/Form.cs
index a924b13fb3b..deed25e1b9c 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Form.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Form.cs
@@ -137,6 +137,9 @@ public partial class Form : ContainerControl
     private static readonly int s_propFormCaptionTextColor = PropertyStore.CreateKey();
     private static readonly int s_propFormCaptionBackColor = PropertyStore.CreateKey();
     private static readonly int s_propFormScreenCaptureMode = PropertyStore.CreateKey();
+#if NET11_0_OR_GREATER
+    private static readonly int s_propFormAppearanceCloaked = PropertyStore.CreateKey();
+#endif
 
     // Form per instance members
     // Note: Do not add anything to this list unless absolutely necessary.
@@ -4209,6 +4212,10 @@ protected override void OnHandleCreated(EventArgs e)
         {
             SetScreenCaptureModeInternal(FormScreenCaptureMode);
         }
+
+#if NET11_0_OR_GREATER
+        CloakForDeferredAppearanceIfNeeded();
+#endif
     }
 
     /// <summary>
@@ -4219,6 +4226,9 @@ protected override void OnHandleCreated(EventArgs e)
     [EditorBrowsable(EditorBrowsableState.Advanced)]
     protected override void OnHandleDestroyed(EventArgs e)
     {
+#if NET11_0_OR_GREATER
+        ClearDeferredAppearanceCloakState();
+#endif
         base.OnHandleDestroyed(e);
         _formStateEx[s_formStateExUseMdiChildProc] = 0;
 
@@ -7175,6 +7185,12 @@ protected override void WndProc(ref Message m)
             case PInvokeCore.WM_ERASEBKGND:
                 WmEraseBkgnd(ref m);
                 break;
+            case PInvokeCore.WM_PAINT:
+                base.WndProc(ref m);
+#if NET11_0_OR_GREATER
+                UncloakDeferredAppearanceIfNeeded();
+#endif
+                break;
 
             case PInvokeCore.WM_NCDESTROY:
                 WmNCDestroy(ref m);
diff --git a/src/System.Windows.Forms/System/Windows/Forms/FormAppearanceMode.cs b/src/System.Windows.Forms/System/Windows/Forms/FormAppearanceMode.cs
new file mode 100644
index 00000000000..f5e76f27151
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/FormAppearanceMode.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Specifies how WinForms presents a form while its initial appearance is prepared.
+/// </summary>
+public enum FormAppearanceMode
+{
+    /// <summary>
+    ///  Uses the classic WinForms form presentation behavior.
+    /// </summary>
+    Classic = 0,
+
+    /// <summary>
+    ///  Defers the initial top-level form presentation to help prevent default-background flash.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Deferral applies to the form background. Deep child-control trees can still produce visible
+    ///   updates after the form is shown.
+    ///  </para>
+    /// </remarks>
+    Deferred = 1
+}
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendPainting.cs b/src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendPainting.cs
new file mode 100644
index 00000000000..77c3ea39ee5
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendPainting.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Provides methods for temporarily suspending and resuming painting.
+/// </summary>
+public interface ISupportSuspendPainting
+{
+    /// <summary>
+    ///  Begins a painting suspension region.
+    /// </summary>
+    void BeginSuspendPainting();
+
+    /// <summary>
+    ///  Ends a painting suspension region.
+    /// </summary>
+    void EndSuspendPainting();
+}
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendRelocation.cs b/src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendRelocation.cs
new file mode 100644
index 00000000000..23338950127
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/ISupportSuspendRelocation.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Provides methods for temporarily suspending and resuming relocation work.
+/// </summary>
+public interface ISupportSuspendRelocation
+{
+    /// <summary>
+    ///  Begins a relocation suspension region.
+    /// </summary>
+    void BeginSuspendRelocation();
+
+    /// <summary>
+    ///  Ends a relocation suspension region.
+    /// </summary>
+    void EndSuspendRelocation();
+}
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs b/src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs
new file mode 100644
index 00000000000..1a3bf4a0c4f
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs
@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Suspends painting for a target until the scope is disposed.
+/// </summary>
+public readonly ref struct SuspendPaintingScope
+{
+    private readonly ISupportSuspendPainting? _target;
+
+    /// <summary>
+    ///  Initializes a new instance of the <see cref="SuspendPaintingScope"/> struct.
+    /// </summary>
+    /// <param name="target">The target whose painting should be suspended.</param>
+    public SuspendPaintingScope(ISupportSuspendPainting? target)
+    {
+        _target = target;
+        _target?.BeginSuspendPainting();
+    }
+
+    /// <summary>
+    ///  Resumes painting for the target associated with this scope.
+    /// </summary>
+    public void Dispose() => _target?.EndSuspendPainting();
+}
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs b/src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs
new file mode 100644
index 00000000000..5289fedd284
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs
@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+#if NET11_0_OR_GREATER
+/// <summary>
+///  Suspends relocation work for a target until the scope is disposed.
+/// </summary>
+public readonly ref struct SuspendRelocationScope
+{
+    private readonly ISupportSuspendRelocation? _target;
+
+    /// <summary>
+    ///  Initializes a new instance of the <see cref="SuspendRelocationScope"/> struct.
+    /// </summary>
+    /// <param name="target">The target whose relocation work should be suspended.</param>
+    public SuspendRelocationScope(ISupportSuspendRelocation? target)
+    {
+        _target = target;
+        _target?.BeginSuspendRelocation();
+    }
+
+    /// <summary>
+    ///  Resumes relocation work for the target associated with this scope.
+    /// </summary>
+    public void Dispose() => _target?.EndSuspendRelocation();
+}
+#endif

From 3c2ddf9549fd642a97ca5fbb41ab6da14666e0e4 Mon Sep 17 00:00:00 2001
From: Klaus Loffelmann <klloeffe@microsoft.com>
Date: Wed, 20 May 2026 14:38:49 -0700
Subject: [PATCH 12/50] Add tests for flicker-free mutation APIs

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../System/Windows/Forms/ApplicationTests.cs  | 25 +++++++++
 .../Windows/Forms/ControlTests.Methods.cs     | 51 +++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
index bf2346ae060..0a44740b336 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
@@ -180,6 +180,31 @@ public void Application_SetColorMode_PlausibilityTests()
 
 #pragma warning restore SYSLIB5002
 
+#if NET11_0_OR_GREATER
+    [WinFormsFact]
+    public void Application_FormAppearanceMode_Default_ReturnsDeferred()
+    {
+        Assert.Equal(FormAppearanceMode.Deferred, Application.FormAppearanceMode);
+    }
+
+    [WinFormsTheory]
+    [InlineData(FormAppearanceMode.Classic)]
+    [InlineData(FormAppearanceMode.Deferred)]
+    public void Application_SetFormAppearanceMode_GetReturnsExpected(FormAppearanceMode mode)
+    {
+        Application.SetFormAppearanceMode(mode);
+        Assert.Equal(mode, Application.FormAppearanceMode);
+    }
+
+    [WinFormsFact]
+    public void Application_SetFormAppearanceMode_Invalid_ThrowsInvalidEnumArgumentException()
+    {
+        Assert.Throws<InvalidEnumArgumentException>(
+            "mode",
+            () => Application.SetFormAppearanceMode((FormAppearanceMode)int.MaxValue));
+    }
+#endif
+
     [WinFormsFact]
     public void Application_DefaultFont_ReturnsNull_IfNoFontSet()
     {
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs
index 18ee42ff6be..d2c8d96dba5 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs
@@ -15,6 +15,57 @@ namespace System.Windows.Forms.Tests;
 
 public partial class ControlTests
 {
+#if NET11_0_OR_GREATER
+    [WinFormsFact]
+    public void Control_BeginEndSuspendPainting_InvokeWithoutHandle_Success()
+    {
+        using SubControl control = new();
+
+        control.BeginSuspendPainting();
+        control.EndSuspendPainting();
+        control.EndSuspendPainting();
+
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsFact]
+    public void Control_SuspendPainting_ScopeDisposes_Success()
+    {
+        using SubControl control = new();
+
+        using SuspendPaintingScope scope = control.SuspendPainting();
+
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsFact]
+    public void Control_BeginEndSuspendRelocation_Invoke_SuspendsLayout()
+    {
+        using SubControl control = new();
+
+        control.BeginSuspendRelocation();
+        control.EndSuspendRelocation();
+        control.EndSuspendRelocation();
+
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsFact]
+    public void Control_DeferLocationChange_DisposeWithoutHandles_AppliesBounds()
+    {
+        using SubControl parent = new();
+        using SubControl child = new();
+        parent.Controls.Add(child);
+
+        using (DeferLocationChangeScope scope = parent.DeferLocationChange())
+        {
+            scope.Defer(child, new Rectangle(1, 2, 3, 4));
+        }
+
+        Assert.Equal(new Rectangle(1, 2, 3, 4), child.Bounds);
+    }
+#endif
+
     public static IEnumerable<object[]> AccessibilityNotifyClients_AccessibleEvents_Int_TestData()
     {
         yield return new object[] { AccessibleEvents.DescriptionChange, int.MinValue };

From 93a068e582afca2fcc0246ea1736eab5d4f25267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:13:55 -0700
Subject: [PATCH 13/50] Remove DeferLocationChange; make suspend-mutation hooks
 explicit-interface

Splits DeferLocationChange out of this branch entirely (postponed pending an
anchor-layout-engine integration fix; tracked separately in
KlausLoeffelmann/winforms#12) and reworks ISupportSuspendPainting /
ISupportSuspendRelocation on Control to match the final API shape agreed in
dotnet/winforms#14585:

- Control implements ISupportSuspendPainting/ISupportSuspendRelocation via
  explicit interface implementation instead of public virtual methods, so the
  manual Begin/End pair does not become the primary IntelliSense surface on
  every Control-derived type. Protected virtual BeginSuspendPaintingCore() /
  EndSuspendPaintingCore() / BeginSuspendRelocationCore() /
  EndSuspendRelocationCore() are the new override points.
- ListView, ListBox, ComboBox, TreeView, RichTextBox override the ...Core()
  hooks instead of the old public virtual methods, still routing through
  their existing BeginUpdate/EndUpdate.
- SuspendPaintingScope and SuspendRelocationScope change from
  readonly ref struct to sealed class : IDisposable, so the scope can span an
  await in an asynchronous UI event handler (a ref struct cannot be hoisted
  into an async state machine - this was the flagship usage scenario in the
  original API proposal, and it did not compile against the ref struct
  version). Dispose is idempotent.
- Deletes DeferLocationChangeScope.cs and the Control.DeferLocationChange
  overloads entirely.
- Updates/removes tests accordingly; updates PublicAPI.Unshipped.txt.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI.Unshipped.txt                   |  12 -
 .../Windows/Forms/Control.SuspendMutation.cs  |  59 +++--
 .../ComboBox/ComboBox.SuspendMutation.cs      |   4 +-
 .../ListBoxes/ListBox.SuspendMutation.cs      |   4 +-
 .../ListView/ListView.SuspendMutation.cs      |   4 +-
 .../RichTextBox.SuspendMutation.cs            |   4 +-
 .../TreeView/TreeView.SuspendMutation.cs      |   4 +-
 .../Windows/Forms/DeferLocationChangeScope.cs | 221 ------------------
 ...m.AppearanceMode.cs => Form.RevealMode.cs} |   0
 ...ormAppearanceMode.cs => FormRevealMode.cs} |   0
 .../Windows/Forms/SuspendPaintingScope.cs     |  22 +-
 .../Windows/Forms/SuspendRelocationScope.cs   |  19 +-
 .../Windows/Forms/ControlTests.Methods.cs     |  42 ++--
 13 files changed, 96 insertions(+), 299 deletions(-)
 delete mode 100644 src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs
 rename src/System.Windows.Forms/System/Windows/Forms/{Form.AppearanceMode.cs => Form.RevealMode.cs} (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{FormAppearanceMode.cs => FormRevealMode.cs} (100%)

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index c5de23a9f99..088af7da16b 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -44,18 +44,6 @@ override System.Windows.Forms.TreeView.BeginSuspendPainting() -> void
 override System.Windows.Forms.TreeView.EndSuspendPainting() -> void
 static System.Windows.Forms.Application.FormAppearanceMode.get -> System.Windows.Forms.FormAppearanceMode
 static System.Windows.Forms.Application.SetFormAppearanceMode(System.Windows.Forms.FormAppearanceMode mode) -> void
-System.Windows.Forms.Control.DeferLocationChange() -> System.Windows.Forms.DeferLocationChangeScope
-System.Windows.Forms.Control.DeferLocationChange(bool suppressRender) -> System.Windows.Forms.DeferLocationChangeScope
-System.Windows.Forms.Control.DeferLocationChange(bool suppressRender, bool suspendLayout) -> System.Windows.Forms.DeferLocationChangeScope
-System.Windows.Forms.DeferLocationChangeScope
-System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope() -> void
-System.Windows.Forms.DeferLocationChangeScope.Defer(System.Windows.Forms.Control! control, int x, int y) -> void
-System.Windows.Forms.DeferLocationChangeScope.Defer(System.Windows.Forms.Control! control, int x, int y, int width, int height) -> void
-System.Windows.Forms.DeferLocationChangeScope.Defer(System.Windows.Forms.Control! control, System.Drawing.Rectangle bounds) -> void
-System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope(System.Windows.Forms.Control! parent) -> void
-System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope(System.Windows.Forms.Control! parent, bool suppressRender) -> void
-System.Windows.Forms.DeferLocationChangeScope.DeferLocationChangeScope(System.Windows.Forms.Control! parent, bool suppressRender, bool suspendLayout) -> void
-System.Windows.Forms.DeferLocationChangeScope.Dispose() -> void
 virtual System.Windows.Forms.Control.BeginSuspendPainting() -> void
 virtual System.Windows.Forms.Control.BeginSuspendRelocation() -> void
 virtual System.Windows.Forms.Control.EndSuspendPainting() -> void
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs
index bd4c5c3398d..0c2d6cae960 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.SuspendMutation.cs
@@ -13,51 +13,46 @@ public unsafe partial class Control
 {
 #if NET11_0_OR_GREATER
     /// <summary>
-    ///  Defers child-control location changes until the returned scope is disposed.
+    ///  Begins a painting suspension region for this control.
     /// </summary>
-    /// <returns>A scope that applies deferred location changes when disposed.</returns>
-    public DeferLocationChangeScope DeferLocationChange()
-        => new(this);
+    void ISupportSuspendPainting.BeginSuspendPainting() => BeginSuspendPaintingCore();
 
     /// <summary>
-    ///  Defers child-control location changes until the returned scope is disposed.
+    ///  Ends a painting suspension region for this control.
     /// </summary>
-    /// <param name="suppressRender">
-    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
-    ///  <see langword="false"/>.
-    /// </param>
-    /// <returns>A scope that applies deferred location changes when disposed.</returns>
-    public DeferLocationChangeScope DeferLocationChange(bool suppressRender)
-        => new(this, suppressRender);
+    void ISupportSuspendPainting.EndSuspendPainting() => EndSuspendPaintingCore();
 
     /// <summary>
-    ///  Defers child-control location changes until the returned scope is disposed.
+    ///  Begins a relocation suspension region for this control.
     /// </summary>
-    /// <param name="suppressRender">
-    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
-    ///  <see langword="false"/>.
-    /// </param>
-    /// <param name="suspendLayout">
-    ///  <see langword="true"/> to suspend layout while changes are deferred; otherwise,
-    ///  <see langword="false"/>.
-    /// </param>
-    /// <returns>A scope that applies deferred location changes when disposed.</returns>
-    public DeferLocationChangeScope DeferLocationChange(bool suppressRender, bool suspendLayout)
-        => new(this, suppressRender, suspendLayout);
+    void ISupportSuspendRelocation.BeginSuspendRelocation() => BeginSuspendRelocationCore();
 
     /// <summary>
-    ///  Begins a painting suspension region for this control.
+    ///  Ends a relocation suspension region for this control.
     /// </summary>
-    public virtual void BeginSuspendPainting()
+    void ISupportSuspendRelocation.EndSuspendRelocation() => EndSuspendRelocationCore();
+
+    /// <summary>
+    ///  When overridden in a derived class, begins a painting suspension region for this control.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   The default implementation suppresses native painting through <see cref="BeginUpdateInternal"/>.
+    ///   Controls that already have a public update mechanism (such as <see cref="ListView.BeginUpdate"/>)
+    ///   should override this method to route through that existing mechanism instead of introducing a
+    ///   second, competing suspension path.
+    ///  </para>
+    /// </remarks>
+    protected virtual void BeginSuspendPaintingCore()
     {
         BeginSuspendPaintingScope();
         BeginUpdateInternal();
     }
 
     /// <summary>
-    ///  Ends a painting suspension region for this control.
+    ///  When overridden in a derived class, ends a painting suspension region for this control.
     /// </summary>
-    public virtual void EndSuspendPainting()
+    protected virtual void EndSuspendPaintingCore()
     {
         if (EndSuspendPaintingScope())
         {
@@ -66,14 +61,14 @@ public virtual void EndSuspendPainting()
     }
 
     /// <summary>
-    ///  Begins a relocation suspension region for this control.
+    ///  When overridden in a derived class, begins a relocation suspension region for this control.
     /// </summary>
-    public virtual void BeginSuspendRelocation() => SuspendLayout();
+    protected virtual void BeginSuspendRelocationCore() => SuspendLayout();
 
     /// <summary>
-    ///  Ends a relocation suspension region for this control.
+    ///  When overridden in a derived class, ends a relocation suspension region for this control.
     /// </summary>
-    public virtual void EndSuspendRelocation() => ResumeLayout();
+    protected virtual void EndSuspendRelocationCore() => ResumeLayout();
 
     internal bool BeginSuspendPaintingScope()
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs
index 348ab18cb24..9a90bcda243 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.SuspendMutation.cs
@@ -7,14 +7,14 @@ public partial class ComboBox
 {
 #if NET11_0_OR_GREATER
     /// <inheritdoc/>
-    public override void BeginSuspendPainting()
+    protected override void BeginSuspendPaintingCore()
     {
         BeginSuspendPaintingScope();
         BeginUpdate();
     }
 
     /// <inheritdoc/>
-    public override void EndSuspendPainting()
+    protected override void EndSuspendPaintingCore()
     {
         if (EndSuspendPaintingScope())
         {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs
index cd21cc7e8ee..e26361db974 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListBoxes/ListBox.SuspendMutation.cs
@@ -7,14 +7,14 @@ public partial class ListBox
 {
 #if NET11_0_OR_GREATER
     /// <inheritdoc/>
-    public override void BeginSuspendPainting()
+    protected override void BeginSuspendPaintingCore()
     {
         BeginSuspendPaintingScope();
         BeginUpdate();
     }
 
     /// <inheritdoc/>
-    public override void EndSuspendPainting()
+    protected override void EndSuspendPaintingCore()
     {
         if (EndSuspendPaintingScope())
         {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs
index dbee7d27836..1fbe0660b39 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.SuspendMutation.cs
@@ -7,14 +7,14 @@ public partial class ListView
 {
 #if NET11_0_OR_GREATER
     /// <inheritdoc/>
-    public override void BeginSuspendPainting()
+    protected override void BeginSuspendPaintingCore()
     {
         BeginSuspendPaintingScope();
         BeginUpdate();
     }
 
     /// <inheritdoc/>
-    public override void EndSuspendPainting()
+    protected override void EndSuspendPaintingCore()
     {
         if (EndSuspendPaintingScope())
         {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs
index 213ee92a195..4625a1cb225 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.SuspendMutation.cs
@@ -7,14 +7,14 @@ public partial class RichTextBox
 {
 #if NET11_0_OR_GREATER
     /// <inheritdoc/>
-    public override void BeginSuspendPainting()
+    protected override void BeginSuspendPaintingCore()
     {
         BeginSuspendPaintingScope();
         BeginUpdateInternal();
     }
 
     /// <inheritdoc/>
-    public override void EndSuspendPainting()
+    protected override void EndSuspendPaintingCore()
     {
         if (EndSuspendPaintingScope())
         {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs
index 16817872b60..f9fc5d4d629 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.SuspendMutation.cs
@@ -7,14 +7,14 @@ public partial class TreeView
 {
 #if NET11_0_OR_GREATER
     /// <inheritdoc/>
-    public override void BeginSuspendPainting()
+    protected override void BeginSuspendPaintingCore()
     {
         BeginSuspendPaintingScope();
         BeginUpdate();
     }
 
     /// <inheritdoc/>
-    public override void EndSuspendPainting()
+    protected override void EndSuspendPaintingCore()
     {
         if (EndSuspendPaintingScope())
         {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs b/src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs
deleted file mode 100644
index c310dbb9e9d..00000000000
--- a/src/System.Windows.Forms/System/Windows/Forms/DeferLocationChangeScope.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Drawing;
-
-namespace System.Windows.Forms;
-
-#if NET11_0_OR_GREATER
-/// <summary>
-///  Batches child-control location changes until the scope is disposed.
-/// </summary>
-/// <remarks>
-///  <para>
-///   This scope uses the Win32 deferred window-position API when possible. If a deferred native batch
-///   cannot be created or is lost, the collected changes are applied individually when the scope is disposed.
-///  </para>
-/// </remarks>
-public readonly ref struct DeferLocationChangeScope
-{
-    private readonly State? _state;
-    private readonly SuspendPaintingScope _paintingScope;
-    private readonly SuspendRelocationScope _relocationScope;
-
-    /// <summary>
-    ///  Initializes a new instance of the <see cref="DeferLocationChangeScope"/> struct.
-    /// </summary>
-    /// <param name="parent">The parent control whose child-control location changes should be deferred.</param>
-    public DeferLocationChangeScope(Control parent)
-        : this(parent, suppressRender: true, suspendLayout: true)
-    {
-    }
-
-    /// <summary>
-    ///  Initializes a new instance of the <see cref="DeferLocationChangeScope"/> struct.
-    /// </summary>
-    /// <param name="parent">The parent control whose child-control location changes should be deferred.</param>
-    /// <param name="suppressRender">
-    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
-    ///  <see langword="false"/>.
-    /// </param>
-    public DeferLocationChangeScope(Control parent, bool suppressRender)
-        : this(parent, suppressRender, suspendLayout: true)
-    {
-    }
-
-    /// <summary>
-    ///  Initializes a new instance of the <see cref="DeferLocationChangeScope"/> struct.
-    /// </summary>
-    /// <param name="parent">The parent control whose child-control location changes should be deferred.</param>
-    /// <param name="suppressRender">
-    ///  <see langword="true"/> to suppress rendering while changes are deferred; otherwise,
-    ///  <see langword="false"/>.
-    /// </param>
-    /// <param name="suspendLayout">
-    ///  <see langword="true"/> to suspend layout while changes are deferred; otherwise,
-    ///  <see langword="false"/>.
-    /// </param>
-    public DeferLocationChangeScope(Control parent, bool suppressRender, bool suspendLayout)
-    {
-        ArgumentNullException.ThrowIfNull(parent);
-
-        _state = new(parent);
-        _paintingScope = suppressRender
-            ? new SuspendPaintingScope(parent)
-            : default;
-        _relocationScope = suspendLayout
-            ? new SuspendRelocationScope(parent)
-            : default;
-    }
-
-    /// <summary>
-    ///  Defers moving a control to the specified location.
-    /// </summary>
-    /// <param name="control">The control to move.</param>
-    /// <param name="x">The deferred x-coordinate.</param>
-    /// <param name="y">The deferred y-coordinate.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="control"/> is <see langword="null"/>.</exception>
-    public void Defer(Control control, int x, int y)
-    {
-        ArgumentNullException.ThrowIfNull(control);
-        Size size = control.Size;
-        _state?.Defer(control, new Rectangle(x, y, size.Width, size.Height));
-    }
-
-    /// <summary>
-    ///  Defers moving and resizing a control to the specified bounds.
-    /// </summary>
-    /// <param name="control">The control to move and resize.</param>
-    /// <param name="x">The deferred x-coordinate.</param>
-    /// <param name="y">The deferred y-coordinate.</param>
-    /// <param name="width">The deferred width.</param>
-    /// <param name="height">The deferred height.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="control"/> is <see langword="null"/>.</exception>
-    public void Defer(Control control, int x, int y, int width, int height)
-    {
-        ArgumentNullException.ThrowIfNull(control);
-        _state?.Defer(control, new Rectangle(x, y, width, height));
-    }
-
-    /// <summary>
-    ///  Defers moving and resizing a control to the specified bounds.
-    /// </summary>
-    /// <param name="control">The control to move and resize.</param>
-    /// <param name="bounds">The deferred bounds.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="control"/> is <see langword="null"/>.</exception>
-    public void Defer(Control control, Rectangle bounds)
-    {
-        ArgumentNullException.ThrowIfNull(control);
-        _state?.Defer(control, bounds);
-    }
-
-    /// <summary>
-    ///  Applies the deferred location changes and resumes any bundled suspension scopes.
-    /// </summary>
-    public void Dispose()
-    {
-        _state?.Dispose();
-        _relocationScope.Dispose();
-        _paintingScope.Dispose();
-    }
-
-    /// <summary>
-    ///  Holds mutable deferred-position state for <see cref="DeferLocationChangeScope"/>.
-    /// </summary>
-    private sealed class State
-    {
-        private readonly Control _parent;
-        private readonly List<DeferredWindowPosition> _deferredPositions = [];
-        private HDWP _hdwp;
-        private bool _batchFailed;
-
-        public State(Control parent)
-        {
-            _parent = parent;
-            _hdwp = parent.IsHandleCreated && parent.Controls.Count > 0
-                ? PInvoke.BeginDeferWindowPos(parent.Controls.Count)
-                : HDWP.Null;
-            _batchFailed = _hdwp.IsNull || !parent.IsHandleCreated;
-        }
-
-        public void Defer(Control control, Rectangle bounds)
-        {
-            DeferredWindowPosition deferredPosition = new(control, bounds);
-            _deferredPositions.Add(deferredPosition);
-
-            if (_batchFailed)
-            {
-                return;
-            }
-
-            if (!control.IsHandleCreated)
-            {
-                _batchFailed = true;
-
-                return;
-            }
-
-            HDWP hdwp = PInvoke.DeferWindowPos(
-                _hdwp,
-                (HWND)control.Handle,
-                HWND.Null,
-                bounds.X,
-                bounds.Y,
-                bounds.Width,
-                bounds.Height,
-                SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE | SET_WINDOW_POS_FLAGS.SWP_NOZORDER);
-
-            if (hdwp.IsNull)
-            {
-                _hdwp = HDWP.Null;
-                _batchFailed = true;
-
-                return;
-            }
-
-            _hdwp = hdwp;
-        }
-
-        public void Dispose()
-        {
-            if (!_batchFailed && !_hdwp.IsNull && PInvoke.EndDeferWindowPos(_hdwp))
-            {
-                return;
-            }
-
-            if (_batchFailed && !_hdwp.IsNull)
-            {
-                PInvoke.EndDeferWindowPos(_hdwp);
-            }
-
-            foreach (DeferredWindowPosition deferredPosition in _deferredPositions)
-            {
-                Control control = deferredPosition.Control;
-                Rectangle bounds = deferredPosition.Bounds;
-                if (control.IsHandleCreated)
-                {
-                    PInvoke.SetWindowPos(
-                        control,
-                        HWND.Null,
-                        bounds.X,
-                        bounds.Y,
-                        bounds.Width,
-                        bounds.Height,
-                        SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE | SET_WINDOW_POS_FLAGS.SWP_NOZORDER);
-                }
-                else
-                {
-                    control.Bounds = bounds;
-                }
-            }
-
-            _parent.Invalidate(invalidateChildren: true);
-        }
-    }
-
-    /// <summary>
-    ///  Represents a deferred window-position request.
-    /// </summary>
-    private readonly record struct DeferredWindowPosition(Control Control, Rectangle Bounds);
-}
-#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Form.AppearanceMode.cs b/src/System.Windows.Forms/System/Windows/Forms/Form.RevealMode.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Form.AppearanceMode.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Form.RevealMode.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/FormAppearanceMode.cs b/src/System.Windows.Forms/System/Windows/Forms/FormRevealMode.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/FormAppearanceMode.cs
rename to src/System.Windows.Forms/System/Windows/Forms/FormRevealMode.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs b/src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs
index 1a3bf4a0c4f..c596dfbc452 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/SuspendPaintingScope.cs
@@ -7,12 +7,20 @@ namespace System.Windows.Forms;
 /// <summary>
 ///  Suspends painting for a target until the scope is disposed.
 /// </summary>
-public readonly ref struct SuspendPaintingScope
+/// <remarks>
+///  <para>
+///   This is a sealed class rather than a <c>ref struct</c> so the scope can span an
+///   <see langword="await"/> in an asynchronous UI event handler (for example, suspending painting for
+///   the duration of an async data reload). <see cref="Dispose"/> is idempotent: disposing the scope more
+///   than once only resumes painting once.
+///  </para>
+/// </remarks>
+public sealed class SuspendPaintingScope : IDisposable
 {
-    private readonly ISupportSuspendPainting? _target;
+    private ISupportSuspendPainting? _target;
 
     /// <summary>
-    ///  Initializes a new instance of the <see cref="SuspendPaintingScope"/> struct.
+    ///  Initializes a new instance of the <see cref="SuspendPaintingScope"/> class.
     /// </summary>
     /// <param name="target">The target whose painting should be suspended.</param>
     public SuspendPaintingScope(ISupportSuspendPainting? target)
@@ -24,6 +32,12 @@ public SuspendPaintingScope(ISupportSuspendPainting? target)
     /// <summary>
     ///  Resumes painting for the target associated with this scope.
     /// </summary>
-    public void Dispose() => _target?.EndSuspendPainting();
+    public void Dispose()
+    {
+        // Idempotent: only the first Dispose call should resume painting, since the underlying
+        // refcount on the target was only incremented once, in the constructor.
+        _target?.EndSuspendPainting();
+        _target = null;
+    }
 }
 #endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs b/src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs
index 5289fedd284..a86acb0e42f 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/SuspendRelocationScope.cs
@@ -7,12 +7,19 @@ namespace System.Windows.Forms;
 /// <summary>
 ///  Suspends relocation work for a target until the scope is disposed.
 /// </summary>
-public readonly ref struct SuspendRelocationScope
+/// <remarks>
+///  <para>
+///   This is a sealed class rather than a <c>ref struct</c> so the scope can span an
+///   <see langword="await"/> in an asynchronous UI event handler. <see cref="Dispose"/> is idempotent:
+///   disposing the scope more than once only resumes relocation work once.
+///  </para>
+/// </remarks>
+public sealed class SuspendRelocationScope : IDisposable
 {
-    private readonly ISupportSuspendRelocation? _target;
+    private ISupportSuspendRelocation? _target;
 
     /// <summary>
-    ///  Initializes a new instance of the <see cref="SuspendRelocationScope"/> struct.
+    ///  Initializes a new instance of the <see cref="SuspendRelocationScope"/> class.
     /// </summary>
     /// <param name="target">The target whose relocation work should be suspended.</param>
     public SuspendRelocationScope(ISupportSuspendRelocation? target)
@@ -24,6 +31,10 @@ public SuspendRelocationScope(ISupportSuspendRelocation? target)
     /// <summary>
     ///  Resumes relocation work for the target associated with this scope.
     /// </summary>
-    public void Dispose() => _target?.EndSuspendRelocation();
+    public void Dispose()
+    {
+        _target?.EndSuspendRelocation();
+        _target = null;
+    }
 }
 #endif
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs
index d2c8d96dba5..fa6b67eb5a2 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs
@@ -20,10 +20,11 @@ public partial class ControlTests
     public void Control_BeginEndSuspendPainting_InvokeWithoutHandle_Success()
     {
         using SubControl control = new();
+        ISupportSuspendPainting suspendPainting = control;
 
-        control.BeginSuspendPainting();
-        control.EndSuspendPainting();
-        control.EndSuspendPainting();
+        suspendPainting.BeginSuspendPainting();
+        suspendPainting.EndSuspendPainting();
+        suspendPainting.EndSuspendPainting();
 
         Assert.False(control.IsHandleCreated);
     }
@@ -39,30 +40,39 @@ public void Control_SuspendPainting_ScopeDisposes_Success()
     }
 
     [WinFormsFact]
-    public void Control_BeginEndSuspendRelocation_Invoke_SuspendsLayout()
+    public void Control_SuspendPainting_ScopeDispose_IsIdempotent()
     {
         using SubControl control = new();
 
-        control.BeginSuspendRelocation();
-        control.EndSuspendRelocation();
-        control.EndSuspendRelocation();
+        SuspendPaintingScope scope = control.SuspendPainting();
+        scope.Dispose();
+        scope.Dispose();
 
         Assert.False(control.IsHandleCreated);
     }
 
     [WinFormsFact]
-    public void Control_DeferLocationChange_DisposeWithoutHandles_AppliesBounds()
+    public async Task Control_SuspendPainting_ScopeSpansAwait_Success()
     {
-        using SubControl parent = new();
-        using SubControl child = new();
-        parent.Controls.Add(child);
+        using SubControl control = new();
 
-        using (DeferLocationChangeScope scope = parent.DeferLocationChange())
-        {
-            scope.Defer(child, new Rectangle(1, 2, 3, 4));
-        }
+        using SuspendPaintingScope scope = control.SuspendPainting();
+        await Task.Yield();
+
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsFact]
+    public void Control_BeginEndSuspendRelocation_Invoke_SuspendsLayout()
+    {
+        using SubControl control = new();
+        ISupportSuspendRelocation suspendRelocation = control;
 
-        Assert.Equal(new Rectangle(1, 2, 3, 4), child.Bounds);
+        suspendRelocation.BeginSuspendRelocation();
+        suspendRelocation.EndSuspendRelocation();
+        suspendRelocation.EndSuspendRelocation();
+
+        Assert.False(control.IsHandleCreated);
     }
 #endif
 

From 5d4cb8baedbef03caed4b3f14593663792606f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:14:53 -0700
Subject: [PATCH 14/50] Rename FormAppearanceMode to FormRevealMode with
 Inherit ambient sentinel

Matches the final API shape agreed in dotnet/winforms#14585:

- FormAppearanceMode -> FormRevealMode, adding Inherit = -1 as the ambient
  sentinel (Classic stays the CLR default value 0, matching the
  RightToLeft.Inherit / VisualStylesMode.Inherit precedent for ambient
  enums - the sentinel is a distinct value, not the zero value, so
  default(FormRevealMode) stays conservative).
- Form.FormRevealMode is now a real public virtual, PropertyStore-backed,
  [AmbientValue(Inherit)] property (previously there was no per-Form
  property at all - only the flat, process-wide
  Application.FormAppearanceMode existed). This lets a form such as a splash
  screen opt itself out of deferred reveal without touching the process-wide
  default. Resolution is flat (Form only, no Control-parent-chain): DWM
  cloaking only ever applies to top-level, non-MDI-child windows, so there is
  no hierarchy to walk, unlike VisualStylesMode's genuine control-nesting
  cascade.
- Application.FormAppearanceMode / SetFormAppearanceMode are replaced by
  three members: DefaultFormRevealMode (get; may return the unresolved
  Inherit sentinel, mirroring ColorMode returning the unresolved System
  value), SetDefaultFormRevealMode (freely reassignable, unlike the
  write-once SetDefaultVisualStylesMode - the effective default is derived in
  part from ColorMode/IsDarkModeEnabled, which are themselves mutable for the
  life of the process), and IsFormRevealDeferred (bool; the fully resolved
  answer: Deferred, or Inherit + IsDarkModeEnabled). This also fixes a
  compatibility problem in the original design: the old default was
  unconditionally Deferred whenever SetFormAppearanceMode was never called,
  an opt-out behavior change for every existing app; tying the Inherit
  resolution to dark mode means an app that never touches SystemColorMode
  sees no behavior change, while the scenario the feature exists for
  (dark-mode startup flash) is fixed by default.
- ShouldUseDeferredAppearanceCloak now reads the resolved Form.FormRevealMode
  instead of the old flat Application-only check, so a per-Form override is
  actually honored.
- Adds SR.resx/xlf entries for the new property's designer description.
- Updates/adds tests; updates PublicAPI.Unshipped.txt.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI.Unshipped.txt                   | 34 ++++----
 src/System.Windows.Forms/Resources/SR.resx    |  3 +
 .../Resources/xlf/SR.cs.xlf                   |  5 ++
 .../Resources/xlf/SR.de.xlf                   |  5 ++
 .../Resources/xlf/SR.es.xlf                   |  5 ++
 .../Resources/xlf/SR.fr.xlf                   |  5 ++
 .../Resources/xlf/SR.it.xlf                   |  5 ++
 .../Resources/xlf/SR.ja.xlf                   |  5 ++
 .../Resources/xlf/SR.ko.xlf                   |  5 ++
 .../Resources/xlf/SR.pl.xlf                   |  5 ++
 .../Resources/xlf/SR.pt-BR.xlf                |  5 ++
 .../Resources/xlf/SR.ru.xlf                   |  5 ++
 .../Resources/xlf/SR.tr.xlf                   |  5 ++
 .../Resources/xlf/SR.zh-Hans.xlf              |  5 ++
 .../Resources/xlf/SR.zh-Hant.xlf              |  5 ++
 .../System/Windows/Forms/Application.cs       | 60 ++++++++++----
 .../System/Windows/Forms/Form.RevealMode.cs   | 62 ++++++++++++++-
 .../System/Windows/Forms/FormRevealMode.cs    | 20 ++++-
 .../System/Windows/Forms/ApplicationTests.cs  | 45 ++++++++---
 .../Windows/Forms/FormTests.RevealMode.cs     | 78 +++++++++++++++++++
 20 files changed, 322 insertions(+), 45 deletions(-)
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.RevealMode.cs

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 088af7da16b..af40817ec06 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -13,8 +13,8 @@ System.Windows.Forms.TreeView.NodeLeading.set -> void
 System.Windows.Forms.TreeView.NodeLeadingChanged -> System.EventHandler?
 virtual System.Windows.Forms.TreeView.OnNodeLeadingChanged(System.EventArgs! e) -> void
 System.Windows.Forms.ControlMutationExtensions
-static System.Windows.Forms.ControlMutationExtensions.SuspendPainting(this System.Windows.Forms.ISupportSuspendPainting! target) -> System.Windows.Forms.SuspendPaintingScope
-static System.Windows.Forms.ControlMutationExtensions.SuspendRelocation(this System.Windows.Forms.ISupportSuspendRelocation! target) -> System.Windows.Forms.SuspendRelocationScope
+static System.Windows.Forms.ControlMutationExtensions.SuspendPainting(this System.Windows.Forms.ISupportSuspendPainting! target) -> System.Windows.Forms.SuspendPaintingScope!
+static System.Windows.Forms.ControlMutationExtensions.SuspendRelocation(this System.Windows.Forms.ISupportSuspendRelocation! target) -> System.Windows.Forms.SuspendRelocationScope!
 System.Windows.Forms.FormAppearanceMode
 System.Windows.Forms.FormAppearanceMode.Classic = 0 -> System.Windows.Forms.FormAppearanceMode
 System.Windows.Forms.FormAppearanceMode.Deferred = 1 -> System.Windows.Forms.FormAppearanceMode
@@ -26,25 +26,23 @@ System.Windows.Forms.ISupportSuspendRelocation.BeginSuspendRelocation() -> void
 System.Windows.Forms.ISupportSuspendRelocation.EndSuspendRelocation() -> void
 System.Windows.Forms.SuspendPaintingScope
 System.Windows.Forms.SuspendPaintingScope.Dispose() -> void
-System.Windows.Forms.SuspendPaintingScope.SuspendPaintingScope() -> void
 System.Windows.Forms.SuspendPaintingScope.SuspendPaintingScope(System.Windows.Forms.ISupportSuspendPainting? target) -> void
 System.Windows.Forms.SuspendRelocationScope
 System.Windows.Forms.SuspendRelocationScope.Dispose() -> void
-System.Windows.Forms.SuspendRelocationScope.SuspendRelocationScope() -> void
 System.Windows.Forms.SuspendRelocationScope.SuspendRelocationScope(System.Windows.Forms.ISupportSuspendRelocation? target) -> void
-override System.Windows.Forms.ComboBox.BeginSuspendPainting() -> void
-override System.Windows.Forms.ComboBox.EndSuspendPainting() -> void
-override System.Windows.Forms.ListBox.BeginSuspendPainting() -> void
-override System.Windows.Forms.ListBox.EndSuspendPainting() -> void
-override System.Windows.Forms.ListView.BeginSuspendPainting() -> void
-override System.Windows.Forms.ListView.EndSuspendPainting() -> void
-override System.Windows.Forms.RichTextBox.BeginSuspendPainting() -> void
-override System.Windows.Forms.RichTextBox.EndSuspendPainting() -> void
-override System.Windows.Forms.TreeView.BeginSuspendPainting() -> void
-override System.Windows.Forms.TreeView.EndSuspendPainting() -> void
 static System.Windows.Forms.Application.FormAppearanceMode.get -> System.Windows.Forms.FormAppearanceMode
 static System.Windows.Forms.Application.SetFormAppearanceMode(System.Windows.Forms.FormAppearanceMode mode) -> void
-virtual System.Windows.Forms.Control.BeginSuspendPainting() -> void
-virtual System.Windows.Forms.Control.BeginSuspendRelocation() -> void
-virtual System.Windows.Forms.Control.EndSuspendPainting() -> void
-virtual System.Windows.Forms.Control.EndSuspendRelocation() -> void
+virtual System.Windows.Forms.Control.BeginSuspendPaintingCore() -> void
+virtual System.Windows.Forms.Control.BeginSuspendRelocationCore() -> void
+virtual System.Windows.Forms.Control.EndSuspendPaintingCore() -> void
+virtual System.Windows.Forms.Control.EndSuspendRelocationCore() -> void
+override System.Windows.Forms.ComboBox.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.ComboBox.EndSuspendPaintingCore() -> void
+override System.Windows.Forms.ListBox.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.ListBox.EndSuspendPaintingCore() -> void
+override System.Windows.Forms.ListView.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.ListView.EndSuspendPaintingCore() -> void
+override System.Windows.Forms.RichTextBox.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.RichTextBox.EndSuspendPaintingCore() -> void
+override System.Windows.Forms.TreeView.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.TreeView.EndSuspendPaintingCore() -> void
diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index 9794e8910e2..82a972e4c57 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -3286,6 +3286,9 @@ Do you want to replace it?</value>
   <data name="FormTopMostDescr" xml:space="preserve">
     <value>Indicates whether the form always appears above all other forms that do not have this property set to true.</value>
   </data>
+  <data name="FormFormRevealModeDescr" xml:space="preserve">
+    <value>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</value>
+  </data>
   <data name="FormTransparencyKeyDescr" xml:space="preserve">
     <value>A color which will appear transparent when painted on the form.</value>
   </data>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
index 436c5db8aa3..9c3c80273df 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
@@ -5420,6 +5420,11 @@ Chcete ho nahradit?</target>
         <target state="translated">Hodnota, kterou tento formulář vrátí, pokud bude zobrazen jako dialogové okno.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Událost aktivovaná při kliknutí na tlačítko nápovědy</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
index 273d2f75887..e9d2ba0f1db 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
@@ -5420,6 +5420,11 @@ Möchten Sie den Pfad ersetzen?</target>
         <target state="translated">Der Wert, den dieses Formular zurückgibt, wenn es als Dialogfeld angezeigt wird.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Das ausgelöste Ereignis, wenn auf die Schaltfläche "Hilfe" geklickt wird.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
index 5a71457bfe7..a1d3ba0bed9 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
@@ -5420,6 +5420,11 @@ Do you want to replace it?</source>
         <target state="translated">Valor de este formulario si se muestra como un cuadro de diálogo.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Evento que se desencadena cuando se hace clic en el botón Ayuda.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
index 497705cc659..7c529132c9f 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
@@ -5420,6 +5420,11 @@ Voulez-vous le remplacer ?</target>
         <target state="translated">La valeur que ce formulaire retourne s'il est affiché en tant que boîte de dialogue.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Événement qui est déclenché à la suite d'un clic sur le bouton d'aide.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
index 0f9f746eb32..90e86134c28 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
@@ -5420,6 +5420,11 @@ Sostituirlo?</target>
         <target state="translated">Il valore che questo form restituirà se viene visualizzato come finestra di dialogo.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Evento generato quando si fa clic sul pulsante ?.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
index 5c1e01f3e14..02114c6d400 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
@@ -5420,6 +5420,11 @@ Do you want to replace it?</source>
         <target state="translated">ダイアログ ボックスとして表示された場合に、このフォームが返す値です。</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">[ヘルプ] ボタンがクリックされたときに発生するイベントです。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
index 36ae814250f..7cb8d5d75de 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
@@ -5420,6 +5420,11 @@ Do you want to replace it?</source>
         <target state="translated">대화 상자로 표시할 경우, 이 폼에서 반환하는 값입니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">[도움말] 단추를 클릭하면 이벤트가 발생합니다.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
index cf5ec9f4e94..0ca219a45f9 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
@@ -5420,6 +5420,11 @@ Czy chcesz zastąpić?</target>
         <target state="translated">Wartość zwracana przez formularz, gdy jest on wyświetlany jako okno dialogowe.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Zdarzenie wywoływane po kliknięciu przycisku pomocy.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
index 3a5790e5f7a..c4adee1ac55 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
@@ -5420,6 +5420,11 @@ Deseja substituí-lo?</target>
         <target state="translated">O valor que este formulário retornará se exibido como uma caixa de diálogo.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Evento gerado quando o usuário clica no botão de ajuda.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
index 26aa4b68c8d..2d7a3b02c80 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
@@ -5420,6 +5420,11 @@ Do you want to replace it?</source>
         <target state="translated">Значение, возвращаемое этой формой при ее отображении в виде диалогового окна.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Событие возникает при нажатии кнопки справки.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
index 07f04f08733..33d5cfc26c7 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
@@ -5420,6 +5420,11 @@ Değiştirmek istiyor musunuz?</target>
         <target state="translated">Bu formun iletişim kutusu olarak görüntülendiğinde döndüreceği değer.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">Yardım düğmesi tıklatıldığında harekete geçirilen olay.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
index 4981ca37d4b..45bb2833259 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
@@ -5420,6 +5420,11 @@ Do you want to replace it?</source>
         <target state="translated">此窗体在显示为对话框时将返回的值。</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">单击“帮助”按钮时引发的事件。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
index ae4bca12121..975f3f60b72 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
@@ -5420,6 +5420,11 @@ Do you want to replace it?</source>
         <target state="translated">如果顯示為對話方塊，此表單會傳回的值。</target>
         <note />
       </trans-unit>
+      <trans-unit id="FormFormRevealModeDescr">
+        <source>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</source>
+        <target state="new">Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="FormHelpButtonClickedDescr">
         <source>Event raised when the help button is clicked.</source>
         <target state="translated">按下說明按鈕時引發的事件。</target>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
index fd1fc9ba89c..b40d50ad9fc 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
@@ -45,7 +45,7 @@ public sealed partial class Application
 
     private static SystemColorMode? s_colorMode;
 #if NET11_0_OR_GREATER
-    private static FormAppearanceMode? s_formAppearanceMode;
+    private static FormRevealMode? s_defaultFormRevealMode;
 #endif
 
     private const string DarkModeKeyPath = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
@@ -254,16 +254,40 @@ internal static bool CustomThreadExceptionHandlerAttached
 
 #if NET11_0_OR_GREATER
     /// <summary>
-    ///  Gets the configured form appearance mode for the application.
+    ///  Gets the configured default <see cref="Forms.FormRevealMode"/> used as the reveal behavior for
+    ///  top-level forms that do not set <see cref="Form.FormRevealMode"/> explicitly.
     /// </summary>
     /// <remarks>
     ///  <para>
-    ///   If no mode has been configured with <see cref="SetFormAppearanceMode(FormAppearanceMode)"/>,
-    ///   WinForms uses <see cref="FormAppearanceMode.Deferred"/>.
+    ///   If no mode has been configured with <see cref="SetDefaultFormRevealMode(FormRevealMode)"/>, this
+    ///   returns <see cref="FormRevealMode.Inherit"/>. Unlike <see cref="Form.FormRevealMode"/>, this
+    ///   getter may return the unresolved <see cref="FormRevealMode.Inherit"/> sentinel; use
+    ///   <see cref="IsFormRevealDeferred"/> for the fully resolved answer.
     ///  </para>
     /// </remarks>
-    public static FormAppearanceMode FormAppearanceMode
-        => s_formAppearanceMode ?? FormAppearanceMode.Deferred;
+    public static FormRevealMode DefaultFormRevealMode
+        => s_defaultFormRevealMode ?? FormRevealMode.Inherit;
+
+    /// <summary>
+    ///  Gets a value indicating whether newly created top-level forms use deferred reveal by default.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   This is the fully resolved answer: <see langword="true"/> when
+    ///   <see cref="DefaultFormRevealMode"/> is <see cref="FormRevealMode.Deferred"/>, or when it is
+    ///   <see cref="FormRevealMode.Inherit"/> (the default, when <see cref="SetDefaultFormRevealMode(FormRevealMode)"/>
+    ///   has never been called) and <see cref="IsDarkModeEnabled"/> is <see langword="true"/>.
+    ///   Accessibility trumps compatibility here: an application that opts into dark mode gets
+    ///   flash-reduced form reveal automatically, without also having to call
+    ///   <see cref="SetDefaultFormRevealMode(FormRevealMode)"/> explicitly.
+    ///  </para>
+    /// </remarks>
+    public static bool IsFormRevealDeferred => DefaultFormRevealMode switch
+    {
+        FormRevealMode.Deferred => true,
+        FormRevealMode.Classic => false,
+        _ => IsDarkModeEnabled
+    };
 
 #endif
 
@@ -401,22 +425,30 @@ static void NotifySystemEventsOfColorChange()
 
 #if NET11_0_OR_GREATER
     /// <summary>
-    ///  Sets the process-wide form appearance mode.
+    ///  Sets the process-wide default <see cref="Forms.FormRevealMode"/> used for top-level forms that do
+    ///  not set <see cref="Form.FormRevealMode"/> explicitly.
     /// </summary>
-    /// <param name="mode">The form appearance mode to use for newly created forms.</param>
+    /// <param name="mode">The default form reveal mode to use for newly created top-level forms.</param>
     /// <remarks>
     ///  <para>
-    ///   Set the form appearance mode before creating UI to ensure newly created forms use the intended
-    ///   startup presentation behavior.
+    ///   Set the default form reveal mode before creating UI to ensure newly created forms use the
+    ///   intended startup presentation behavior. Unlike the visual-styles default-mode setter (which is
+    ///   write-once, since rendering-version selection is a static, one-time choice), this method can be
+    ///   called more than once, and <see cref="FormRevealMode.Inherit"/> is a valid argument (it resets
+    ///   the default back to its own ambient resolution via <see cref="IsFormRevealDeferred"/>). Free
+    ///   reassignment is intentional: the effective default is derived in part from <see cref="ColorMode"/>
+    ///   and <see cref="IsDarkModeEnabled"/>, which can themselves change for the lifetime of the process;
+    ///   locking this value after first use would make forms created after a later dark-mode change use a
+    ///   stale reveal behavior.
     ///  </para>
     /// </remarks>
-    /// <exception cref="ArgumentOutOfRangeException">
-    ///  <paramref name="mode"/> is not a valid <see cref="FormAppearanceMode"/> value.
+    /// <exception cref="InvalidEnumArgumentException">
+    ///  <paramref name="mode"/> is not a valid <see cref="Forms.FormRevealMode"/> value.
     /// </exception>
-    public static void SetFormAppearanceMode(FormAppearanceMode mode)
+    public static void SetDefaultFormRevealMode(FormRevealMode mode)
     {
         SourceGenerated.EnumValidator.Validate(mode, nameof(mode));
-        s_formAppearanceMode = mode;
+        s_defaultFormRevealMode = mode;
     }
 
 #endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Form.RevealMode.cs b/src/System.Windows.Forms/System/Windows/Forms/Form.RevealMode.cs
index 853bdd55346..d3eee07dbd0 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Form.RevealMode.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Form.RevealMode.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.ComponentModel;
 using Windows.Win32.Graphics.Dwm;
 
 namespace System.Windows.Forms;
@@ -8,6 +9,65 @@ namespace System.Windows.Forms;
 public partial class Form
 {
 #if NET11_0_OR_GREATER
+    private static readonly int s_propFormRevealMode = PropertyStore.CreateKey();
+
+    /// <summary>
+    ///  Gets or sets how this form is presented while its initial appearance is prepared.
+    /// </summary>
+    /// <value>
+    ///  A <see cref="Forms.FormRevealMode"/> value. When not explicitly set, the effective value is
+    ///  <see cref="FormRevealMode.Deferred"/> or <see cref="FormRevealMode.Classic"/>, resolved from
+    ///  <see cref="Application.IsFormRevealDeferred"/>.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   As an ambient property, a form that does not have this value set explicitly resolves it from
+    ///   <see cref="Application.DefaultFormRevealMode"/>. Unlike a control-level ambient property that
+    ///   chains through a parent hierarchy, this property does not chain through a parent hierarchy:
+    ///   deferred reveal is a top-level-window-only concept (see remarks on
+    ///   <see cref="FormRevealMode.Deferred"/> and the DWM cloaking mechanism it relies on), so only
+    ///   <see cref="Form"/> itself, and the process-wide <see cref="Application"/> default, participate.
+    ///  </para>
+    ///  <para>
+    ///   A splash screen or other form that should always appear instantly, even while the rest of the
+    ///   application defers by default, can set this property on itself to
+    ///   <see cref="FormRevealMode.Classic"/> without affecting the process-wide default.
+    ///  </para>
+    /// </remarks>
+    [SRCategory(nameof(SR.CatWindowStyle))]
+    [AmbientValue(FormRevealMode.Inherit)]
+    [SRDescription(nameof(SR.FormFormRevealModeDescr))]
+    public virtual FormRevealMode FormRevealMode
+    {
+        get
+        {
+            if (!Properties.TryGetValue(s_propFormRevealMode, out FormRevealMode value)
+                || value == FormRevealMode.Inherit)
+            {
+                value = Application.IsFormRevealDeferred ? FormRevealMode.Deferred : FormRevealMode.Classic;
+            }
+
+            return value;
+        }
+        set
+        {
+            SourceGenerated.EnumValidator.Validate(value, nameof(value));
+
+            if (value == FormRevealMode.Inherit)
+            {
+                Properties.RemoveValue(s_propFormRevealMode);
+            }
+            else
+            {
+                Properties.AddValue(s_propFormRevealMode, value);
+            }
+        }
+    }
+
+    private bool ShouldSerializeFormRevealMode() => Properties.ContainsKey(s_propFormRevealMode);
+
+    private void ResetFormRevealMode() => Properties.RemoveValue(s_propFormRevealMode);
+
     private bool DeferredAppearanceCloaked
     {
         get => Properties.GetValueOrDefault(s_propFormAppearanceCloaked, false);
@@ -43,7 +103,7 @@ private void UncloakDeferredAppearanceIfNeeded()
     private void ClearDeferredAppearanceCloakState() => DeferredAppearanceCloaked = false;
 
     private bool ShouldUseDeferredAppearanceCloak()
-        => Application.FormAppearanceMode == FormAppearanceMode.Deferred
+        => FormRevealMode == FormRevealMode.Deferred
             && TopLevel
             && !IsMdiChild
             && Visible
diff --git a/src/System.Windows.Forms/System/Windows/Forms/FormRevealMode.cs b/src/System.Windows.Forms/System/Windows/Forms/FormRevealMode.cs
index f5e76f27151..076b339a558 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/FormRevealMode.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/FormRevealMode.cs
@@ -5,12 +5,26 @@ namespace System.Windows.Forms;
 
 #if NET11_0_OR_GREATER
 /// <summary>
-///  Specifies how WinForms presents a form while its initial appearance is prepared.
+///  Specifies how WinForms presents a top-level <see cref="Form"/> while its initial appearance is
+///  prepared.
 /// </summary>
-public enum FormAppearanceMode
+public enum FormRevealMode
 {
     /// <summary>
-    ///  Uses the classic WinForms form presentation behavior.
+    ///  The form inherits its effective reveal behavior from <see cref="Application.DefaultFormRevealMode"/>.
+    ///  This is the ambient default and is never returned by <see cref="Form.FormRevealMode"/> after
+    ///  resolution.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   This value is the ambient sentinel: assigning it to <see cref="Form.FormRevealMode"/> clears any
+    ///   local override so the value is inherited from <see cref="Application.DefaultFormRevealMode"/> again.
+    ///  </para>
+    /// </remarks>
+    Inherit = -1,
+
+    /// <summary>
+    ///  Uses the classic WinForms form presentation behavior. The form is never cloaked.
     /// </summary>
     Classic = 0,
 
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
index 0a44740b336..5aeb7d2f2e4 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
@@ -182,26 +182,53 @@ public void Application_SetColorMode_PlausibilityTests()
 
 #if NET11_0_OR_GREATER
     [WinFormsFact]
-    public void Application_FormAppearanceMode_Default_ReturnsDeferred()
+    public void Application_DefaultFormRevealMode_Default_ReturnsInherit()
     {
-        Assert.Equal(FormAppearanceMode.Deferred, Application.FormAppearanceMode);
+        // Run in an isolated child process: DefaultFormRevealMode is process-wide state, and other tests
+        // in this shared-process test binary may have already called SetDefaultFormRevealMode.
+        RemoteExecutor.Invoke(() =>
+        {
+            Assert.Equal(FormRevealMode.Inherit, Application.DefaultFormRevealMode);
+        }).Dispose();
     }
 
     [WinFormsTheory]
-    [InlineData(FormAppearanceMode.Classic)]
-    [InlineData(FormAppearanceMode.Deferred)]
-    public void Application_SetFormAppearanceMode_GetReturnsExpected(FormAppearanceMode mode)
+    [InlineData(FormRevealMode.Classic)]
+    [InlineData(FormRevealMode.Deferred)]
+    [InlineData(FormRevealMode.Inherit)]
+    public void Application_SetDefaultFormRevealMode_GetReturnsExpected(FormRevealMode mode)
     {
-        Application.SetFormAppearanceMode(mode);
-        Assert.Equal(mode, Application.FormAppearanceMode);
+        Application.SetDefaultFormRevealMode(mode);
+        Assert.Equal(mode, Application.DefaultFormRevealMode);
     }
 
     [WinFormsFact]
-    public void Application_SetFormAppearanceMode_Invalid_ThrowsInvalidEnumArgumentException()
+    public void Application_SetDefaultFormRevealMode_Invalid_ThrowsInvalidEnumArgumentException()
     {
         Assert.Throws<InvalidEnumArgumentException>(
             "mode",
-            () => Application.SetFormAppearanceMode((FormAppearanceMode)int.MaxValue));
+            () => Application.SetDefaultFormRevealMode((FormRevealMode)int.MaxValue));
+    }
+
+    [WinFormsFact]
+    public void Application_IsFormRevealDeferred_Classic_ReturnsFalse()
+    {
+        Application.SetDefaultFormRevealMode(FormRevealMode.Classic);
+        Assert.False(Application.IsFormRevealDeferred);
+    }
+
+    [WinFormsFact]
+    public void Application_IsFormRevealDeferred_Deferred_ReturnsTrue()
+    {
+        Application.SetDefaultFormRevealMode(FormRevealMode.Deferred);
+        Assert.True(Application.IsFormRevealDeferred);
+    }
+
+    [WinFormsFact]
+    public void Application_IsFormRevealDeferred_Inherit_MatchesIsDarkModeEnabled()
+    {
+        Application.SetDefaultFormRevealMode(FormRevealMode.Inherit);
+        Assert.Equal(Application.IsDarkModeEnabled, Application.IsFormRevealDeferred);
     }
 #endif
 
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.RevealMode.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.RevealMode.cs
new file mode 100644
index 00000000000..9b4aa4ef442
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/FormTests.RevealMode.cs
@@ -0,0 +1,78 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.ComponentModel;
+
+namespace System.Windows.Forms.Tests;
+
+public partial class FormTests
+{
+#if NET11_0_OR_GREATER
+    [WinFormsFact]
+    public void Form_FormRevealMode_Default_ResolvesFromApplication()
+    {
+        using SubForm form = new();
+
+        Application.SetDefaultFormRevealMode(FormRevealMode.Classic);
+        Assert.Equal(FormRevealMode.Classic, form.FormRevealMode);
+
+        Application.SetDefaultFormRevealMode(FormRevealMode.Deferred);
+        Assert.Equal(FormRevealMode.Deferred, form.FormRevealMode);
+    }
+
+    [WinFormsTheory]
+    [InlineData(FormRevealMode.Classic)]
+    [InlineData(FormRevealMode.Deferred)]
+    public void Form_FormRevealMode_SetExplicit_OverridesApplicationDefault(FormRevealMode mode)
+    {
+        using SubForm form = new();
+        FormRevealMode otherMode = mode == FormRevealMode.Classic ? FormRevealMode.Deferred : FormRevealMode.Classic;
+
+        Application.SetDefaultFormRevealMode(otherMode);
+        form.FormRevealMode = mode;
+
+        Assert.Equal(mode, form.FormRevealMode);
+    }
+
+    [WinFormsFact]
+    public void Form_FormRevealMode_SetInherit_ClearsLocalOverride()
+    {
+        using SubForm form = new();
+
+        Application.SetDefaultFormRevealMode(FormRevealMode.Deferred);
+        form.FormRevealMode = FormRevealMode.Classic;
+        Assert.Equal(FormRevealMode.Classic, form.FormRevealMode);
+
+        form.FormRevealMode = FormRevealMode.Inherit;
+
+        Assert.Equal(FormRevealMode.Deferred, form.FormRevealMode);
+    }
+
+    [WinFormsFact]
+    public void Form_FormRevealMode_InvalidValue_ThrowsInvalidEnumArgumentException()
+    {
+        using SubForm form = new();
+
+        Assert.Throws<InvalidEnumArgumentException>(
+            "value",
+            () => form.FormRevealMode = (FormRevealMode)int.MaxValue);
+    }
+
+    [WinFormsFact]
+    public void Form_FormRevealMode_ShouldSerialize_ResetRoundTrips()
+    {
+        using SubForm form = new();
+        PropertyDescriptor property = TypeDescriptor.GetProperties(form)[nameof(Form.FormRevealMode)];
+
+        Assert.False(property.ShouldSerializeValue(form));
+
+        form.FormRevealMode = FormRevealMode.Classic;
+        Assert.True(property.ShouldSerializeValue(form));
+
+        property.ResetValue(form);
+        Assert.False(property.ShouldSerializeValue(form));
+    }
+#endif
+}

From 3fc0c2c0b8a0873cfff8658be13e785bc57d532a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:15:10 -0700
Subject: [PATCH 15/50] Wire FormRevealMode into the VB Application Framework

Adds Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.FormRevealMode,
following the exact same pattern already established for ColorMode and
HighDpiMode in that class, per dotnet/winforms#14585's API Proposal.

WindowsFormsApplicationBase now carries a _formRevealMode shadow field
(defaulting to FormRevealMode.Classic, matching the existing conservative
default for _colorMode) and a protected FormRevealMode property, feeds it
into the ApplyApplicationDefaultsEventArgs constructor alongside
MinimumSplashScreenDisplayTime/HighDpiMode/ColorMode, reads back whatever the
ApplyApplicationDefaults event handler set, and calls
Application.SetDefaultFormRevealMode(_formRevealMode) at the end of
OnInitialize alongside the existing Application.SetColorMode(_colorMode)
call.

This completes work anticipated but never finished in an earlier .NET 9
Visual Styles attempt at this same VB Application Framework extension point
(OnInitialize already carried a comment claiming "We feed the defaults for
HighDpiMode, ColorMode, VisualStylesMode to the EventArgs", but only
HighDpiMode/ColorMode were ever actually wired up).

Updates PublicAPI.Unshipped.txt for Microsoft.VisualBasic.Forms.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../ApplyApplicationDefaultsEventArgs.vb      | 10 ++++++-
 .../WindowsFormsApplicationBase.vb            | 27 +++++++++++++++++--
 .../src/PublicAPI.Unshipped.txt               |  4 +++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
index 91ea19640da..8dc15332326 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
@@ -19,11 +19,13 @@ Namespace Microsoft.VisualBasic.ApplicationServices
 
         Friend Sub New(minimumSplashScreenDisplayTime As Integer,
                 highDpiMode As HighDpiMode,
-                colorMode As SystemColorMode)
+                colorMode As SystemColorMode,
+                formRevealMode As FormRevealMode)
 
             Me.MinimumSplashScreenDisplayTime = minimumSplashScreenDisplayTime
             Me.HighDpiMode = highDpiMode
             Me.ColorMode = colorMode
+            Me.FormRevealMode = formRevealMode
         End Sub
 
         ''' <summary>
@@ -32,6 +34,12 @@ Namespace Microsoft.VisualBasic.ApplicationServices
         ''' </summary>
         Public Property ColorMode As SystemColorMode
 
+        ''' <summary>
+        '''  Setting this property inside the event handler determines the default
+        '''  <see cref="FormRevealMode"/> for newly created top-level forms.
+        ''' </summary>
+        Public Property FormRevealMode As FormRevealMode
+
         ''' <summary>
         '''  Setting this property inside the event handler causes a
         '''  new default <see cref="Font"/> for Forms and UserControls to be set.
diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
index 6e14d471534..ee64edcc086 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
@@ -69,6 +69,9 @@ Namespace Microsoft.VisualBasic.ApplicationServices
         ' Note: We aim to expose this to the App Designer in later runtime/VS versions.
         Private _colorMode As SystemColorMode = SystemColorMode.Classic
 
+        ' The FormRevealMode the user assigned to the ApplyApplicationsDefault event.
+        Private _formRevealMode As FormRevealMode = FormRevealMode.Classic
+
         ' We only need to show the splash screen once.
         ' Protect the user from himself if they are overriding our app model.
         Private _didSplashScreen As Boolean
@@ -200,6 +203,23 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             End Set
         End Property
 
+        ''' <summary>
+        '''  Gets or sets the <see cref="FormRevealMode"/> for the Application.
+        ''' </summary>
+        ''' <value>
+        '''  The <see cref="FormRevealMode"/> that newly created top-level forms use by
+        '''  default.
+        ''' </value>
+        <EditorBrowsable(EditorBrowsableState.Never)>
+        Protected Property FormRevealMode As FormRevealMode
+            Get
+                Return _formRevealMode
+            End Get
+            Set(value As FormRevealMode)
+                _formRevealMode = value
+            End Set
+        End Property
+
         ''' <summary>
         '''  Determines whether this application will use the XP Windows styles for windows, controls, etc.
         ''' </summary>
@@ -734,7 +754,7 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             '    in a derived class and setting `MyBase.MinimumSplashScreenDisplayTime` there.
             '    We are picking this (probably) changed value up, and pass it to the ApplyDefaultsEvents
             '    where it could be modified (again). So event wins over Override over default value (2 seconds).
-            ' b) We feed the defaults for HighDpiMode, ColorMode, VisualStylesMode to the EventArgs.
+            ' b) We feed the defaults for HighDpiMode, ColorMode, FormRevealMode to the EventArgs.
             '    With the introduction of the HighDpiMode property, we changed Project System the chance to reflect
             '    those default values in the App Designer UI and have it code-generated based on a modified
             '    Application.myapp, which would result it to be set in the derived constructor.
@@ -746,7 +766,8 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             Dim applicationDefaultsEventArgs As New ApplyApplicationDefaultsEventArgs(
                 MinimumSplashScreenDisplayTime,
                 HighDpiMode,
-                ColorMode) With
+                ColorMode,
+                FormRevealMode) With
             {
                 .MinimumSplashScreenDisplayTime = MinimumSplashScreenDisplayTime
             }
@@ -765,6 +786,7 @@ Namespace Microsoft.VisualBasic.ApplicationServices
 
             _highDpiMode = applicationDefaultsEventArgs.HighDpiMode
             _colorMode = applicationDefaultsEventArgs.ColorMode
+            _formRevealMode = applicationDefaultsEventArgs.FormRevealMode
 
             ' Then, it's applying what we got back as HighDpiMode.
             Dim dpiSetResult As Boolean = Application.SetHighDpiMode(_highDpiMode)
@@ -781,6 +803,7 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             End If
 
             Application.SetColorMode(_colorMode)
+            Application.SetDefaultFormRevealMode(_formRevealMode)
 
             ' We'll handle "/nosplash" for you.
             If Not (commandLineArgs.Contains("/nosplash") OrElse Me.CommandLineArgs.Contains("-nosplash")) Then
diff --git a/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt b/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
index e69de29bb2d..71b1f47c484 100644
--- a/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
@@ -0,0 +1,4 @@
+Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.FormRevealMode() -> System.Windows.Forms.FormRevealMode
+Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.FormRevealMode(AutoPropertyValue As System.Windows.Forms.FormRevealMode) -> Void
+Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode() -> System.Windows.Forms.FormRevealMode
+Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode(value As System.Windows.Forms.FormRevealMode) -> Void

From b0e8702534010f7e0297deb375f41f2780ad0847 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Sat, 13 Jun 2026 13:26:48 -0700
Subject: [PATCH 16/50] Update agent skills: build.cmd build tenet, PublicAPI
 override tracking, and test cancellation/nullable guidance

- building-code: add a top-level TENET to build the solution only with build.cmd (CI parity for
  PublicAPI/analyzer enforcement and -warnAsError); a plain dotnet build is inner-loop only.
- new-control-api: new public/protected overrides must be tracked in PublicAPI.Unshipped.txt with the
  override prefix; note CS0114 (new keyword) and CS1574 (no cref to cross-assembly internal types).
- control-api-tests: async tests must pass CancellationToken (TestContext.Current.CancellationToken,
  CA2016/xUnit1051) and respect the #nullable context (CS8632).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/skills/building-code/SKILL.md     |  78 ++++++++++++++
 .github/skills/control-api-tests/SKILL.md |  22 ++++
 .github/skills/new-control-api/SKILL.md   | 124 +++++++++++++++-------
 3 files changed, 187 insertions(+), 37 deletions(-)

diff --git a/.github/skills/building-code/SKILL.md b/.github/skills/building-code/SKILL.md
index 040dd437081..67fd8c7ba30 100644
--- a/.github/skills/building-code/SKILL.md
+++ b/.github/skills/building-code/SKILL.md
@@ -11,6 +11,22 @@ metadata:
 
 # Building the WinForms Repository
 
+> ## 🛑 TENET — Build the solution ONLY with `build.cmd`
+>
+> **Never** build, validate, or declare the WinForms solution "clean" with a plain
+> `dotnet build` / `dotnet msbuild` of `Winforms.sln`. Only **`build.cmd`** (Arcade) applies the
+> repository's CI configuration — the **PublicAPI analyzer (RS0016/RS0017)**, the code-style and
+> documentation analyzers, and **`-warnAsError`**. A plain `dotnet build` silently downgrades or
+> skips these, so **"0 warnings" there does NOT mean CI is green** — the very same change can fail
+> the official build with errors.
+>
+> * **Full / release / package / "is it clean?" verification → always `build.cmd`** (see §2).
+> * A single-project `dotnet build` (see §3) is an **inner-loop convenience only**. It is fine while
+>   iterating, but you **must re-verify with `build.cmd` before claiming a change builds cleanly**.
+> * If `build.cmd` cannot run in your environment, the closest fallback is
+>   `dotnet build <project> /p:ContinuousIntegrationBuild=true /p:TreatWarningsAsErrors=true` — and
+>   you must say so explicitly rather than implying a `build.cmd` result.
+
 ## Prerequisites
 
 * Windows is required for WinForms runtime scenarios, test execution, and Visual
@@ -45,6 +61,12 @@ You can pass any extra `Build.ps1` flags after `Restore.cmd`, e.g.
 
 ## 2  Full Solution Build (preferred)
 
+> **Always use `build.cmd` (Arcade) for full, release, and package builds.** Do **not** use a plain
+> `dotnet build` of the solution for these — only `build.cmd` guarantees the Arcade-supported build
+> options and the download of the correct base SDK (`global.json`) needed to compile. Plain
+> `dotnet build` is reserved for the fast single-project inner loop (see Section 3), and even then
+> only after at least one successful `build.cmd` / `Restore.cmd`.
+
 ```
 .\build.cmd
 ```
@@ -57,6 +79,56 @@ Under the hood this runs:
 eng\common\Build.ps1 -NativeToolsOnMachine -restore -build -bl
 ```
 
+### 2.1  Full (clean) test build — required workflow
+
+For a full, clean build of the whole solution, **clean the artifacts first, then build**:
+
+```powershell
+# 1. Clean the artifacts folder.
+.\build -clean
+
+# 2. Build the full solution.
+.\build
+```
+
+**Reporting requirement:** a full build is long-running, so while it runs **report progress back to
+the user in the console to bridge the wait and give early orientation.** As assemblies complete,
+report which assemblies have been **built successfully** and which **failed and with how many
+errors**. Prefer running the build with a binary log (the default `-bl`) and/or stream the console
+output so per-project results can be surfaced as they happen rather than only at the end.
+
+### 2.2  Release build
+
+```powershell
+.\build -configuration release
+```
+
+### 2.3  Creating packages
+
+```powershell
+# Debug packages
+.\build -pack
+
+# Release packages
+.\build -configuration release -pack
+```
+
+### 2.4  Full `Build.ps1` parameter list
+
+`build.cmd` forwards every extra argument to `eng\common\Build.ps1`. The full surface is:
+
+```
+Build.ps1 [-configuration <string>] [-platform <string>] [-projects <string>]
+          [-verbosity <string>] [-msbuildEngine <string>] [-warnAsError <bool>]
+          [-warnNotAsError <string>] [-nodeReuse <bool>] [-buildCheck] [-restore]
+          [-deployDeps] [-build] [-rebuild] [-deploy] [-test] [-integrationTest]
+          [-performanceTest] [-sign] [-pack] [-publish] [-clean] [-productBuild]
+          [-fromVMR] [-binaryLog] [-binaryLogName <string>] [-excludeCIBinarylog]
+          [-ci] [-prepareMachine] [-runtimeSourceFeed <string>]
+          [-runtimeSourceFeedKey <string>] [-excludePrereleaseVS]
+          [-nativeToolsOnMachine] [-help] [-properties <string[]>] [<CommonParameters>]
+```
+
 ### Common flags
 
 | Flag | Short | Description |
@@ -90,6 +162,12 @@ eng\common\Build.ps1 -NativeToolsOnMachine -restore -build -bl
 
 ## 3  Optimized Building a Single Project (fast inner-loop)
 
+> **Inner-loop only.** Use plain `dotnet build` of a single project **only** for quick iteration on
+> one project, and **only after** at least one successful `.\build.cmd` / `.\Restore.cmd`. It does
+> **not** guarantee the Arcade-supported build options or the download of the correct base SDK, so it
+> must **never** be used for a full solution build, a release build, packaging, or any build whose
+> result you intend to report as authoritative. For those, always use `build.cmd` (Section 2).
+
 Prefer rebuilding just the project(s) with recent changes by using the
 standard `dotnet build` command, **after** at least one initial successful
 full restore (via `.\Restore.cmd` or `.\build.cmd`).
diff --git a/.github/skills/control-api-tests/SKILL.md b/.github/skills/control-api-tests/SKILL.md
index 5badcc2547c..ff4e9304230 100644
--- a/.github/skills/control-api-tests/SKILL.md
+++ b/.github/skills/control-api-tests/SKILL.md
@@ -66,6 +66,28 @@ The project uses **xUnit** with **FluentAssertions**. Key attributes:
 These are custom xUnit attributes that ensure tests run on an STA thread,
 which WinForms requires for COM interop and UI operations.
 
+### 1.4 Async tests: pass a CancellationToken, respect `#nullable`
+
+The repository runs **xUnit v3** and enforces the relevant analyzers as **errors** under the CI
+build (`build.cmd`). Two pitfalls fail CI even though a plain `dotnet build` may not flag them:
+
+* **CA2016 / xUnit1051 — always pass a `CancellationToken` to async calls.** Methods such as
+  `Task.Delay` must receive a token so a cancelled test run stops promptly. In xUnit v3 use
+  `TestContext.Current.CancellationToken`:
+
+  ```csharp
+  await Task.Delay(25, TestContext.Current.CancellationToken);
+  ```
+
+  When you receive a `CancellationToken ct` (e.g. in a callback), **forward it** rather than dropping it.
+
+* **CS8632 — nullable annotations need a `#nullable` context.** If a test file uses `?` reference
+  annotations (e.g. `object? sender`) but the project does not enable nullable, add `#nullable enable`
+  at the top of the file (or remove the annotation). Match the surrounding files' convention.
+
+> Verify with `build.cmd` (CI parity) — see the `building-code` skill's build tenet. A plain
+> single-project `dotnet build` can report these as 0 warnings while CI fails them as errors.
+
 ---
 
 ## 2. Test Method Naming
diff --git a/.github/skills/new-control-api/SKILL.md b/.github/skills/new-control-api/SKILL.md
index ce6c58b6d2e..3030cf92ef7 100644
--- a/.github/skills/new-control-api/SKILL.md
+++ b/.github/skills/new-control-api/SKILL.md
@@ -148,7 +148,34 @@ System.Windows.Forms.MyEnum.Value2 = 1 -> System.Windows.Forms.MyEnum
 **Nullable annotations:** `?` = nullable reference, `!` = non-nullable
 reference. Value types do not carry these markers unless `Nullable<T>`.
 
-### 2.4 Publicly accessible interfaces
+### 2.4 New `override` members must be tracked too
+
+The PublicAPI analyzer (RS0016) treats a **newly introduced `override`** of a public or
+protected member as new API surface — even though the base member is already public. Whenever
+you **add an `override` that did not previously exist on that type**, add a line for it to
+`PublicAPI.Unshipped.txt` with the `override` prefix. This is easy to miss for paint/lifecycle
+overrides added to support a feature. Examples:
+
+```text
+override System.Windows.Forms.CheckBox.OnPaint(System.Windows.Forms.PaintEventArgs! pevent) -> void
+override System.Windows.Forms.CheckBox.Dispose(bool disposing) -> void
+override System.Windows.Forms.ButtonBase.OnVisualStylesModeChanged(System.EventArgs! e) -> void
+```
+
+> **CI catches this, a plain `dotnet build` may not.** RS0016 is enforced as an **error** under
+> the CI/Arcade build (`build.cmd`); a single-project `dotnet build` can report it as 0 warnings.
+> Always re-verify API tracking with `build.cmd` (see the `building-code` skill's build tenet).
+
+### 2.5 Related pitfalls when adding members to a control
+
+* **Hiding an inherited member (CS0114):** if your new member intentionally hides an inherited
+  one (e.g. a `private new bool ShouldSerializePadding()` shadowing `Control.ShouldSerializePadding()`),
+  you **must** use the `new` keyword, or the CI build fails.
+* **`cref` to internal types in another assembly (CS1574):** XML-doc `<see cref="..."/>` cannot
+  resolve a type that is `internal` in a *different* assembly (even via `InternalsVisibleTo`). Use
+  `<c>TypeName</c>` (plain code font) instead of a `cref` for such references.
+
+### 2.6 Publicly accessible interfaces
 
 If a new **public or protected interface** is introduced (or an existing one
 gains new members), every member that is publicly accessible must also appear
@@ -468,51 +495,73 @@ protected virtual void OnMyPropertyChanged(EventArgs e)
 
 ---
 
-## 7. .NET Version Guard — Mandatory
+## 7. API Stability: Experimental vs. Stable — and Version Guards
 
-All new public APIs **must** be guarded with a preprocessor directive for the
-target .NET version. Currently, new APIs target at least **.NET 11**:
+### 7.1 New APIs are STABLE by default — do NOT mark them `[Experimental]`
 
-```csharp
-#if NET11_0_OR_GREATER
-    /// <summary>
-    ///  Gets or sets the corner radius for the control's border.
-    /// </summary>
-    public int CornerRadius
-    {
-        get => Properties.GetValueOrDefault(s_cornerRadiusProperty, 0);
-        set
-        {
-            ArgumentOutOfRangeException.ThrowIfNegative(value);
+New public APIs ship as **normal, stable APIs by default**. Do **not** add the
+`[Experimental(...)]` attribute, a `WFO5xxx` diagnostic ID, or `[WFO5xxx]`
+PublicAPI prefixes unless the work item **explicitly** asks for an experimental
+API.
 
-            if (Properties.GetValueOrDefault(s_cornerRadiusProperty, 0) != value)
-            {
-                Properties.AddOrRemoveValue(s_cornerRadiusProperty, value, defaultValue: 0);
-                OnCornerRadiusChanged(EventArgs.Empty);
-            }
-        }
-    }
-#endif
-```
+> **Never make an API experimental implicitly.** Experimental status is a
+> deliberate, requested decision (it changes the customer contract and requires a
+> diagnostic ID + suppression to consume). If the context does not explicitly call
+> for it, the API is stable.
+
+### 7.2 When an experimental API *is* explicitly requested
+
+Only when the task explicitly requests an experimental API:
+
+1. Add (or reuse) a diagnostic ID in the `WFO500x` group in
+   `src\System.Windows.Forms.Analyzers\src\System\Windows\Forms\Analyzers\Diagnostics\DiagnosticIDs.cs`
+   (e.g. `ExperimentalDarkMode = "WFO5001"`, `ExperimentalAsync = "WFO5002"`,
+   `ExperimentalAsyncDropTarget = "WFO5003"`). New IDs continue the sequence.
+2. Decorate the API:
+   ```csharp
+   [Experimental(DiagnosticIDs.ExperimentalXxx, UrlFormat = DiagnosticIDs.UrlFormat)]
+   ```
+3. Prefix every PublicAPI entry for that API with the diagnostic ID, e.g.
+   `[WFO5001]System.Windows.Forms.SomeNewApi.get -> ...`.
+4. Add a row to **both** `docs\analyzers\Experimental.Help.md` and
+   `docs\list-of-diagnostics.md`.
+5. Suppress the diagnostic where the framework itself consumes the API
+   (`#pragma warning disable WFOxxxx` / `#Disable Warning WFOxxxx` in VB).
 
-> **Why?** Version guards ensure new APIs are only available on the .NET version
-> they were approved for, preventing accidental use on older runtimes. The guard
-> applies to the entire API surface: property, event, `On` method, and any
-> associated types.
+When the API later **graduates to stable** (typically the next release), reverse
+all five steps: remove the attribute, the `[WFOxxxx]` PublicAPI prefixes, the
+suppressions, the docs rows, and the unused diagnostic ID.
 
-The matching tests must use the **same** preprocessor guard:
+### 7.3 Version guards
+
+This repository **single-targets the current in-development .NET** (see
+`TargetFramework` / `NetCurrent`), so source is **not** wrapped in
+`#if NETxx_0_OR_GREATER` guards — there are none in `System.Windows.Forms`. Do
+**not** add `#if NET11_0_OR_GREATER` blocks around new APIs. Add the member
+directly:
 
 ```csharp
-#if NET11_0_OR_GREATER
-    [WinFormsFact]
-    public void MyControl_CornerRadius_Set_GetReturnsExpected()
+/// <summary>
+///  Gets or sets the corner radius for the control's border.
+/// </summary>
+public int CornerRadius
+{
+    get => Properties.GetValueOrDefault(s_cornerRadiusProperty, 0);
+    set
     {
-        using MyControl control = new() { CornerRadius = 5 };
-        Assert.Equal(5, control.CornerRadius);
+        ArgumentOutOfRangeException.ThrowIfNegative(value);
+
+        if (Properties.GetValueOrDefault(s_cornerRadiusProperty, 0) != value)
+        {
+            Properties.AddOrRemoveValue(s_cornerRadiusProperty, value, defaultValue: 0);
+            OnCornerRadiusChanged(EventArgs.Empty);
+        }
     }
-#endif
+}
 ```
 
+Tests do not need a version guard either.
+
 ---
 
 ## 8. Checklist Before Submitting
@@ -521,7 +570,8 @@ Before considering the implementation complete, verify:
 
 * [ ] API proposal issue exists (upstream or fork) with full proposal format
 * [ ] All new public/protected members are in `PublicAPI.Unshipped.txt`
-* [ ] New APIs guarded with `#if NET11_0_OR_GREATER` (or appropriate version)
+* [ ] API is **stable** (no `[Experimental]`/`WFO5xxx`) unless experimental was
+      explicitly requested; no `#if NETxx_0_OR_GREATER` guards
 * [ ] Property values stored via `PropertyStore` (not backing fields)
 * [ ] Every property has a CodeDOM serialization strategy
 * [ ] Every property has `On[Property]Changed` + `[Property]Changed` event
@@ -533,7 +583,7 @@ Before considering the implementation complete, verify:
 * [ ] XML documentation on every new public/protected member
 * [ ] Naming follows precedent on the control and its base classes
 * [ ] Publicly accessible interface members are tracked in PublicAPI files
-* [ ] Unit tests cover the new API surface (with matching version guard)
+* [ ] Unit tests cover the new API surface
 
 ### 8.1 API issue checklist
 

From 5355ae04109fc725a667a46874491815c74379b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Tue, 19 May 2026 15:11:44 -0700
Subject: [PATCH 17/50] Move component code files to component folder.

---
 .../src/NativeMethods.txt                     |  3 +
 .../PublicAPI.Unshipped.txt                   | 68 +++++++++++++++++++
 .../ErrorProvider/ErrorBlinkStyle.cs          |  0
 .../ErrorProvider/ErrorIconAlignment.cs       |  0
 ...ControlItem.ControlItemAccessibleObject.cs |  0
 .../ErrorProvider.ControlItem.cs              |  0
 .../ErrorProvider.ErrorProviderStates.cs      |  0
 ...ErrorWindow.ErrorWindowAccessibleObject.cs |  0
 .../ErrorProvider.ErrorWindow.cs              |  0
 .../ErrorProvider/ErrorProvider.IconRegion.cs |  0
 .../ErrorProvider/ErrorProvider.cs            |  0
 .../{Help => Components}/HelpProvider.cs      |  0
 .../ImageList/ColorDepth.cs                   |  0
 .../ImageList.ImageCollection.ImageInfo.cs    |  0
 .../ImageList/ImageList.ImageCollection.cs    |  0
 .../ImageList/ImageList.Indexer.cs            |  0
 .../ImageList/ImageList.NativeImageList.cs    |  0
 .../ImageList/ImageList.Original.cs           |  0
 .../ImageList/ImageList.OriginalOptions.cs    |  0
 .../ImageList/ImageList.cs                    |  0
 .../ImageList/ImageListConverter.cs           |  0
 .../ImageList/ImageListStreamer.cs            |  0
 .../ImageList/RelatedImageListAttribute.cs    |  0
 .../Windows/Forms/{ => Components}/Timer.cs   |  0
 24 files changed, 71 insertions(+)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorBlinkStyle.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorIconAlignment.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorProvider.ControlItem.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorProvider.ErrorProviderStates.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorProvider.ErrorWindow.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorProvider.IconRegion.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/ErrorProvider/ErrorProvider.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Help => Components}/HelpProvider.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ColorDepth.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageList.ImageCollection.ImageInfo.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageList.ImageCollection.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageList.Indexer.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageList.NativeImageList.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageList.Original.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageList.OriginalOptions.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageList.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageListConverter.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/ImageListStreamer.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{Controls => Components}/ImageList/RelatedImageListAttribute.cs (100%)
 rename src/System.Windows.Forms/System/Windows/Forms/{ => Components}/Timer.cs (100%)

diff --git a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
index 751a668cde2..ecb393942e5 100644
--- a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
+++ b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
@@ -516,6 +516,9 @@ PD_RESULT_*
 PostQuitMessage
 PostQuitMessage
 PostThreadMessage
+PowerCreateRequest
+PowerClearRequest
+PowerSetRequest
 PRF_*
 PROGRESS_CLASS
 PROPERTYKEY
diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index af40817ec06..4a9ea0b6c72 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -46,3 +46,71 @@ override System.Windows.Forms.RichTextBox.BeginSuspendPaintingCore() -> void
 override System.Windows.Forms.RichTextBox.EndSuspendPaintingCore() -> void
 override System.Windows.Forms.TreeView.BeginSuspendPaintingCore() -> void
 override System.Windows.Forms.TreeView.EndSuspendPaintingCore() -> void
+WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreenChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreen.set -> void
+WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreen.get -> bool
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKeyChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKey.set -> void
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.Forms.Keys
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreen() -> void
+WinFormsBoards.Controls.KioskModeManager.SuppressPowerSavingChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.SuppressPowerSaving.set -> void
+WinFormsBoards.Controls.KioskModeManager.SuppressPowerSaving.get -> bool
+WinFormsBoards.Controls.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
+WinFormsBoards.Controls.KioskModeManager.KioskModeManager() -> void
+WinFormsBoards.Controls.KioskModeManager.IsFullScreen.get -> bool
+WinFormsBoards.Controls.KioskModeManager.HideTaskbarChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.HideTaskbar.set -> void
+WinFormsBoards.Controls.KioskModeManager.HideTaskbar.get -> bool
+WinFormsBoards.Controls.KioskModeManager.FullScreenChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.ExitFullScreen() -> void
+WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreenChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreen.set -> void
+WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreen.get -> bool
+WinFormsBoards.Controls.KioskModeManager.EnterFullScreen() -> void
+WinFormsBoards.Controls.KioskModeManager.ContainerControlChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.ContainerControl.set -> void
+WinFormsBoards.Controls.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
+WinFormsBoards.Controls.KioskModeManager
+virtual WinFormsBoards.Controls.KioskModeManager.OnTopMostInFullScreenChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnToggleFullScreenKeyChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnSuppressPowerSavingChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnHideTaskbarChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnEscapeExitsFullScreenChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnTopMostInFullScreenChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnToggleFullScreenKeyChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnSuppressPowerSavingChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnHideTaskbarChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnEscapeExitsFullScreenChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
+System.Windows.Forms.KioskModeManager.TopMostInFullScreenChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.TopMostInFullScreen.set -> void
+System.Windows.Forms.KioskModeManager.TopMostInFullScreen.get -> bool
+System.Windows.Forms.KioskModeManager.ToggleFullScreenKeyChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.set -> void
+System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.Forms.Keys
+System.Windows.Forms.KioskModeManager.ToggleFullScreen() -> void
+System.Windows.Forms.KioskModeManager.SuppressPowerSavingChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.SuppressPowerSaving.set -> void
+System.Windows.Forms.KioskModeManager.SuppressPowerSaving.get -> bool
+System.Windows.Forms.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
+System.Windows.Forms.KioskModeManager.KioskModeManager() -> void
+System.Windows.Forms.KioskModeManager.IsFullScreen.get -> bool
+System.Windows.Forms.KioskModeManager.HideTaskbarChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.HideTaskbar.set -> void
+System.Windows.Forms.KioskModeManager.HideTaskbar.get -> bool
+System.Windows.Forms.KioskModeManager.FullScreenChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.ExitFullScreen() -> void
+System.Windows.Forms.KioskModeManager.EscapeExitsFullScreenChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.set -> void
+System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.get -> bool
+System.Windows.Forms.KioskModeManager.EnterFullScreen() -> void
+System.Windows.Forms.KioskModeManager.ContainerControlChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.ContainerControl.set -> void
+System.Windows.Forms.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
+System.Windows.Forms.KioskModeManager
+override WinFormsBoards.Controls.KioskModeManager.Dispose(bool disposing) -> void
+override System.Windows.Forms.KioskModeManager.Dispose(bool disposing) -> void
\ No newline at end of file
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorBlinkStyle.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorBlinkStyle.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorBlinkStyle.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorBlinkStyle.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorIconAlignment.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorIconAlignment.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorIconAlignment.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorIconAlignment.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ControlItem.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ControlItem.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ControlItem.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ControlItem.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ErrorProviderStates.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ErrorProviderStates.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ErrorProviderStates.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ErrorProviderStates.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ErrorWindow.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ErrorWindow.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.ErrorWindow.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.ErrorWindow.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.IconRegion.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.IconRegion.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.IconRegion.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.IconRegion.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/ErrorProvider/ErrorProvider.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ErrorProvider/ErrorProvider.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Help/HelpProvider.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/HelpProvider.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Help/HelpProvider.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/HelpProvider.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ColorDepth.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ColorDepth.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ColorDepth.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ColorDepth.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.ImageCollection.ImageInfo.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.ImageCollection.ImageInfo.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.ImageCollection.ImageInfo.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.ImageCollection.ImageInfo.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.ImageCollection.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.ImageCollection.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.ImageCollection.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.ImageCollection.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.Indexer.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.Indexer.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.Indexer.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.Indexer.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.NativeImageList.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.NativeImageList.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.NativeImageList.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.NativeImageList.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.Original.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.Original.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.Original.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.Original.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.OriginalOptions.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.OriginalOptions.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.OriginalOptions.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.OriginalOptions.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageList.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageList.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageListConverter.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageListConverter.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageListConverter.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageListConverter.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageListStreamer.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageListStreamer.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/ImageListStreamer.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/ImageListStreamer.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/RelatedImageListAttribute.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/RelatedImageListAttribute.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Controls/ImageList/RelatedImageListAttribute.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/ImageList/RelatedImageListAttribute.cs
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Timer.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/Timer.cs
similarity index 100%
rename from src/System.Windows.Forms/System/Windows/Forms/Timer.cs
rename to src/System.Windows.Forms/System/Windows/Forms/Components/Timer.cs

From 5207f4df459bf739ea9d9f2d0a434030b2cd00e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Tue, 19 May 2026 15:12:12 -0700
Subject: [PATCH 18/50] Introduce KioskModeManager component.

---
 .../Forms/Components/KioskModeManager.cs      | 420 ++++++++++++++++++
 1 file changed, 420 insertions(+)
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs
new file mode 100644
index 00000000000..bbf241364e9
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs
@@ -0,0 +1,420 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+using Windows.Win32.System.Threading;
+using Windows.Win32.System.Power;
+
+namespace System.Windows.Forms;
+
+[DefaultProperty(nameof(ToggleFullScreenKey))]
+[ToolboxItemFilter("System.Windows.Forms")]
+public class KioskModeManager : Component, ISupportInitialize
+{
+    private const uint POWER_REQUEST_CONTEXT_VERSION = 0;
+    private const POWER_REQUEST_CONTEXT_FLAGS POWER_REQUEST_CONTEXT_SIMPLE_STRING = (POWER_REQUEST_CONTEXT_FLAGS)0x00000001;
+
+    private ContainerControl? _containerControl;
+    private Form? _targetForm;
+    private bool _isFullScreen;
+    private bool _initializing;
+
+    // Saved form state for restoring
+    private FormBorderStyle _savedBorderStyle;
+    private FormWindowState _savedWindowState;
+    private Rectangle _savedBounds;
+    private bool _savedTopMost;
+
+    // Configuration backing fields
+    private bool _hideTaskbar;
+    private bool _topMostInFullScreen;
+    private Keys _toggleFullScreenKey = Keys.F11;
+    private bool _escapeExitsFullScreen = true;
+    private bool _suppressPowerSaving;
+
+    private HANDLE _powerRequestHandle;
+
+    public KioskModeManager()
+    {
+    }
+
+    public KioskModeManager(IContainer container)
+    {
+        ArgumentNullException.ThrowIfNull(container);
+        container.Add(this);
+    }
+
+    [Category("Kiosk")]
+    [Description("The Form whose fullscreen state this component controls.")]
+    [DefaultValue(null)]
+    public ContainerControl? ContainerControl
+    {
+        get => _containerControl;
+        set
+        {
+            if (_containerControl == value)
+            {
+                return;
+            }
+
+            DetachFromForm();
+            _containerControl = value;
+            AttachToForm();
+            OnContainerControlChanged(EventArgs.Empty);
+        }
+    }
+
+    public event EventHandler? ContainerControlChanged;
+
+    protected virtual void OnContainerControlChanged(EventArgs e)
+        => ContainerControlChanged?.Invoke(this, e);
+
+    [Category("Kiosk")]
+    [Description("When true, fullscreen mode overlays the OS taskbar. When false, the taskbar remains visible.")]
+    [DefaultValue(false)]
+    public bool HideTaskbar
+    {
+        get => _hideTaskbar;
+        set
+        {
+            if (_hideTaskbar == value)
+            {
+                return;
+            }
+
+            _hideTaskbar = value;
+
+            OnHideTaskbarChanged(EventArgs.Empty);
+
+            // Re-apply if currently in fullscreen
+            if (_isFullScreen && _targetForm is not null)
+            {
+                ApplyFullScreen(_targetForm);
+            }
+        }
+    }
+
+    public event EventHandler? HideTaskbarChanged;
+
+    protected virtual void OnHideTaskbarChanged(EventArgs e)
+        => HideTaskbarChanged?.Invoke(this, e);
+
+    [Category("Kiosk")]
+    [Description("When true, the form becomes TopMost in fullscreen mode, preventing other windows from appearing in front.")]
+    [DefaultValue(false)]
+    public bool TopMostInFullScreen
+    {
+        get => _topMostInFullScreen;
+        set
+        {
+            if (_topMostInFullScreen == value)
+            {
+                return;
+            }
+
+            _topMostInFullScreen = value;
+            OnTopMostInFullScreenChanged(EventArgs.Empty);
+
+            if (_isFullScreen && _targetForm is not null)
+            {
+                _targetForm.TopMost = value;
+            }
+        }
+    }
+
+    public event EventHandler? TopMostInFullScreenChanged;
+
+    protected virtual void OnTopMostInFullScreenChanged(EventArgs e)
+        => TopMostInFullScreenChanged?.Invoke(this, e);
+
+    [Category("Kiosk")]
+    [Description("The key that toggles between fullscreen and windowed mode.")]
+    [DefaultValue(Keys.F11)]
+    public Keys ToggleFullScreenKey
+    {
+        get => _toggleFullScreenKey;
+        set
+        {
+            if (_toggleFullScreenKey == value)
+            {
+                return;
+            }
+
+            _toggleFullScreenKey = value;
+            OnToggleFullScreenKeyChanged(EventArgs.Empty);
+        }
+    }
+
+    public event EventHandler? ToggleFullScreenKeyChanged;
+
+    protected virtual void OnToggleFullScreenKeyChanged(EventArgs e)
+        => ToggleFullScreenKeyChanged?.Invoke(this, e);
+
+    [Category("Kiosk")]
+    [Description("When true, pressing Escape exits fullscreen mode.")]
+    [DefaultValue(true)]
+    public bool EscapeExitsFullScreen
+    {
+        get => _escapeExitsFullScreen;
+        set
+        {
+            if (_escapeExitsFullScreen == value)
+            {
+                return;
+            }
+
+            _escapeExitsFullScreen = value;
+            OnEscapeExitsFullScreenChanged(EventArgs.Empty);
+        }
+    }
+
+    public event EventHandler? EscapeExitsFullScreenChanged;
+
+    protected virtual void OnEscapeExitsFullScreenChanged(EventArgs e)
+        => EscapeExitsFullScreenChanged?.Invoke(this, e);
+
+    [Category("Kiosk")]
+    [Description("When true, prevents the machine from entering screen-saver, sleep, or hibernation.")]
+    [DefaultValue(false)]
+    public bool SuppressPowerSaving
+    {
+        get => _suppressPowerSaving;
+        set
+        {
+            if (_suppressPowerSaving == value)
+            {
+                return;
+            }
+
+            _suppressPowerSaving = value;
+
+            if (value)
+            {
+                CreatePowerRequest();
+            }
+            else
+            {
+                ReleasePowerRequest();
+            }
+
+            OnSuppressPowerSavingChanged(EventArgs.Empty);
+        }
+    }
+
+    public event EventHandler? SuppressPowerSavingChanged;
+
+    protected virtual void OnSuppressPowerSavingChanged(EventArgs e)
+        => SuppressPowerSavingChanged?.Invoke(this, e);
+
+    [Browsable(false)]
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    public bool IsFullScreen
+    {
+        get => _isFullScreen;
+        private set
+        {
+            if (_isFullScreen == value)
+            {
+                return;
+            }
+
+            _isFullScreen = value;
+            OnFullScreenChanged(EventArgs.Empty);
+        }
+    }
+
+    [Category("Kiosk")]
+    [Description("Occurs when the fullscreen state changes.")]
+    public event EventHandler? FullScreenChanged;
+
+    protected virtual void OnFullScreenChanged(EventArgs e)
+        => FullScreenChanged?.Invoke(this, e);
+
+    public void EnterFullScreen()
+    {
+        if (_isFullScreen || _targetForm is null)
+        {
+            return;
+        }
+
+        // Save current state
+        _savedBorderStyle = _targetForm.FormBorderStyle;
+        _savedWindowState = _targetForm.WindowState;
+        _savedBounds = _targetForm.Bounds;
+        _savedTopMost = _targetForm.TopMost;
+
+        ApplyFullScreen(_targetForm);
+        IsFullScreen = true;
+    }
+
+    public void ExitFullScreen()
+    {
+        if (!_isFullScreen || _targetForm is null)
+        {
+            return;
+        }
+
+        _targetForm.FormBorderStyle = _savedBorderStyle;
+        _targetForm.TopMost = _savedTopMost;
+        _targetForm.WindowState = _savedWindowState;
+        _targetForm.Bounds = _savedBounds;
+
+        IsFullScreen = false;
+    }
+
+    public void ToggleFullScreen()
+    {
+        if (_isFullScreen)
+        {
+            ExitFullScreen();
+        }
+        else
+        {
+            EnterFullScreen();
+        }
+    }
+
+    void ISupportInitialize.BeginInit()
+    {
+        _initializing = true;
+    }
+
+    void ISupportInitialize.EndInit()
+    {
+        _initializing = false;
+
+        // Auto-discover the parent form if ContainerControl was set during initialization
+        if (_containerControl is not null)
+        {
+            AttachToForm();
+        }
+    }
+
+    private void AttachToForm()
+    {
+        if (_initializing)
+        {
+            return;
+        }
+
+        _targetForm = _containerControl as Form ?? _containerControl?.FindForm();
+
+        if (_targetForm is null)
+        {
+            return;
+        }
+
+        // Enable KeyPreview so we get key events before child controls
+        _targetForm.KeyPreview = true;
+        _targetForm.KeyDown += OnFormKeyDown;
+    }
+
+    private void DetachFromForm()
+    {
+        _targetForm?.KeyDown -= OnFormKeyDown;
+        _targetForm = null;
+    }
+
+    private void OnFormKeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.KeyCode == _toggleFullScreenKey && e.Modifiers == Keys.None)
+        {
+            ToggleFullScreen();
+            e.Handled = true;
+            e.SuppressKeyPress = true;
+
+            return;
+        }
+
+        if (e.KeyCode == Keys.Escape && e.Modifiers == Keys.None
+            && _escapeExitsFullScreen && _isFullScreen)
+        {
+            ExitFullScreen();
+            e.Handled = true;
+            e.SuppressKeyPress = true;
+        }
+    }
+
+    private void ApplyFullScreen(Form form)
+    {
+        form.FormBorderStyle = FormBorderStyle.None;
+
+        if (_topMostInFullScreen)
+        {
+            form.TopMost = true;
+        }
+
+        if (_hideTaskbar)
+        {
+            // Cover the entire screen including taskbar
+            form.WindowState = FormWindowState.Normal;
+            Screen screen = Screen.FromControl(form);
+            form.Bounds = screen.Bounds;
+        }
+        else
+        {
+            // Standard maximized — taskbar remains accessible
+            form.WindowState = FormWindowState.Maximized;
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            DetachFromForm();
+
+            if (_suppressPowerSaving)
+            {
+                ReleasePowerRequest();
+            }
+        }
+
+        base.Dispose(disposing);
+    }
+
+    private void CreatePowerRequest()
+    {
+        if (!_powerRequestHandle.IsNull)
+        {
+            return;
+        }
+
+        var context = new REASON_CONTEXT
+        {
+            Version = POWER_REQUEST_CONTEXT_VERSION,
+            Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING,
+        };
+
+        nint reasonString = Marshal.StringToHGlobalUni(
+            "WinForms KioskModeManager: Preventing screen saver and sleep");
+
+        try
+        {
+            context.Reason.Detailed.ReasonStrings = (PWSTR*)reasonString;
+            _powerRequestHandle = PInvoke.PowerCreateRequest(in context);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(reasonString);
+        }
+
+        PInvoke.PowerSetRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestDisplayRequired);
+        PInvoke.PowerSetRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestSystemRequired);
+    }
+
+    private void ReleasePowerRequest()
+    {
+        if (_powerRequestHandle.IsNull)
+        {
+            return;
+        }
+
+        PInvoke.PowerClearRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestDisplayRequired);
+        PInvoke.PowerClearRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestSystemRequired);
+    }
+}

From 297579f987b61d9d19402b02b3117945ced4e7f7 Mon Sep 17 00:00:00 2001
From: Klaus Loffelmann <klloeffe@microsoft.com>
Date: Wed, 20 May 2026 10:46:30 -0700
Subject: [PATCH 19/50] Refactor KioskModeManager component and introduce

* WakeUp-Events incl.. new WakeUpEventArgs.
---
 .../PublicAPI.Unshipped.txt                   |   21 +-
 src/System.Windows.Forms/Resources/SR.resx    |   53 +-
 .../Resources/xlf/SR.cs.xlf                   |   85 ++
 .../Resources/xlf/SR.de.xlf                   |   85 ++
 .../Resources/xlf/SR.es.xlf                   |   85 ++
 .../Resources/xlf/SR.fr.xlf                   |   85 ++
 .../Resources/xlf/SR.it.xlf                   |   85 ++
 .../Resources/xlf/SR.ja.xlf                   |   85 ++
 .../Resources/xlf/SR.ko.xlf                   |   85 ++
 .../Resources/xlf/SR.pl.xlf                   |   85 ++
 .../Resources/xlf/SR.pt-BR.xlf                |   85 ++
 .../Resources/xlf/SR.ru.xlf                   |   85 ++
 .../Resources/xlf/SR.tr.xlf                   |   85 ++
 .../Resources/xlf/SR.zh-Hans.xlf              |   85 ++
 .../Resources/xlf/SR.zh-Hant.xlf              |   85 ++
 .../Forms/Components/KioskModeManager.cs      |  420 -------
 .../KioskModeManager/KioskModeManager.cs      | 1003 +++++++++++++++++
 .../KioskModeWakeupEventArgs.cs               |   34 +
 .../KioskModeWakeupEventHandler.cs            |   12 +
 .../KioskModeManager/KioskModeWakeupSource.cs |   33 +
 .../Windows/Forms/KioskModeManagerTests.cs    |  327 ++++++
 21 files changed, 2583 insertions(+), 425 deletions(-)
 delete mode 100644 src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 4a9ea0b6c72..3b87d84db63 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -79,13 +79,26 @@ virtual WinFormsBoards.Controls.KioskModeManager.OnHideTaskbarChanged(System.Eve
 virtual WinFormsBoards.Controls.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
 virtual WinFormsBoards.Controls.KioskModeManager.OnEscapeExitsFullScreenChanged(System.EventArgs! e) -> void
 virtual WinFormsBoards.Controls.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeWakeupEventHandler.Invoke(object? sender, System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnWakeup(System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnTopMostInFullScreenChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnToggleFullScreenKeyChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnSuppressPowerSavingChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnMousePointerAutoHideDelayChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnHideTaskbarChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnEscapeExitsFullScreenChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
+System.Windows.Forms.KioskModeWakeupSource.Session = 3 -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource.PowerResume = 2 -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource.Mouse = 1 -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource.Keyboard = 0 -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupEventHandler
+System.Windows.Forms.KioskModeWakeupEventArgs.Source.get -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupEventArgs.KioskModeWakeupEventArgs(System.Windows.Forms.KioskModeWakeupSource source) -> void
+System.Windows.Forms.KioskModeWakeupEventArgs
+System.Windows.Forms.KioskModeManager.Wakeup -> System.Windows.Forms.KioskModeWakeupEventHandler?
 System.Windows.Forms.KioskModeManager.TopMostInFullScreenChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.TopMostInFullScreen.set -> void
 System.Windows.Forms.KioskModeManager.TopMostInFullScreen.get -> bool
@@ -96,6 +109,9 @@ System.Windows.Forms.KioskModeManager.ToggleFullScreen() -> void
 System.Windows.Forms.KioskModeManager.SuppressPowerSavingChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.SuppressPowerSaving.set -> void
 System.Windows.Forms.KioskModeManager.SuppressPowerSaving.get -> bool
+System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelayChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.set -> void
+System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.get -> int
 System.Windows.Forms.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
 System.Windows.Forms.KioskModeManager.KioskModeManager() -> void
 System.Windows.Forms.KioskModeManager.IsFullScreen.get -> bool
@@ -103,14 +119,11 @@ System.Windows.Forms.KioskModeManager.HideTaskbarChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.HideTaskbar.set -> void
 System.Windows.Forms.KioskModeManager.HideTaskbar.get -> bool
 System.Windows.Forms.KioskModeManager.FullScreenChanged -> System.EventHandler?
-System.Windows.Forms.KioskModeManager.ExitFullScreen() -> void
 System.Windows.Forms.KioskModeManager.EscapeExitsFullScreenChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.set -> void
 System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.get -> bool
-System.Windows.Forms.KioskModeManager.EnterFullScreen() -> void
 System.Windows.Forms.KioskModeManager.ContainerControlChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.ContainerControl.set -> void
 System.Windows.Forms.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
 System.Windows.Forms.KioskModeManager
-override WinFormsBoards.Controls.KioskModeManager.Dispose(bool disposing) -> void
-override System.Windows.Forms.KioskModeManager.Dispose(bool disposing) -> void
\ No newline at end of file
+override System.Windows.Forms.KioskModeManager.Dispose(bool disposing) -> void
diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index 82a972e4c57..e7ceb89fd24 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -2679,6 +2679,57 @@ To replace this default dialog please handle the DataError event.</value>
   <data name="DescriptionImageList" xml:space="preserve">
     <value>Manages a collection of images that are typically used by other controls such as ListView, TreeView, or ToolStrip.</value>
   </data>
+  <data name="DescriptionKioskModeManager" xml:space="preserve">
+    <value>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</value>
+  </data>
+  <data name="KioskModeManagerContainerControlDescr" xml:space="preserve">
+    <value>The container whose containing form is controlled by the kiosk mode manager.</value>
+  </data>
+  <data name="KioskModeManagerContainerControlChangedDescr" xml:space="preserve">
+    <value>Occurs when the ContainerControl property value changes.</value>
+  </data>
+  <data name="KioskModeManagerEscapeExitsFullScreenDescr" xml:space="preserve">
+    <value>Indicates whether pressing Escape exits fullscreen mode.</value>
+  </data>
+  <data name="KioskModeManagerEscapeExitsFullScreenChangedDescr" xml:space="preserve">
+    <value>Occurs when the EscapeExitsFullScreen property value changes.</value>
+  </data>
+  <data name="KioskModeManagerFullScreenChangedDescr" xml:space="preserve">
+    <value>Occurs when the fullscreen state changes.</value>
+  </data>
+  <data name="KioskModeManagerHideTaskbarDescr" xml:space="preserve">
+    <value>Indicates whether fullscreen mode covers the Windows taskbar.</value>
+  </data>
+  <data name="KioskModeManagerHideTaskbarChangedDescr" xml:space="preserve">
+    <value>Occurs when the HideTaskbar property value changes.</value>
+  </data>
+  <data name="KioskModeManagerMousePointerAutoHideDelayDescr" xml:space="preserve">
+    <value>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</value>
+  </data>
+  <data name="KioskModeManagerMousePointerAutoHideDelayChangedDescr" xml:space="preserve">
+    <value>Occurs when the MousePointerAutoHideDelay property value changes.</value>
+  </data>
+  <data name="KioskModeManagerSuppressPowerSavingDescr" xml:space="preserve">
+    <value>Indicates whether Windows should keep the display and system awake while this component is active.</value>
+  </data>
+  <data name="KioskModeManagerSuppressPowerSavingChangedDescr" xml:space="preserve">
+    <value>Occurs when the SuppressPowerSaving property value changes.</value>
+  </data>
+  <data name="KioskModeManagerToggleFullScreenKeyDescr" xml:space="preserve">
+    <value>The key that toggles between fullscreen and restored mode.</value>
+  </data>
+  <data name="KioskModeManagerToggleFullScreenKeyChangedDescr" xml:space="preserve">
+    <value>Occurs when the ToggleFullScreenKey property value changes.</value>
+  </data>
+  <data name="KioskModeManagerTopMostInFullScreenDescr" xml:space="preserve">
+    <value>Indicates whether the form is topmost while fullscreen.</value>
+  </data>
+  <data name="KioskModeManagerTopMostInFullScreenChangedDescr" xml:space="preserve">
+    <value>Occurs when the TopMostInFullScreen property value changes.</value>
+  </data>
+  <data name="KioskModeManagerWakeupDescr" xml:space="preserve">
+    <value>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</value>
+  </data>
   <data name="DescriptionLabel" xml:space="preserve">
     <value>Provides run-time information or descriptive text for a control.</value>
   </data>
@@ -7057,4 +7108,4 @@ Stack trace where the illegal operation occurred was:
   <data name="FormScreenCaptureModeRequiresTopLevel" xml:space="preserve">
     <value>The FormScreenCaptureMode property can only be changed on top-level Forms with their TopLevel property set to true.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
index 9c3c80273df..1f65ccf1457 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
@@ -4519,6 +4519,11 @@ Chcete-li nahradit toto výchozí dialogové okno, nastavte popisovač události
         <target state="translated">Spravuje kolekci obrázků, které standardně používají ovládací prvky, jako například ListView, TreeView nebo ToolStrip.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Poskytuje běhové informace nebo popisný text pro ovládací prvek.</target>
@@ -6114,6 +6119,86 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="translated">Kombinace klíčů je neplatná.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Umožňuje automatické zpracování textu, který je delší než šířka ovládacího prvku popisku.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
index e9d2ba0f1db..3cc2b32ca3f 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
@@ -4519,6 +4519,11 @@ Behandeln Sie das DataError-Ereignis, um dieses Standarddialogfeld zu ersetzen.<
         <target state="translated">Verwaltet eine Sammlung von Bildern, die in der Regel von anderen Steuerelementen wie ListView, TreeView oder ToolStrip verwendet werden.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Stellt Laufzeitinformationen oder deskriptiven Text für ein Steuerelement bereit.</target>
@@ -6114,6 +6119,86 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="translated">Ungültige Schlüsselkombination.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Aktiviert die automatische Behandlung von Text, der über die Breite des Bezeichnungssteuerelements hinausgeht.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
index a1d3ba0bed9..cfb52fd123c 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
@@ -4519,6 +4519,11 @@ Para reemplazar este cuadro de diálogo predeterminado controle el evento DataEr
         <target state="translated">Controla una colección de imágenes que suelen utilizar otros controles como ListView, TreeView o ToolStrip.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Proporciona información en tiempo de ejecución o texto descriptivo para un control.</target>
@@ -6114,6 +6119,86 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="translated">La combinación de teclas no es válida.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Permite el control automático del texto que se extiende más allá del ancho del control de la etiqueta.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
index 7c529132c9f..65abe23c062 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
@@ -4519,6 +4519,11 @@ Pour remplacer cette boîte de dialogue par défaut, traitez l'événement DataE
         <target state="translated">Gère une collection d'images qui sont généralement utilisées par d'autres contrôles tels que ListView, TreeView et ToolStrip.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Fournit des informations d'exécution ou un texte descriptif pour un contrôle.</target>
@@ -6114,6 +6119,86 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="translated">La combinaison de touches n'est pas valide.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Active la gestion automatique du texte qui dépasse les limites de largeur du contrôle label.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
index 90e86134c28..9bf30d7253f 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
@@ -4519,6 +4519,11 @@ Per sostituire questa finestra di dialogo, gestisci l'evento DataError.</target>
         <target state="translated">Gestisce una raccolta di immagini utilizzate in genere da altri controlli, quali ListView, TreeView o ToolStrip.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Fornisce informazioni di runtime o testo descrittivo per un controllo.</target>
@@ -6114,6 +6119,86 @@ Analisi dello stack dove si è verificata l'operazione non valida:
         <target state="translated">Combinazione di tasti non valida.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Consente la gestione automatica del testo che non è contenuto all'interno della larghezza del controllo etichetta.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
index 02114c6d400..76fa9688a5f 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
@@ -4519,6 +4519,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">ListView、TreeView、または ToolStrip のような他のコントロールが通常使用するイメージのコレクションを管理します。</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">コントロールの実行時の情報または説明用のテキストを提供します。</target>
@@ -6114,6 +6119,86 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">キーの組み合わせが有効ではありません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">ラベル コントロールの幅を越えるテキストの自動処理を有効にします。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
index 7cb8d5d75de..591b573a434 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
@@ -4519,6 +4519,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">ListView, TreeView 또는 ToolStrip과 같은 다른 컨트롤에서 일반적으로 사용하는 이미지 컬렉션을 관리합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">컨트롤에 대한 설명 텍스트나 런타임 정보를 제공합니다.</target>
@@ -6114,6 +6119,86 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">키 조합이 잘못되었습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">레이블 컨트롤의 너비보다 큰 텍스트를 자동으로 처리합니다.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
index 0ca219a45f9..34bfbbb410b 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
@@ -4519,6 +4519,11 @@ Aby zamienić to domyślne okno dialogowe, obsłuż zdarzenie DataError.</target
         <target state="translated">Zarządza kolekcją obrazów, które są zazwyczaj używane przez inne formanty, takie jak ListView, TreeView lub ToolStrip.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Wyświetla informacje o wykonaniu lub tekst opisowy dla formantu.</target>
@@ -6114,6 +6119,86 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="translated">Kombinacja kluczy jest nieprawidłowa.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Włącza automatyczną obsługę tekstu, który mieści się w szerokości formantu etykiety.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
index c4adee1ac55..03080cb8c77 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
@@ -4519,6 +4519,11 @@ Para substituir a caixa de diálogo padrão, manipule o evento DataError.</targe
         <target state="translated">Gerencia uma coleção de imagens geralmente usadas por outros controles, como ListView, TreeView ou ToolStrip.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Fornece informações em tempo de execução ou texto descritivo para um controle.</target>
@@ -6114,6 +6119,86 @@ O rastreamento de pilha em que a operação ilegal ocorreu foi:
         <target state="translated">A combinação de chave não é válida.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Permite a manipulação automática de texto que ultrapassa a largura do controle de rótulo.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
index 2d7a3b02c80..2b8d0190b07 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
@@ -4519,6 +4519,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">Управляет коллекцией изображений, которые обычно используются другими элементами управления (например, ListView, TreeView или ToolStrip).</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Предоставляет элементу управления текст описания либо информацию во время выполнения.</target>
@@ -6114,6 +6119,86 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">Недопустимая комбинация ключа.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Включает автоматическую обработку текста, выходящего за пределы ширины элемента управления с подписью.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
index 33d5cfc26c7..b202c9cb65c 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
@@ -4519,6 +4519,11 @@ Bu varsayılan iletişim kutusunu değiştirmek için, lütfen DataError olayın
         <target state="translated">Genellikle ListView, TreeView veya ToolStrip gibi diğer denetimler tarafından kullanılan resim koleksiyonunu düzenler.</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">Bir denetim için çalışma zamanı bilgileri veya açıklayıcı metin sağlar.</target>
@@ -6114,6 +6119,86 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="translated">Anahtar birleşimi geçerli değil.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Etiket denetimi genişliğini aşan metnin otomatik işlenmesini sağlar.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
index 45bb2833259..f89e7726e18 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
@@ -4519,6 +4519,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">管理通常由其他控件(如 ListView、TreeView 或 ToolStrip)使用的图像集合。</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">为控件提供运行时信息或说明性文字。</target>
@@ -6114,6 +6119,86 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">组合键无效。</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">启用对扩展到标签控件宽度以外的文本的自动处理。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
index 975f3f60b72..b2729c0c4e5 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
@@ -4519,6 +4519,11 @@ To replace this default dialog please handle the DataError event.</source>
         <target state="translated">管理通常由其他控制項 (例如 ListView、TreeView 或 ToolStrip) 使用的影像集合。</target>
         <note />
       </trans-unit>
+      <trans-unit id="DescriptionKioskModeManager">
+        <source>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</source>
+        <target state="new">Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="DescriptionLabel">
         <source>Provides run-time information or descriptive text for a control.</source>
         <target state="translated">提供控制項的執行階段資訊或描述文字。</target>
@@ -6114,6 +6119,86 @@ Stack trace where the illegal operation occurred was:
         <target state="translated">組合鍵無效。</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlChangedDescr">
+        <source>Occurs when the ContainerControl property value changes.</source>
+        <target state="new">Occurs when the ContainerControl property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerContainerControlDescr">
+        <source>The container whose containing form is controlled by the kiosk mode manager.</source>
+        <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
+        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
+        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
+        <source>Indicates whether pressing Escape exits fullscreen mode.</source>
+        <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenChangedDescr">
+        <source>Occurs when the fullscreen state changes.</source>
+        <target state="new">Occurs when the fullscreen state changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
+        <source>Occurs when the HideTaskbar property value changes.</source>
+        <target state="new">Occurs when the HideTaskbar property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerHideTaskbarDescr">
+        <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
+        <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
+        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
+        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
+        <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
+        <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
+        <source>Occurs when the SuppressPowerSaving property value changes.</source>
+        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
+        <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
+        <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
+        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
+        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
+        <source>The key that toggles between fullscreen and restored mode.</source>
+        <target state="new">The key that toggles between fullscreen and restored mode.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
+        <source>Occurs when the TopMostInFullScreen property value changes.</source>
+        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
+        <source>Indicates whether the form is topmost while fullscreen.</source>
+        <target state="new">Indicates whether the form is topmost while fullscreen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="KioskModeManagerWakeupDescr">
+        <source>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</source>
+        <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">啟用自動處理，以處理超出標籤控制項寬度的文件。</target>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs
deleted file mode 100644
index bbf241364e9..00000000000
--- a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager.cs
+++ /dev/null
@@ -1,420 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel;
-using System.Drawing;
-using System.Runtime.InteropServices;
-
-using Windows.Win32.System.Threading;
-using Windows.Win32.System.Power;
-
-namespace System.Windows.Forms;
-
-[DefaultProperty(nameof(ToggleFullScreenKey))]
-[ToolboxItemFilter("System.Windows.Forms")]
-public class KioskModeManager : Component, ISupportInitialize
-{
-    private const uint POWER_REQUEST_CONTEXT_VERSION = 0;
-    private const POWER_REQUEST_CONTEXT_FLAGS POWER_REQUEST_CONTEXT_SIMPLE_STRING = (POWER_REQUEST_CONTEXT_FLAGS)0x00000001;
-
-    private ContainerControl? _containerControl;
-    private Form? _targetForm;
-    private bool _isFullScreen;
-    private bool _initializing;
-
-    // Saved form state for restoring
-    private FormBorderStyle _savedBorderStyle;
-    private FormWindowState _savedWindowState;
-    private Rectangle _savedBounds;
-    private bool _savedTopMost;
-
-    // Configuration backing fields
-    private bool _hideTaskbar;
-    private bool _topMostInFullScreen;
-    private Keys _toggleFullScreenKey = Keys.F11;
-    private bool _escapeExitsFullScreen = true;
-    private bool _suppressPowerSaving;
-
-    private HANDLE _powerRequestHandle;
-
-    public KioskModeManager()
-    {
-    }
-
-    public KioskModeManager(IContainer container)
-    {
-        ArgumentNullException.ThrowIfNull(container);
-        container.Add(this);
-    }
-
-    [Category("Kiosk")]
-    [Description("The Form whose fullscreen state this component controls.")]
-    [DefaultValue(null)]
-    public ContainerControl? ContainerControl
-    {
-        get => _containerControl;
-        set
-        {
-            if (_containerControl == value)
-            {
-                return;
-            }
-
-            DetachFromForm();
-            _containerControl = value;
-            AttachToForm();
-            OnContainerControlChanged(EventArgs.Empty);
-        }
-    }
-
-    public event EventHandler? ContainerControlChanged;
-
-    protected virtual void OnContainerControlChanged(EventArgs e)
-        => ContainerControlChanged?.Invoke(this, e);
-
-    [Category("Kiosk")]
-    [Description("When true, fullscreen mode overlays the OS taskbar. When false, the taskbar remains visible.")]
-    [DefaultValue(false)]
-    public bool HideTaskbar
-    {
-        get => _hideTaskbar;
-        set
-        {
-            if (_hideTaskbar == value)
-            {
-                return;
-            }
-
-            _hideTaskbar = value;
-
-            OnHideTaskbarChanged(EventArgs.Empty);
-
-            // Re-apply if currently in fullscreen
-            if (_isFullScreen && _targetForm is not null)
-            {
-                ApplyFullScreen(_targetForm);
-            }
-        }
-    }
-
-    public event EventHandler? HideTaskbarChanged;
-
-    protected virtual void OnHideTaskbarChanged(EventArgs e)
-        => HideTaskbarChanged?.Invoke(this, e);
-
-    [Category("Kiosk")]
-    [Description("When true, the form becomes TopMost in fullscreen mode, preventing other windows from appearing in front.")]
-    [DefaultValue(false)]
-    public bool TopMostInFullScreen
-    {
-        get => _topMostInFullScreen;
-        set
-        {
-            if (_topMostInFullScreen == value)
-            {
-                return;
-            }
-
-            _topMostInFullScreen = value;
-            OnTopMostInFullScreenChanged(EventArgs.Empty);
-
-            if (_isFullScreen && _targetForm is not null)
-            {
-                _targetForm.TopMost = value;
-            }
-        }
-    }
-
-    public event EventHandler? TopMostInFullScreenChanged;
-
-    protected virtual void OnTopMostInFullScreenChanged(EventArgs e)
-        => TopMostInFullScreenChanged?.Invoke(this, e);
-
-    [Category("Kiosk")]
-    [Description("The key that toggles between fullscreen and windowed mode.")]
-    [DefaultValue(Keys.F11)]
-    public Keys ToggleFullScreenKey
-    {
-        get => _toggleFullScreenKey;
-        set
-        {
-            if (_toggleFullScreenKey == value)
-            {
-                return;
-            }
-
-            _toggleFullScreenKey = value;
-            OnToggleFullScreenKeyChanged(EventArgs.Empty);
-        }
-    }
-
-    public event EventHandler? ToggleFullScreenKeyChanged;
-
-    protected virtual void OnToggleFullScreenKeyChanged(EventArgs e)
-        => ToggleFullScreenKeyChanged?.Invoke(this, e);
-
-    [Category("Kiosk")]
-    [Description("When true, pressing Escape exits fullscreen mode.")]
-    [DefaultValue(true)]
-    public bool EscapeExitsFullScreen
-    {
-        get => _escapeExitsFullScreen;
-        set
-        {
-            if (_escapeExitsFullScreen == value)
-            {
-                return;
-            }
-
-            _escapeExitsFullScreen = value;
-            OnEscapeExitsFullScreenChanged(EventArgs.Empty);
-        }
-    }
-
-    public event EventHandler? EscapeExitsFullScreenChanged;
-
-    protected virtual void OnEscapeExitsFullScreenChanged(EventArgs e)
-        => EscapeExitsFullScreenChanged?.Invoke(this, e);
-
-    [Category("Kiosk")]
-    [Description("When true, prevents the machine from entering screen-saver, sleep, or hibernation.")]
-    [DefaultValue(false)]
-    public bool SuppressPowerSaving
-    {
-        get => _suppressPowerSaving;
-        set
-        {
-            if (_suppressPowerSaving == value)
-            {
-                return;
-            }
-
-            _suppressPowerSaving = value;
-
-            if (value)
-            {
-                CreatePowerRequest();
-            }
-            else
-            {
-                ReleasePowerRequest();
-            }
-
-            OnSuppressPowerSavingChanged(EventArgs.Empty);
-        }
-    }
-
-    public event EventHandler? SuppressPowerSavingChanged;
-
-    protected virtual void OnSuppressPowerSavingChanged(EventArgs e)
-        => SuppressPowerSavingChanged?.Invoke(this, e);
-
-    [Browsable(false)]
-    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-    public bool IsFullScreen
-    {
-        get => _isFullScreen;
-        private set
-        {
-            if (_isFullScreen == value)
-            {
-                return;
-            }
-
-            _isFullScreen = value;
-            OnFullScreenChanged(EventArgs.Empty);
-        }
-    }
-
-    [Category("Kiosk")]
-    [Description("Occurs when the fullscreen state changes.")]
-    public event EventHandler? FullScreenChanged;
-
-    protected virtual void OnFullScreenChanged(EventArgs e)
-        => FullScreenChanged?.Invoke(this, e);
-
-    public void EnterFullScreen()
-    {
-        if (_isFullScreen || _targetForm is null)
-        {
-            return;
-        }
-
-        // Save current state
-        _savedBorderStyle = _targetForm.FormBorderStyle;
-        _savedWindowState = _targetForm.WindowState;
-        _savedBounds = _targetForm.Bounds;
-        _savedTopMost = _targetForm.TopMost;
-
-        ApplyFullScreen(_targetForm);
-        IsFullScreen = true;
-    }
-
-    public void ExitFullScreen()
-    {
-        if (!_isFullScreen || _targetForm is null)
-        {
-            return;
-        }
-
-        _targetForm.FormBorderStyle = _savedBorderStyle;
-        _targetForm.TopMost = _savedTopMost;
-        _targetForm.WindowState = _savedWindowState;
-        _targetForm.Bounds = _savedBounds;
-
-        IsFullScreen = false;
-    }
-
-    public void ToggleFullScreen()
-    {
-        if (_isFullScreen)
-        {
-            ExitFullScreen();
-        }
-        else
-        {
-            EnterFullScreen();
-        }
-    }
-
-    void ISupportInitialize.BeginInit()
-    {
-        _initializing = true;
-    }
-
-    void ISupportInitialize.EndInit()
-    {
-        _initializing = false;
-
-        // Auto-discover the parent form if ContainerControl was set during initialization
-        if (_containerControl is not null)
-        {
-            AttachToForm();
-        }
-    }
-
-    private void AttachToForm()
-    {
-        if (_initializing)
-        {
-            return;
-        }
-
-        _targetForm = _containerControl as Form ?? _containerControl?.FindForm();
-
-        if (_targetForm is null)
-        {
-            return;
-        }
-
-        // Enable KeyPreview so we get key events before child controls
-        _targetForm.KeyPreview = true;
-        _targetForm.KeyDown += OnFormKeyDown;
-    }
-
-    private void DetachFromForm()
-    {
-        _targetForm?.KeyDown -= OnFormKeyDown;
-        _targetForm = null;
-    }
-
-    private void OnFormKeyDown(object? sender, KeyEventArgs e)
-    {
-        if (e.KeyCode == _toggleFullScreenKey && e.Modifiers == Keys.None)
-        {
-            ToggleFullScreen();
-            e.Handled = true;
-            e.SuppressKeyPress = true;
-
-            return;
-        }
-
-        if (e.KeyCode == Keys.Escape && e.Modifiers == Keys.None
-            && _escapeExitsFullScreen && _isFullScreen)
-        {
-            ExitFullScreen();
-            e.Handled = true;
-            e.SuppressKeyPress = true;
-        }
-    }
-
-    private void ApplyFullScreen(Form form)
-    {
-        form.FormBorderStyle = FormBorderStyle.None;
-
-        if (_topMostInFullScreen)
-        {
-            form.TopMost = true;
-        }
-
-        if (_hideTaskbar)
-        {
-            // Cover the entire screen including taskbar
-            form.WindowState = FormWindowState.Normal;
-            Screen screen = Screen.FromControl(form);
-            form.Bounds = screen.Bounds;
-        }
-        else
-        {
-            // Standard maximized — taskbar remains accessible
-            form.WindowState = FormWindowState.Maximized;
-        }
-    }
-
-    /// <inheritdoc/>
-    protected override void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            DetachFromForm();
-
-            if (_suppressPowerSaving)
-            {
-                ReleasePowerRequest();
-            }
-        }
-
-        base.Dispose(disposing);
-    }
-
-    private void CreatePowerRequest()
-    {
-        if (!_powerRequestHandle.IsNull)
-        {
-            return;
-        }
-
-        var context = new REASON_CONTEXT
-        {
-            Version = POWER_REQUEST_CONTEXT_VERSION,
-            Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING,
-        };
-
-        nint reasonString = Marshal.StringToHGlobalUni(
-            "WinForms KioskModeManager: Preventing screen saver and sleep");
-
-        try
-        {
-            context.Reason.Detailed.ReasonStrings = (PWSTR*)reasonString;
-            _powerRequestHandle = PInvoke.PowerCreateRequest(in context);
-        }
-        finally
-        {
-            Marshal.FreeHGlobal(reasonString);
-        }
-
-        PInvoke.PowerSetRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestDisplayRequired);
-        PInvoke.PowerSetRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestSystemRequired);
-    }
-
-    private void ReleasePowerRequest()
-    {
-        if (_powerRequestHandle.IsNull)
-        {
-            return;
-        }
-
-        PInvoke.PowerClearRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestDisplayRequired);
-        PInvoke.PowerClearRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestSystemRequired);
-    }
-}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
new file mode 100644
index 00000000000..7309cb977fe
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
@@ -0,0 +1,1003 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using Microsoft.Win32;
+using Windows.Win32.System.Power;
+using Windows.Win32.System.Threading;
+
+namespace System.Windows.Forms;
+
+/// <summary>
+///  Manages common kiosk-mode behavior for a WinForms form.
+/// </summary>
+/// <remarks>
+///  <para>
+///   <see cref="KioskModeManager"/> is a component that can be dropped on a
+///   form or on a user control at design time. Set <see cref="ContainerControl"/>
+///   to the owning container and the component resolves the containing
+///   <see cref="Form"/> when fullscreen behavior is needed.
+///  </para>
+///  <para>
+///   The component can make the resolved form fullscreen, optionally cover the
+///   taskbar, keep the form topmost while fullscreen, suppress display and
+///   system sleep, hide the mouse pointer after inactivity, and notify the
+///   application when user or system activity wakes the kiosk experience.
+///  </para>
+/// </remarks>
+/// <example>
+///  <code>
+///   public partial class MainForm : Form
+///   {
+///       private readonly KioskModeManager _kioskModeManager;
+///
+///       public MainForm()
+///       {
+///           InitializeComponent();
+///
+///           _kioskModeManager = new KioskModeManager
+///           {
+///               ContainerControl = this,
+///               HideTaskbar = true,
+///               TopMostInFullScreen = true,
+///               MousePointerAutoHideDelay = 3000,
+///               SuppressPowerSaving = true
+///           };
+///
+///           _kioskModeManager.Wakeup += (sender, e) =>
+///           {
+///               if (e.Source == KioskModeWakeupSource.Mouse)
+///               {
+///                   // Refresh the kiosk surface after mouse activity.
+///               }
+///           };
+///
+///           if (!_kioskModeManager.IsFullScreen)
+///           {
+///              _kioskModeManager.ToggleFullScreen();
+///           }
+///       }
+///   }
+///  </code>
+/// </example>
+[DefaultProperty(nameof(ToggleFullScreenKey))]
+[ToolboxItemFilter("System.Windows.Forms")]
+[SRDescription(nameof(SR.DescriptionKioskModeManager))]
+public class KioskModeManager : Component, ISupportInitialize
+{
+    private const uint PowerRequestContextVersion = 0;
+    private const POWER_REQUEST_CONTEXT_FLAGS PowerRequestContextSimpleString = (POWER_REQUEST_CONTEXT_FLAGS)0x00000001;
+    private const string PowerRequestReason = "WinForms KioskModeManager: Preventing screen saver and sleep";
+
+    private ContainerControl? _containerControl;
+    private Form? _targetForm;
+    private bool _isFullScreen;
+    private bool _initializing;
+    private bool _isCursorHidden;
+    private KioskModeMessageFilter? _messageFilter;
+    private Timer? _mousePointerAutoHideTimer;
+    private bool _systemEventsSubscribed;
+
+    private FormBorderStyle _savedBorderStyle;
+    private FormWindowState _savedWindowState;
+    private Rectangle _savedBounds;
+    private bool _savedTopMost;
+
+    private bool _hideTaskbar;
+    private bool _topMostInFullScreen;
+    private Keys _toggleFullScreenKey = Keys.F11;
+    private bool _escapeExitsFullScreen = true;
+    private bool _suppressPowerSaving;
+    private int _mousePointerAutoHideDelay;
+
+    private HANDLE _powerRequestHandle;
+
+    private EventHandler? _containerControlChanged;
+    private EventHandler? _hideTaskbarChanged;
+    private EventHandler? _topMostInFullScreenChanged;
+    private EventHandler? _toggleFullScreenKeyChanged;
+    private EventHandler? _escapeExitsFullScreenChanged;
+    private EventHandler? _suppressPowerSavingChanged;
+    private EventHandler? _mousePointerAutoHideDelayChanged;
+    private EventHandler? _fullScreenChanged;
+    private KioskModeWakeupEventHandler? _wakeup;
+
+    /// <summary>
+    ///  Initializes a new instance of the <see cref="KioskModeManager"/> class.
+    /// </summary>
+    public KioskModeManager()
+    {
+    }
+
+    /// <summary>
+    ///  Initializes a new instance of the <see cref="KioskModeManager"/> class
+    ///  and adds it to the specified container.
+    /// </summary>
+    /// <param name="container">The container that owns the component.</param>
+    /// <exception cref="ArgumentNullException">
+    ///  <paramref name="container"/> is <see langword="null"/>.
+    /// </exception>
+    public KioskModeManager(IContainer container)
+    {
+        ArgumentNullException.ThrowIfNull(container);
+        container.Add(this);
+    }
+
+    /// <summary>
+    ///  Gets or sets the container whose containing form is controlled by this
+    ///  component.
+    /// </summary>
+    /// <value>
+    ///  A <see cref="ContainerControl"/> that is either a <see cref="Form"/> or
+    ///  a child container that can resolve a parent form; otherwise,
+    ///  <see langword="null"/>.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   This property intentionally uses <see cref="ContainerControl"/> rather
+    ///   than <see cref="Form"/>. A <see cref="KioskModeManager"/> can be placed
+    ///   on a <see cref="UserControl"/> at design time, and that user control
+    ///   can later be hosted by a form. Restricting the property to
+    ///   <see cref="Form"/> would make that design-time scenario inconsistent.
+    ///  </para>
+    /// </remarks>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerContainerControlDescr))]
+    [DefaultValue(null)]
+    public ContainerControl? ContainerControl
+    {
+        get => _containerControl;
+        set
+        {
+            if (_containerControl == value)
+            {
+                return;
+            }
+
+            if (_isFullScreen)
+            {
+                ExitFullScreen();
+            }
+
+            DetachFromForm();
+            _containerControl = value;
+            AttachToForm();
+
+            OnContainerControlChanged(EventArgs.Empty);
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the value of <see cref="ContainerControl"/> changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerContainerControlChangedDescr))]
+    public event EventHandler? ContainerControlChanged
+    {
+        add => _containerControlChanged += value;
+        remove => _containerControlChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="ContainerControlChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnContainerControlChanged(EventArgs e)
+        => _containerControlChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Gets or sets a value indicating whether fullscreen mode covers the
+    ///  Windows taskbar.
+    /// </summary>
+    /// <value>
+    ///  <see langword="true"/> to size the form to the complete screen bounds;
+    ///  <see langword="false"/> to use normal maximized form behavior.
+    ///  The default is <see langword="false"/>.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   When this property is <see langword="false"/>, the form is maximized
+    ///   and Windows keeps the taskbar available according to the user's shell
+    ///   settings. When this property is <see langword="true"/>, the form is
+    ///   sized to the screen bounds so the kiosk surface covers the taskbar.
+    ///  </para>
+    /// </remarks>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerHideTaskbarDescr))]
+    [DefaultValue(false)]
+    public bool HideTaskbar
+    {
+        get => _hideTaskbar;
+        set
+        {
+            if (_hideTaskbar == value)
+            {
+                return;
+            }
+
+            _hideTaskbar = value;
+            OnHideTaskbarChanged(EventArgs.Empty);
+
+            if (_isFullScreen && _targetForm is not null)
+            {
+                ApplyFullScreen(_targetForm);
+            }
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the value of <see cref="HideTaskbar"/> changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerHideTaskbarChangedDescr))]
+    public event EventHandler? HideTaskbarChanged
+    {
+        add => _hideTaskbarChanged += value;
+        remove => _hideTaskbarChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="HideTaskbarChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnHideTaskbarChanged(EventArgs e)
+        => _hideTaskbarChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Gets or sets a value indicating whether the form is topmost while
+    ///  fullscreen.
+    /// </summary>
+    /// <value>
+    ///  <see langword="true"/> to set <see cref="Form.TopMost"/> while
+    ///  fullscreen; otherwise, <see langword="false"/>. The default is
+    ///  <see langword="false"/>.
+    /// </value>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerTopMostInFullScreenDescr))]
+    [DefaultValue(false)]
+    public bool TopMostInFullScreen
+    {
+        get => _topMostInFullScreen;
+        set
+        {
+            if (_topMostInFullScreen == value)
+            {
+                return;
+            }
+
+            _topMostInFullScreen = value;
+            OnTopMostInFullScreenChanged(EventArgs.Empty);
+
+            if (_isFullScreen && _targetForm is not null)
+            {
+                _targetForm.TopMost = value;
+            }
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the value of <see cref="TopMostInFullScreen"/> changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerTopMostInFullScreenChangedDescr))]
+    public event EventHandler? TopMostInFullScreenChanged
+    {
+        add => _topMostInFullScreenChanged += value;
+        remove => _topMostInFullScreenChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="TopMostInFullScreenChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnTopMostInFullScreenChanged(EventArgs e)
+        => _topMostInFullScreenChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Gets or sets the key that toggles fullscreen mode.
+    /// </summary>
+    /// <value>
+    ///  A <see cref="Keys"/> value that is handled without modifiers. The
+    ///  default is <see cref="Keys.F11"/>.
+    /// </value>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerToggleFullScreenKeyDescr))]
+    [DefaultValue(Keys.F11)]
+    public Keys ToggleFullScreenKey
+    {
+        get => _toggleFullScreenKey;
+        set
+        {
+            if (_toggleFullScreenKey == value)
+            {
+                return;
+            }
+
+            _toggleFullScreenKey = value;
+            OnToggleFullScreenKeyChanged(EventArgs.Empty);
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the value of <see cref="ToggleFullScreenKey"/> changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerToggleFullScreenKeyChangedDescr))]
+    public event EventHandler? ToggleFullScreenKeyChanged
+    {
+        add => _toggleFullScreenKeyChanged += value;
+        remove => _toggleFullScreenKeyChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="ToggleFullScreenKeyChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnToggleFullScreenKeyChanged(EventArgs e)
+        => _toggleFullScreenKeyChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Gets or sets a value indicating whether pressing Escape exits
+    ///  fullscreen mode.
+    /// </summary>
+    /// <value>
+    ///  <see langword="true"/> to exit fullscreen mode when Escape is pressed
+    ///  without modifiers; otherwise, <see langword="false"/>. The default is
+    ///  <see langword="true"/>.
+    /// </value>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerEscapeExitsFullScreenDescr))]
+    [DefaultValue(true)]
+    public bool EscapeExitsFullScreen
+    {
+        get => _escapeExitsFullScreen;
+        set
+        {
+            if (_escapeExitsFullScreen == value)
+            {
+                return;
+            }
+
+            _escapeExitsFullScreen = value;
+            OnEscapeExitsFullScreenChanged(EventArgs.Empty);
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the value of <see cref="EscapeExitsFullScreen"/> changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerEscapeExitsFullScreenChangedDescr))]
+    public event EventHandler? EscapeExitsFullScreenChanged
+    {
+        add => _escapeExitsFullScreenChanged += value;
+        remove => _escapeExitsFullScreenChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="EscapeExitsFullScreenChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnEscapeExitsFullScreenChanged(EventArgs e)
+        => _escapeExitsFullScreenChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Gets or sets a value indicating whether the component requests that
+    ///  Windows keep the display and system awake.
+    /// </summary>
+    /// <value>
+    ///  <see langword="true"/> to request that Windows suppress display sleep
+    ///  and system sleep; otherwise, <see langword="false"/>. The default is
+    ///  <see langword="false"/>.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   This property uses the Windows power request APIs. It prevents ordinary
+    ///   display and system idle sleep while enabled, but it does not override
+    ///   every system policy and does not configure wake timers, Wake-on-LAN, or
+    ///   voice activation.
+    ///  </para>
+    /// </remarks>
+    /// <exception cref="Win32Exception">
+    ///  Windows could not create or activate the power request.
+    /// </exception>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerSuppressPowerSavingDescr))]
+    [DefaultValue(false)]
+    public bool SuppressPowerSaving
+    {
+        get => _suppressPowerSaving;
+        set
+        {
+            if (_suppressPowerSaving == value)
+            {
+                return;
+            }
+
+            if (value)
+            {
+                CreatePowerRequest();
+            }
+            else
+            {
+                ReleasePowerRequest();
+            }
+
+            _suppressPowerSaving = value;
+            OnSuppressPowerSavingChanged(EventArgs.Empty);
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the value of <see cref="SuppressPowerSaving"/> changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerSuppressPowerSavingChangedDescr))]
+    public event EventHandler? SuppressPowerSavingChanged
+    {
+        add => _suppressPowerSavingChanged += value;
+        remove => _suppressPowerSavingChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="SuppressPowerSavingChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnSuppressPowerSavingChanged(EventArgs e)
+        => _suppressPowerSavingChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Gets or sets the amount of time, in milliseconds, before the mouse
+    ///  pointer is hidden while fullscreen.
+    /// </summary>
+    /// <value>
+    ///  The inactivity delay in milliseconds. A value of 0 disables automatic
+    ///  pointer hiding. The default is 0.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   The timer is active only while the component is in fullscreen mode.
+    ///   When the user moves the mouse after the component hid the pointer, the
+    ///   pointer is shown immediately and the timer starts again.
+    ///  </para>
+    /// </remarks>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="value"/> is less than 0.
+    /// </exception>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerMousePointerAutoHideDelayDescr))]
+    [DefaultValue(0)]
+    public int MousePointerAutoHideDelay
+    {
+        get => _mousePointerAutoHideDelay;
+        set
+        {
+            ArgumentOutOfRangeException.ThrowIfNegative(value);
+
+            if (_mousePointerAutoHideDelay == value)
+            {
+                return;
+            }
+
+            _mousePointerAutoHideDelay = value;
+
+            if (value == 0)
+            {
+                StopMousePointerAutoHideTimer();
+                ShowMousePointerIfHidden();
+            }
+            else if (_isFullScreen)
+            {
+                RestartMousePointerAutoHideTimer();
+            }
+
+            OnMousePointerAutoHideDelayChanged(EventArgs.Empty);
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the value of <see cref="MousePointerAutoHideDelay"/>
+    ///  changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerMousePointerAutoHideDelayChangedDescr))]
+    public event EventHandler? MousePointerAutoHideDelayChanged
+    {
+        add => _mousePointerAutoHideDelayChanged += value;
+        remove => _mousePointerAutoHideDelayChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="MousePointerAutoHideDelayChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnMousePointerAutoHideDelayChanged(EventArgs e)
+        => _mousePointerAutoHideDelayChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Gets a value indicating whether the resolved form is currently
+    ///  fullscreen.
+    /// </summary>
+    /// <value>
+    ///  <see langword="true"/> if the component has placed the form in
+    ///  fullscreen mode; otherwise, <see langword="false"/>.
+    /// </value>
+    [Browsable(false)]
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    public bool IsFullScreen
+    {
+        get => _isFullScreen;
+        private set
+        {
+            if (_isFullScreen == value)
+            {
+                return;
+            }
+
+            _isFullScreen = value;
+            OnFullScreenChanged(EventArgs.Empty);
+        }
+    }
+
+    /// <summary>
+    ///  Occurs when the fullscreen state changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatPropertyChanged))]
+    [SRDescription(nameof(SR.KioskModeManagerFullScreenChangedDescr))]
+    public event EventHandler? FullScreenChanged
+    {
+        add => _fullScreenChanged += value;
+        remove => _fullScreenChanged -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="FullScreenChanged"/> event.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    protected virtual void OnFullScreenChanged(EventArgs e)
+        => _fullScreenChanged?.Invoke(this, e);
+
+    /// <summary>
+    ///  Occurs when keyboard, mouse, power resume, or session activity wakes
+    ///  the kiosk experience.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   The event reports activity that the component can observe on the UI
+    ///   thread or through Windows power/session notifications. It does not mean
+    ///   that the component caused the computer to wake from sleep, and it does
+    ///   not configure voice wake, network wake, or wake timers.
+    ///  </para>
+    /// </remarks>
+    [SRCategory(nameof(SR.CatAction))]
+    [SRDescription(nameof(SR.KioskModeManagerWakeupDescr))]
+    public event KioskModeWakeupEventHandler? Wakeup
+    {
+        add => _wakeup += value;
+        remove => _wakeup -= value;
+    }
+
+    /// <summary>
+    ///  Raises the <see cref="Wakeup"/> event.
+    /// </summary>
+    /// <param name="e">A <see cref="KioskModeWakeupEventArgs"/> that contains the event data.</param>
+    protected virtual void OnWakeup(KioskModeWakeupEventArgs e)
+        => _wakeup?.Invoke(this, e);
+
+    /// <summary>
+    ///  Places the resolved form in fullscreen mode.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+///   The component saves the form's border style, window state, bounds, and
+///   topmost state before applying fullscreen mode. Call
+///   <see cref="ToggleFullScreen"/> again to restore the saved state.
+    ///  </para>
+    /// </remarks>
+    private void EnterFullScreen()
+    {
+        Form? targetForm = ResolveTargetForm();
+        if (_isFullScreen || targetForm is null)
+        {
+            return;
+        }
+
+        EnsureFormMonitoring();
+
+        _savedBorderStyle = targetForm.FormBorderStyle;
+        _savedWindowState = targetForm.WindowState;
+        _savedBounds = targetForm.WindowState == FormWindowState.Normal
+            ? targetForm.Bounds
+            : targetForm.RestoreBounds;
+        _savedTopMost = targetForm.TopMost;
+
+        ApplyFullScreen(targetForm);
+        IsFullScreen = true;
+
+        RestartMousePointerAutoHideTimer();
+    }
+
+    /// <summary>
+    ///  Restores the form state that was saved when fullscreen mode was
+    ///  entered.
+    /// </summary>
+    private void ExitFullScreen()
+    {
+        if (!_isFullScreen || _targetForm is null)
+        {
+            return;
+        }
+
+        StopMousePointerAutoHideTimer();
+        ShowMousePointerIfHidden();
+
+        _targetForm.FormBorderStyle = _savedBorderStyle;
+        _targetForm.TopMost = _savedTopMost;
+        _targetForm.WindowState = FormWindowState.Normal;
+        _targetForm.Bounds = _savedBounds;
+        _targetForm.WindowState = _savedWindowState;
+
+        IsFullScreen = false;
+    }
+
+    /// <summary>
+    ///  Toggles the resolved form between fullscreen and restored mode.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Use <see cref="IsFullScreen"/> to determine the current state before
+    ///   calling this method when the application needs an explicit target
+    ///   state.
+    ///  </para>
+    /// </remarks>
+    public void ToggleFullScreen()
+    {
+        if (_isFullScreen)
+        {
+            ExitFullScreen();
+        }
+        else
+        {
+            EnterFullScreen();
+        }
+    }
+
+    void ISupportInitialize.BeginInit()
+    {
+        _initializing = true;
+    }
+
+    void ISupportInitialize.EndInit()
+    {
+        _initializing = false;
+
+        if (_containerControl is not null)
+        {
+            AttachToForm();
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            DetachFromForm();
+            _mousePointerAutoHideTimer?.Dispose();
+            _mousePointerAutoHideTimer = null;
+            ReleasePowerRequest();
+        }
+
+        base.Dispose(disposing);
+    }
+
+    private void AttachToForm()
+    {
+        if (_initializing)
+        {
+            return;
+        }
+
+        // UserControl-hosted components can initialize before the UserControl
+        // is parented. Resolve again when fullscreen is requested to support
+        // that design-time workflow.
+        _targetForm = ResolveTargetForm();
+
+        if (_targetForm is null)
+        {
+            return;
+        }
+
+        EnsureFormMonitoring();
+    }
+
+    private void DetachFromForm()
+    {
+        // Undo all thread-wide and static subscriptions owned by this component
+        // before switching containers or disposing.
+        if (_messageFilter is not null)
+        {
+            Application.RemoveMessageFilter(_messageFilter);
+            _messageFilter = null;
+        }
+
+        UnsubscribeSystemEvents();
+        StopMousePointerAutoHideTimer();
+        ShowMousePointerIfHidden();
+        _targetForm = null;
+    }
+
+    private Form? ResolveTargetForm()
+    {
+        // ContainerControl intentionally supports both Form and UserControl
+        // design-time placement. FindForm handles the UserControl case.
+        _targetForm = _containerControl as Form ?? _containerControl?.FindForm();
+        return _targetForm;
+    }
+
+    private void EnsureFormMonitoring()
+    {
+        // IMessageFilter observes input for child controls without changing
+        // Form.KeyPreview or installing global keyboard/mouse hooks.
+        if (_messageFilter is null)
+        {
+            _messageFilter = new KioskModeMessageFilter(this);
+            Application.AddMessageFilter(_messageFilter);
+        }
+
+        SubscribeSystemEvents();
+    }
+
+    private void ApplyFullScreen(Form form)
+    {
+        // Apply fullscreen from a normal state so bounds and border changes do
+        // not operate on Windows' maximized window rectangle.
+        form.WindowState = FormWindowState.Normal;
+        form.FormBorderStyle = FormBorderStyle.None;
+
+        if (_topMostInFullScreen)
+        {
+            form.TopMost = true;
+        }
+
+        if (_hideTaskbar)
+        {
+            Screen screen = Screen.FromControl(form);
+            form.Bounds = screen.Bounds;
+        }
+        else
+        {
+            form.WindowState = FormWindowState.Maximized;
+        }
+    }
+
+    private void SubscribeSystemEvents()
+    {
+        // SystemEvents are static events, so they must be unsubscribed
+        // explicitly to avoid rooting this component after disposal.
+        if (_systemEventsSubscribed || DesignMode)
+        {
+            return;
+        }
+
+        SystemEvents.PowerModeChanged += OnSystemPowerModeChanged;
+        SystemEvents.SessionSwitch += OnSystemSessionSwitch;
+        _systemEventsSubscribed = true;
+    }
+
+    private void UnsubscribeSystemEvents()
+    {
+        if (!_systemEventsSubscribed)
+        {
+            return;
+        }
+
+        SystemEvents.PowerModeChanged -= OnSystemPowerModeChanged;
+        SystemEvents.SessionSwitch -= OnSystemSessionSwitch;
+        _systemEventsSubscribed = false;
+    }
+
+    private void OnSystemPowerModeChanged(object? sender, PowerModeChangedEventArgs e)
+    {
+        if (e.Mode == PowerModes.Resume)
+        {
+            RaiseWakeup(KioskModeWakeupSource.PowerResume);
+        }
+    }
+
+    private void OnSystemSessionSwitch(object? sender, SessionSwitchEventArgs e)
+    {
+        if (e.Reason is SessionSwitchReason.SessionUnlock or SessionSwitchReason.SessionLogon)
+        {
+            RaiseWakeup(KioskModeWakeupSource.Session);
+        }
+    }
+
+    private void RestartMousePointerAutoHideTimer()
+    {
+        // Use a WinForms timer so cursor changes happen on the UI thread that
+        // receives the input messages restarting this timer.
+        if (!_isFullScreen || _mousePointerAutoHideDelay == 0)
+        {
+            return;
+        }
+
+        _mousePointerAutoHideTimer ??= new Timer();
+        _mousePointerAutoHideTimer.Stop();
+        _mousePointerAutoHideTimer.Interval = _mousePointerAutoHideDelay;
+        _mousePointerAutoHideTimer.Tick -= OnMousePointerAutoHideTimerTick;
+        _mousePointerAutoHideTimer.Tick += OnMousePointerAutoHideTimerTick;
+        _mousePointerAutoHideTimer.Start();
+    }
+
+    private void StopMousePointerAutoHideTimer()
+    {
+        _mousePointerAutoHideTimer?.Stop();
+    }
+
+    private void OnMousePointerAutoHideTimerTick(object? sender, EventArgs e)
+    {
+        StopMousePointerAutoHideTimer();
+
+        if (!_isCursorHidden)
+        {
+            Cursor.Hide();
+            _isCursorHidden = true;
+        }
+    }
+
+    private void ProcessKeyboardActivity(Keys keyData)
+    {
+        // Any keyboard input wakes the kiosk experience, even when it does not
+        // match one of the configured fullscreen control keys.
+        RaiseWakeup(KioskModeWakeupSource.Keyboard);
+
+        Keys keyCode = keyData & Keys.KeyCode;
+        Keys modifiers = keyData & Keys.Modifiers;
+
+        if (keyCode == _toggleFullScreenKey && modifiers == Keys.None)
+        {
+            ToggleFullScreen();
+        }
+        else if (keyCode == Keys.Escape && modifiers == Keys.None
+            && _escapeExitsFullScreen && _isFullScreen)
+        {
+            ExitFullScreen();
+        }
+    }
+
+    private void ProcessMouseActivity()
+    {
+        // Mouse movement can be noisy. Raise Wakeup only when activity brings
+        // back a pointer that this component hid.
+        bool wasHidden = _isCursorHidden;
+
+        ShowMousePointerIfHidden();
+        RestartMousePointerAutoHideTimer();
+
+        if (wasHidden)
+        {
+            RaiseWakeup(KioskModeWakeupSource.Mouse);
+        }
+    }
+
+    private void ShowMousePointerIfHidden()
+    {
+        // Cursor.Hide and Cursor.Show are counter-based. Only balance hides
+        // performed by this component.
+        if (!_isCursorHidden)
+        {
+            return;
+        }
+
+        Cursor.Show();
+        _isCursorHidden = false;
+    }
+
+    private void RaiseWakeup(KioskModeWakeupSource source)
+        => OnWakeup(new KioskModeWakeupEventArgs(source));
+
+    private unsafe void CreatePowerRequest()
+    {
+        // PowerClearRequest clears the active request, but only CloseHandle
+        // releases the native HANDLE returned by PowerCreateRequest.
+        if (!_powerRequestHandle.IsNull)
+        {
+            return;
+        }
+
+        REASON_CONTEXT context = new()
+        {
+            Version = PowerRequestContextVersion,
+            Flags = PowerRequestContextSimpleString,
+        };
+
+        nint reasonString = Marshal.StringToHGlobalUni(PowerRequestReason);
+
+        try
+        {
+            context.Reason.SimpleReasonString = (PWSTR)(char*)reasonString;
+            _powerRequestHandle = PInvoke.PowerCreateRequest(in context);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(reasonString);
+        }
+
+        if (_powerRequestHandle.IsNull)
+        {
+            throw new Win32Exception();
+        }
+
+        try
+        {
+            if (!PInvoke.PowerSetRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestDisplayRequired)
+                || !PInvoke.PowerSetRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestSystemRequired))
+            {
+                throw new Win32Exception();
+            }
+        }
+        catch
+        {
+            ReleasePowerRequest();
+            throw;
+        }
+    }
+
+    private void ReleasePowerRequest()
+    {
+        if (_powerRequestHandle.IsNull)
+        {
+            return;
+        }
+
+        PInvoke.PowerClearRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestDisplayRequired);
+        PInvoke.PowerClearRequest(_powerRequestHandle, POWER_REQUEST_TYPE.PowerRequestSystemRequired);
+        PInvoke.CloseHandle(_powerRequestHandle);
+        _powerRequestHandle = default;
+    }
+
+    private bool IsMessageFromTargetForm(HWND hwnd)
+        => _targetForm is not null
+            && !_targetForm.IsDisposed
+            && (hwnd == _targetForm.HWND || PInvoke.IsChild(_targetForm, hwnd));
+
+    private bool ProcessMessage(ref Message message)
+    {
+        if (!IsMessageFromTargetForm(message.HWND))
+        {
+            return false;
+        }
+
+        if (message.MsgInternal >= PInvokeCore.WM_KEYFIRST
+            && message.MsgInternal <= PInvokeCore.WM_KEYLAST)
+        {
+            ProcessKeyboardActivity((Keys)(nint)message.WParamInternal);
+        }
+        else if (message.MsgInternal >= PInvokeCore.WM_MOUSEFIRST
+            && message.MsgInternal <= PInvokeCore.WM_MOUSELAST)
+        {
+            ProcessMouseActivity();
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    ///  Observes keyboard and mouse messages that belong to the target form.
+    /// </summary>
+    private sealed class KioskModeMessageFilter : IMessageFilter
+    {
+        private readonly KioskModeManager _owner;
+
+        public KioskModeMessageFilter(KioskModeManager owner)
+        {
+            _owner = owner;
+        }
+
+        public bool PreFilterMessage(ref Message m)
+            => _owner.ProcessMessage(ref m);
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs
new file mode 100644
index 00000000000..3e40b6f10f5
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+/// <summary>
+///  Provides data for the <see cref="KioskModeManager.Wakeup"/> event.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The <see cref="Source"/> property identifies the kind of activity the
+///   component observed. Applications can use this value to distinguish direct
+///   user activity, such as mouse or keyboard input, from system activity such
+///   as power resume or session unlock.
+///  </para>
+/// </remarks>
+public class KioskModeWakeupEventArgs : EventArgs
+{
+    /// <summary>
+    ///  Initializes a new instance of the
+    ///  <see cref="KioskModeWakeupEventArgs"/> class.
+    /// </summary>
+    /// <param name="source">The source of the wakeup notification.</param>
+    public KioskModeWakeupEventArgs(KioskModeWakeupSource source)
+    {
+        SourceGenerated.EnumValidator.Validate(source, nameof(source));
+        Source = source;
+    }
+
+    /// <summary>
+    ///  Gets the source of the wakeup notification.
+    /// </summary>
+    public KioskModeWakeupSource Source { get; }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs
new file mode 100644
index 00000000000..993f54f25f8
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+/// <summary>
+///  Represents the method that will handle the
+///  <see cref="KioskModeManager.Wakeup"/> event.
+/// </summary>
+/// <param name="sender">The source of the event.</param>
+/// <param name="e">A <see cref="KioskModeWakeupEventArgs"/> that contains the event data.</param>
+public delegate void KioskModeWakeupEventHandler(object? sender, KioskModeWakeupEventArgs e);
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs
new file mode 100644
index 00000000000..ffed33c106d
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+/// <summary>
+///  Specifies the source of a <see cref="KioskModeManager.Wakeup"/>
+///  notification.
+/// </summary>
+public enum KioskModeWakeupSource
+{
+    /// <summary>
+    ///  The wakeup notification was caused by keyboard activity.
+    /// </summary>
+    Keyboard = 0,
+
+    /// <summary>
+    ///  The wakeup notification was caused by mouse activity.
+    /// </summary>
+    Mouse = 1,
+
+    /// <summary>
+    ///  The wakeup notification was caused by the system resuming from a low
+    ///  power state.
+    /// </summary>
+    PowerResume = 2,
+
+    /// <summary>
+    ///  The wakeup notification was caused by a Windows session activity, such
+    ///  as logon or unlock.
+    /// </summary>
+    Session = 3,
+}
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
new file mode 100644
index 00000000000..f06a6257e70
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
@@ -0,0 +1,327 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.ComponentModel;
+using System.Drawing;
+
+namespace System.Windows.Forms.Tests;
+
+public class KioskModeManagerTests
+{
+    [WinFormsFact]
+    public void KioskModeManager_Ctor_Default()
+    {
+        using SubKioskModeManager manager = new();
+
+        Assert.Null(manager.Container);
+        Assert.Null(manager.ContainerControl);
+        Assert.False(manager.DesignMode);
+        Assert.True(manager.EscapeExitsFullScreen);
+        Assert.False(manager.HideTaskbar);
+        Assert.False(manager.IsFullScreen);
+        Assert.Equal(0, manager.MousePointerAutoHideDelay);
+        Assert.Null(manager.Site);
+        Assert.False(manager.SuppressPowerSaving);
+        Assert.Equal(Keys.F11, manager.ToggleFullScreenKey);
+        Assert.False(manager.TopMostInFullScreen);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_Ctor_IContainer()
+    {
+        using Container container = new();
+        using KioskModeManager manager = new(container);
+
+        Assert.Same(container, manager.Container);
+        Assert.NotNull(manager.Site);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_Ctor_NullContainer_ThrowsArgumentNullException()
+    {
+        Assert.Throws<ArgumentNullException>("container", () => new KioskModeManager(null));
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ContainerControl_Set_GetReturnsExpected()
+    {
+        using Form form = new();
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form
+        };
+
+        Assert.Same(form, manager.ContainerControl);
+
+        manager.ContainerControl = form;
+        Assert.Same(form, manager.ContainerControl);
+
+        manager.ContainerControl = null;
+        Assert.Null(manager.ContainerControl);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ContainerControl_SetWithHandler_CallsContainerControlChanged()
+    {
+        using Form form = new();
+        using KioskModeManager manager = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            Assert.Same(EventArgs.Empty, e);
+            callCount++;
+        };
+
+        manager.ContainerControlChanged += handler;
+        manager.ContainerControl = form;
+        Assert.Equal(1, callCount);
+
+        manager.ContainerControl = form;
+        Assert.Equal(1, callCount);
+
+        manager.ContainerControl = null;
+        Assert.Equal(2, callCount);
+
+        manager.ContainerControlChanged -= handler;
+        manager.ContainerControl = form;
+        Assert.Equal(2, callCount);
+    }
+
+    [WinFormsTheory]
+    [InlineData(0)]
+    [InlineData(1)]
+    [InlineData(3000)]
+    public void KioskModeManager_MousePointerAutoHideDelay_Set_GetReturnsExpected(int value)
+    {
+        using KioskModeManager manager = new()
+        {
+            MousePointerAutoHideDelay = value
+        };
+
+        Assert.Equal(value, manager.MousePointerAutoHideDelay);
+
+        manager.MousePointerAutoHideDelay = value;
+        Assert.Equal(value, manager.MousePointerAutoHideDelay);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_MousePointerAutoHideDelay_SetNegative_ThrowsArgumentOutOfRangeException()
+    {
+        using KioskModeManager manager = new();
+
+        Assert.Throws<ArgumentOutOfRangeException>("value", () => manager.MousePointerAutoHideDelay = -1);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_MousePointerAutoHideDelay_SetWithHandler_CallsMousePointerAutoHideDelayChanged()
+    {
+        using KioskModeManager manager = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            Assert.Same(EventArgs.Empty, e);
+            callCount++;
+        };
+
+        manager.MousePointerAutoHideDelayChanged += handler;
+        manager.MousePointerAutoHideDelay = 1;
+        Assert.Equal(1, callCount);
+
+        manager.MousePointerAutoHideDelay = 1;
+        Assert.Equal(1, callCount);
+
+        manager.MousePointerAutoHideDelay = 2;
+        Assert.Equal(2, callCount);
+
+        manager.MousePointerAutoHideDelayChanged -= handler;
+        manager.MousePointerAutoHideDelay = 3;
+        Assert.Equal(2, callCount);
+    }
+
+    [WinFormsTheory]
+    [NewAndDefaultData<EventArgs>]
+    public void KioskModeManager_OnMousePointerAutoHideDelayChanged_Invoke_CallsMousePointerAutoHideDelayChanged(EventArgs eventArgs)
+    {
+        using SubKioskModeManager manager = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            Assert.Same(eventArgs, e);
+            callCount++;
+        };
+
+        manager.MousePointerAutoHideDelayChanged += handler;
+        manager.OnMousePointerAutoHideDelayChanged(eventArgs);
+        Assert.Equal(1, callCount);
+
+        manager.MousePointerAutoHideDelayChanged -= handler;
+        manager.OnMousePointerAutoHideDelayChanged(eventArgs);
+        Assert.Equal(1, callCount);
+    }
+
+    [WinFormsTheory]
+    [EnumData<KioskModeWakeupSource>]
+    public void KioskModeWakeupEventArgs_Ctor_Source(KioskModeWakeupSource source)
+    {
+        KioskModeWakeupEventArgs eventArgs = new(source);
+
+        Assert.Equal(source, eventArgs.Source);
+    }
+
+    [WinFormsTheory]
+    [InvalidEnumData<KioskModeWakeupSource>]
+    public void KioskModeWakeupEventArgs_Ctor_InvalidSource_ThrowsInvalidEnumArgumentException(KioskModeWakeupSource source)
+    {
+        Assert.Throws<InvalidEnumArgumentException>("source", () => new KioskModeWakeupEventArgs(source));
+    }
+
+    [WinFormsTheory]
+    [EnumData<KioskModeWakeupSource>]
+    public void KioskModeManager_OnWakeup_Invoke_CallsWakeup(KioskModeWakeupSource source)
+    {
+        using SubKioskModeManager manager = new();
+        KioskModeWakeupEventArgs eventArgs = new(source);
+        int callCount = 0;
+        KioskModeWakeupEventHandler handler = (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            Assert.Same(eventArgs, e);
+            Assert.Equal(source, e.Source);
+            callCount++;
+        };
+
+        manager.Wakeup += handler;
+        manager.OnWakeup(eventArgs);
+        Assert.Equal(1, callCount);
+
+        manager.Wakeup -= handler;
+        manager.OnWakeup(eventArgs);
+        Assert.Equal(1, callCount);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ToggleFullScreen_Form_RestoresExpected()
+    {
+        using Form form = new()
+        {
+            Bounds = new Rectangle(10, 20, 300, 200),
+            FormBorderStyle = FormBorderStyle.FixedDialog,
+            WindowState = FormWindowState.Normal,
+            TopMost = false
+        };
+
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form,
+            HideTaskbar = false,
+            TopMostInFullScreen = true
+        };
+
+        manager.ToggleFullScreen();
+
+        Assert.True(manager.IsFullScreen);
+        Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
+        Assert.True(form.TopMost);
+        Assert.Equal(FormWindowState.Maximized, form.WindowState);
+
+        manager.ToggleFullScreen();
+
+        Assert.False(manager.IsFullScreen);
+        Assert.Equal(FormBorderStyle.FixedDialog, form.FormBorderStyle);
+        Assert.False(form.TopMost);
+        Assert.Equal(FormWindowState.Normal, form.WindowState);
+        Assert.Equal(new Rectangle(10, 20, 300, 200), form.Bounds);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ToggleFullScreen_UserControlContainer_UsesParentForm()
+    {
+        using Form form = new();
+        using UserControl userControl = new();
+        form.Controls.Add(userControl);
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = userControl
+        };
+
+        manager.ToggleFullScreen();
+
+        Assert.True(manager.IsFullScreen);
+        Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ToggleFullScreen_UserControlContainerParentedAfterSet_UsesParentForm()
+    {
+        using Form form = new();
+        using UserControl userControl = new();
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = userControl
+        };
+
+        form.Controls.Add(userControl);
+        manager.ToggleFullScreen();
+
+        Assert.True(manager.IsFullScreen);
+        Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ContainerControl_SetWhileFullScreen_RestoresPreviousForm()
+    {
+        using Form form = new()
+        {
+            Bounds = new Rectangle(10, 20, 300, 200),
+            FormBorderStyle = FormBorderStyle.FixedDialog,
+            WindowState = FormWindowState.Normal
+        };
+
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form
+        };
+
+        manager.ToggleFullScreen();
+        Assert.True(manager.IsFullScreen);
+
+        manager.ContainerControl = null;
+
+        Assert.False(manager.IsFullScreen);
+        Assert.Equal(FormBorderStyle.FixedDialog, form.FormBorderStyle);
+        Assert.Equal(FormWindowState.Normal, form.WindowState);
+        Assert.Equal(new Rectangle(10, 20, 300, 200), form.Bounds);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ContainerControl_Set_DoesNotChangeFormKeyPreview()
+    {
+        using Form form = new()
+        {
+            KeyPreview = false
+        };
+
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form
+        };
+
+        Assert.False(form.KeyPreview);
+    }
+
+    private class SubKioskModeManager : KioskModeManager
+    {
+        public new bool DesignMode => base.DesignMode;
+
+        public new void OnMousePointerAutoHideDelayChanged(EventArgs e)
+            => base.OnMousePointerAutoHideDelayChanged(e);
+
+        public new void OnWakeup(KioskModeWakeupEventArgs e)
+            => base.OnWakeup(e);
+    }
+}

From b236582e7f360fc90f31b5d1406073a4300b425a Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Sun, 14 Jun 2026 09:32:13 -0700
Subject: [PATCH 20/50] Make BuildAssist locate vswhere.exe by absolute path

BuildAssist invoked 'vswhere.exe' by bare name, relying on cmd.exe searching the current working directory. In environments where NoDefaultCurrentDirectoryInExePath is set, that lookup is disabled, so the Exec fails with exit code 9009 and cascades into unresolved AxWMPLib/Interop.WMPLib COM references in System.Windows.Forms.Design.Tests. Invoke vswhere via its absolute path so discovery of Framework MSBuild works regardless of that setting.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/BuildAssist/BuildAssist.msbuildproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BuildAssist/BuildAssist.msbuildproj b/src/BuildAssist/BuildAssist.msbuildproj
index 2e188f76ff6..400c78f44e6 100644
--- a/src/BuildAssist/BuildAssist.msbuildproj
+++ b/src/BuildAssist/BuildAssist.msbuildproj
@@ -37,7 +37,7 @@
 
     <!-- Work out VS installation path, so we can find MSBuild.exe -->
     <Exec
-      Command="vswhere.exe -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild"
+      Command='"$(VSWherePath)\vswhere.exe" -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild'
       WorkingDirectory="$(VSWherePath)"
       EchoOff="true"
       ConsoleToMsBuild="true"

From 436d0b9d7659e22d7ee52a0adde6487c212f730a Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Fri, 19 Jun 2026 17:47:13 -0700
Subject: [PATCH 21/50] Improve and streamline APIs.

---
 .../PublicAPI.Unshipped.txt                   |  19 +-
 src/System.Windows.Forms/Resources/SR.resx    |  22 +-
 .../Resources/xlf/SR.cs.xlf                   |  40 +--
 .../Resources/xlf/SR.de.xlf                   |  40 +--
 .../Resources/xlf/SR.es.xlf                   |  40 +--
 .../Resources/xlf/SR.fr.xlf                   |  40 +--
 .../Resources/xlf/SR.it.xlf                   |  40 +--
 .../Resources/xlf/SR.ja.xlf                   |  40 +--
 .../Resources/xlf/SR.ko.xlf                   |  40 +--
 .../Resources/xlf/SR.pl.xlf                   |  40 +--
 .../Resources/xlf/SR.pt-BR.xlf                |  40 +--
 .../Resources/xlf/SR.ru.xlf                   |  40 +--
 .../Resources/xlf/SR.tr.xlf                   |  40 +--
 .../Resources/xlf/SR.zh-Hans.xlf              |  40 +--
 .../Resources/xlf/SR.zh-Hant.xlf              |  40 +--
 .../KioskModeManager/KioskModeManager.cs      | 241 ++++++++----------
 .../Windows/Forms/KioskModeManagerTests.cs    | 216 +++++++++++-----
 17 files changed, 402 insertions(+), 616 deletions(-)

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 3b87d84db63..54fe8d52e13 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -81,13 +81,7 @@ virtual WinFormsBoards.Controls.KioskModeManager.OnEscapeExitsFullScreenChanged(
 virtual WinFormsBoards.Controls.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeWakeupEventHandler.Invoke(object? sender, System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnWakeup(System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnTopMostInFullScreenChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnToggleFullScreenKeyChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnSuppressPowerSavingChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnMousePointerAutoHideDelayChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnHideTaskbarChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnEscapeExitsFullScreenChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
 System.Windows.Forms.KioskModeWakeupSource.Session = 3 -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupSource.PowerResume = 2 -> System.Windows.Forms.KioskModeWakeupSource
@@ -98,28 +92,25 @@ System.Windows.Forms.KioskModeWakeupEventHandler
 System.Windows.Forms.KioskModeWakeupEventArgs.Source.get -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupEventArgs.KioskModeWakeupEventArgs(System.Windows.Forms.KioskModeWakeupSource source) -> void
 System.Windows.Forms.KioskModeWakeupEventArgs
+System.Windows.Forms.KioskModeManager.WakeUpCommand.get -> System.Windows.Input.ICommand?
+System.Windows.Forms.KioskModeManager.WakeUpCommand.set -> void
 System.Windows.Forms.KioskModeManager.Wakeup -> System.Windows.Forms.KioskModeWakeupEventHandler?
-System.Windows.Forms.KioskModeManager.TopMostInFullScreenChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.TopMostInFullScreen.set -> void
 System.Windows.Forms.KioskModeManager.TopMostInFullScreen.get -> bool
-System.Windows.Forms.KioskModeManager.ToggleFullScreenKeyChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.set -> void
 System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.Forms.Keys
 System.Windows.Forms.KioskModeManager.ToggleFullScreen() -> void
-System.Windows.Forms.KioskModeManager.SuppressPowerSavingChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.SuppressPowerSaving.set -> void
 System.Windows.Forms.KioskModeManager.SuppressPowerSaving.get -> bool
-System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelayChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.set -> void
 System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.get -> int
 System.Windows.Forms.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
 System.Windows.Forms.KioskModeManager.KioskModeManager() -> void
-System.Windows.Forms.KioskModeManager.IsFullScreen.get -> bool
-System.Windows.Forms.KioskModeManager.HideTaskbarChanged -> System.EventHandler?
 System.Windows.Forms.KioskModeManager.HideTaskbar.set -> void
 System.Windows.Forms.KioskModeManager.HideTaskbar.get -> bool
 System.Windows.Forms.KioskModeManager.FullScreenChanged -> System.EventHandler?
-System.Windows.Forms.KioskModeManager.EscapeExitsFullScreenChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.FullScreen.get -> bool
+System.Windows.Forms.KioskModeManager.FullScreen.set -> void
 System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.set -> void
 System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.get -> bool
 System.Windows.Forms.KioskModeManager.ContainerControlChanged -> System.EventHandler?
@@ -127,3 +118,5 @@ System.Windows.Forms.KioskModeManager.ContainerControl.set -> void
 System.Windows.Forms.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
 System.Windows.Forms.KioskModeManager
 override System.Windows.Forms.KioskModeManager.Dispose(bool disposing) -> void
+override System.Windows.Forms.KioskModeManager.Site.get -> System.ComponentModel.ISite?
+override System.Windows.Forms.KioskModeManager.Site.set -> void
diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index e7ceb89fd24..2b53c4c5f9a 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -2691,8 +2691,8 @@ To replace this default dialog please handle the DataError event.</value>
   <data name="KioskModeManagerEscapeExitsFullScreenDescr" xml:space="preserve">
     <value>Indicates whether pressing Escape exits fullscreen mode.</value>
   </data>
-  <data name="KioskModeManagerEscapeExitsFullScreenChangedDescr" xml:space="preserve">
-    <value>Occurs when the EscapeExitsFullScreen property value changes.</value>
+  <data name="KioskModeManagerFullScreenDescr" xml:space="preserve">
+    <value>Gets or sets a value indicating whether the resolved form is currently fullscreen.</value>
   </data>
   <data name="KioskModeManagerFullScreenChangedDescr" xml:space="preserve">
     <value>Occurs when the fullscreen state changes.</value>
@@ -2700,36 +2700,24 @@ To replace this default dialog please handle the DataError event.</value>
   <data name="KioskModeManagerHideTaskbarDescr" xml:space="preserve">
     <value>Indicates whether fullscreen mode covers the Windows taskbar.</value>
   </data>
-  <data name="KioskModeManagerHideTaskbarChangedDescr" xml:space="preserve">
-    <value>Occurs when the HideTaskbar property value changes.</value>
-  </data>
   <data name="KioskModeManagerMousePointerAutoHideDelayDescr" xml:space="preserve">
     <value>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</value>
   </data>
-  <data name="KioskModeManagerMousePointerAutoHideDelayChangedDescr" xml:space="preserve">
-    <value>Occurs when the MousePointerAutoHideDelay property value changes.</value>
-  </data>
   <data name="KioskModeManagerSuppressPowerSavingDescr" xml:space="preserve">
     <value>Indicates whether Windows should keep the display and system awake while this component is active.</value>
   </data>
-  <data name="KioskModeManagerSuppressPowerSavingChangedDescr" xml:space="preserve">
-    <value>Occurs when the SuppressPowerSaving property value changes.</value>
-  </data>
   <data name="KioskModeManagerToggleFullScreenKeyDescr" xml:space="preserve">
     <value>The key that toggles between fullscreen and restored mode.</value>
   </data>
-  <data name="KioskModeManagerToggleFullScreenKeyChangedDescr" xml:space="preserve">
-    <value>Occurs when the ToggleFullScreenKey property value changes.</value>
-  </data>
   <data name="KioskModeManagerTopMostInFullScreenDescr" xml:space="preserve">
     <value>Indicates whether the form is topmost while fullscreen.</value>
   </data>
-  <data name="KioskModeManagerTopMostInFullScreenChangedDescr" xml:space="preserve">
-    <value>Occurs when the TopMostInFullScreen property value changes.</value>
-  </data>
   <data name="KioskModeManagerWakeupDescr" xml:space="preserve">
     <value>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</value>
   </data>
+  <data name="KioskModeManagerWakeUpCommandDescr" xml:space="preserve">
+    <value>The command that is executed whenever the kiosk experience is woken.</value>
+  </data>
   <data name="DescriptionLabel" xml:space="preserve">
     <value>Provides run-time information or descriptive text for a control.</value>
   </data>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
index 1f65ccf1457..80736719f78 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
@@ -6129,66 +6129,41 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Trasování zásobníku, kde došlo k neplatné operaci:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Umožňuje automatické zpracování textu, který je delší než šířka ovládacího prvku popisku.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
index 3cc2b32ca3f..5be7bb5b3fa 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
@@ -6129,66 +6129,41 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Aktiviert die automatische Behandlung von Text, der über die Breite des Bezeichnungssteuerelements hinausgeht.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
index cfb52fd123c..d0725d9d5dd 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
@@ -6129,66 +6129,41 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Permite el control automático del texto que se extiende más allá del ancho del control de la etiqueta.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
index 65abe23c062..13e6c849190 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
@@ -6129,66 +6129,41 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Cette opération non conforme s'est produite sur la trace de la pile :
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Active la gestion automatique du texte qui dépasse les limites de largeur du contrôle label.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
index 9bf30d7253f..5af3d425cb6 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
@@ -6129,66 +6129,41 @@ Analisi dello stack dove si è verificata l'operazione non valida:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Analisi dello stack dove si è verificata l'operazione non valida:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Consente la gestione automatica del testo che non è contenuto all'interno della larghezza del controllo etichetta.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
index 76fa9688a5f..14876be5a33 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
@@ -6129,66 +6129,41 @@ Stack trace where the illegal operation occurred was:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Stack trace where the illegal operation occurred was:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">ラベル コントロールの幅を越えるテキストの自動処理を有効にします。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
index 591b573a434..7776400cc91 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
@@ -6129,66 +6129,41 @@ Stack trace where the illegal operation occurred was:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Stack trace where the illegal operation occurred was:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">레이블 컨트롤의 너비보다 큰 텍스트를 자동으로 처리합니다.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
index 34bfbbb410b..2b5069370a7 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
@@ -6129,66 +6129,41 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Włącza automatyczną obsługę tekstu, który mieści się w szerokości formantu etykiety.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
index 03080cb8c77..0049498e30e 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
@@ -6129,66 +6129,41 @@ O rastreamento de pilha em que a operação ilegal ocorreu foi:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ O rastreamento de pilha em que a operação ilegal ocorreu foi:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Permite a manipulação automática de texto que ultrapassa a largura do controle de rótulo.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
index 2b8d0190b07..bba77ec4065 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
@@ -6129,66 +6129,41 @@ Stack trace where the illegal operation occurred was:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Stack trace where the illegal operation occurred was:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Включает автоматическую обработку текста, выходящего за пределы ширины элемента управления с подписью.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
index b202c9cb65c..19529ea64f9 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
@@ -6129,66 +6129,41 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Geçersiz işlemin gerçekleştiği yığın izi:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">Etiket denetimi genişliğini aşan metnin otomatik işlenmesini sağlar.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
index f89e7726e18..273d0235920 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
@@ -6129,66 +6129,41 @@ Stack trace where the illegal operation occurred was:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Stack trace where the illegal operation occurred was:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">启用对扩展到标签控件宽度以外的文本的自动处理。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
index b2729c0c4e5..86e90809d5a 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
@@ -6129,66 +6129,41 @@ Stack trace where the illegal operation occurred was:
         <target state="new">The container whose containing form is controlled by the kiosk mode manager.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerEscapeExitsFullScreenChangedDescr">
-        <source>Occurs when the EscapeExitsFullScreen property value changes.</source>
-        <target state="new">Occurs when the EscapeExitsFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerEscapeExitsFullScreenDescr">
         <source>Indicates whether pressing Escape exits fullscreen mode.</source>
         <target state="new">Indicates whether pressing Escape exits fullscreen mode.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerFullScreenDescr">
+        <source>Gets or sets a value indicating whether the resolved form is currently fullscreen.</source>
+        <target state="new">Gets or sets a value indicating whether the resolved form is currently fullscreen.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="KioskModeManagerFullScreenChangedDescr">
         <source>Occurs when the fullscreen state changes.</source>
         <target state="new">Occurs when the fullscreen state changes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerHideTaskbarChangedDescr">
-        <source>Occurs when the HideTaskbar property value changes.</source>
-        <target state="new">Occurs when the HideTaskbar property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerHideTaskbarDescr">
         <source>Indicates whether fullscreen mode covers the Windows taskbar.</source>
         <target state="new">Indicates whether fullscreen mode covers the Windows taskbar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerMousePointerAutoHideDelayChangedDescr">
-        <source>Occurs when the MousePointerAutoHideDelay property value changes.</source>
-        <target state="new">Occurs when the MousePointerAutoHideDelay property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerMousePointerAutoHideDelayDescr">
         <source>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</source>
         <target state="new">The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerSuppressPowerSavingChangedDescr">
-        <source>Occurs when the SuppressPowerSaving property value changes.</source>
-        <target state="new">Occurs when the SuppressPowerSaving property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerSuppressPowerSavingDescr">
         <source>Indicates whether Windows should keep the display and system awake while this component is active.</source>
         <target state="new">Indicates whether Windows should keep the display and system awake while this component is active.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerToggleFullScreenKeyChangedDescr">
-        <source>Occurs when the ToggleFullScreenKey property value changes.</source>
-        <target state="new">Occurs when the ToggleFullScreenKey property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerToggleFullScreenKeyDescr">
         <source>The key that toggles between fullscreen and restored mode.</source>
         <target state="new">The key that toggles between fullscreen and restored mode.</target>
         <note />
       </trans-unit>
-      <trans-unit id="KioskModeManagerTopMostInFullScreenChangedDescr">
-        <source>Occurs when the TopMostInFullScreen property value changes.</source>
-        <target state="new">Occurs when the TopMostInFullScreen property value changes.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="KioskModeManagerTopMostInFullScreenDescr">
         <source>Indicates whether the form is topmost while fullscreen.</source>
         <target state="new">Indicates whether the form is topmost while fullscreen.</target>
@@ -6199,6 +6174,11 @@ Stack trace where the illegal operation occurred was:
         <target state="new">Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</target>
         <note />
       </trans-unit>
+      <trans-unit id="KioskModeManagerWakeUpCommandDescr">
+        <source>The command that is executed whenever the kiosk experience is woken.</source>
+        <target state="new">The command that is executed whenever the kiosk experience is woken.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LabelAutoEllipsisDescr">
         <source>Enables the automatic handling of text that extends beyond the width of the label control.</source>
         <target state="translated">啟用自動處理，以處理超出標籤控制項寬度的文件。</target>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
index 7309cb977fe..6a6be0c9e8a 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
@@ -2,8 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.ComponentModel;
+using System.ComponentModel.Design;
 using System.Drawing;
 using System.Runtime.InteropServices;
+using System.Windows.Input;
 using Microsoft.Win32;
 using Windows.Win32.System.Power;
 using Windows.Win32.System.Threading;
@@ -54,7 +56,7 @@ namespace System.Windows.Forms;
 ///               }
 ///           };
 ///
-///           if (!_kioskModeManager.IsFullScreen)
+///           if (!_kioskModeManager.FullScreen)
 ///           {
 ///              _kioskModeManager.ToggleFullScreen();
 ///           }
@@ -91,16 +93,11 @@ public class KioskModeManager : Component, ISupportInitialize
     private bool _escapeExitsFullScreen = true;
     private bool _suppressPowerSaving;
     private int _mousePointerAutoHideDelay;
+    private ICommand? _wakeUpCommand;
 
     private HANDLE _powerRequestHandle;
 
     private EventHandler? _containerControlChanged;
-    private EventHandler? _hideTaskbarChanged;
-    private EventHandler? _topMostInFullScreenChanged;
-    private EventHandler? _toggleFullScreenKeyChanged;
-    private EventHandler? _escapeExitsFullScreenChanged;
-    private EventHandler? _suppressPowerSavingChanged;
-    private EventHandler? _mousePointerAutoHideDelayChanged;
     private EventHandler? _fullScreenChanged;
     private KioskModeWakeupEventHandler? _wakeup;
 
@@ -125,6 +122,35 @@ public KioskModeManager(IContainer container)
         container.Add(this);
     }
 
+    /// <summary>
+    ///  Gets or sets the <see cref="ISite"/> associated with the component.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   When the component is sited at design time and <see cref="ContainerControl"/>
+    ///   has not been set explicitly, the component resolves the root component of the
+    ///   designer host (typically the owning <see cref="Form"/> or <see cref="UserControl"/>)
+    ///   and assigns it as the <see cref="ContainerControl"/>. An explicitly assigned
+    ///   <see cref="ContainerControl"/> is never overwritten.
+    ///  </para>
+    /// </remarks>
+    public override ISite? Site
+    {
+        get => base.Site;
+        set
+        {
+            base.Site = value;
+
+            if (value is not null
+                && _containerControl is null
+                && value.GetService(typeof(IDesignerHost)) is IDesignerHost host
+                && host.RootComponent is ContainerControl root)
+            {
+                ContainerControl = root;
+            }
+        }
+    }
+
     /// <summary>
     ///  Gets or sets the container whose containing form is controlled by this
     ///  component.
@@ -218,7 +244,6 @@ public bool HideTaskbar
             }
 
             _hideTaskbar = value;
-            OnHideTaskbarChanged(EventArgs.Empty);
 
             if (_isFullScreen && _targetForm is not null)
             {
@@ -227,24 +252,6 @@ public bool HideTaskbar
         }
     }
 
-    /// <summary>
-    ///  Occurs when the value of <see cref="HideTaskbar"/> changes.
-    /// </summary>
-    [SRCategory(nameof(SR.CatPropertyChanged))]
-    [SRDescription(nameof(SR.KioskModeManagerHideTaskbarChangedDescr))]
-    public event EventHandler? HideTaskbarChanged
-    {
-        add => _hideTaskbarChanged += value;
-        remove => _hideTaskbarChanged -= value;
-    }
-
-    /// <summary>
-    ///  Raises the <see cref="HideTaskbarChanged"/> event.
-    /// </summary>
-    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
-    protected virtual void OnHideTaskbarChanged(EventArgs e)
-        => _hideTaskbarChanged?.Invoke(this, e);
-
     /// <summary>
     ///  Gets or sets a value indicating whether the form is topmost while
     ///  fullscreen.
@@ -268,7 +275,6 @@ public bool TopMostInFullScreen
             }
 
             _topMostInFullScreen = value;
-            OnTopMostInFullScreenChanged(EventArgs.Empty);
 
             if (_isFullScreen && _targetForm is not null)
             {
@@ -277,24 +283,6 @@ public bool TopMostInFullScreen
         }
     }
 
-    /// <summary>
-    ///  Occurs when the value of <see cref="TopMostInFullScreen"/> changes.
-    /// </summary>
-    [SRCategory(nameof(SR.CatPropertyChanged))]
-    [SRDescription(nameof(SR.KioskModeManagerTopMostInFullScreenChangedDescr))]
-    public event EventHandler? TopMostInFullScreenChanged
-    {
-        add => _topMostInFullScreenChanged += value;
-        remove => _topMostInFullScreenChanged -= value;
-    }
-
-    /// <summary>
-    ///  Raises the <see cref="TopMostInFullScreenChanged"/> event.
-    /// </summary>
-    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
-    protected virtual void OnTopMostInFullScreenChanged(EventArgs e)
-        => _topMostInFullScreenChanged?.Invoke(this, e);
-
     /// <summary>
     ///  Gets or sets the key that toggles fullscreen mode.
     /// </summary>
@@ -316,28 +304,9 @@ public Keys ToggleFullScreenKey
             }
 
             _toggleFullScreenKey = value;
-            OnToggleFullScreenKeyChanged(EventArgs.Empty);
         }
     }
 
-    /// <summary>
-    ///  Occurs when the value of <see cref="ToggleFullScreenKey"/> changes.
-    /// </summary>
-    [SRCategory(nameof(SR.CatPropertyChanged))]
-    [SRDescription(nameof(SR.KioskModeManagerToggleFullScreenKeyChangedDescr))]
-    public event EventHandler? ToggleFullScreenKeyChanged
-    {
-        add => _toggleFullScreenKeyChanged += value;
-        remove => _toggleFullScreenKeyChanged -= value;
-    }
-
-    /// <summary>
-    ///  Raises the <see cref="ToggleFullScreenKeyChanged"/> event.
-    /// </summary>
-    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
-    protected virtual void OnToggleFullScreenKeyChanged(EventArgs e)
-        => _toggleFullScreenKeyChanged?.Invoke(this, e);
-
     /// <summary>
     ///  Gets or sets a value indicating whether pressing Escape exits
     ///  fullscreen mode.
@@ -361,28 +330,9 @@ public bool EscapeExitsFullScreen
             }
 
             _escapeExitsFullScreen = value;
-            OnEscapeExitsFullScreenChanged(EventArgs.Empty);
         }
     }
 
-    /// <summary>
-    ///  Occurs when the value of <see cref="EscapeExitsFullScreen"/> changes.
-    /// </summary>
-    [SRCategory(nameof(SR.CatPropertyChanged))]
-    [SRDescription(nameof(SR.KioskModeManagerEscapeExitsFullScreenChangedDescr))]
-    public event EventHandler? EscapeExitsFullScreenChanged
-    {
-        add => _escapeExitsFullScreenChanged += value;
-        remove => _escapeExitsFullScreenChanged -= value;
-    }
-
-    /// <summary>
-    ///  Raises the <see cref="EscapeExitsFullScreenChanged"/> event.
-    /// </summary>
-    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
-    protected virtual void OnEscapeExitsFullScreenChanged(EventArgs e)
-        => _escapeExitsFullScreenChanged?.Invoke(this, e);
-
     /// <summary>
     ///  Gets or sets a value indicating whether the component requests that
     ///  Windows keep the display and system awake.
@@ -426,28 +376,9 @@ public bool SuppressPowerSaving
             }
 
             _suppressPowerSaving = value;
-            OnSuppressPowerSavingChanged(EventArgs.Empty);
         }
     }
 
-    /// <summary>
-    ///  Occurs when the value of <see cref="SuppressPowerSaving"/> changes.
-    /// </summary>
-    [SRCategory(nameof(SR.CatPropertyChanged))]
-    [SRDescription(nameof(SR.KioskModeManagerSuppressPowerSavingChangedDescr))]
-    public event EventHandler? SuppressPowerSavingChanged
-    {
-        add => _suppressPowerSavingChanged += value;
-        remove => _suppressPowerSavingChanged -= value;
-    }
-
-    /// <summary>
-    ///  Raises the <see cref="SuppressPowerSavingChanged"/> event.
-    /// </summary>
-    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
-    protected virtual void OnSuppressPowerSavingChanged(EventArgs e)
-        => _suppressPowerSavingChanged?.Invoke(this, e);
-
     /// <summary>
     ///  Gets or sets the amount of time, in milliseconds, before the mouse
     ///  pointer is hidden while fullscreen.
@@ -492,52 +423,43 @@ public int MousePointerAutoHideDelay
             {
                 RestartMousePointerAutoHideTimer();
             }
-
-            OnMousePointerAutoHideDelayChanged(EventArgs.Empty);
         }
     }
 
     /// <summary>
-    ///  Occurs when the value of <see cref="MousePointerAutoHideDelay"/>
-    ///  changes.
-    /// </summary>
-    [SRCategory(nameof(SR.CatPropertyChanged))]
-    [SRDescription(nameof(SR.KioskModeManagerMousePointerAutoHideDelayChangedDescr))]
-    public event EventHandler? MousePointerAutoHideDelayChanged
-    {
-        add => _mousePointerAutoHideDelayChanged += value;
-        remove => _mousePointerAutoHideDelayChanged -= value;
-    }
-
-    /// <summary>
-    ///  Raises the <see cref="MousePointerAutoHideDelayChanged"/> event.
-    /// </summary>
-    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
-    protected virtual void OnMousePointerAutoHideDelayChanged(EventArgs e)
-        => _mousePointerAutoHideDelayChanged?.Invoke(this, e);
-
-    /// <summary>
-    ///  Gets a value indicating whether the resolved form is currently
+    ///  Gets or sets a value indicating whether the resolved form is currently
     ///  fullscreen.
     /// </summary>
     /// <value>
     ///  <see langword="true"/> if the component has placed the form in
     ///  fullscreen mode; otherwise, <see langword="false"/>.
     /// </value>
-    [Browsable(false)]
+    /// <remarks>
+    ///  <para>
+    ///   Setting this property to <see langword="true"/> enters fullscreen mode and
+    ///   setting it to <see langword="false"/> restores the previously saved form
+    ///   state. The property is bindable so it can participate in two-way data
+    ///   binding.
+    ///  </para>
+    /// </remarks>
+    [SRCategory(nameof(SR.CatBehavior))]
+    [SRDescription(nameof(SR.KioskModeManagerFullScreenDescr))]
+    [Bindable(true)]
+    [DefaultValue(false)]
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-    public bool IsFullScreen
+    public bool FullScreen
     {
         get => _isFullScreen;
-        private set
+        set
         {
-            if (_isFullScreen == value)
+            if (value)
             {
-                return;
+                EnterFullScreen();
+            }
+            else
+            {
+                ExitFullScreen();
             }
-
-            _isFullScreen = value;
-            OnFullScreenChanged(EventArgs.Empty);
         }
     }
 
@@ -584,7 +506,38 @@ public event KioskModeWakeupEventHandler? Wakeup
     /// </summary>
     /// <param name="e">A <see cref="KioskModeWakeupEventArgs"/> that contains the event data.</param>
     protected virtual void OnWakeup(KioskModeWakeupEventArgs e)
-        => _wakeup?.Invoke(this, e);
+    {
+        _wakeup?.Invoke(this, e);
+
+        // The wakeup source is passed as its string name so the bound command stays
+        // independent of the WinForms-specific enum type.
+        _wakeUpCommand?.Execute(e.Source.ToString());
+    }
+
+    /// <summary>
+    ///  Gets or sets the command that is executed whenever the <see cref="Wakeup"/>
+    ///  event is raised.
+    /// </summary>
+    /// <value>
+    ///  An <see cref="ICommand"/> to execute on every wakeup, or <see langword="null"/>
+    ///  to execute no command. The default is <see langword="null"/>.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   The command is executed with the wakeup source name (the result of
+    ///   <see cref="KioskModeWakeupSource"/>.<see cref="object.ToString"/>) as the command
+    ///   parameter, keeping the command independent of the WinForms-specific enum type.
+    ///  </para>
+    /// </remarks>
+    [SRCategory(nameof(SR.CatAction))]
+    [SRDescription(nameof(SR.KioskModeManagerWakeUpCommandDescr))]
+    [Bindable(true)]
+    [DefaultValue(null)]
+    public ICommand? WakeUpCommand
+    {
+        get => _wakeUpCommand;
+        set => _wakeUpCommand = value;
+    }
 
     /// <summary>
     ///  Places the resolved form in fullscreen mode.
@@ -614,7 +567,7 @@ private void EnterFullScreen()
         _savedTopMost = targetForm.TopMost;
 
         ApplyFullScreen(targetForm);
-        IsFullScreen = true;
+        SetFullScreenState(true);
 
         RestartMousePointerAutoHideTimer();
     }
@@ -639,7 +592,23 @@ private void ExitFullScreen()
         _targetForm.Bounds = _savedBounds;
         _targetForm.WindowState = _savedWindowState;
 
-        IsFullScreen = false;
+        SetFullScreenState(false);
+    }
+
+    /// <summary>
+    ///  Updates the fullscreen state and raises <see cref="FullScreenChanged"/>
+    ///  when the value changes.
+    /// </summary>
+    /// <param name="value">The new fullscreen state.</param>
+    private void SetFullScreenState(bool value)
+    {
+        if (_isFullScreen == value)
+        {
+            return;
+        }
+
+        _isFullScreen = value;
+        OnFullScreenChanged(EventArgs.Empty);
     }
 
     /// <summary>
@@ -647,7 +616,7 @@ private void ExitFullScreen()
     /// </summary>
     /// <remarks>
     ///  <para>
-    ///   Use <see cref="IsFullScreen"/> to determine the current state before
+    ///   Use <see cref="FullScreen"/> to determine the current state before
     ///   calling this method when the application needs an explicit target
     ///   state.
     ///  </para>
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
index f06a6257e70..c5d3adcdff4 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
@@ -1,10 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #nullable disable
 
 using System.ComponentModel;
+using System.ComponentModel.Design;
 using System.Drawing;
+using System.Windows.Input;
+using Moq;
 
 namespace System.Windows.Forms.Tests;
 
@@ -20,7 +23,7 @@ public void KioskModeManager_Ctor_Default()
         Assert.False(manager.DesignMode);
         Assert.True(manager.EscapeExitsFullScreen);
         Assert.False(manager.HideTaskbar);
-        Assert.False(manager.IsFullScreen);
+        Assert.False(manager.FullScreen);
         Assert.Equal(0, manager.MousePointerAutoHideDelay);
         Assert.Null(manager.Site);
         Assert.False(manager.SuppressPowerSaving);
@@ -115,55 +118,6 @@ public void KioskModeManager_MousePointerAutoHideDelay_SetNegative_ThrowsArgumen
         Assert.Throws<ArgumentOutOfRangeException>("value", () => manager.MousePointerAutoHideDelay = -1);
     }
 
-    [WinFormsFact]
-    public void KioskModeManager_MousePointerAutoHideDelay_SetWithHandler_CallsMousePointerAutoHideDelayChanged()
-    {
-        using KioskModeManager manager = new();
-        int callCount = 0;
-        EventHandler handler = (sender, e) =>
-        {
-            Assert.Same(manager, sender);
-            Assert.Same(EventArgs.Empty, e);
-            callCount++;
-        };
-
-        manager.MousePointerAutoHideDelayChanged += handler;
-        manager.MousePointerAutoHideDelay = 1;
-        Assert.Equal(1, callCount);
-
-        manager.MousePointerAutoHideDelay = 1;
-        Assert.Equal(1, callCount);
-
-        manager.MousePointerAutoHideDelay = 2;
-        Assert.Equal(2, callCount);
-
-        manager.MousePointerAutoHideDelayChanged -= handler;
-        manager.MousePointerAutoHideDelay = 3;
-        Assert.Equal(2, callCount);
-    }
-
-    [WinFormsTheory]
-    [NewAndDefaultData<EventArgs>]
-    public void KioskModeManager_OnMousePointerAutoHideDelayChanged_Invoke_CallsMousePointerAutoHideDelayChanged(EventArgs eventArgs)
-    {
-        using SubKioskModeManager manager = new();
-        int callCount = 0;
-        EventHandler handler = (sender, e) =>
-        {
-            Assert.Same(manager, sender);
-            Assert.Same(eventArgs, e);
-            callCount++;
-        };
-
-        manager.MousePointerAutoHideDelayChanged += handler;
-        manager.OnMousePointerAutoHideDelayChanged(eventArgs);
-        Assert.Equal(1, callCount);
-
-        manager.MousePointerAutoHideDelayChanged -= handler;
-        manager.OnMousePointerAutoHideDelayChanged(eventArgs);
-        Assert.Equal(1, callCount);
-    }
-
     [WinFormsTheory]
     [EnumData<KioskModeWakeupSource>]
     public void KioskModeWakeupEventArgs_Ctor_Source(KioskModeWakeupSource source)
@@ -224,14 +178,14 @@ public void KioskModeManager_ToggleFullScreen_Form_RestoresExpected()
 
         manager.ToggleFullScreen();
 
-        Assert.True(manager.IsFullScreen);
+        Assert.True(manager.FullScreen);
         Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
         Assert.True(form.TopMost);
         Assert.Equal(FormWindowState.Maximized, form.WindowState);
 
         manager.ToggleFullScreen();
 
-        Assert.False(manager.IsFullScreen);
+        Assert.False(manager.FullScreen);
         Assert.Equal(FormBorderStyle.FixedDialog, form.FormBorderStyle);
         Assert.False(form.TopMost);
         Assert.Equal(FormWindowState.Normal, form.WindowState);
@@ -251,7 +205,7 @@ public void KioskModeManager_ToggleFullScreen_UserControlContainer_UsesParentFor
 
         manager.ToggleFullScreen();
 
-        Assert.True(manager.IsFullScreen);
+        Assert.True(manager.FullScreen);
         Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
     }
 
@@ -268,7 +222,7 @@ public void KioskModeManager_ToggleFullScreen_UserControlContainerParentedAfterS
         form.Controls.Add(userControl);
         manager.ToggleFullScreen();
 
-        Assert.True(manager.IsFullScreen);
+        Assert.True(manager.FullScreen);
         Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
     }
 
@@ -288,11 +242,11 @@ public void KioskModeManager_ContainerControl_SetWhileFullScreen_RestoresPreviou
         };
 
         manager.ToggleFullScreen();
-        Assert.True(manager.IsFullScreen);
+        Assert.True(manager.FullScreen);
 
         manager.ContainerControl = null;
 
-        Assert.False(manager.IsFullScreen);
+        Assert.False(manager.FullScreen);
         Assert.Equal(FormBorderStyle.FixedDialog, form.FormBorderStyle);
         Assert.Equal(FormWindowState.Normal, form.WindowState);
         Assert.Equal(new Rectangle(10, 20, 300, 200), form.Bounds);
@@ -314,13 +268,155 @@ public void KioskModeManager_ContainerControl_Set_DoesNotChangeFormKeyPreview()
         Assert.False(form.KeyPreview);
     }
 
+    [WinFormsFact]
+    public void KioskModeManager_FullScreen_SetTrueThenFalse_EntersAndExitsFullScreen()
+    {
+        using Form form = new()
+        {
+            Bounds = new Rectangle(10, 20, 300, 200),
+            FormBorderStyle = FormBorderStyle.FixedDialog,
+            WindowState = FormWindowState.Normal
+        };
+
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form
+        };
+
+        manager.FullScreen = true;
+
+        Assert.True(manager.FullScreen);
+        Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
+
+        manager.FullScreen = false;
+
+        Assert.False(manager.FullScreen);
+        Assert.Equal(FormBorderStyle.FixedDialog, form.FormBorderStyle);
+        Assert.Equal(FormWindowState.Normal, form.WindowState);
+        Assert.Equal(new Rectangle(10, 20, 300, 200), form.Bounds);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_FullScreen_SetWithHandler_CallsFullScreenChanged()
+    {
+        using Form form = new();
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form
+        };
+
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            Assert.Same(EventArgs.Empty, e);
+            callCount++;
+        };
+
+        manager.FullScreenChanged += handler;
+
+        manager.FullScreen = true;
+        Assert.Equal(1, callCount);
+
+        manager.FullScreen = true;
+        Assert.Equal(1, callCount);
+
+        manager.FullScreen = false;
+        Assert.Equal(2, callCount);
+
+        manager.FullScreenChanged -= handler;
+        manager.FullScreen = true;
+        Assert.Equal(2, callCount);
+    }
+
+    [WinFormsTheory]
+    [EnumData<KioskModeWakeupSource>]
+    public void KioskModeManager_WakeUpCommand_ExecutedOnWakeup_WithSourceName(KioskModeWakeupSource source)
+    {
+        using SubKioskModeManager manager = new();
+        TestCommand command = new();
+        manager.WakeUpCommand = command;
+
+        Assert.Same(command, manager.WakeUpCommand);
+
+        manager.OnWakeup(new KioskModeWakeupEventArgs(source));
+
+        Assert.Equal(1, command.ExecuteCount);
+        Assert.Equal(source.ToString(), command.LastParameter);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_WakeUpCommand_Null_DoesNotThrowOnWakeup()
+    {
+        using SubKioskModeManager manager = new();
+
+        Assert.Null(manager.WakeUpCommand);
+
+        manager.OnWakeup(new KioskModeWakeupEventArgs(KioskModeWakeupSource.Keyboard));
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_Site_Set_AssignsRootComponentAsContainerControl()
+    {
+        using Form form = new();
+        Mock<IDesignerHost> host = new();
+        host.Setup(h => h.RootComponent).Returns(form);
+
+        Mock<ISite> site = new();
+        site.Setup(s => s.GetService(typeof(IDesignerHost))).Returns(host.Object);
+
+        using KioskModeManager manager = new();
+        manager.Site = site.Object;
+
+        Assert.Same(form, manager.ContainerControl);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_Site_Set_DoesNotOverwriteExplicitContainerControl()
+    {
+        using Form explicitForm = new();
+        using Form rootForm = new();
+        Mock<IDesignerHost> host = new();
+        host.Setup(h => h.RootComponent).Returns(rootForm);
+
+        Mock<ISite> site = new();
+        site.Setup(s => s.GetService(typeof(IDesignerHost))).Returns(host.Object);
+
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = explicitForm
+        };
+
+        manager.Site = site.Object;
+
+        Assert.Same(explicitForm, manager.ContainerControl);
+    }
+
+    private class TestCommand : ICommand
+    {
+        public int ExecuteCount { get; private set; }
+
+        public object LastParameter { get; private set; }
+
+        public event EventHandler CanExecuteChanged
+        {
+            add { }
+            remove { }
+        }
+
+        public bool CanExecute(object parameter) => true;
+
+        public void Execute(object parameter)
+        {
+            ExecuteCount++;
+            LastParameter = parameter;
+        }
+    }
+
     private class SubKioskModeManager : KioskModeManager
     {
         public new bool DesignMode => base.DesignMode;
 
-        public new void OnMousePointerAutoHideDelayChanged(EventArgs e)
-            => base.OnMousePointerAutoHideDelayChanged(e);
-
         public new void OnWakeup(KioskModeWakeupEventArgs e)
             => base.OnWakeup(e);
     }

From 4a7dbf89789a718ae9551172f875789f96690d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 17:38:59 -0700
Subject: [PATCH 22/50] Refine KioskModeManager behavior.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/NativeMethods.txt                     |   2 +
 .../PublicAPI.Unshipped.txt                   |  45 +-
 .../KioskModeManager/KioskModeManager.cs      | 413 +++++++++++++-----
 .../KioskModeWakeupEventArgs.cs               |   2 +
 .../KioskModeWakeupEventHandler.cs            |   2 +
 .../KioskModeManager/KioskModeWakeupSource.cs |   2 +
 6 files changed, 339 insertions(+), 127 deletions(-)

diff --git a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
index ecb393942e5..9afb6cfbc99 100644
--- a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
+++ b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
@@ -699,6 +699,8 @@ WC_TABCONTROL
 WC_TREEVIEW
 WHEEL_DELTA
 WindowFromPoint
+WTSRegisterSessionNotification
+WTSUnRegisterSessionNotification
 WINDOWPOS
 WINEVENT_INCONTEXT
 WSF_VISIBLE
diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 54fe8d52e13..974e0b4c711 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -109,14 +109,45 @@ System.Windows.Forms.KioskModeManager.KioskModeManager() -> void
 System.Windows.Forms.KioskModeManager.HideTaskbar.set -> void
 System.Windows.Forms.KioskModeManager.HideTaskbar.get -> bool
 System.Windows.Forms.KioskModeManager.FullScreenChanged -> System.EventHandler?
-System.Windows.Forms.KioskModeManager.FullScreen.get -> bool
-System.Windows.Forms.KioskModeManager.FullScreen.set -> void
-System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.set -> void
-System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.get -> bool
-System.Windows.Forms.KioskModeManager.ContainerControlChanged -> System.EventHandler?
-System.Windows.Forms.KioskModeManager.ContainerControl.set -> void
-System.Windows.Forms.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
+#nullable enable
 System.Windows.Forms.KioskModeManager
+System.Windows.Forms.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
+System.Windows.Forms.KioskModeManager.ContainerControl.set -> void
+System.Windows.Forms.KioskModeManager.ContainerControlChanged -> System.EventHandler?
 override System.Windows.Forms.KioskModeManager.Dispose(bool disposing) -> void
+System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.get -> bool
+System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.set -> void
+System.Windows.Forms.KioskModeManager.FullScreen.get -> bool
+System.Windows.Forms.KioskModeManager.FullScreen.set -> void
+System.Windows.Forms.KioskModeManager.FullScreenChanged -> System.EventHandler?
+System.Windows.Forms.KioskModeManager.HideTaskbar.get -> bool
+System.Windows.Forms.KioskModeManager.HideTaskbar.set -> void
+System.Windows.Forms.KioskModeManager.KioskModeManager() -> void
+System.Windows.Forms.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
+System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.get -> int
+System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.set -> void
+virtual System.Windows.Forms.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnWakeup(System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
 override System.Windows.Forms.KioskModeManager.Site.get -> System.ComponentModel.ISite?
 override System.Windows.Forms.KioskModeManager.Site.set -> void
+System.Windows.Forms.KioskModeManager.SuppressPowerSaving.get -> bool
+System.Windows.Forms.KioskModeManager.SuppressPowerSaving.set -> void
+System.Windows.Forms.KioskModeManager.ToggleFullScreen() -> void
+System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.Forms.Keys
+System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.set -> void
+System.Windows.Forms.KioskModeManager.TopMostInFullScreen.get -> bool
+System.Windows.Forms.KioskModeManager.TopMostInFullScreen.set -> void
+System.Windows.Forms.KioskModeManager.Wakeup -> System.Windows.Forms.KioskModeWakeupEventHandler?
+System.Windows.Forms.KioskModeManager.WakeUpCommand.get -> System.Windows.Input.ICommand?
+System.Windows.Forms.KioskModeManager.WakeUpCommand.set -> void
+System.Windows.Forms.KioskModeWakeupEventArgs
+System.Windows.Forms.KioskModeWakeupEventArgs.KioskModeWakeupEventArgs(System.Windows.Forms.KioskModeWakeupSource source) -> void
+System.Windows.Forms.KioskModeWakeupEventArgs.Source.get -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupEventHandler
+virtual System.Windows.Forms.KioskModeWakeupEventHandler.Invoke(object? sender, System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
+System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource.Keyboard = 0 -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource.Mouse = 1 -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource.PowerResume = 2 -> System.Windows.Forms.KioskModeWakeupSource
+System.Windows.Forms.KioskModeWakeupSource.Session = 3 -> System.Windows.Forms.KioskModeWakeupSource
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
index 6a6be0c9e8a..30bf82ff0b8 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeManager.cs
@@ -6,12 +6,12 @@
 using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Input;
-using Microsoft.Win32;
 using Windows.Win32.System.Power;
 using Windows.Win32.System.Threading;
 
 namespace System.Windows.Forms;
 
+#if NET11_0_OR_GREATER
 /// <summary>
 ///  Manages common kiosk-mode behavior for a WinForms form.
 /// </summary>
@@ -71,16 +71,29 @@ public class KioskModeManager : Component, ISupportInitialize
 {
     private const uint PowerRequestContextVersion = 0;
     private const POWER_REQUEST_CONTEXT_FLAGS PowerRequestContextSimpleString = (POWER_REQUEST_CONTEXT_FLAGS)0x00000001;
+    private const uint NotifyForThisSession = 0;
+    private const nint PbtApmResumeSuspend = 0x0007;
+    private const nint PbtApmResumeAutomatic = 0x0012;
+    private const nint WtsConsoleConnect = 0x0001;
+    private const nint WtsRemoteConnect = 0x0003;
+    private const nint WtsSessionLogon = 0x0005;
+    private const nint WtsSessionUnlock = 0x0008;
     private const string PowerRequestReason = "WinForms KioskModeManager: Preventing screen saver and sleep";
 
+    private static readonly object s_containerControlChangedEvent = new();
+    private static readonly object s_fullScreenChangedEvent = new();
+    private static readonly object s_wakeupEvent = new();
+
     private ContainerControl? _containerControl;
+    private bool _containerControlExplicitlySet;
     private Form? _targetForm;
     private bool _isFullScreen;
+    private bool _pendingFullScreen;
     private bool _initializing;
     private bool _isCursorHidden;
     private KioskModeMessageFilter? _messageFilter;
+    private KioskModeFormObserver? _formObserver;
     private Timer? _mousePointerAutoHideTimer;
-    private bool _systemEventsSubscribed;
 
     private FormBorderStyle _savedBorderStyle;
     private FormWindowState _savedWindowState;
@@ -97,10 +110,6 @@ public class KioskModeManager : Component, ISupportInitialize
 
     private HANDLE _powerRequestHandle;
 
-    private EventHandler? _containerControlChanged;
-    private EventHandler? _fullScreenChanged;
-    private KioskModeWakeupEventHandler? _wakeup;
-
     /// <summary>
     ///  Initializes a new instance of the <see cref="KioskModeManager"/> class.
     /// </summary>
@@ -142,11 +151,11 @@ public override ISite? Site
             base.Site = value;
 
             if (value is not null
-                && _containerControl is null
+                && !_containerControlExplicitlySet
                 && value.GetService(typeof(IDesignerHost)) is IDesignerHost host
                 && host.RootComponent is ContainerControl root)
             {
-                ContainerControl = root;
+                SetContainerControl(root, isExplicitAssignment: false);
             }
         }
     }
@@ -175,24 +184,7 @@ public override ISite? Site
     public ContainerControl? ContainerControl
     {
         get => _containerControl;
-        set
-        {
-            if (_containerControl == value)
-            {
-                return;
-            }
-
-            if (_isFullScreen)
-            {
-                ExitFullScreen();
-            }
-
-            DetachFromForm();
-            _containerControl = value;
-            AttachToForm();
-
-            OnContainerControlChanged(EventArgs.Empty);
-        }
+        set => SetContainerControl(value, isExplicitAssignment: true);
     }
 
     /// <summary>
@@ -202,16 +194,22 @@ public ContainerControl? ContainerControl
     [SRDescription(nameof(SR.KioskModeManagerContainerControlChangedDescr))]
     public event EventHandler? ContainerControlChanged
     {
-        add => _containerControlChanged += value;
-        remove => _containerControlChanged -= value;
+        add => Events.AddHandler(s_containerControlChangedEvent, value);
+        remove => Events.RemoveHandler(s_containerControlChangedEvent, value);
     }
 
     /// <summary>
     ///  Raises the <see cref="ContainerControlChanged"/> event.
     /// </summary>
     /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
     protected virtual void OnContainerControlChanged(EventArgs e)
-        => _containerControlChanged?.Invoke(this, e);
+    {
+        if (Events[s_containerControlChangedEvent] is EventHandler handler)
+        {
+            handler(this, e);
+        }
+    }
 
     /// <summary>
     ///  Gets or sets a value indicating whether fullscreen mode covers the
@@ -366,16 +364,8 @@ public bool SuppressPowerSaving
                 return;
             }
 
-            if (value)
-            {
-                CreatePowerRequest();
-            }
-            else
-            {
-                ReleasePowerRequest();
-            }
-
             _suppressPowerSaving = value;
+            UpdatePowerRequest();
         }
     }
 
@@ -449,16 +439,21 @@ public int MousePointerAutoHideDelay
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public bool FullScreen
     {
-        get => _isFullScreen;
+        get => _pendingFullScreen || _isFullScreen;
         set
         {
-            if (value)
+            if (!value)
             {
-                EnterFullScreen();
+                _pendingFullScreen = false;
+                ExitFullScreen();
+            }
+            else if (_initializing || DesignMode || !EnterFullScreen())
+            {
+                _pendingFullScreen = true;
             }
             else
             {
-                ExitFullScreen();
+                _pendingFullScreen = false;
             }
         }
     }
@@ -470,16 +465,22 @@ public bool FullScreen
     [SRDescription(nameof(SR.KioskModeManagerFullScreenChangedDescr))]
     public event EventHandler? FullScreenChanged
     {
-        add => _fullScreenChanged += value;
-        remove => _fullScreenChanged -= value;
+        add => Events.AddHandler(s_fullScreenChangedEvent, value);
+        remove => Events.RemoveHandler(s_fullScreenChangedEvent, value);
     }
 
     /// <summary>
     ///  Raises the <see cref="FullScreenChanged"/> event.
     /// </summary>
     /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
     protected virtual void OnFullScreenChanged(EventArgs e)
-        => _fullScreenChanged?.Invoke(this, e);
+    {
+        if (Events[s_fullScreenChangedEvent] is EventHandler handler)
+        {
+            handler(this, e);
+        }
+    }
 
     /// <summary>
     ///  Occurs when keyboard, mouse, power resume, or session activity wakes
@@ -497,21 +498,32 @@ protected virtual void OnFullScreenChanged(EventArgs e)
     [SRDescription(nameof(SR.KioskModeManagerWakeupDescr))]
     public event KioskModeWakeupEventHandler? Wakeup
     {
-        add => _wakeup += value;
-        remove => _wakeup -= value;
+        add => Events.AddHandler(s_wakeupEvent, value);
+        remove => Events.RemoveHandler(s_wakeupEvent, value);
     }
 
     /// <summary>
     ///  Raises the <see cref="Wakeup"/> event.
     /// </summary>
     /// <param name="e">A <see cref="KioskModeWakeupEventArgs"/> that contains the event data.</param>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
     protected virtual void OnWakeup(KioskModeWakeupEventArgs e)
     {
-        _wakeup?.Invoke(this, e);
+        if (Events[s_wakeupEvent] is KioskModeWakeupEventHandler handler)
+        {
+            handler(this, e);
+        }
 
-        // The wakeup source is passed as its string name so the bound command stays
-        // independent of the WinForms-specific enum type.
-        _wakeUpCommand?.Execute(e.Source.ToString());
+        if (_wakeUpCommand is not null)
+        {
+            // The wakeup source is passed as its string name so the bound command stays
+            // independent of the WinForms-specific enum type.
+            string parameter = e.Source.ToString();
+            if (_wakeUpCommand.CanExecute(parameter))
+            {
+                _wakeUpCommand.Execute(parameter);
+            }
+        }
     }
 
     /// <summary>
@@ -549,15 +561,18 @@ public ICommand? WakeUpCommand
 ///   <see cref="ToggleFullScreen"/> again to restore the saved state.
     ///  </para>
     /// </remarks>
-    private void EnterFullScreen()
+    private bool EnterFullScreen()
     {
-        Form? targetForm = ResolveTargetForm();
-        if (_isFullScreen || targetForm is null)
+        if (_isFullScreen || _initializing || DesignMode)
         {
-            return;
+            return _isFullScreen;
         }
 
-        EnsureFormMonitoring();
+        Form? targetForm = ResolveTargetForm();
+        if (targetForm is null)
+        {
+            return false;
+        }
 
         _savedBorderStyle = targetForm.FormBorderStyle;
         _savedWindowState = targetForm.WindowState;
@@ -568,8 +583,9 @@ private void EnterFullScreen()
 
         ApplyFullScreen(targetForm);
         SetFullScreenState(true);
-
+        _pendingFullScreen = false;
         RestartMousePointerAutoHideTimer();
+        return true;
     }
 
     /// <summary>
@@ -622,16 +638,7 @@ private void SetFullScreenState(bool value)
     ///  </para>
     /// </remarks>
     public void ToggleFullScreen()
-    {
-        if (_isFullScreen)
-        {
-            ExitFullScreen();
-        }
-        else
-        {
-            EnterFullScreen();
-        }
-    }
+        => FullScreen = !FullScreen;
 
     void ISupportInitialize.BeginInit()
     {
@@ -642,9 +649,12 @@ void ISupportInitialize.EndInit()
     {
         _initializing = false;
 
-        if (_containerControl is not null)
+        AttachToForm();
+        UpdatePowerRequest();
+
+        if (_pendingFullScreen)
         {
-            AttachToForm();
+            FullScreen = true;
         }
     }
 
@@ -653,6 +663,8 @@ protected override void Dispose(bool disposing)
     {
         if (disposing)
         {
+            _pendingFullScreen = false;
+            ExitFullScreen();
             DetachFromForm();
             _mousePointerAutoHideTimer?.Dispose();
             _mousePointerAutoHideTimer = null;
@@ -662,37 +674,64 @@ protected override void Dispose(bool disposing)
         base.Dispose(disposing);
     }
 
-    private void AttachToForm()
+    private void SetContainerControl(ContainerControl? value, bool isExplicitAssignment)
     {
-        if (_initializing)
+        if (_containerControl == value)
         {
+            if (isExplicitAssignment)
+            {
+                _containerControlExplicitlySet = true;
+            }
+
             return;
         }
 
-        // UserControl-hosted components can initialize before the UserControl
-        // is parented. Resolve again when fullscreen is requested to support
-        // that design-time workflow.
-        _targetForm = ResolveTargetForm();
+        if (_isFullScreen)
+        {
+            _pendingFullScreen = false;
+            ExitFullScreen();
+        }
+
+        if (value is null)
+        {
+            _pendingFullScreen = false;
+        }
 
-        if (_targetForm is null)
+        DetachFromForm();
+        _containerControl = value;
+        if (isExplicitAssignment)
+        {
+            _containerControlExplicitlySet = true;
+        }
+
+        AttachToForm();
+        OnContainerControlChanged(EventArgs.Empty);
+    }
+
+    private void AttachToForm()
+    {
+        if (_initializing || DesignMode || _containerControl is null)
         {
             return;
         }
 
-        EnsureFormMonitoring();
+        EnsureMessageMonitoring();
+        ResolveTargetForm();
+        if (_pendingFullScreen && _targetForm is not null)
+        {
+            EnterFullScreen();
+        }
     }
 
     private void DetachFromForm()
     {
-        // Undo all thread-wide and static subscriptions owned by this component
-        // before switching containers or disposing.
         if (_messageFilter is not null)
         {
             Application.RemoveMessageFilter(_messageFilter);
             _messageFilter = null;
         }
 
-        UnsubscribeSystemEvents();
+        _formObserver?.Detach();
         StopMousePointerAutoHideTimer();
         ShowMousePointerIfHidden();
         _targetForm = null;
@@ -702,11 +741,17 @@ private void DetachFromForm()
     {
         // ContainerControl intentionally supports both Form and UserControl
         // design-time placement. FindForm handles the UserControl case.
-        _targetForm = _containerControl as Form ?? _containerControl?.FindForm();
+        Form? targetForm = _containerControl as Form ?? _containerControl?.FindForm();
+        if (!ReferenceEquals(_targetForm, targetForm))
+        {
+            _targetForm = targetForm;
+            UpdateFormObserver();
+        }
+
         return _targetForm;
     }
 
-    private void EnsureFormMonitoring()
+    private void EnsureMessageMonitoring()
     {
         // IMessageFilter observes input for child controls without changing
         // Form.KeyPreview or installing global keyboard/mouse hooks.
@@ -715,8 +760,6 @@ private void EnsureFormMonitoring()
             _messageFilter = new KioskModeMessageFilter(this);
             Application.AddMessageFilter(_messageFilter);
         }
-
-        SubscribeSystemEvents();
     }
 
     private void ApplyFullScreen(Form form)
@@ -742,43 +785,47 @@ private void ApplyFullScreen(Form form)
         }
     }
 
-    private void SubscribeSystemEvents()
+    private void UpdateFormObserver()
     {
-        // SystemEvents are static events, so they must be unsubscribed
-        // explicitly to avoid rooting this component after disposal.
-        if (_systemEventsSubscribed || DesignMode)
+        if (DesignMode)
         {
             return;
         }
 
-        SystemEvents.PowerModeChanged += OnSystemPowerModeChanged;
-        SystemEvents.SessionSwitch += OnSystemSessionSwitch;
-        _systemEventsSubscribed = true;
+        _formObserver ??= new KioskModeFormObserver(this);
+        _formObserver.Attach(_targetForm);
     }
 
-    private void UnsubscribeSystemEvents()
+    private void UpdatePowerRequest()
     {
-        if (!_systemEventsSubscribed)
+        if (_initializing || DesignMode)
         {
             return;
         }
 
-        SystemEvents.PowerModeChanged -= OnSystemPowerModeChanged;
-        SystemEvents.SessionSwitch -= OnSystemSessionSwitch;
-        _systemEventsSubscribed = false;
+        if (_suppressPowerSaving)
+        {
+            CreatePowerRequest();
+        }
+        else
+        {
+            ReleasePowerRequest();
+        }
     }
 
-    private void OnSystemPowerModeChanged(object? sender, PowerModeChangedEventArgs e)
+    private void ProcessPowerBroadcast(WPARAM powerEvent)
     {
-        if (e.Mode == PowerModes.Resume)
+        nint value = (nint)powerEvent.Value;
+        if (value is PbtApmResumeAutomatic or PbtApmResumeSuspend)
         {
             RaiseWakeup(KioskModeWakeupSource.PowerResume);
         }
     }
 
-    private void OnSystemSessionSwitch(object? sender, SessionSwitchEventArgs e)
+    private void ProcessSessionChange(WPARAM sessionEvent)
     {
-        if (e.Reason is SessionSwitchReason.SessionUnlock or SessionSwitchReason.SessionLogon)
+        nint value = (nint)sessionEvent.Value;
+        if (value is WtsConsoleConnect or WtsRemoteConnect or WtsSessionLogon or WtsSessionUnlock)
         {
             RaiseWakeup(KioskModeWakeupSource.Session);
         }
@@ -817,14 +864,13 @@ private void OnMousePointerAutoHideTimerTick(object? sender, EventArgs e)
         }
     }
 
-    private void ProcessKeyboardActivity(Keys keyData)
+    private void ProcessKeyboardActivity(Keys keyData, Keys modifiers)
     {
         // Any keyboard input wakes the kiosk experience, even when it does not
         // match one of the configured fullscreen control keys.
         RaiseWakeup(KioskModeWakeupSource.Keyboard);
 
         Keys keyCode = keyData & Keys.KeyCode;
-        Keys modifiers = keyData & Keys.Modifiers;
 
         if (keyCode == _toggleFullScreenKey && modifiers == Keys.None)
         {
@@ -839,17 +885,9 @@ private void ProcessKeyboardActivity(Keys keyData)
 
     private void ProcessMouseActivity()
     {
-        // Mouse movement can be noisy. Raise Wakeup only when activity brings
-        // back a pointer that this component hid.
-        bool wasHidden = _isCursorHidden;
-
         ShowMousePointerIfHidden();
         RestartMousePointerAutoHideTimer();
-
-        if (wasHidden)
-        {
-            RaiseWakeup(KioskModeWakeupSource.Mouse);
-        }
+        RaiseWakeup(KioskModeWakeupSource.Mouse);
     }
 
     private void ShowMousePointerIfHidden()
@@ -928,22 +966,46 @@ private void ReleasePowerRequest()
         _powerRequestHandle = default;
     }
 
-    private bool IsMessageFromTargetForm(HWND hwnd)
-        => _targetForm is not null
+    private bool IsMessageFromMonitoredControl(HWND hwnd)
+    {
+        if (_targetForm is not null
             && !_targetForm.IsDisposed
-            && (hwnd == _targetForm.HWND || PInvoke.IsChild(_targetForm, hwnd));
+            && (hwnd == _targetForm.HWND || PInvoke.IsChild(_targetForm, hwnd)))
+        {
+            return true;
+        }
+
+        return _containerControl is not null
+            && !_containerControl.IsDisposed
+            && _containerControl.IsHandleCreated
+            && (hwnd == _containerControl.HWND || PInvoke.IsChild(_containerControl, hwnd));
+    }
 
-    private bool ProcessMessage(ref Message message)
+    private bool ProcessMessage(Message message)
     {
-        if (!IsMessageFromTargetForm(message.HWND))
+        if (_containerControl is null || DesignMode)
         {
             return false;
         }
 
-        if (message.MsgInternal >= PInvokeCore.WM_KEYFIRST
-            && message.MsgInternal <= PInvokeCore.WM_KEYLAST)
+        if (_targetForm is null || _targetForm.IsDisposed)
         {
-            ProcessKeyboardActivity((Keys)(nint)message.WParamInternal);
+            ResolveTargetForm();
+            if (_pendingFullScreen && _targetForm is not null)
+            {
+                EnterFullScreen();
+            }
+        }
+
+        if (!IsMessageFromMonitoredControl(message.HWND))
+        {
+            return false;
+        }
+
+        if (message.MsgInternal == PInvokeCore.WM_KEYDOWN
+            || message.MsgInternal == PInvokeCore.WM_SYSKEYDOWN)
+        {
+            ProcessKeyboardActivity((Keys)(nint)message.WParamInternal, Control.ModifierKeys & Keys.Modifiers);
         }
         else if (message.MsgInternal >= PInvokeCore.WM_MOUSEFIRST
             && message.MsgInternal <= PInvokeCore.WM_MOUSELAST)
@@ -967,6 +1029,117 @@ public KioskModeMessageFilter(KioskModeManager owner)
         }
 
         public bool PreFilterMessage(ref Message m)
-            => _owner.ProcessMessage(ref m);
+            => _owner.ProcessMessage(m);
+    }
+
+    /// <summary>
+    ///  Observes power and session messages that belong to the target form.
+    /// </summary>
+    private sealed class KioskModeFormObserver : NativeWindow
+    {
+        private readonly KioskModeManager _owner;
+        private Form? _form;
+        private bool _sessionNotificationsRegistered;
+
+        public KioskModeFormObserver(KioskModeManager owner)
+        {
+            _owner = owner;
+        }
+
+        public void Attach(Form? form)
+        {
+            if (ReferenceEquals(_form, form))
+            {
+                return;
+            }
+
+            Detach();
+
+            if (form is null || form.IsDisposed)
+            {
+                return;
+            }
+
+            _form = form;
+            form.HandleCreated += OnFormHandleCreated;
+            form.HandleDestroyed += OnFormHandleDestroyed;
+
+            if (form.IsHandleCreated)
+            {
+                OnFormHandleCreated(form, EventArgs.Empty);
+            }
+        }
+
+        public void Detach()
+        {
+            if (_form is not null)
+            {
+                _form.HandleCreated -= OnFormHandleCreated;
+                _form.HandleDestroyed -= OnFormHandleDestroyed;
+                _form = null;
+            }
+
+            UnregisterSessionNotifications();
+            if (!HWND.IsNull)
+            {
+                ReleaseHandle();
+            }
+        }
+
+        private void OnFormHandleCreated(object? sender, EventArgs e)
+        {
+            if (_form is null || _form.IsDisposed || !_form.IsHandleCreated)
+            {
+                return;
+            }
+
+            AssignHandle(_form.HWND);
+            RegisterSessionNotifications();
+        }
+
+        private void OnFormHandleDestroyed(object? sender, EventArgs e)
+        {
+            UnregisterSessionNotifications();
+            if (!HWND.IsNull)
+            {
+                ReleaseHandle();
+            }
+        }
+
+        private void RegisterSessionNotifications()
+        {
+            if (_sessionNotificationsRegistered || HWND.IsNull)
+            {
+                return;
+            }
+
+            _sessionNotificationsRegistered = PInvoke.WTSRegisterSessionNotification(HWND, NotifyForThisSession);
+        }
+
+        private void UnregisterSessionNotifications()
+        {
+            if (!_sessionNotificationsRegistered)
+            {
+                return;
+            }
+
+            PInvoke.WTSUnRegisterSessionNotification(HWND);
+            _sessionNotificationsRegistered = false;
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.MsgInternal == PInvokeCore.WM_POWERBROADCAST)
+            {
+                _owner.ProcessPowerBroadcast(m.WParamInternal);
+            }
+            else if (m.MsgInternal == PInvokeCore.WM_WTSSESSION_CHANGE)
+            {
+                _owner.ProcessSessionChange(m.WParamInternal);
+            }
+
+            base.WndProc(ref m);
+        }
     }
 }
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs
index 3e40b6f10f5..1ad14d4fcc2 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventArgs.cs
@@ -3,6 +3,7 @@
 
 namespace System.Windows.Forms;
 
+#if NET11_0_OR_GREATER
 /// <summary>
 ///  Provides data for the <see cref="KioskModeManager.Wakeup"/> event.
 /// </summary>
@@ -32,3 +33,4 @@ public KioskModeWakeupEventArgs(KioskModeWakeupSource source)
     /// </summary>
     public KioskModeWakeupSource Source { get; }
 }
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs
index 993f54f25f8..b2784bb3b3c 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupEventHandler.cs
@@ -3,6 +3,7 @@
 
 namespace System.Windows.Forms;
 
+#if NET11_0_OR_GREATER
 /// <summary>
 ///  Represents the method that will handle the
 ///  <see cref="KioskModeManager.Wakeup"/> event.
@@ -10,3 +11,4 @@ namespace System.Windows.Forms;
 /// <param name="sender">The source of the event.</param>
 /// <param name="e">A <see cref="KioskModeWakeupEventArgs"/> that contains the event data.</param>
 public delegate void KioskModeWakeupEventHandler(object? sender, KioskModeWakeupEventArgs e);
+#endif
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs
index ffed33c106d..6c9a05784c4 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Components/KioskModeManager/KioskModeWakeupSource.cs
@@ -3,6 +3,7 @@
 
 namespace System.Windows.Forms;
 
+#if NET11_0_OR_GREATER
 /// <summary>
 ///  Specifies the source of a <see cref="KioskModeManager.Wakeup"/>
 ///  notification.
@@ -31,3 +32,4 @@ public enum KioskModeWakeupSource
     /// </summary>
     Session = 3,
 }
+#endif

From fa0ee1340580fb2d310096bee015f04d43180758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 17:39:18 -0700
Subject: [PATCH 23/50] Expand KioskModeManager tests.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Windows/Forms/KioskModeManagerTests.cs    | 272 +++++++++++++++++-
 1 file changed, 271 insertions(+), 1 deletion(-)

diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
index c5d3adcdff4..6c3f1c2d652 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/KioskModeManagerTests.cs
@@ -11,6 +11,7 @@
 
 namespace System.Windows.Forms.Tests;
 
+#if NET11_0_OR_GREATER
 public class KioskModeManagerTests
 {
     [WinFormsFact]
@@ -329,6 +330,50 @@ public void KioskModeManager_FullScreen_SetWithHandler_CallsFullScreenChanged()
         Assert.Equal(2, callCount);
     }
 
+    [WinFormsTheory]
+    [NewAndDefaultData<EventArgs>]
+    public void KioskModeManager_OnContainerControlChanged_Invoke_CallsContainerControlChanged(EventArgs eventArgs)
+    {
+        using SubKioskModeManager manager = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            Assert.Same(eventArgs, e);
+            callCount++;
+        };
+
+        manager.ContainerControlChanged += handler;
+        manager.OnContainerControlChanged(eventArgs);
+        Assert.Equal(1, callCount);
+
+        manager.ContainerControlChanged -= handler;
+        manager.OnContainerControlChanged(eventArgs);
+        Assert.Equal(1, callCount);
+    }
+
+    [WinFormsTheory]
+    [NewAndDefaultData<EventArgs>]
+    public void KioskModeManager_OnFullScreenChanged_Invoke_CallsFullScreenChanged(EventArgs eventArgs)
+    {
+        using SubKioskModeManager manager = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            Assert.Same(eventArgs, e);
+            callCount++;
+        };
+
+        manager.FullScreenChanged += handler;
+        manager.OnFullScreenChanged(eventArgs);
+        Assert.Equal(1, callCount);
+
+        manager.FullScreenChanged -= handler;
+        manager.OnFullScreenChanged(eventArgs);
+        Assert.Equal(1, callCount);
+    }
+
     [WinFormsTheory]
     [EnumData<KioskModeWakeupSource>]
     public void KioskModeManager_WakeUpCommand_ExecutedOnWakeup_WithSourceName(KioskModeWakeupSource source)
@@ -341,6 +386,8 @@ public void KioskModeManager_WakeUpCommand_ExecutedOnWakeup_WithSourceName(Kiosk
 
         manager.OnWakeup(new KioskModeWakeupEventArgs(source));
 
+        Assert.Equal(1, command.CanExecuteCount);
+        Assert.Equal(source.ToString(), command.LastCanExecuteParameter);
         Assert.Equal(1, command.ExecuteCount);
         Assert.Equal(source.ToString(), command.LastParameter);
     }
@@ -355,6 +402,24 @@ public void KioskModeManager_WakeUpCommand_Null_DoesNotThrowOnWakeup()
         manager.OnWakeup(new KioskModeWakeupEventArgs(KioskModeWakeupSource.Keyboard));
     }
 
+    [WinFormsFact]
+    public void KioskModeManager_WakeUpCommand_CanExecuteFalse_DoesNotExecute()
+    {
+        using SubKioskModeManager manager = new();
+        TestCommand command = new()
+        {
+            CanExecuteResult = false
+        };
+
+        manager.WakeUpCommand = command;
+        manager.OnWakeup(new KioskModeWakeupEventArgs(KioskModeWakeupSource.Mouse));
+
+        Assert.Equal(1, command.CanExecuteCount);
+        Assert.Equal(KioskModeWakeupSource.Mouse.ToString(), command.LastCanExecuteParameter);
+        Assert.Equal(0, command.ExecuteCount);
+        Assert.Null(command.LastParameter);
+    }
+
     [WinFormsFact]
     public void KioskModeManager_Site_Set_AssignsRootComponentAsContainerControl()
     {
@@ -392,8 +457,201 @@ public void KioskModeManager_Site_Set_DoesNotOverwriteExplicitContainerControl()
         Assert.Same(explicitForm, manager.ContainerControl);
     }
 
+    [WinFormsFact]
+    public void KioskModeManager_Site_SetWithExplicitNull_DoesNotAssignRootComponent()
+    {
+        using Form form = new();
+        Mock<IDesignerHost> host = new();
+        host.Setup(h => h.RootComponent).Returns(form);
+
+        Mock<ISite> site = new();
+        site.Setup(s => s.GetService(typeof(IDesignerHost))).Returns(host.Object);
+
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = null
+        };
+
+        manager.Site = site.Object;
+
+        Assert.Null(manager.ContainerControl);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_Site_SetWithoutExplicitContainerControl_UpdatesResolvedRootComponent()
+    {
+        using Form firstForm = new();
+        using Form secondForm = new();
+
+        Mock<IDesignerHost> firstHost = new();
+        firstHost.Setup(h => h.RootComponent).Returns(firstForm);
+        Mock<IDesignerHost> secondHost = new();
+        secondHost.Setup(h => h.RootComponent).Returns(secondForm);
+
+        Mock<ISite> firstSite = new();
+        firstSite.Setup(s => s.GetService(typeof(IDesignerHost))).Returns(firstHost.Object);
+        Mock<ISite> secondSite = new();
+        secondSite.Setup(s => s.GetService(typeof(IDesignerHost))).Returns(secondHost.Object);
+
+        using KioskModeManager manager = new();
+        manager.Site = firstSite.Object;
+        Assert.Same(firstForm, manager.ContainerControl);
+
+        manager.Site = secondSite.Object;
+        Assert.Same(secondForm, manager.ContainerControl);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_BeginInit_FullScreenSet_DoesNotEnterUntilEndInit()
+    {
+        using Form form = new()
+        {
+            Bounds = new Rectangle(10, 20, 300, 200),
+            FormBorderStyle = FormBorderStyle.FixedDialog,
+            WindowState = FormWindowState.Normal
+        };
+
+        using KioskModeManager manager = new();
+        ISupportInitialize supportInitialize = manager;
+
+        supportInitialize.BeginInit();
+        manager.ContainerControl = form;
+        manager.FullScreen = true;
+
+        Assert.Equal(FormBorderStyle.FixedDialog, form.FormBorderStyle);
+        Assert.Equal(FormWindowState.Normal, form.WindowState);
+
+        supportInitialize.EndInit();
+
+        Assert.True(manager.FullScreen);
+        Assert.Equal(FormBorderStyle.None, form.FormBorderStyle);
+        Assert.Equal(FormWindowState.Maximized, form.WindowState);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_DisposeWhileFullScreen_RestoresExpected()
+    {
+        using Form form = new()
+        {
+            Bounds = new Rectangle(10, 20, 300, 200),
+            FormBorderStyle = FormBorderStyle.FixedDialog,
+            WindowState = FormWindowState.Normal,
+            TopMost = false
+        };
+
+        KioskModeManager manager = new()
+        {
+            ContainerControl = form,
+            TopMostInFullScreen = true,
+            FullScreen = true
+        };
+        manager.Dispose();
+
+        Assert.Equal(FormBorderStyle.FixedDialog, form.FormBorderStyle);
+        Assert.Equal(FormWindowState.Normal, form.WindowState);
+        Assert.Equal(new Rectangle(10, 20, 300, 200), form.Bounds);
+        Assert.False(form.TopMost);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ProcessMessage_KeyDownThenKeyUp_TogglesOnce()
+    {
+        using Form form = new();
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form
+        };
+
+        Message keyDownMessage = Message.Create(form.Handle, (int)PInvokeCore.WM_KEYDOWN, (nint)Keys.F11, 0);
+        Message keyUpMessage = Message.Create(form.Handle, (int)PInvokeCore.WM_KEYUP, (nint)Keys.F11, 0);
+
+        manager.TestAccessor.Dynamic.ProcessMessage(keyDownMessage);
+        Assert.True(manager.FullScreen);
+
+        manager.TestAccessor.Dynamic.ProcessMessage(keyUpMessage);
+        Assert.True(manager.FullScreen);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ProcessMessage_MouseMove_CallsWakeup()
+    {
+        using Form form = new();
+        using KioskModeManager manager = new()
+        {
+            ContainerControl = form
+        };
+
+        int callCount = 0;
+        KioskModeWakeupEventArgs lastEventArgs = null;
+        manager.Wakeup += (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            callCount++;
+            lastEventArgs = e;
+        };
+
+        Message message = Message.Create(form.Handle, (int)PInvokeCore.WM_MOUSEMOVE, 0, 0);
+        manager.TestAccessor.Dynamic.ProcessMessage(message);
+
+        Assert.Equal(1, callCount);
+        Assert.NotNull(lastEventArgs);
+        Assert.Equal(KioskModeWakeupSource.Mouse, lastEventArgs.Source);
+    }
+
+    [WinFormsFact]
+    public void KioskModeManager_ProcessPowerBroadcast_Resume_CallsWakeup()
+    {
+        using SubKioskModeManager manager = new();
+        int callCount = 0;
+        KioskModeWakeupEventArgs lastEventArgs = null;
+        manager.Wakeup += (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            callCount++;
+            lastEventArgs = e;
+        };
+
+        Message message = Message.Create(IntPtr.Zero, (int)PInvokeCore.WM_POWERBROADCAST, (nint)0x0012, 0);
+        manager.TestAccessor.Dynamic.ProcessPowerBroadcast(message.WParamInternal);
+
+        Assert.Equal(1, callCount);
+        Assert.NotNull(lastEventArgs);
+        Assert.Equal(KioskModeWakeupSource.PowerResume, lastEventArgs.Source);
+    }
+
+    [WinFormsTheory]
+    [InlineData(0x0001)]
+    [InlineData(0x0003)]
+    [InlineData(0x0005)]
+    [InlineData(0x0008)]
+    public void KioskModeManager_ProcessSessionChange_RecognizedReason_CallsWakeup(nint sessionReason)
+    {
+        using SubKioskModeManager manager = new();
+        int callCount = 0;
+        KioskModeWakeupEventArgs lastEventArgs = null;
+        manager.Wakeup += (sender, e) =>
+        {
+            Assert.Same(manager, sender);
+            callCount++;
+            lastEventArgs = e;
+        };
+
+        Message message = Message.Create(IntPtr.Zero, 0, sessionReason, 0);
+        manager.TestAccessor.Dynamic.ProcessSessionChange(message.WParamInternal);
+
+        Assert.Equal(1, callCount);
+        Assert.NotNull(lastEventArgs);
+        Assert.Equal(KioskModeWakeupSource.Session, lastEventArgs.Source);
+    }
+
     private class TestCommand : ICommand
     {
+        public bool CanExecuteResult { get; set; } = true;
+
+        public int CanExecuteCount { get; private set; }
+
+        public object LastCanExecuteParameter { get; private set; }
+
         public int ExecuteCount { get; private set; }
 
         public object LastParameter { get; private set; }
@@ -404,7 +662,12 @@ public event EventHandler CanExecuteChanged
             remove { }
         }
 
-        public bool CanExecute(object parameter) => true;
+        public bool CanExecute(object parameter)
+        {
+            CanExecuteCount++;
+            LastCanExecuteParameter = parameter;
+            return CanExecuteResult;
+        }
 
         public void Execute(object parameter)
         {
@@ -417,7 +680,14 @@ private class SubKioskModeManager : KioskModeManager
     {
         public new bool DesignMode => base.DesignMode;
 
+        public new void OnContainerControlChanged(EventArgs e)
+            => base.OnContainerControlChanged(e);
+
+        public new void OnFullScreenChanged(EventArgs e)
+            => base.OnFullScreenChanged(e);
+
         public new void OnWakeup(KioskModeWakeupEventArgs e)
             => base.OnWakeup(e);
     }
 }
+#endif

From 77e387fd6f2841792bf462a6eb969ccaa65da4d6 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Sat, 13 Jun 2026 13:26:48 -0700
Subject: [PATCH 24/50] Update agent skills: build.cmd build tenet, PublicAPI
 override tracking, and test cancellation/nullable guidance

- building-code: add a top-level TENET to build the solution only with build.cmd (CI parity for
  PublicAPI/analyzer enforcement and -warnAsError); a plain dotnet build is inner-loop only.
- new-control-api: new public/protected overrides must be tracked in PublicAPI.Unshipped.txt with the
  override prefix; note CS0114 (new keyword) and CS1574 (no cref to cross-assembly internal types).
- control-api-tests: async tests must pass CancellationToken (TestContext.Current.CancellationToken,
  CA2016/xUnit1051) and respect the #nullable context (CS8632).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

From 0863a776d907de2115bc0ddd7a8cde518626b3de Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Sat, 13 Jun 2026 13:38:11 -0700
Subject: [PATCH 25/50] Add Visual Styles (.NET 11): VisualStylesMode,
 animation timer, modern Button and CheckBox toggle renderers

Introduces the (non-experimental) Visual Styles versioning API and the first modern renderers gated behind it:
- VisualStylesMode enum (Classic/Disabled/Net11/Latest); ambient Control.VisualStylesMode (+event/On-methods);
  Application.DefaultVisualStylesMode/SetDefaultVisualStylesMode; Appearance.ToggleSwitch; VB framework APIs.
- HighPrecisionTimer (internal, Primitives) as the animation frame trigger, with tests.
- AnimationManager/AnimatedControlRenderer driven by HighPrecisionTimer.
- Conservative dark-mode Standard button (owner-drawn, reachable) + modern WinUI-style Button renderer.
- CheckBox Appearance.ToggleSwitch modern toggle switch (animated, flicker-free).
- WinformsControlsTest VisualStylesButtons exploratory harness; unit tests.

Verified CI-clean with build.cmd: System.Windows.Forms, Microsoft.VisualBasic.Forms and Primitives build
with no analyzer/PublicAPI/style errors (the only remaining failure is the pre-existing BuildAssist/AxHosts
step, which is an environment limitation unrelated to these changes).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../ApplyApplicationDefaultsEventArgs.vb      |  42 ++-
 .../WindowsFormsApplicationBase.vb            |  89 +++--
 .../src/PublicAPI.Unshipped.txt               |   4 +
 .../Forms/Animation/HighPrecisionTimer.cs     | 330 ++++++++++++++++++
 .../Forms/Animation/HighPrecisionTimerTick.cs |  30 ++
 .../Animation/HighPrecisionTimerTests.cs      | 220 ++++++++++++
 .../PublicAPI.Unshipped.txt                   |  19 +
 src/System.Windows.Forms/Resources/SR.resx    |   9 +
 .../Resources/xlf/SR.cs.xlf                   |  15 +
 .../Resources/xlf/SR.de.xlf                   |  15 +
 .../Resources/xlf/SR.es.xlf                   |  15 +
 .../Resources/xlf/SR.fr.xlf                   |  15 +
 .../Resources/xlf/SR.it.xlf                   |  15 +
 .../Resources/xlf/SR.ja.xlf                   |  15 +
 .../Resources/xlf/SR.ko.xlf                   |  15 +
 .../Resources/xlf/SR.pl.xlf                   |  15 +
 .../Resources/xlf/SR.pt-BR.xlf                |  15 +
 .../Resources/xlf/SR.ru.xlf                   |  15 +
 .../Resources/xlf/SR.tr.xlf                   |  15 +
 .../Resources/xlf/SR.zh-Hans.xlf              |  15 +
 .../Resources/xlf/SR.zh-Hant.xlf              |  15 +
 .../System/Windows/Forms/Application.cs       |  57 +++
 .../System/Windows/Forms/Control.cs           | 140 ++++++++
 .../Forms/Controls/Buttons/Appearance.cs      |  13 +-
 .../Windows/Forms/Controls/Buttons/Button.cs  |  34 --
 .../Forms/Controls/Buttons/ButtonBase.cs      |  16 +
 .../DarkMode/ButtonDarkModeAdapter.cs         |  14 +-
 .../DarkMode/ButtonDarkModeRendererBase.cs    |  11 +
 .../DarkMode/DarkModeAdapterFactory.cs        |  13 +-
 .../DarkMode/ModernButtonDarkModeRenderer.cs  | 199 +++++++++++
 .../Forms/Controls/Buttons/CheckBox.cs        | 100 +++++-
 .../Forms/Controls/TextBox/TextBoxBase.cs     |  11 +-
 .../Animation/AnimatedControlRenderer.cs      | 152 ++++++++
 .../Rendering/Animation/AnimationCycle.cs     |  11 +
 .../AnimationManager.AnimationRendererItem.cs |  25 ++
 .../Rendering/Animation/AnimationManager.cs   | 154 ++++++++
 .../CheckBox/AnimatedToggleSwitchRenderer.cs  | 140 ++++++++
 .../Rendering/CheckBox/ModernCheckBoxStyle.cs |  10 +
 .../System/Windows/Forms/VisualStylesMode.cs  |  41 +++
 .../WinformsControlsTest/Buttons.cs           |   8 +
 .../VisualStylesButtons.cs                    | 193 ++++++++++
 .../Forms/AnimatedControlRendererTests.cs     |  89 +++++
 .../Windows/Forms/ButtonVisualStylesTests.cs  |  76 ++++
 .../Forms/CheckBoxToggleSwitchTests.cs        |  84 +++++
 .../Forms/ControlTests.VisualStylesMode.cs    | 143 ++++++++
 45 files changed, 2587 insertions(+), 85 deletions(-)
 create mode 100644 src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs
 create mode 100644 src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimerTick.cs
 create mode 100644 src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimatedControlRenderer.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationCycle.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.AnimationRendererItem.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/ModernCheckBoxStyle.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
 create mode 100644 src/test/integration/WinformsControlsTest/VisualStylesButtons.cs
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/AnimatedControlRendererTests.cs
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/ButtonVisualStylesTests.cs
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
 create mode 100644 src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs

diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
index 8dc15332326..aadab446322 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
@@ -1,4 +1,4 @@
-' Licensed to the .NET Foundation under one or more agreements.
+' Licensed to the .NET Foundation under one or more agreements.
 ' The .NET Foundation licenses this file to you under the MIT license.
 
 Imports System.ComponentModel
@@ -17,29 +17,12 @@ Namespace Microsoft.VisualBasic.ApplicationServices
     Public Class ApplyApplicationDefaultsEventArgs
         Inherits EventArgs
 
-        Friend Sub New(minimumSplashScreenDisplayTime As Integer,
-                highDpiMode As HighDpiMode,
-                colorMode As SystemColorMode,
-                formRevealMode As FormRevealMode)
-
-            Me.MinimumSplashScreenDisplayTime = minimumSplashScreenDisplayTime
-            Me.HighDpiMode = highDpiMode
-            Me.ColorMode = colorMode
-            Me.FormRevealMode = formRevealMode
-        End Sub
-
         ''' <summary>
         '''  Setting this property inside the event handler determines the
         '''  <see cref="Application.ColorMode"/> for the application.
         ''' </summary>
         Public Property ColorMode As SystemColorMode
 
-        ''' <summary>
-        '''  Setting this property inside the event handler determines the default
-        '''  <see cref="FormRevealMode"/> for newly created top-level forms.
-        ''' </summary>
-        Public Property FormRevealMode As FormRevealMode
-
         ''' <summary>
         '''  Setting this property inside the event handler causes a
         '''  new default <see cref="Font"/> for Forms and UserControls to be set.
@@ -67,5 +50,28 @@ Namespace Microsoft.VisualBasic.ApplicationServices
         Public Property MinimumSplashScreenDisplayTime As Integer =
             WindowsFormsApplicationBase.MinimumSplashExposureDefault
 
+        Friend Sub New(minimumSplashScreenDisplayTime As Integer,
+                highDpiMode As HighDpiMode,
+                colorMode As SystemColorMode,
+                formRevealMode As FormRevealMode)
+
+            Me.MinimumSplashScreenDisplayTime = minimumSplashScreenDisplayTime
+            Me.HighDpiMode = highDpiMode
+            Me.ColorMode = colorMode
+            Me.FormRevealMode = formRevealMode
+        End Sub
+
+        ''' <summary>
+        '''  Setting this property inside the event handler determines the default
+        '''  <see cref="FormRevealMode"/> for newly created top-level forms.
+        ''' </summary>
+        Public Property FormRevealMode As FormRevealMode
+
+        ''' <summary>
+        '''  Setting this property inside the event handler determines the
+        '''  <see cref="Application.DefaultVisualStylesMode"/> for the application.
+        ''' </summary>
+        Public Property VisualStylesMode As VisualStylesMode
+
     End Class
 End Namespace
diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
index ee64edcc086..9bf787859f0 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
@@ -1,4 +1,4 @@
-' Licensed to the .NET Foundation under one or more agreements.
+' Licensed to the .NET Foundation under one or more agreements.
 ' The .NET Foundation licenses this file to you under the MIT license.
 
 Imports System.Collections.ObjectModel
@@ -69,9 +69,6 @@ Namespace Microsoft.VisualBasic.ApplicationServices
         ' Note: We aim to expose this to the App Designer in later runtime/VS versions.
         Private _colorMode As SystemColorMode = SystemColorMode.Classic
 
-        ' The FormRevealMode the user assigned to the ApplyApplicationsDefault event.
-        Private _formRevealMode As FormRevealMode = FormRevealMode.Classic
-
         ' We only need to show the splash screen once.
         ' Protect the user from himself if they are overriding our app model.
         Private _didSplashScreen As Boolean
@@ -203,23 +200,6 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             End Set
         End Property
 
-        ''' <summary>
-        '''  Gets or sets the <see cref="FormRevealMode"/> for the Application.
-        ''' </summary>
-        ''' <value>
-        '''  The <see cref="FormRevealMode"/> that newly created top-level forms use by
-        '''  default.
-        ''' </value>
-        <EditorBrowsable(EditorBrowsableState.Never)>
-        Protected Property FormRevealMode As FormRevealMode
-            Get
-                Return _formRevealMode
-            End Get
-            Set(value As FormRevealMode)
-                _formRevealMode = value
-            End Set
-        End Property
-
         ''' <summary>
         '''  Determines whether this application will use the XP Windows styles for windows, controls, etc.
         ''' </summary>
@@ -772,6 +752,31 @@ Namespace Microsoft.VisualBasic.ApplicationServices
                 .MinimumSplashScreenDisplayTime = MinimumSplashScreenDisplayTime
             }
 
+            ' Rationale for how we process the default values and how we let the user modify
+            ' them on demand via the ApplyApplicationDefaults event.
+            ' ===========================================================================================
+            ' a) Users used to be able to set MinimumSplashScreenDisplayTime _only_ by overriding OnInitialize
+            '    in a derived class and setting `MyBase.MinimumSplashScreenDisplayTime` there.
+            '    We are picking this (probably) changed value up, and pass it to the ApplyDefaultsEvents
+            '    where it could be modified (again). So event wins over Override over default value (2 seconds).
+            ' b) We feed the defaults for HighDpiMode, ColorMode, VisualStylesMode to the EventArgs.
+            '    With the introduction of the HighDpiMode property, we changed Project System the chance to reflect
+            '    those default values in the App Designer UI and have it code-generated based on a modified
+            '    Application.myapp, which would result it to be set in the derived constructor.
+            '    (See the hidden file in the Solution Explorer "My Project\Application.myapp\Application.Designer.vb
+            '     for how those UI-set values get applied.)
+            '    Once all this is done, we give the User another chance to change the value by code through
+            '    the ApplyDefaults event.
+            ' Note: Overriding MinimumSplashScreenDisplayTime needs still to keep working!
+            Dim applicationDefaultsEventArgs As New ApplyApplicationDefaultsEventArgs(
+                MinimumSplashScreenDisplayTime,
+                HighDpiMode,
+                ColorMode) With
+            {
+                .MinimumSplashScreenDisplayTime = MinimumSplashScreenDisplayTime,
+                .VisualStylesMode = VisualStylesMode
+            }
+
             RaiseEvent ApplyApplicationDefaults(Me, applicationDefaultsEventArgs)
 
             If applicationDefaultsEventArgs.Font IsNot Nothing Then
@@ -787,6 +792,7 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             _highDpiMode = applicationDefaultsEventArgs.HighDpiMode
             _colorMode = applicationDefaultsEventArgs.ColorMode
             _formRevealMode = applicationDefaultsEventArgs.FormRevealMode
+            _visualStylesMode = applicationDefaultsEventArgs.VisualStylesMode
 
             ' Then, it's applying what we got back as HighDpiMode.
             Dim dpiSetResult As Boolean = Application.SetHighDpiMode(_highDpiMode)
@@ -802,6 +808,8 @@ Namespace Microsoft.VisualBasic.ApplicationServices
                 Application.EnableVisualStyles()
             End If
 
+            Application.SetDefaultVisualStylesMode(_visualStylesMode)
+
             Application.SetColorMode(_colorMode)
             Application.SetDefaultFormRevealMode(_formRevealMode)
 
@@ -1102,5 +1110,44 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             End If ' Single-Instance application
         End Sub
 
+        ' The FormRevealMode the user assigned to the ApplyApplicationsDefault event.
+        Private _formRevealMode As FormRevealMode = FormRevealMode.Classic
+
+        ''' <summary>
+        '''  Gets or sets the <see cref="FormRevealMode"/> for the Application.
+        ''' </summary>
+        ''' <value>
+        '''  The <see cref="FormRevealMode"/> that newly created top-level forms use by
+        '''  default.
+        ''' </value>
+        <EditorBrowsable(EditorBrowsableState.Never)>
+        Protected Property FormRevealMode As FormRevealMode
+            Get
+                Return _formRevealMode
+            End Get
+            Set(value As FormRevealMode)
+                _formRevealMode = value
+            End Set
+        End Property
+
+        ' The VisualStylesMode (renderer version) the user assigned to the ApplyApplicationDefaults event.
+        Private _visualStylesMode As VisualStylesMode = VisualStylesMode.Classic
+
+        ''' <summary>
+        '''  Gets or sets the <see cref="VisualStylesMode"/> (renderer version) for the application.
+        ''' </summary>
+        ''' <value>
+        '''  The <see cref="VisualStylesMode"/> that the application uses to render its controls.
+        ''' </value>
+        <EditorBrowsable(EditorBrowsableState.Never)>
+        Protected Property VisualStylesMode As VisualStylesMode
+            Get
+                Return _visualStylesMode
+            End Get
+            Set(value As VisualStylesMode)
+                _visualStylesMode = value
+            End Set
+        End Property
+
     End Class
 End Namespace
diff --git a/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt b/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
index 71b1f47c484..93b55542d62 100644
--- a/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
@@ -2,3 +2,7 @@ Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.Form
 Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.FormRevealMode(AutoPropertyValue As System.Windows.Forms.FormRevealMode) -> Void
 Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode() -> System.Windows.Forms.FormRevealMode
 Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode(value As System.Windows.Forms.FormRevealMode) -> Void
+Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.VisualStylesMode() -> System.Windows.Forms.VisualStylesMode
+Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.VisualStylesMode(AutoPropertyValue As System.Windows.Forms.VisualStylesMode) -> Void
+Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.VisualStylesMode() -> System.Windows.Forms.VisualStylesMode
+Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.VisualStylesMode(value As System.Windows.Forms.VisualStylesMode) -> Void
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs
new file mode 100644
index 00000000000..9c6b1bb7cca
--- /dev/null
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs
@@ -0,0 +1,330 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+
+namespace System.Windows.Forms.Animation;
+
+/// <summary>
+///  A high-precision static timer designed to trigger WinForms control animations
+///  at 60 Hz (or 30 Hz on systems without high-resolution timer support).
+///  Controls register callbacks that are marshalled back to the UI thread via
+///  the captured <see cref="SynchronizationContext"/>.
+/// </summary>
+internal static partial class HighPrecisionTimer
+{
+    // Target frame intervals.
+    private const double TargetFrameTimeMs60Hz = 16.667;
+    private const double TargetFrameTimeMs30Hz = 33.333;
+
+    // We aim the PeriodicTimer earlier than the target frame time to allow
+    // for spin-wait refinement to hit the target precisely.
+    private const double TimerTickMs60Hz = 14.0;
+    private const double TimerTickMs30Hz = 30.0;
+
+    // Maximum drift before we assert (20% of target frame time sustained over 10 frames).
+    private const int MaxDriftFrames = 10;
+    private const double MaxDriftThresholdRatio = 0.20;
+
+    private static readonly Lock s_lock = new();
+    private static readonly ConcurrentDictionary<long, Registration> s_registrations = new();
+    private static long s_nextId;
+    private static CancellationTokenSource? s_cts;
+    private static Task? s_loopTask;
+    private static bool s_highResolutionAvailable;
+    private static double s_targetFrameTimeMs;
+    private static double s_timerTickMs;
+
+    /// <summary>
+    ///  Gets the current target frame time in milliseconds.
+    /// </summary>
+    internal static double TargetFrameTimeMs => s_targetFrameTimeMs;
+
+    /// <summary>
+    ///  Gets whether high-resolution timing (60 Hz) is available on this system.
+    /// </summary>
+    internal static bool IsHighResolutionAvailable => s_highResolutionAvailable;
+
+    /// <summary>
+    ///  Registers a callback to be invoked on each animation frame tick.
+    ///  The current <see cref="SynchronizationContext"/> is captured and used
+    ///  to marshal the callback to the appropriate thread.
+    /// </summary>
+    /// <param name="callback">
+    ///  The async callback invoked each frame. Receives timing information and a cancellation token.
+    /// </param>
+    /// <returns>A <see cref="TimerRegistration"/> that must be disposed to unregister.</returns>
+    /// <exception cref="InvalidOperationException">
+    ///  Thrown when no <see cref="SynchronizationContext"/> is available on the current thread.
+    /// </exception>
+    internal static TimerRegistration Register(Func<HighPrecisionTimerTick, CancellationToken, ValueTask> callback)
+    {
+        ArgumentNullException.ThrowIfNull(callback);
+
+        SynchronizationContext? syncContext = SynchronizationContext.Current
+            ?? throw new InvalidOperationException(
+                "A SynchronizationContext must be available on the calling thread. " +
+                "Ensure registration is performed from a UI thread.");
+
+        long id = Interlocked.Increment(ref s_nextId);
+        Registration registration = new(id, callback, syncContext);
+        s_registrations.TryAdd(id, registration);
+
+        EnsureRunning();
+
+        return new TimerRegistration(id);
+    }
+
+    /// <summary>
+    ///  Unregisters a previously registered callback.
+    /// </summary>
+    internal static void Unregister(long registrationId)
+    {
+        s_registrations.TryRemove(registrationId, out _);
+
+        if (s_registrations.IsEmpty)
+        {
+            StopTimer();
+        }
+    }
+
+    private static void EnsureRunning()
+    {
+        lock (s_lock)
+        {
+            if (s_loopTask is not null)
+            {
+                return;
+            }
+
+            s_highResolutionAvailable = TrySetHighResolutionTimerMode();
+            s_targetFrameTimeMs = s_highResolutionAvailable ? TargetFrameTimeMs60Hz : TargetFrameTimeMs30Hz;
+            s_timerTickMs = s_highResolutionAvailable ? TimerTickMs60Hz : TimerTickMs30Hz;
+
+            s_cts = new CancellationTokenSource();
+            CancellationToken cancellationToken = s_cts.Token;
+            s_loopTask = Task.Factory.StartNew(
+                () => TimerLoopAsync(cancellationToken),
+                cancellationToken,
+                TaskCreationOptions.LongRunning,
+                TaskScheduler.Default).Unwrap();
+        }
+    }
+
+    private static void StopTimer()
+    {
+        CancellationTokenSource? cts;
+
+        lock (s_lock)
+        {
+            cts = s_cts;
+            s_cts = null;
+            s_loopTask = null;
+        }
+
+        if (cts is not null)
+        {
+            cts.Cancel();
+            cts.Dispose();
+        }
+
+        // Best-effort: restore timer resolution.
+        if (s_highResolutionAvailable)
+        {
+            ResetTimerResolution();
+        }
+    }
+
+    private static async Task TimerLoopAsync(CancellationToken cancellationToken)
+    {
+        using PeriodicTimer periodicTimer = new(TimeSpan.FromMilliseconds(s_timerTickMs));
+        Stopwatch stopwatch = Stopwatch.StartNew();
+        long lastTickTimestamp = 0;
+        int consecutiveDriftFrames = 0;
+
+        try
+        {
+            while (await periodicTimer.WaitForNextTickAsync(cancellationToken).ConfigureAwait(false))
+            {
+                // Spin-wait refinement: if we woke up early, spin until target time.
+                double targetMs = lastTickTimestamp + s_targetFrameTimeMs;
+                SpinToTarget(stopwatch, targetMs);
+
+                long currentTimestamp = stopwatch.ElapsedMilliseconds;
+                double elapsed = currentTimestamp - lastTickTimestamp;
+
+                // Drift detection: check if we are consistently overshooting.
+                double drift = elapsed - s_targetFrameTimeMs;
+                if (Math.Abs(drift) > s_targetFrameTimeMs * MaxDriftThresholdRatio)
+                {
+                    consecutiveDriftFrames++;
+                    Debug.Assert(
+                        consecutiveDriftFrames < MaxDriftFrames,
+                        $"HighPrecisionTimer: Excessive drift detected. " +
+                        $"Drift: {drift:F2}ms over {consecutiveDriftFrames} consecutive frames.");
+                }
+                else
+                {
+                    consecutiveDriftFrames = 0;
+                }
+
+                lastTickTimestamp = currentTimestamp;
+
+                // Dispatch to all registered callbacks.
+                DispatchCallbacks(
+                    TimeSpan.FromMilliseconds(currentTimestamp),
+                    TimeSpan.FromMilliseconds(elapsed),
+                    cancellationToken);
+            }
+        }
+        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+        {
+            // Normal shutdown.
+        }
+    }
+
+    private static void SpinToTarget(Stopwatch stopwatch, double targetMs)
+    {
+        SpinWait spinner = default;
+
+        while (stopwatch.Elapsed.TotalMilliseconds < targetMs)
+        {
+            // SpinOnce with sleep1Threshold=-1 ensures we stay in PAUSE/yield
+            // mode and never escalate to Thread.Sleep(1).
+            spinner.SpinOnce(sleep1Threshold: -1);
+        }
+    }
+
+    private static void DispatchCallbacks(
+        TimeSpan timestamp,
+        TimeSpan elapsed,
+        CancellationToken cancellationToken)
+    {
+        foreach (KeyValuePair<long, Registration> kvp in s_registrations)
+        {
+            Registration registration = kvp.Value;
+
+            // Skip if previous callback is still in flight (frame coalescing).
+            if (Interlocked.CompareExchange(ref registration.InFlight, 1, 0) != 0)
+            {
+                Interlocked.Increment(ref registration.DroppedFrames);
+                continue;
+            }
+
+            long frameIndex = Interlocked.Increment(ref registration.FrameIndex) - 1;
+            int dropped = Interlocked.Exchange(ref registration.DroppedFrames, 0);
+
+            HighPrecisionTimerTick tick = new()
+            {
+                Timestamp = timestamp,
+                Elapsed = elapsed,
+                DroppedFrames = dropped,
+                FrameIndex = frameIndex
+            };
+
+            registration.SyncContext.Post(
+                _ => _ = InvokeCallbackAsync(registration, tick, cancellationToken),
+                null);
+        }
+    }
+
+    private static async Task InvokeCallbackAsync(
+        Registration registration,
+        HighPrecisionTimerTick tick,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            await registration.Callback(tick, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            Debug.Fail($"HighPrecisionTimer: Unhandled exception in callback: {ex.Message}");
+        }
+        finally
+        {
+            Interlocked.Exchange(ref registration.InFlight, 0);
+        }
+    }
+
+    [SupportedOSPlatform("windows10.0.17134.0")]
+    private static bool TrySetHighResolutionTimerMode()
+    {
+        if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
+        {
+            return false;
+        }
+
+        try
+        {
+            // Use timeBeginPeriod for documented, reliable high-resolution timing.
+            return NativeMethods.TimeBeginPeriod(1) == 0; // TIMERR_NOERROR
+        }
+        catch (Exception ex) when (!ex.IsCriticalException())
+        {
+            return false;
+        }
+    }
+
+    private static void ResetTimerResolution()
+    {
+        try
+        {
+            NativeMethods.TimeEndPeriod(1);
+        }
+        catch (Exception ex) when (!ex.IsCriticalException())
+        {
+            // Best effort.
+        }
+    }
+
+    private static partial class NativeMethods
+    {
+        [LibraryImport("winmm.dll")]
+        internal static partial int TimeBeginPeriod(int uPeriod);
+
+        [LibraryImport("winmm.dll")]
+        internal static partial int TimeEndPeriod(int uPeriod);
+    }
+
+    private sealed class Registration(
+        long id,
+        Func<HighPrecisionTimerTick, CancellationToken, ValueTask> callback,
+        SynchronizationContext syncContext)
+    {
+        public long Id { get; } = id;
+        public Func<HighPrecisionTimerTick, CancellationToken, ValueTask> Callback { get; } = callback;
+        public SynchronizationContext SyncContext { get; } = syncContext;
+        public int InFlight;
+        public int DroppedFrames;
+        public long FrameIndex;
+    }
+
+    /// <summary>
+    ///  Represents a timer registration. Dispose to unregister.
+    /// </summary>
+    internal readonly struct TimerRegistration : IDisposable
+    {
+        private readonly long _id;
+
+        internal TimerRegistration(long id) => _id = id;
+
+        /// <summary>Gets the registration identifier.</summary>
+        public long Id => _id;
+
+        /// <summary>Unregisters this callback from the timer.</summary>
+        public void Dispose() => Unregister(_id);
+    }
+
+    /// <summary>
+    ///  Resets internal state. For testing purposes only.
+    /// </summary>
+    internal static void Reset()
+    {
+        StopTimer();
+        s_registrations.Clear();
+        s_nextId = 0;
+    }
+}
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimerTick.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimerTick.cs
new file mode 100644
index 00000000000..3b6557e2643
--- /dev/null
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimerTick.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Animation;
+
+/// <summary>
+///  Provides timing information for a single animation frame tick.
+/// </summary>
+internal readonly struct HighPrecisionTimerTick
+{
+    /// <summary>
+    ///  The absolute timestamp of this tick from the timer's epoch.
+    /// </summary>
+    public TimeSpan Timestamp { get; init; }
+
+    /// <summary>
+    ///  The elapsed time since the last tick delivered to this registration.
+    /// </summary>
+    public TimeSpan Elapsed { get; init; }
+
+    /// <summary>
+    ///  The number of frames that were dropped (coalesced) since the last delivered tick.
+    /// </summary>
+    public int DroppedFrames { get; init; }
+
+    /// <summary>
+    ///  The zero-based frame index for this registration.
+    /// </summary>
+    public long FrameIndex { get; init; }
+}
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs
new file mode 100644
index 00000000000..b577b820494
--- /dev/null
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs
@@ -0,0 +1,220 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Windows.Forms.Animation;
+
+namespace System.Windows.Forms.Primitives.Tests.Animation;
+
+/// <summary>
+///  A test synchronization context that executes posted callbacks immediately
+///  on the thread pool, simulating a UI message pump for testing purposes.
+/// </summary>
+internal sealed class TestSynchronizationContext : SynchronizationContext
+{
+    public override void Post(SendOrPostCallback d, object? state) => ThreadPool.QueueUserWorkItem(_ => d(state));
+
+    public override void Send(SendOrPostCallback d, object? state) => d(state);
+}
+
+// The timer is process-wide static; disable parallelization so timing-sensitive
+// assertions are not perturbed by concurrently running tests.
+[Collection(nameof(HighPrecisionTimerTests))]
+[CollectionDefinition(nameof(HighPrecisionTimerTests), DisableParallelization = true)]
+public sealed class HighPrecisionTimerTests : IDisposable
+{
+    private readonly SynchronizationContext? _originalContext;
+
+    public HighPrecisionTimerTests()
+    {
+        _originalContext = SynchronizationContext.Current;
+        SynchronizationContext.SetSynchronizationContext(new TestSynchronizationContext());
+    }
+
+    public void Dispose()
+    {
+        HighPrecisionTimer.Reset();
+        SynchronizationContext.SetSynchronizationContext(_originalContext);
+    }
+
+    [Fact]
+    public async Task SingleConsumer_ReceivesTicksAtApproximatelyExpectedRate()
+    {
+        ConcurrentBag<double> intervals = [];
+        Stopwatch stopwatch = Stopwatch.StartNew();
+        double lastTick = 0;
+        int tickCount = 0;
+        const int TargetTicks = 30;
+
+        using HighPrecisionTimer.TimerRegistration registration = HighPrecisionTimer.Register(
+            (tick, ct) =>
+            {
+                double now = stopwatch.Elapsed.TotalMilliseconds;
+                if (lastTick > 0)
+                {
+                    intervals.Add(now - lastTick);
+                }
+
+                lastTick = now;
+                Interlocked.Increment(ref tickCount);
+                return ValueTask.CompletedTask;
+            });
+
+        await WaitForAsync(() => tickCount >= TargetTicks);
+
+        List<double> sorted = [.. intervals.OrderBy(x => x)];
+        double targetMs = HighPrecisionTimer.TargetFrameTimeMs;
+
+        // Relaxed bounds to remain robust on loaded CI machines: the median must be in a
+        // sane band around the target frame time.
+        double median = Percentile(sorted, 0.50);
+        median.Should().BeLessThan(targetMs * 3.0, "the median frame interval should stay near the target");
+    }
+
+    [Fact]
+    public async Task MultipleConsumers_AllReceiveTicksIndependently()
+    {
+        const int ConsumerCount = 5;
+        const int TargetTicks = 15;
+        int[] tickCounts = new int[ConsumerCount];
+        HighPrecisionTimer.TimerRegistration[] registrations = new HighPrecisionTimer.TimerRegistration[ConsumerCount];
+
+        for (int i = 0; i < ConsumerCount; i++)
+        {
+            int index = i;
+            registrations[i] = HighPrecisionTimer.Register(
+                (tick, ct) =>
+                {
+                    Interlocked.Increment(ref tickCounts[index]);
+                    return ValueTask.CompletedTask;
+                });
+        }
+
+        await WaitForAsync(() => tickCounts.Min() >= TargetTicks);
+
+        foreach (HighPrecisionTimer.TimerRegistration registration in registrations)
+        {
+            registration.Dispose();
+        }
+
+        tickCounts.Should().OnlyContain(count => count >= TargetTicks);
+    }
+
+    [Fact]
+    public async Task SlowConsumer_DropsFramesInsteadOfQueuing()
+    {
+        ConcurrentBag<HighPrecisionTimerTick> ticks = [];
+
+        using HighPrecisionTimer.TimerRegistration registration = HighPrecisionTimer.Register(
+            async (tick, ct) =>
+            {
+                ticks.Add(tick);
+                // Simulate slow rendering (well over one frame time).
+                await Task.Delay((int)(HighPrecisionTimer.TargetFrameTimeMs * 3), ct);
+            });
+
+        await WaitForAsync(() => ticks.Sum(t => t.DroppedFrames) > 0, timeoutMs: 4000);
+
+        ticks.Sum(t => t.DroppedFrames).Should().BeGreaterThan(0, "a slow consumer should report dropped frames");
+    }
+
+    [Fact]
+    public async Task Registration_Disposal_StopsCallbacks()
+    {
+        int tickCount = 0;
+
+        HighPrecisionTimer.TimerRegistration registration = HighPrecisionTimer.Register(
+            (tick, ct) =>
+            {
+                Interlocked.Increment(ref tickCount);
+                return ValueTask.CompletedTask;
+            });
+
+        await WaitForAsync(() => tickCount > 0);
+        registration.Dispose();
+        int ticksAfterDispose = Volatile.Read(ref tickCount);
+
+        await Task.Delay(200, TestContext.Current.CancellationToken);
+
+        // At most a couple of in-flight callbacks may land right after disposal.
+        (Volatile.Read(ref tickCount) - ticksAfterDispose).Should().BeLessThanOrEqualTo(2);
+    }
+
+    [Fact]
+    public void Registration_WithoutSyncContext_Throws()
+    {
+        SynchronizationContext? original = SynchronizationContext.Current;
+        SynchronizationContext.SetSynchronizationContext(null);
+
+        try
+        {
+            Action act = () => HighPrecisionTimer.Register((tick, ct) => ValueTask.CompletedTask);
+            act.Should().Throw<InvalidOperationException>();
+        }
+        finally
+        {
+            SynchronizationContext.SetSynchronizationContext(original);
+        }
+    }
+
+    [Fact]
+    public async Task TimerTick_ProvidesElapsedAndIncreasingFrameIndex()
+    {
+        ConcurrentBag<double> elapsedValues = [];
+        long lastFrameIndex = -1;
+        bool frameIndexMonotonic = true;
+        int tickCount = 0;
+        const int TargetTicks = 15;
+
+        using HighPrecisionTimer.TimerRegistration registration = HighPrecisionTimer.Register(
+            (tick, ct) =>
+            {
+                if (tick.FrameIndex <= lastFrameIndex)
+                {
+                    frameIndexMonotonic = false;
+                }
+
+                lastFrameIndex = tick.FrameIndex;
+
+                if (tick.FrameIndex > 0)
+                {
+                    elapsedValues.Add(tick.Elapsed.TotalMilliseconds);
+                }
+
+                Interlocked.Increment(ref tickCount);
+                return ValueTask.CompletedTask;
+            });
+
+        await WaitForAsync(() => tickCount >= TargetTicks);
+
+        frameIndexMonotonic.Should().BeTrue("frame indices should increase monotonically");
+        elapsedValues.Should().NotBeEmpty();
+        elapsedValues.Should().OnlyContain(value => value > 0, "elapsed time between ticks should be positive");
+    }
+
+    private static double Percentile(List<double> sortedValues, double percentile)
+    {
+        if (sortedValues.Count == 0)
+        {
+            return 0;
+        }
+
+        int index = (int)Math.Ceiling(percentile * sortedValues.Count) - 1;
+        return sortedValues[Math.Max(0, index)];
+    }
+
+    private static async Task WaitForAsync(Func<bool> condition, int timeoutMs = 5000)
+    {
+        Stopwatch stopwatch = Stopwatch.StartNew();
+        while (!condition())
+        {
+            if (stopwatch.ElapsedMilliseconds > timeoutMs)
+            {
+                throw new TimeoutException("Timed out waiting for the expected timer ticks.");
+            }
+
+            await Task.Delay(25, TestContext.Current.CancellationToken);
+        }
+    }
+}
diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 974e0b4c711..8b2a5e9c16b 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -151,3 +151,22 @@ System.Windows.Forms.KioskModeWakeupSource.Keyboard = 0 -> System.Windows.Forms.
 System.Windows.Forms.KioskModeWakeupSource.Mouse = 1 -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupSource.PowerResume = 2 -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupSource.Session = 3 -> System.Windows.Forms.KioskModeWakeupSource
+#nullable enable
+override System.Windows.Forms.ButtonBase.OnVisualStylesModeChanged(System.EventArgs! e) -> void
+override System.Windows.Forms.CheckBox.Dispose(bool disposing) -> void
+override System.Windows.Forms.CheckBox.OnPaint(System.Windows.Forms.PaintEventArgs! pevent) -> void
+override System.Windows.Forms.CheckBox.OnVisualStylesModeChanged(System.EventArgs! e) -> void
+static System.Windows.Forms.Application.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
+static System.Windows.Forms.Application.SetDefaultVisualStylesMode(System.Windows.Forms.VisualStylesMode styleSetting) -> void
+System.Windows.Forms.Appearance.ToggleSwitch = 2 -> System.Windows.Forms.Appearance
+System.Windows.Forms.Control.VisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.Control.VisualStylesMode.set -> void
+System.Windows.Forms.Control.VisualStylesModeChanged -> System.EventHandler?
+System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Classic = 0 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Disabled = 1 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Latest = 32767 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Net11 = 2 -> System.Windows.Forms.VisualStylesMode
+virtual System.Windows.Forms.Control.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
+virtual System.Windows.Forms.Control.OnParentVisualStylesModeChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.Control.OnVisualStylesModeChanged(System.EventArgs! e) -> void
diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index 2b53c4c5f9a..a50ebfcf425 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -171,6 +171,9 @@
   <data name="ApplicationCannotChangeApplicationExceptionMode" xml:space="preserve">
     <value>Application exception mode cannot be changed once any Controls are created in the application.</value>
   </data>
+  <data name="Application_VisualStylesModeCanOnlyBeSetOnce" xml:space="preserve">
+    <value>The default visual styles mode can only be set once and cannot be changed afterwards.</value>
+  </data>
   <data name="ApplyCaption" xml:space="preserve">
     <value>&amp;Apply</value>
   </data>
@@ -6982,6 +6985,12 @@ Stack trace where the illegal operation occurred was:
   <data name="ControlDataContextChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataContext property changes.</value>
   </data>
+  <data name="ControlVisualStylesModeDescr" xml:space="preserve">
+    <value>Determines how the control renders itself when visual styles are applied.</value>
+  </data>
+  <data name="ControlVisualStylesModeChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the VisualStylesMode property changes.</value>
+  </data>
   <data name="CommandComponentCommandParameterDescr" xml:space="preserve">
     <value>Gets or sets the parameter that is passed to the Command property's object on execution or on execution context request.</value>
   </data>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
index 80736719f78..dc61cf6dfe0 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
@@ -242,6 +242,11 @@
         <target state="translated">Režim výjimky vlákna nelze změnit po vytvoření ovládacích prvků ve vlákně.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Použít</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Určuje, zda je ovládací prvek viditelný nebo skrytý.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">Šířka ovládacího prvku, v souřadnicích kontejneru.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
index 5be7bb5b3fa..6e4717ed5fb 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
@@ -242,6 +242,11 @@
         <target state="translated">Der Threadausnahmemodus kann nicht mehr geändert werden, sobald Steuerelemente in dem Thread erstellt wurden.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Anwenden</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Bestimmt, ob das Steuerelement sichtbar oder ausgeblendet ist.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">Die Breite des Steuerelements (in Containerkoordinaten).</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
index d0725d9d5dd..720687178cd 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
@@ -242,6 +242,11 @@
         <target state="translated">El modo de excepción del subproceso no se puede cambiar una vez que se creen Controles en el subproceso.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Aplicar</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Determina si el control está visible u oculto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">Ancho del control, en las coordenadas del contenedor.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
index 13e6c849190..66c1e5ca451 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
@@ -242,6 +242,11 @@
         <target state="translated">Impossible de modifier le mode d'exceptions du thread une fois que des Controls ont été créés sur le thread.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Appliquer</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Détermine si le contrôle est visible ou masqué.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">La largeur du contrôle, en coordonnées conteneur.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
index 5af3d425cb6..919e844d1cb 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
@@ -242,6 +242,11 @@
         <target state="translated">Una volta creati controlli nel thread, non è possibile modificare la modalità eccezioni del thread.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Applica</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Determina se il controllo è visibile o nascosto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">La larghezza del controllo, nelle coordinate del contenitore.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
index 14876be5a33..476c66762e8 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
@@ -242,6 +242,11 @@
         <target state="translated">スレッドでコントロールが作成された後、スレッド例外モードを変更することはできません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">適用(&amp;A)</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">コントロールの表示、非表示を示します。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">コンテナー座標で表したコントロールの幅です。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
index 7776400cc91..df6ba0e47cb 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
@@ -242,6 +242,11 @@
         <target state="translated">스레드에서 컨트롤이 만들어진 이후에는 스레드 예외 모드를 변경할 수 없습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">적용(&amp;A)</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">컨트롤을 표시할지 여부를 결정합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">컨테이너 좌표로 표시한 컨트롤의 너비입니다.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
index 2b5069370a7..8c9555dacc5 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
@@ -242,6 +242,11 @@
         <target state="translated">Trybu wyjątków wątku nie można zmienić po utworzeniu jakichkolwiek formantów w aplikacji.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Zastosuj</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Określa, czy formant jest widoczny, czy ukryty.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">Szerokość formantu we współrzędnych kontenera.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
index 0049498e30e..ade44214e91 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
@@ -242,6 +242,11 @@
         <target state="translated">Não é possível alterar o modo de exceção de thread após a criação de qualquer controle no thread.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Aplicar</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Determina se o controle está visível ou oculto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">A largura do controle, nas coordenadas do recipiente.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
index bba77ec4065..ac9c5917fe8 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
@@ -242,6 +242,11 @@
         <target state="translated">Режим исключений потоков нельзя изменить, если в потоке были созданы элементы управления.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Применить</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Определяет, отображается или скрыт данный элемент управления.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">Ширина элемента управления в координатах контейнера.</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
index 19529ea64f9..a41d2792eb4 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
@@ -242,6 +242,11 @@
         <target state="translated">İş parçacığında herhangi bir Denetim oluşturulduktan sonra iş parçacığı özel durum modu değiştirilemez.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Uygula</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">Denetimin görünür mü yoksa gizli mi olduğunu belirler.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">Denetimin genişliği (kapsayıcı koordinatlarında).</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
index 273d0235920..7006001e4a2 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
@@ -242,6 +242,11 @@
         <target state="translated">只要在线程上创建了任何控件，则线程异常模式将不能再有任何更改。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">应用(&amp;A)</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">确定该控件是可见的还是隐藏的。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">控件的宽度(以容器坐标表示)。</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
index 86e90809d5a..5e106664612 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
@@ -242,6 +242,11 @@
         <target state="translated">一旦在執行緒上建立了控制項，就不能變更執行緒例外狀況模式。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeCanOnlyBeSetOnce">
+        <source>The default visual styles mode can only be set once and cannot be changed afterwards.</source>
+        <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">套用(&amp;A)</target>
@@ -2172,6 +2177,16 @@
         <target state="translated">決定控制項是可見或隱藏。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ControlVisualStylesModeChangedDescr">
+        <source>Occurs when the value of the VisualStylesMode property changes.</source>
+        <target state="new">Occurs when the value of the VisualStylesMode property changes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ControlVisualStylesModeDescr">
+        <source>Determines how the control renders itself when visual styles are applied.</source>
+        <target state="new">Determines how the control renders itself when visual styles are applied.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ControlWidthDescr">
         <source>The width of the control, in container coordinates.</source>
         <target state="translated">容器座標中控制項的寬度。</target>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
index b40d50ad9fc..06a7a41b10a 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
@@ -48,6 +48,8 @@ public sealed partial class Application
     private static FormRevealMode? s_defaultFormRevealMode;
 #endif
 
+    private static VisualStylesMode? s_defaultVisualStylesMode;
+
     private const string DarkModeKeyPath = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
     private const string DarkModeKey = "AppsUseLightTheme";
     private const int SystemDarkModeDisabled = 1;
@@ -664,6 +666,54 @@ public static void RegisterMessageLoop(MessageLoopCallback? callback)
     public static bool RenderWithVisualStyles
         => ComCtlSupportsVisualStyles && VisualStyleRenderer.IsSupported;
 
+    /// <summary>
+    ///  Gets the default <see cref="VisualStylesMode"/> used as the rendering style guideline for the
+    ///  application's controls.
+    /// </summary>
+    /// <value>
+    ///  The <see cref="VisualStylesMode"/> used as the rendering style guideline for the application's
+    ///  controls. This is <see cref="VisualStylesMode.Classic"/> when visual styles are enabled and
+    ///  <see cref="VisualStylesMode.Disabled"/> otherwise, unless it has been changed by a call to
+    ///  <see cref="SetDefaultVisualStylesMode(VisualStylesMode)"/>.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   The default value is <see cref="VisualStylesMode.Classic"/> so that applications that simply
+    ///   recompile against a newer framework keep their existing look. Opt in to a newer renderer by
+    ///   calling <see cref="SetDefaultVisualStylesMode(VisualStylesMode)"/>.
+    ///  </para>
+    /// </remarks>
+    public static VisualStylesMode DefaultVisualStylesMode
+        => s_defaultVisualStylesMode ??=
+            UseVisualStyles ? VisualStylesMode.Classic : VisualStylesMode.Disabled;
+
+    /// <summary>
+    ///  Sets the default <see cref="VisualStylesMode"/> used as the rendering style guideline for the
+    ///  application's controls.
+    /// </summary>
+    /// <param name="styleSetting">The version of the visual styles renderer to use by default.</param>
+    /// <exception cref="InvalidOperationException">
+    ///  The default visual styles mode has already been set to a different value. It can only be set once.
+    /// </exception>
+    /// <remarks>
+    ///  <para>
+    ///   Call this method before creating any window. If visual styles have not been enabled through
+    ///   <see cref="EnableVisualStyles"/>, the effective mode remains <see cref="VisualStylesMode.Disabled"/>.
+    ///   Passing <see cref="VisualStylesMode.Disabled"/> has the same effect as not calling
+    ///   <see cref="EnableVisualStyles"/>.
+    ///  </para>
+    /// </remarks>
+    public static void SetDefaultVisualStylesMode(VisualStylesMode styleSetting)
+    {
+        if (s_defaultVisualStylesMode is { } current && current != styleSetting)
+        {
+            throw new InvalidOperationException(SR.Application_VisualStylesModeCanOnlyBeSetOnce);
+        }
+
+        // Without visual styles enabled, the only effective mode is Disabled.
+        s_defaultVisualStylesMode = UseVisualStyles ? styleSetting : VisualStylesMode.Disabled;
+    }
+
     /// <summary>
     ///  Gets or sets the format string to apply to top level window captions
     ///  when they are displayed with a warning banner.
@@ -1052,6 +1102,13 @@ public static void EnableVisualStyles()
         Debug.Assert(UseVisualStyles, "Enable Visual Styles failed");
 
         s_comCtlSupportsVisualStylesInitialized = false;
+
+        // Keep the default visual styles mode in sync when EnableVisualStyles is called after
+        // SetDefaultVisualStylesMode(VisualStylesMode.Disabled): an explicitly disabled mode becomes Classic.
+        if (UseVisualStyles && s_defaultVisualStylesMode == VisualStylesMode.Disabled)
+        {
+            s_defaultVisualStylesMode = VisualStylesMode.Classic;
+        }
     }
 
     /// <summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
index f4961ae73d6..d9f2340fca1 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
@@ -146,6 +146,7 @@ public unsafe partial class Control :
     private protected static readonly object s_paddingChangedEvent = new();
     private static readonly object s_previewKeyDownEvent = new();
     private static readonly object s_dataContextEvent = new();
+    private static readonly object s_visualStylesModeChangedEvent = new();
 
     private static MessageId s_threadCallbackMessage;
     private static ContextCallback? s_invokeMarshaledCallbackHelperDelegate;
@@ -224,6 +225,7 @@ public unsafe partial class Control :
     private static readonly int s_cacheTextFieldProperty = PropertyStore.CreateKey();
     private static readonly int s_ambientPropertiesServiceProperty = PropertyStore.CreateKey();
     private static readonly int s_dataContextProperty = PropertyStore.CreateKey();
+    private static readonly int s_visualStylesModeProperty = PropertyStore.CreateKey();
 
     private static readonly int s_deviceDpiInternal = PropertyStore.CreateKey();
     private static readonly int s_originalDeviceDpiInternal = PropertyStore.CreateKey();
@@ -859,6 +861,80 @@ private bool ShouldSerializeDataContext()
     private void ResetDataContext()
         => Properties.RemoveValue(s_dataContextProperty);
 
+    /// <summary>
+    ///  Gets or sets how the control renders itself when visual styles are applied. This is an ambient property.
+    /// </summary>
+    /// <value>
+    ///  The <see cref="Forms.VisualStylesMode"/> for the control. When not explicitly set, the value is inherited
+    ///  from the parent control, or, for a top-level control, from <see cref="Application.DefaultVisualStylesMode"/>.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   As an ambient property, a control that does not have its <see cref="VisualStylesMode"/> set explicitly
+    ///   inherits the value from its parent, or, if it has no parent, from
+    ///   <see cref="Application.DefaultVisualStylesMode"/>. Derived controls can override
+    ///   <see cref="DefaultVisualStylesMode"/> to pin themselves to a specific renderer version for backward
+    ///   compatibility (see <see cref="TextBoxBase"/> for an example).
+    ///  </para>
+    /// </remarks>
+    [SRCategory(nameof(SR.CatAppearance))]
+    [EditorBrowsable(EditorBrowsableState.Always)]
+    [SRDescription(nameof(SR.ControlVisualStylesModeDescr))]
+    public VisualStylesMode VisualStylesMode
+    {
+        get => Properties.TryGetValue(s_visualStylesModeProperty, out VisualStylesMode value)
+            ? value
+            : ParentInternal?.VisualStylesMode ?? DefaultVisualStylesMode;
+        set
+        {
+            // Can't use the source generated enum validator here, since it cannot deal with [Experimental].
+            _ = value switch
+            {
+                VisualStylesMode.Classic => value,
+                VisualStylesMode.Disabled => value,
+                VisualStylesMode.Net11 => value,
+                VisualStylesMode.Latest => value,
+                _ => throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(VisualStylesMode))
+            };
+
+            if (value == VisualStylesMode)
+            {
+                return;
+            }
+
+            // When VisualStylesMode differed from its parent before but is about to become the same,
+            // we remove it altogether so it can again inherit the value from its parent.
+            if (Properties.ContainsKey(s_visualStylesModeProperty) && ParentInternal?.VisualStylesMode == value)
+            {
+                Properties.RemoveValue(s_visualStylesModeProperty);
+                OnVisualStylesModeChanged(EventArgs.Empty);
+                return;
+            }
+
+            Properties.AddValue(s_visualStylesModeProperty, value);
+            OnVisualStylesModeChanged(EventArgs.Empty);
+        }
+    }
+
+    private bool ShouldSerializeVisualStylesMode()
+        => Properties.ContainsKey(s_visualStylesModeProperty);
+
+    private void ResetVisualStylesMode()
+        => Properties.RemoveValue(s_visualStylesModeProperty);
+
+    /// <summary>
+    ///  Gets the default <see cref="Forms.VisualStylesMode"/> for the control, which is ambient to
+    ///  <see cref="Application.DefaultVisualStylesMode"/>.
+    /// </summary>
+    /// <value>The default visual styles mode for the control.</value>
+    /// <remarks>
+    ///  <para>
+    ///   Derived controls can override this property to pin themselves to a specific renderer version when their
+    ///   rendering or layout depends on it, independent of the application-wide default.
+    ///  </para>
+    /// </remarks>
+    protected virtual VisualStylesMode DefaultVisualStylesMode => Application.DefaultVisualStylesMode;
+
     /// <summary>
     ///  The background color of this control. This is an ambient property and
     ///  will always return a non-null value.
@@ -3742,6 +3818,19 @@ public event EventHandler? DataContextChanged
         remove => Events.RemoveHandler(s_dataContextEvent, value);
     }
 
+    /// <summary>
+    ///  Occurs when the value of the <see cref="VisualStylesMode"/> property changes.
+    /// </summary>
+    [SRCategory(nameof(SR.CatAppearance))]
+    [Browsable(true)]
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    [SRDescription(nameof(SR.ControlVisualStylesModeChangedDescr))]
+    public event EventHandler? VisualStylesModeChanged
+    {
+        add => Events.AddHandler(s_visualStylesModeChangedEvent, value);
+        remove => Events.RemoveHandler(s_visualStylesModeChangedEvent, value);
+    }
+
     [SRCategory(nameof(SR.CatDragDrop))]
     [SRDescription(nameof(SR.ControlOnDragDropDescr))]
     public event DragEventHandler? DragDrop
@@ -6843,6 +6932,34 @@ protected virtual void OnDataContextChanged(EventArgs e)
         }
     }
 
+    /// <summary>
+    ///  Raises the <see cref="VisualStylesModeChanged"/> event. Inheriting classes should override this method
+    ///  to handle the event, and call <see langword="base"/>.<see cref="OnVisualStylesModeChanged(EventArgs)"/>
+    ///  to forward the event to any registered listeners.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    protected virtual void OnVisualStylesModeChanged(EventArgs e)
+    {
+        if (GetAnyDisposingInHierarchy())
+        {
+            return;
+        }
+
+        if (Events[s_visualStylesModeChangedEvent] is EventHandler eventHandler)
+        {
+            eventHandler(this, e);
+        }
+
+        if (ChildControls is { } children)
+        {
+            for (int i = 0; i < children.Count; i++)
+            {
+                children[i].OnParentVisualStylesModeChanged(e);
+            }
+        }
+    }
+
     [EditorBrowsable(EditorBrowsableState.Advanced)]
     protected virtual void OnDockChanged(EventArgs e)
     {
@@ -7056,6 +7173,29 @@ protected virtual void OnParentDataContextChanged(EventArgs e)
         OnDataContextChanged(e);
     }
 
+    /// <summary>
+    ///  Occurs when the <see cref="VisualStylesMode"/> property of the parent of this control changes.
+    /// </summary>
+    /// <param name="e">An <see cref="EventArgs"/> that contains the event data.</param>
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    protected virtual void OnParentVisualStylesModeChanged(EventArgs e)
+    {
+        if (Properties.ContainsKey(s_visualStylesModeProperty)
+            && Properties.GetValueOrDefault<VisualStylesMode>(s_visualStylesModeProperty) == Parent?.VisualStylesMode)
+        {
+            // Same as the parent value, make it ambient again by removing it.
+            Properties.RemoveValue(s_visualStylesModeProperty);
+
+            // Even though internally we don't store it any longer, and the value we had stored
+            // therefore changed, technically the value remains the same, so we don't raise the
+            // VisualStylesModeChanged event.
+            return;
+        }
+
+        // In every other case we're going to raise the event.
+        OnVisualStylesModeChanged(e);
+    }
+
     [EditorBrowsable(EditorBrowsableState.Advanced)]
     protected virtual void OnParentEnabledChanged(EventArgs e)
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Appearance.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Appearance.cs
index fb144cac774..83aacaaf244 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Appearance.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Appearance.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace System.Windows.Forms;
@@ -17,4 +17,15 @@ public enum Appearance
     ///  The appearance of a Windows button.
     /// </summary>
     Button = 1,
+
+    /// <summary>
+    ///  The appearance of a modern UI toggle switch.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   This value has no effect when <see cref="Control.VisualStylesMode"/> is set to
+    ///   <see cref="VisualStylesMode.Disabled"/> or <see cref="VisualStylesMode.Classic"/>.
+    ///  </para>
+    /// </remarks>
+    ToggleSwitch = 2
 }
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs
index e76dd755f29..5843696f0cb 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs
@@ -148,40 +148,6 @@ public virtual DialogResult DialogResult
         }
     }
 
-    /// <summary>
-    ///  Defines, whether the control is owner-drawn. Based on this,
-    ///  the UserPaint flags get set, which in turn makes it later
-    ///  a Win32 controls, which we wrap (OwnerDraw == false) or not, and then
-    ///  we draw ourselves. If the user wants to opt out of DarkMode, we can no
-    ///  longer force (wrapping) System-Painting for FlatStyle.Standard, and we
-    ///  need this then also here and now, before CreateParams is called.
-    /// </summary>
-    private protected override bool OwnerDraw
-    {
-        get
-        {
-            if (Application.IsDarkModeEnabled
-
-                // The SystemRenderer cannot render images. So, we flip to our
-                // own DarkMode renderer, if we need to render images, except if...
-                && Image is null
-                // ...or a BackgroundImage, except if...
-                && BackgroundImage is null
-                // ...the user wants to opt out of implicit DarkMode rendering.
-                && DarkModeRequestState is true
-
-                // And all of this only counts for FlatStyle.Standard. For the
-                // rest, we're using specific renderers anyway, which check
-                // themselves on demand, if they need to apply Light- or DarkMode.
-                && FlatStyle == FlatStyle.Standard)
-            {
-                return false;
-            }
-
-            return base.OwnerDraw;
-        }
-    }
-
     internal override bool SupportsUiaProviders => true;
 
     /// <summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index 26c3292e175..f7fe95af5ff 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -1256,6 +1256,22 @@ protected override void OnPaint(PaintEventArgs pevent)
         base.OnPaint(pevent);
     }
 
+    /// <inheritdoc/>
+    protected override void OnVisualStylesModeChanged(EventArgs e)
+    {
+        base.OnVisualStylesModeChanged(e);
+
+        // The button adapter is selected based on VisualStylesMode, so drop the cached adapter and
+        // force it to be recreated (and the button repainted) on the next paint.
+        _adapter = null;
+        _cachedAdapterType = (FlatStyle)(-1);
+
+        if (IsHandleCreated)
+        {
+            Invalidate();
+        }
+    }
+
     protected override void OnParentChanged(EventArgs e)
     {
         base.OnParentChanged(e);
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
index a85dd3ed4cc..8db1ce8d28b 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
@@ -12,14 +12,22 @@ internal class ButtonDarkModeAdapter : ButtonBaseAdapter
 
     internal ButtonDarkModeAdapter(ButtonBase control) : base(control)
     {
+        bool modern = control.VisualStylesMode >= VisualStylesMode.Net11;
+
         _buttonDarkModeRenderer = control.FlatStyle switch
         {
-            FlatStyle.Standard => new FlatButtonDarkModeRenderer(),
-            FlatStyle.Flat => new FlatButtonDarkModeRenderer(),
-            FlatStyle.Popup => new PopupButtonDarkModeRenderer(),
+            // With VisualStyles (.NET 11+) the modern, WinUI-inspired renderer is used for the owner-drawn
+            // styles. Otherwise FlatStyle.Standard renders with a conservative owner-drawn renderer that mimics
+            // the dark-mode system button (instead of delegating to the Win32 control); this makes the owner-drawn
+            // path reachable and lets Standard buttons support images, focus cues, etc.
+            FlatStyle.Standard => modern ? new ModernButtonDarkModeRenderer() : new SystemButtonDarkModeRenderer(),
+            FlatStyle.Flat => modern ? new ModernButtonDarkModeRenderer() : new FlatButtonDarkModeRenderer(),
+            FlatStyle.Popup => modern ? new ModernButtonDarkModeRenderer() : new PopupButtonDarkModeRenderer(),
             FlatStyle.System => new SystemButtonDarkModeRenderer(),
             _ => throw new ArgumentOutOfRangeException(nameof(control))
         };
+
+        _buttonDarkModeRenderer.DeviceDpi = control.DeviceDpi;
     }
 
     private ButtonDarkModeRendererBase ButtonDarkModeRenderer =>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
index 9d655a618b0..b0834ee0070 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
@@ -14,6 +14,17 @@ internal abstract partial class ButtonDarkModeRendererBase : IButtonRenderer
     // Define padding values for each renderer type
     private protected abstract Padding PaddingCore { get; }
 
+    /// <summary>
+    ///  The device DPI of the control being rendered. Set by the adapter before each paint so renderers
+    ///  can DPI-scale their logical (96-DPI) constants. Defaults to 96 (100%).
+    /// </summary>
+    internal int DeviceDpi { get; set; } = 96;
+
+    /// <summary>
+    ///  Scales a logical (96-DPI) value to the current <see cref="DeviceDpi"/>.
+    /// </summary>
+    private protected int Scale(int logicalValue) => (int)Math.Round(logicalValue * (DeviceDpi / 96.0));
+
     /// <summary>
     ///  Clears the background with the parent's background color or the control's background color if no parent is available.
     /// </summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs
index 55552647bce..bf7f7144dfa 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs
@@ -5,18 +5,25 @@ namespace System.Windows.Forms.ButtonInternal;
 
 internal static class DarkModeAdapterFactory
 {
+    // The owner-drawn dark/modern adapter is used when dark mode is enabled (conservative renderer) or when
+    // the control opts into the modern .NET 11 visual styles (modern renderer, in either dark or light scheme).
+    private static bool UseOwnerDrawnAdapter(ButtonBase control)
+    {
+        return Application.IsDarkModeEnabled || control.VisualStylesMode >= VisualStylesMode.Net11;
+    }
+
     public static ButtonBaseAdapter CreateFlatAdapter(ButtonBase control) =>
-        Application.IsDarkModeEnabled
+        UseOwnerDrawnAdapter(control)
             ? new ButtonDarkModeAdapter(control)
             : new ButtonFlatAdapter(control);
 
     public static ButtonBaseAdapter CreateStandardAdapter(ButtonBase control) =>
-        Application.IsDarkModeEnabled
+        UseOwnerDrawnAdapter(control)
             ? new ButtonDarkModeAdapter(control)
             : new ButtonStandardAdapter(control);
 
     public static ButtonBaseAdapter CreatePopupAdapter(ButtonBase control) =>
-        Application.IsDarkModeEnabled
+        UseOwnerDrawnAdapter(control)
             ? new ButtonDarkModeAdapter(control)
             : new ButtonPopupAdapter(control);
 }
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs
new file mode 100644
index 00000000000..ac1ea0c013e
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs
@@ -0,0 +1,199 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms.VisualStyles;
+
+namespace System.Windows.Forms;
+
+/// <summary>
+///  Modern, WinUI-inspired push button renderer used when <see cref="Control.VisualStylesMode"/> is
+///  <see cref="VisualStylesMode.Net11"/> or later. It supports both dark and light color schemes and draws a
+///  rounded button area, an optional dark gap ring, and a rounded focus ring for the focused button.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The visual is intentionally driven by a small set of DPI-scaled constants so the appearance can be
+///   fine-tuned during exploratory testing. All widths are expressed in logical (96-DPI) pixels.
+///  </para>
+/// </remarks>
+internal sealed class ModernButtonDarkModeRenderer : ButtonDarkModeRendererBase
+{
+    // Logical (96-DPI) layout constants. DPI-scaled via the base Scale() helper.
+    private const int FocusRingThicknessLogical = 2;
+    private const int FocusGapThicknessLogical = 1;
+    private const int OuterBreathingLogical = 1;
+    private const int CornerRadiusLogical = 6;
+    private const int ContentInsetLogical = 4;
+
+    // Dark scheme - default (accept) button area.
+    private static readonly Color s_darkDefaultNormal = Color.FromArgb(0x4C, 0xC2, 0xFF);
+    private static readonly Color s_darkDefaultHover = Color.FromArgb(0x47, 0xB1, 0xE8);
+    private static readonly Color s_darkDefaultPressed = Color.FromArgb(0x42, 0xA1, 0xD2);
+
+    // Dark scheme - normal button area.
+    private static readonly Color s_darkNormal = Color.FromArgb(0x2D, 0x2D, 0x2D);
+    private static readonly Color s_darkNormalHover = Color.FromArgb(0x32, 0x32, 0x32);
+    private static readonly Color s_darkNormalPressed = Color.FromArgb(0x2A, 0x2A, 0x2A);
+    private static readonly Color s_darkDisabled = Color.FromArgb(0x25, 0x25, 0x25);
+
+    private static readonly Color s_darkDefaultText = Color.Black;
+    private static readonly Color s_darkNormalText = Color.FromArgb(0xF0, 0xF0, 0xF0);
+    private static readonly Color s_darkDisabledText = Color.FromArgb(0x88, 0x88, 0x88);
+
+    private static readonly Color s_darkGap = Color.FromArgb(0x0A, 0x0A, 0x0A);
+    private static readonly Color s_darkFocusRing = Color.White;
+
+    // Light (WinUI) scheme - normal button area.
+    private static readonly Color s_lightNormal = Color.FromArgb(0xFB, 0xFB, 0xFB);
+    private static readonly Color s_lightNormalHover = Color.FromArgb(0xF9, 0xF9, 0xF9);
+    private static readonly Color s_lightNormalPressed = Color.FromArgb(0xF5, 0xF5, 0xF5);
+    private static readonly Color s_lightDisabled = Color.FromArgb(0xFA, 0xFA, 0xFA);
+    private static readonly Color s_lightBorder = Color.FromArgb(0xD0, 0xD0, 0xD0);
+
+    private static readonly Color s_lightNormalText = Color.FromArgb(0x1A, 0x1A, 0x1A);
+    private static readonly Color s_lightDisabledText = Color.FromArgb(0xA0, 0xA0, 0xA0);
+    private static readonly Color s_lightDefaultText = Color.White;
+
+    private static bool IsDark => Application.IsDarkModeEnabled;
+
+    private int FocusRingThickness => Math.Max(1, Scale(FocusRingThicknessLogical));
+
+    private int FocusGapThickness => Math.Max(1, Scale(FocusGapThicknessLogical));
+
+    private int CornerRadius => Math.Max(1, Scale(CornerRadiusLogical));
+
+    private protected override Padding PaddingCore
+        => new(FocusRingThickness + FocusGapThickness + Math.Max(0, Scale(OuterBreathingLogical)));
+
+    public override Rectangle DrawButtonBackground(
+        Graphics graphics,
+        Rectangle bounds,
+        PushButtonState state,
+        bool isDefault,
+        Color backColor)
+    {
+        GraphicsState? saved = graphics.Save();
+        try
+        {
+            graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+            int radius = CornerRadius;
+            using (var brush = backColor.GetCachedSolidBrushScope())
+            {
+                graphics.FillRoundedRectangle(brush, bounds, new Size(radius, radius));
+            }
+
+            // A subtle border for the light, non-default button, matching the WinUI neutral button.
+            if (!IsDark && !isDefault && state != PushButtonState.Disabled)
+            {
+                using var borderPen = s_lightBorder.GetCachedPenScope();
+                Rectangle borderRect = new(bounds.X, bounds.Y, bounds.Width - 1, bounds.Height - 1);
+                graphics.DrawRoundedRectangle(borderPen, borderRect, new Size(radius, radius));
+            }
+        }
+        finally
+        {
+            if (saved is not null)
+            {
+                graphics.Restore(saved);
+            }
+        }
+
+        int inset = Scale(ContentInsetLogical);
+        return Rectangle.Inflate(bounds, -inset, -inset);
+    }
+
+    public override void DrawFocusIndicator(Graphics graphics, Rectangle bounds, bool isDefault)
+    {
+        GraphicsState? saved = graphics.Save();
+        try
+        {
+            graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+            int radius = CornerRadius + FocusGapThickness + FocusRingThickness;
+
+            // Dark gap ring between the focus ring and the button area.
+            Color gapColor = IsDark ? s_darkGap : SystemColors.Window;
+            int gapInset = FocusRingThickness + (FocusGapThickness / 2);
+            Rectangle gapRect = Rectangle.Inflate(bounds, -gapInset, -gapInset);
+            gapRect.Width -= 1;
+            gapRect.Height -= 1;
+            using (var gapPen = gapColor.GetCachedPenScope(FocusGapThickness))
+            {
+                graphics.DrawRoundedRectangle(gapPen, gapRect, new Size(radius, radius));
+            }
+
+            // Outer rounded focus ring.
+            Color ringColor = IsDark ? s_darkFocusRing : SystemColors.WindowText;
+            int ringInset = FocusRingThickness / 2;
+            Rectangle ringRect = Rectangle.Inflate(bounds, -ringInset, -ringInset);
+            ringRect.Width -= 1;
+            ringRect.Height -= 1;
+            using var ringPen = ringColor.GetCachedPenScope(FocusRingThickness);
+            graphics.DrawRoundedRectangle(ringPen, ringRect, new Size(radius + ringInset, radius + ringInset));
+        }
+        finally
+        {
+            if (saved is not null)
+            {
+                graphics.Restore(saved);
+            }
+        }
+    }
+
+    public override Color GetTextColor(PushButtonState state, bool isDefault)
+    {
+        if (state == PushButtonState.Disabled)
+        {
+            return IsDark ? s_darkDisabledText : s_lightDisabledText;
+        }
+
+        if (isDefault)
+        {
+            return IsDark ? s_darkDefaultText : s_lightDefaultText;
+        }
+
+        return IsDark ? s_darkNormalText : s_lightNormalText;
+    }
+
+    public override Color GetBackgroundColor(PushButtonState state, bool isDefault)
+    {
+        if (state == PushButtonState.Disabled)
+        {
+            return IsDark ? s_darkDisabled : s_lightDisabled;
+        }
+
+        if (isDefault)
+        {
+            return IsDark
+                ? state switch
+                {
+                    PushButtonState.Hot => s_darkDefaultHover,
+                    PushButtonState.Pressed => s_darkDefaultPressed,
+                    _ => s_darkDefaultNormal
+                }
+                : state switch
+                {
+                    PushButtonState.Hot => ControlPaint.Light(SystemColors.Highlight, 0.1f),
+                    PushButtonState.Pressed => ControlPaint.Dark(SystemColors.Highlight, 0.1f),
+                    _ => SystemColors.Highlight
+                };
+        }
+
+        return IsDark
+            ? state switch
+            {
+                PushButtonState.Hot => s_darkNormalHover,
+                PushButtonState.Pressed => s_darkNormalPressed,
+                _ => s_darkNormal
+            }
+            : state switch
+            {
+                PushButtonState.Hot => s_lightNormalHover,
+                PushButtonState.Pressed => s_lightNormalPressed,
+                _ => s_lightNormal
+            };
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
index 57526b2644b..fd532dd4d7b 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
@@ -29,6 +29,8 @@ public partial class CheckBox : ButtonBase
     private CheckState _checkState;
     private Appearance _appearance;
 
+    private Rendering.CheckBox.AnimatedToggleSwitchRenderer? _toggleSwitchRenderer;
+
     private int _flatSystemStylePaddingWidth;
     private int _flatSystemStyleMinimumHeight;
 
@@ -80,6 +82,7 @@ public Appearance Appearance
                 // the handle if they differ. Since we hijack FlatStyle.Standard for DarkMode, the transition
                 // between Normal and Button appearance is critical for updating the OwnerDraw flag.
                 UpdateOwnerDraw();
+                UpdateToggleSwitchStyles();
 
                 // If handle wasn't recreated (OwnerDraw state didn't change), refresh the appearance.
                 if (OwnerDraw)
@@ -97,16 +100,44 @@ public Appearance Appearance
     }
 
     private protected override bool OwnerDraw =>
+            // The modern toggle switch is always owner-drawn (so UserPaint is enabled for it).
+            IsToggleSwitchAppearance
+            ||
             // We want NO owner draw ONLY when we're
             // * In Dark Mode
             // * When _then_ the Appearance is Button
             // * But then ONLY when we're rendering with FlatStyle.Standard
             //   (because that would let us usually let us draw with the VisualStyleRenderers,
             //   which cause HighDPI issues in Dark Mode).
-            (!Application.IsDarkModeEnabled
+            ((!Application.IsDarkModeEnabled
                 || Appearance != Appearance.Button
                 || FlatStyle != FlatStyle.Standard)
-                && base.OwnerDraw;
+                && base.OwnerDraw);
+
+    /// <summary>
+    ///  Gets a value indicating whether the check box should render as the modern, animated toggle switch.
+    /// </summary>
+    private bool IsToggleSwitchAppearance
+    {
+        get
+        {
+            return Appearance == Appearance.ToggleSwitch
+                && VisualStylesMode >= VisualStylesMode.Net11
+                && !ThreeState;
+        }
+    }
+
+    private Rendering.CheckBox.AnimatedToggleSwitchRenderer ToggleSwitchRenderer =>
+        _toggleSwitchRenderer ??= new(this, Rendering.CheckBox.ModernCheckBoxStyle.Rounded);
+
+    private void UpdateToggleSwitchStyles()
+    {
+        if (IsToggleSwitchAppearance)
+        {
+            // Owner-paint with WinForms double buffering for a flicker-free, fluent animation.
+            SetStyle(ControlStyles.OptimizedDoubleBuffer | ControlStyles.ResizeRedraw, true);
+        }
+    }
 
     [SRCategory(nameof(SR.CatPropertyChanged))]
     [SRDescription(nameof(SR.CheckBoxOnAppearanceChangedDescr))]
@@ -199,6 +230,14 @@ public CheckState CheckState
                 return;
             }
 
+            // For the animated toggle switch, stop any in-flight animation (leaving the thumb at its current
+            // position) before the state changes, then start a fresh animation toward the new position.
+            bool animateToggleSwitch = IsToggleSwitchAppearance && IsHandleCreated;
+            if (animateToggleSwitch)
+            {
+                ToggleSwitchRenderer.StopAnimation();
+            }
+
             bool oldChecked = Checked;
 
             _checkState = value;
@@ -218,6 +257,11 @@ public CheckState CheckState
             _notifyAccessibilityStateChangedNeeded = !checkedChanged;
             OnCheckStateChanged(EventArgs.Empty);
             _notifyAccessibilityStateChangedNeeded = false;
+
+            if (animateToggleSwitch)
+            {
+                ToggleSwitchRenderer.StartAnimation();
+            }
         }
     }
 
@@ -288,6 +332,17 @@ private void ScaleConstants()
 
     internal override Size GetPreferredSizeCore(Size proposedConstraints)
     {
+        if (IsToggleSwitchAppearance)
+        {
+            int dpiScale = (int)(DeviceDpi / 96f);
+            Size toggleTextSize = TextRenderer.MeasureText(Text, Font);
+            int switchWidth = 50 * dpiScale;
+            int switchHeight = 25 * dpiScale;
+            int totalWidth = toggleTextSize.Width + switchWidth + (20 * dpiScale);
+            int totalHeight = Math.Max(toggleTextSize.Height, switchHeight);
+            return new Size(totalWidth, totalHeight);
+        }
+
         if (Appearance == Appearance.Button)
         {
             ButtonStandardAdapter adapter = new(this);
@@ -497,6 +552,47 @@ protected override void OnHandleCreated(EventArgs e)
         {
             PInvokeCore.SendMessage(this, PInvoke.BM_SETCHECK, (WPARAM)(int)_checkState);
         }
+
+        UpdateToggleSwitchStyles();
+    }
+
+    /// <inheritdoc/>
+    protected override void OnPaint(PaintEventArgs pevent)
+    {
+        if (IsToggleSwitchAppearance)
+        {
+            using GraphicsStateScope scope = new(pevent.Graphics);
+            ToggleSwitchRenderer.RenderControl(pevent.Graphics);
+            return;
+        }
+
+        base.OnPaint(pevent);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnVisualStylesModeChanged(EventArgs e)
+    {
+        base.OnVisualStylesModeChanged(e);
+
+        // Entering or leaving the modern toggle-switch appearance changes whether the control is owner-drawn.
+        UpdateOwnerDraw();
+        UpdateToggleSwitchStyles();
+
+        if (IsHandleCreated)
+        {
+            Invalidate();
+        }
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            _toggleSwitchRenderer?.Dispose();
+            _toggleSwitchRenderer = null;
+        }
+
+        base.Dispose(disposing);
     }
 
     /// <summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index 0ec7ce5fdb5..bec38ade229 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -755,15 +755,20 @@ public event EventHandler? MultilineChanged
         remove => Events.RemoveHandler(s_multilineChangedEvent, value);
     }
 
-    [Browsable(false)]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    [Browsable(true)]
+    [EditorBrowsable(EditorBrowsableState.Always)]
     public new Padding Padding
     {
         get => base.Padding;
         set => base.Padding = value;
     }
 
+    private new bool ShouldSerializePadding()
+        => Padding != DefaultPadding;
+
+    private void ResetPadding()
+        => Padding = DefaultPadding;
+
     [Browsable(false)]
     [EditorBrowsable(EditorBrowsableState.Never)]
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimatedControlRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimatedControlRenderer.cs
new file mode 100644
index 00000000000..7a44245ebb0
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimatedControlRenderer.cs
@@ -0,0 +1,152 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Drawing;
+
+namespace System.Windows.Forms.Rendering.Animation;
+
+/// <summary>
+///  Represents an abstract base class for animated control renderers.
+/// </summary>
+/// <param name="control">The control associated with the renderer.</param>
+internal abstract class AnimatedControlRenderer(Control control) : IDisposable
+{
+    private bool _disposedValue;
+    protected float AnimationProgress = 1;
+
+    /// <summary>
+    ///  Callback for the animation progress. This method is called by the animation manager on each
+    ///  frame tick delivered by <c>HighPrecisionTimer</c>.
+    /// </summary>
+    /// <param name="animationProgress">A fraction between 0 and 1 representing the animation progress.</param>
+    public virtual void AnimationProc(float animationProgress)
+    {
+        AnimationProgress = animationProgress;
+    }
+
+    /// <summary>
+    ///  Called when the control needs to be painted.
+    /// </summary>
+    /// <param name="graphics">The <see cref="Graphics"/> to paint the control.</param>
+    public abstract void RenderControl(Graphics graphics);
+
+    /// <summary>
+    ///  Invalidates the control, causing it to be redrawn, which in turns triggers
+    ///  <see cref="RenderControl(Graphics)"/>.
+    /// </summary>
+    public void Invalidate() => control.Invalidate();
+
+    /// <summary>
+    ///  Starts the animation and gets the animation parameters.
+    /// </summary>
+    public void StartAnimation()
+    {
+        if (IsRunning)
+        {
+            return;
+        }
+
+        // Get the animation parameters.
+        (int animationDuration, AnimationCycle animationCycle) = OnAnimationStarted();
+
+        // Register the renderer with the animation manager.
+        AnimationManager.RegisterOrUpdateAnimationRenderer(
+            this,
+            animationDuration,
+            animationCycle);
+
+        IsRunning = true;
+    }
+
+    internal void StopAnimationInternal() => IsRunning = false;
+
+    public void RestartAnimation()
+    {
+        if (IsRunning)
+        {
+            StopAnimation();
+        }
+
+        StartAnimation();
+    }
+
+    /// <summary>
+    ///  Called in a derived class when the animation starts. The derived class returns the animation duration and cycle type.
+    /// </summary>
+    /// <returns>
+    ///  Tuple containing the animation duration and cycle type.
+    /// </returns>
+    protected abstract (int animationDuration, AnimationCycle animationCycle) OnAnimationStarted();
+
+    /// <summary>
+    ///  Called by the animation manager when the animation ends.
+    /// </summary>
+    internal void EndAnimation()
+    {
+        OnAnimationEnded();
+    }
+
+    /// <summary>
+    ///  Called in a derived class when the animation ends.
+    ///  The derived class can perform any cleanup or state change operations.
+    /// </summary>
+    protected abstract void OnAnimationEnded();
+
+    /// <summary>
+    ///  Can be called by an implementing control, when the animation needs to be stopped or restarted.
+    /// </summary>
+    public void StopAnimation()
+    {
+        AnimationManager.Suspend(this);
+        OnAnimationStopped();
+    }
+
+    /// <summary>
+    ///  Called in the derived class when the animation is stopped.
+    ///  The derived class can perform any cleanup or state change operations.
+    /// </summary>
+    protected abstract void OnAnimationStopped();
+
+    /// <summary>
+    ///  Gets the DPI scale of the control.
+    /// </summary>
+    protected int DpiScale => (int)(control.DeviceDpi / 96f);
+
+    /// <summary>
+    ///  Gets a value indicating whether the animation is running.
+    /// </summary>
+    public bool IsRunning { get; private set; }
+
+    /// <summary>
+    ///  Gets the control associated with the renderer.
+    /// </summary>
+    protected Control Control => control;
+
+    /// <summary>
+    ///  Releases the unmanaged resources used by the <see cref="AnimatedControlRenderer"/> and optionally releases the managed resources.
+    /// </summary>
+    /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_disposedValue)
+        {
+            if (disposing)
+            {
+                // Remove the renderer from the animation manager.
+                AnimationManager.UnregisterAnimationRenderer(this);
+            }
+
+            _disposedValue = true;
+        }
+    }
+
+    /// <summary>
+    ///  Releases all resources used by the <see cref="AnimatedControlRenderer"/>.
+    /// </summary>
+    public void Dispose()
+    {
+        // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method.
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationCycle.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationCycle.cs
new file mode 100644
index 00000000000..0dfac5f12f6
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationCycle.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Animation;
+
+internal enum AnimationCycle
+{
+    Once,
+    Loop,
+    Bounce
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.AnimationRendererItem.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.AnimationRendererItem.cs
new file mode 100644
index 00000000000..dae4505a21b
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.AnimationRendererItem.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Animation;
+
+internal partial class AnimationManager
+{
+    private class AnimationRendererItem
+    {
+        public long StopwatchTarget;
+
+        public AnimationRendererItem(AnimatedControlRenderer renderer, int animationDuration, AnimationCycle animationCycle)
+        {
+            Renderer = renderer;
+            AnimationDuration = animationDuration;
+            AnimationCycle = animationCycle;
+        }
+
+        public AnimatedControlRenderer Renderer { get; }
+        public int AnimationDuration { get; set; }
+        public int FrameCount { get; set; }
+        public AnimationCycle AnimationCycle { get; set; }
+        public int FrameOffset { get; set; } = 1;
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.cs
new file mode 100644
index 00000000000..9cfc01ce919
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Animation/AnimationManager.cs
@@ -0,0 +1,154 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Concurrent;
+using System.Windows.Forms.Animation;
+
+namespace System.Windows.Forms.Rendering.Animation;
+
+/// <summary>
+///  Process-wide dispatcher that drives all <see cref="AnimatedControlRenderer"/> instances from a single
+///  <c>HighPrecisionTimer</c> registration.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The frame cadence is provided by <c>HighPrecisionTimer</c> (60 Hz where supported, otherwise 30 Hz).
+///   Because that timer marshals its callback back to the <see cref="SynchronizationContext"/> captured when this
+///   manager was constructed, the per-frame work runs on the UI thread and can invalidate controls directly.
+///  </para>
+/// </remarks>
+internal partial class AnimationManager
+{
+    private readonly Stopwatch _stopwatch;
+    private readonly HighPrecisionTimer.TimerRegistration _timerRegistration;
+
+    private readonly ConcurrentDictionary<AnimatedControlRenderer, AnimationRendererItem> _renderer = [];
+
+    private static AnimationManager? s_instance;
+
+    private static AnimationManager Instance
+        => s_instance ??= new AnimationManager();
+
+    private AnimationManager()
+    {
+        _stopwatch = Stopwatch.StartNew();
+
+        // HighPrecisionTimer captures the current SynchronizationContext and posts each tick back to it,
+        // so OnFrameTickAsync runs on the UI thread. A SynchronizationContext is expected here because the
+        // first animation is always started from the UI thread.
+        _timerRegistration = HighPrecisionTimer.Register(OnFrameTickAsync);
+
+        Application.ApplicationExit += (sender, e) => DisposeRenderer();
+    }
+
+    /// <summary>
+    ///  Disposes the animation renderers and releases the timer registration.
+    /// </summary>
+    private void DisposeRenderer()
+    {
+        // Stop the timer.
+        _timerRegistration.Dispose();
+
+        foreach (AnimatedControlRenderer renderer in _renderer.Keys)
+        {
+            renderer.Dispose();
+        }
+    }
+
+    /// <summary>
+    ///  Registers an animation renderer.
+    /// </summary>
+    /// <param name="animationRenderer">The animation renderer to register.</param>
+    /// <param name="animationDuration">The duration of the animation.</param>
+    /// <param name="animationCycle">The animation cycle.</param>
+    public static void RegisterOrUpdateAnimationRenderer(
+        AnimatedControlRenderer animationRenderer,
+        int animationDuration,
+        AnimationCycle animationCycle)
+    {
+        // If the renderer is already registered, update the animation parameters.
+        if (Instance._renderer.TryGetValue(animationRenderer, out AnimationRendererItem? renderItem))
+        {
+            renderItem.StopwatchTarget = Instance._stopwatch.ElapsedMilliseconds + animationDuration;
+            renderItem.AnimationDuration = animationDuration;
+            renderItem.AnimationCycle = animationCycle;
+
+            return;
+        }
+
+        renderItem = new AnimationRendererItem(animationRenderer, animationDuration, animationCycle)
+        {
+            StopwatchTarget = Instance._stopwatch.ElapsedMilliseconds + animationDuration,
+        };
+
+        _ = Instance._renderer.TryAdd(animationRenderer, renderItem);
+    }
+
+    /// <summary>
+    ///  Unregisters an animation renderer.
+    /// </summary>
+    /// <param name="animationRenderer">The animation renderer to unregister.</param>
+    internal static void UnregisterAnimationRenderer(AnimatedControlRenderer animationRenderer)
+    {
+        _ = Instance._renderer.TryRemove(animationRenderer, out _);
+    }
+
+    internal static void Suspend(AnimatedControlRenderer animatedControlRenderer)
+    {
+        if (Instance._renderer.TryGetValue(animatedControlRenderer, out AnimationRendererItem? renderItem))
+        {
+            renderItem.Renderer.StopAnimationInternal();
+        }
+    }
+
+    /// <summary>
+    ///  Handles a single frame tick delivered by <c>HighPrecisionTimer</c> (on the UI thread).
+    /// </summary>
+    private ValueTask OnFrameTickAsync(HighPrecisionTimerTick tick, CancellationToken cancellationToken)
+    {
+        long elapsedStopwatchMilliseconds = _stopwatch.ElapsedMilliseconds;
+
+        foreach (AnimationRendererItem item in _renderer.Values)
+        {
+            if (!item.Renderer.IsRunning)
+            {
+                continue;
+            }
+
+            long remainingAnimationMilliseconds = item.StopwatchTarget - elapsedStopwatchMilliseconds;
+
+            item.FrameCount += item.FrameOffset;
+
+            if (elapsedStopwatchMilliseconds >= item.StopwatchTarget)
+            {
+                switch (item.AnimationCycle)
+                {
+                    case AnimationCycle.Once:
+                        item.Renderer.EndAnimation();
+                        break;
+
+                    case AnimationCycle.Loop:
+                        item.FrameCount = 0;
+                        item.StopwatchTarget = elapsedStopwatchMilliseconds + item.AnimationDuration;
+                        item.Renderer.RestartAnimation();
+                        break;
+
+                    case AnimationCycle.Bounce:
+                        item.FrameOffset = -item.FrameOffset;
+                        item.StopwatchTarget = elapsedStopwatchMilliseconds + item.AnimationDuration;
+                        item.Renderer.RestartAnimation();
+                        break;
+                }
+
+                continue;
+            }
+
+            float progress = 1 - (remainingAnimationMilliseconds / (float)item.AnimationDuration);
+
+            // We are already on the UI thread (HighPrecisionTimer marshalled us here), so invoke directly.
+            item.Renderer.AnimationProc(progress);
+        }
+
+        return ValueTask.CompletedTask;
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs
new file mode 100644
index 00000000000..7e0c92054e0
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs
@@ -0,0 +1,140 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms.Rendering.Animation;
+
+namespace System.Windows.Forms.Rendering.CheckBox;
+
+/// <summary>
+///  Renders and animates a <see cref="Forms.CheckBox"/> in <see cref="Appearance.ToggleSwitch"/> mode.
+///  Used when <see cref="Control.VisualStylesMode"/> is <see cref="VisualStylesMode.Net11"/> or later.
+/// </summary>
+internal sealed class AnimatedToggleSwitchRenderer : AnimatedControlRenderer
+{
+    private const int AnimationDuration = 300; // milliseconds
+    private const int SwitchWidthLogical = 50;
+    private const int SwitchHeightLogical = 25;
+    private const int CircleDiameterLogical = 20;
+    private const int TextGapLogical = 10;
+
+    private readonly ModernCheckBoxStyle _switchStyle;
+
+    public AnimatedToggleSwitchRenderer(Control control, ModernCheckBoxStyle switchStyle)
+        : base(control)
+    {
+        _switchStyle = switchStyle;
+    }
+
+    private Forms.CheckBox CheckBox => (Forms.CheckBox)Control;
+
+    public override void AnimationProc(float animationProgress)
+    {
+        base.AnimationProc(animationProgress);
+        Invalidate();
+    }
+
+    protected override (int animationDuration, AnimationCycle animationCycle) OnAnimationStarted()
+    {
+        AnimationProgress = 1;
+
+        return (AnimationDuration, AnimationCycle.Once);
+    }
+
+    /// <summary>
+    ///  Called from the control's <c>OnPaint</c>. Works both while the animation is running (driven by
+    ///  <see cref="AnimationProc"/>) and when it is settled (progress is 1).
+    /// </summary>
+    /// <param name="graphics">The graphics object to render into.</param>
+    public override void RenderControl(Graphics graphics)
+    {
+        int dpiScale = DpiScale;
+
+        int switchWidth = SwitchWidthLogical * dpiScale;
+        int switchHeight = SwitchHeightLogical * dpiScale;
+        int circleDiameter = CircleDiameterLogical * dpiScale;
+        int textGap = TextGapLogical * dpiScale;
+
+        Size textSize = TextRenderer.MeasureText(Control.Text, Control.Font);
+
+        int totalHeight = Math.Max(textSize.Height, switchHeight);
+        int switchY = (totalHeight - switchHeight) / 2;
+        int textY = (totalHeight - textSize.Height) / 2;
+
+        graphics.Clear(Control.BackColor);
+
+        switch (CheckBox.TextAlign)
+        {
+            case ContentAlignment.MiddleLeft:
+            case ContentAlignment.TopLeft:
+            case ContentAlignment.BottomLeft:
+                RenderSwitch(graphics, new Rectangle(textSize.Width + textGap, switchY, switchWidth, switchHeight), circleDiameter);
+                RenderText(graphics, new Point(0, textY));
+                break;
+
+            default:
+                RenderSwitch(graphics, new Rectangle(0, switchY, switchWidth, switchHeight), circleDiameter);
+                RenderText(graphics, new Point(switchWidth + textGap, textY));
+                break;
+        }
+    }
+
+    private void RenderText(Graphics graphics, Point position) =>
+        TextRenderer.DrawText(graphics, CheckBox.Text, CheckBox.Font, position, CheckBox.ForeColor);
+
+    private void RenderSwitch(Graphics graphics, Rectangle rect, int circleDiameter)
+    {
+        // The background color flips at 80% of the animation so the thumb travels visibly before the color change.
+        Color backgroundColor = CheckBox.Checked ^ (AnimationProgress < 0.8f)
+            ? SystemColors.Highlight
+            : SystemColors.ControlDark;
+
+        Color circleColor = SystemColors.ControlText;
+
+        // Works both for the running and settled states (settled progress is 1, so the thumb rests in place).
+        float circlePosition = CheckBox.Checked
+            ? (rect.Width - circleDiameter) * (1 - EaseOut(AnimationProgress))
+            : (rect.Width - circleDiameter) * EaseOut(AnimationProgress);
+
+        using var backgroundBrush = backgroundColor.GetCachedSolidBrushScope();
+        using var circleBrush = circleColor.GetCachedSolidBrushScope();
+        using var backgroundPen = SystemColors.WindowFrame.GetCachedPenScope(2 * DpiScale);
+
+        graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+        if (_switchStyle == ModernCheckBoxStyle.Rounded)
+        {
+            float radius = rect.Height / 2f;
+
+            using GraphicsPath path = new();
+            path.AddArc(rect.X, rect.Y, radius * 2, radius * 2, 180, 90);
+            path.AddArc(rect.Right - radius * 2, rect.Y, radius * 2, radius * 2, 270, 90);
+            path.AddArc(rect.Right - radius * 2, rect.Bottom - radius * 2, radius * 2, radius * 2, 0, 90);
+            path.AddArc(rect.X, rect.Bottom - radius * 2, radius * 2, radius * 2, 90, 90);
+            path.CloseFigure();
+
+            graphics.FillPath(backgroundBrush, path);
+            graphics.DrawPath(backgroundPen, path);
+        }
+        else
+        {
+            graphics.FillRectangle(backgroundBrush, rect);
+            graphics.DrawRectangle(backgroundPen, rect);
+        }
+
+        graphics.FillEllipse(circleBrush, rect.X + circlePosition, rect.Y + (2.5f * DpiScale), circleDiameter, circleDiameter);
+
+        static float EaseOut(float t) => (1 - t) * (1 - t);
+    }
+
+    protected override void OnAnimationStopped()
+    {
+        AnimationProgress = 0;
+    }
+
+    protected override void OnAnimationEnded()
+    {
+        AnimationProgress = 1;
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/ModernCheckBoxStyle.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/ModernCheckBoxStyle.cs
new file mode 100644
index 00000000000..32f35518ed3
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/ModernCheckBoxStyle.cs
@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.CheckBox;
+
+internal enum ModernCheckBoxStyle
+{
+    Rectangular,
+    Rounded
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
new file mode 100644
index 00000000000..2658846d23e
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms;
+
+/// <summary>
+///  Represents the version of the visual renderer that a control or the application uses.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The visual styles version controls how a control renders its adorners, borders, and layout.
+///   Newer versions can adjust minimum sizes, padding, and margins to satisfy current accessibility
+///   requirements without changing the behavior of applications that target an earlier version.
+///  </para>
+/// </remarks>
+public enum VisualStylesMode : short
+{
+    /// <summary>
+    ///  The classic version of the visual renderer (.NET 8 and earlier), based on version 6 of the
+    ///  common controls library.
+    /// </summary>
+    Classic = 0,
+
+    /// <summary>
+    ///  Visual renderers are not in use - see <see cref="Application.UseVisualStyles"/>.
+    ///  Controls are based on version 5 of the common controls library.
+    /// </summary>
+    Disabled = 1,
+
+    /// <summary>
+    ///  The .NET 11 version of the visual renderer. Controls are rendered using the latest version
+    ///  of the common controls library, and the adorner rendering or the layout of specific controls
+    ///  has been improved based on the latest accessibility requirements.
+    /// </summary>
+    Net11 = 2,
+
+    /// <summary>
+    ///  The latest version of the visual renderer available in the running framework.
+    /// </summary>
+    Latest = short.MaxValue
+}
diff --git a/src/test/integration/WinformsControlsTest/Buttons.cs b/src/test/integration/WinformsControlsTest/Buttons.cs
index b6b9836c74f..a369b841659 100644
--- a/src/test/integration/WinformsControlsTest/Buttons.cs
+++ b/src/test/integration/WinformsControlsTest/Buttons.cs
@@ -119,6 +119,14 @@ protected override void OnLoad(EventArgs e)
             column: 1,
             row: 1);
 
+        Button visualStylesButton = new()
+        {
+            AutoSize = true,
+            Text = "VisualStyles Buttons\u2026"
+        };
+        visualStylesButton.Click += (s, _) => new VisualStylesButtons().Show(this);
+        table.Controls.Add(visualStylesButton, column: 2, row: 1);
+
         base.OnLoad(e);
     }
 }
diff --git a/src/test/integration/WinformsControlsTest/VisualStylesButtons.cs b/src/test/integration/WinformsControlsTest/VisualStylesButtons.cs
new file mode 100644
index 00000000000..41fc06292f6
--- /dev/null
+++ b/src/test/integration/WinformsControlsTest/VisualStylesButtons.cs
@@ -0,0 +1,193 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+using System.Drawing;
+
+namespace WinFormsControlsTest;
+
+/// <summary>
+///  Exploratory-testing harness for the conservative and modern (.NET 11 VisualStyles) button renderers.
+///  Toggle the "Modern visual styles" check box to flip every sample button between
+///  <see cref="VisualStylesMode.Classic"/> and <see cref="VisualStylesMode.Net11"/> at runtime.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The application-wide color mode (Classic/Dark) is a start-up, set-once setting, so to evaluate the dark
+///   palette the host application must be started in dark mode. The modern vs. conservative look, however, is
+///   driven by the per-control <see cref="VisualStylesMode"/> ambient property and can be toggled live here.
+///  </para>
+/// </remarks>
+[DesignerCategory("Default")]
+public sealed class VisualStylesButtons : Form
+{
+    private static readonly FlatStyle[] s_styles =
+    [
+        FlatStyle.Standard,
+        FlatStyle.Flat,
+        FlatStyle.Popup,
+        FlatStyle.System
+    ];
+
+    private readonly List<Button> _sampleButtons = [];
+    private readonly List<CheckBox> _sampleToggles = [];
+    private readonly CheckBox _modernToggle;
+
+    public VisualStylesButtons()
+    {
+        Text = "VisualStyles Buttons (exploratory)";
+        Size = new Size(900, 640);
+        Padding = new Padding(8);
+
+        _modernToggle = new CheckBox
+        {
+            Text = "Modern visual styles (.NET 11)",
+            AutoSize = true,
+            Dock = DockStyle.Top,
+            Padding = new Padding(4)
+        };
+        _modernToggle.CheckedChanged += OnModernToggleChanged;
+    }
+
+    protected override void OnLoad(EventArgs e)
+    {
+        TableLayoutPanel table = new()
+        {
+            Dock = DockStyle.Fill,
+            ColumnCount = s_styles.Length + 1,
+            AutoScroll = true
+        };
+
+        string[] scenarios =
+        [
+            "Normal",
+            "Default (Accept)",
+            "Disabled",
+            "With Image",
+            "With BackgroundImage",
+            "FlatAppearance",
+            "AutoSize + AutoEllipsis"
+        ];
+
+        table.RowCount = scenarios.Length + 1;
+
+        // Header row.
+        table.Controls.Add(new Label { Text = "Scenario \\ FlatStyle", AutoSize = true, Font = new Font(Font, FontStyle.Bold) }, 0, 0);
+        for (int c = 0; c < s_styles.Length; c++)
+        {
+            table.Controls.Add(
+                new Label { Text = s_styles[c].ToString(), AutoSize = true, Font = new Font(Font, FontStyle.Bold) },
+                c + 1,
+                0);
+        }
+
+        Bitmap image = SystemIcons.GetStockIcon(StockIconId.DesktopPC).ToBitmap();
+
+        for (int r = 0; r < scenarios.Length; r++)
+        {
+            table.Controls.Add(new Label { Text = scenarios[r], AutoSize = true }, 0, r + 1);
+
+            for (int c = 0; c < s_styles.Length; c++)
+            {
+                Button button = CreateSampleButton(scenarios[r], s_styles[c], image);
+                _sampleButtons.Add(button);
+                table.Controls.Add(button, c + 1, r + 1);
+
+                // Use the first "Default (Accept)" Standard button as the form's accept button.
+                if (scenarios[r].StartsWith("Default", StringComparison.Ordinal) && s_styles[c] == FlatStyle.Standard)
+                {
+                    AcceptButton = button;
+                }
+            }
+        }
+
+        Controls.Add(table);
+        Controls.Add(BuildToggleSwitchPanel());
+        Controls.Add(_modernToggle);
+
+        base.OnLoad(e);
+    }
+
+    private FlowLayoutPanel BuildToggleSwitchPanel()
+    {
+        FlowLayoutPanel panel = new()
+        {
+            Dock = DockStyle.Bottom,
+            AutoSize = true,
+            FlowDirection = FlowDirection.LeftToRight,
+            Padding = new Padding(4)
+        };
+
+        panel.Controls.Add(new Label { Text = "Toggle switches:", AutoSize = true, Padding = new Padding(0, 6, 8, 0) });
+
+        foreach (string caption in new[] { "Wi\u2011Fi", "Bluetooth (off)", "Airplane mode" })
+        {
+            CheckBox toggle = new()
+            {
+                Appearance = Appearance.ToggleSwitch,
+                AutoSize = true,
+                Text = caption,
+                Checked = !caption.Contains("off", StringComparison.OrdinalIgnoreCase),
+                Margin = new Padding(8, 4, 8, 4)
+            };
+
+            _sampleToggles.Add(toggle);
+            panel.Controls.Add(toggle);
+        }
+
+        return panel;
+    }
+
+    private Button CreateSampleButton(string scenario, FlatStyle style, Bitmap image)
+    {
+        Button button = new()
+        {
+            FlatStyle = style,
+            Text = scenario == "AutoSize + AutoEllipsis" ? "A rather long button caption" : "Go to",
+            Margin = new Padding(6)
+        };
+
+        switch (scenario)
+        {
+            case "Disabled":
+                button.Enabled = false;
+                break;
+            case "With Image":
+                button.Image = image;
+                button.TextImageRelation = TextImageRelation.ImageBeforeText;
+                break;
+            case "With BackgroundImage":
+                button.BackgroundImage = image;
+                button.BackgroundImageLayout = ImageLayout.Center;
+                break;
+            case "FlatAppearance":
+                button.FlatAppearance.BorderColor = Color.MediumPurple;
+                button.FlatAppearance.BorderSize = 2;
+                button.FlatAppearance.MouseOverBackColor = Color.MediumPurple;
+                button.FlatAppearance.MouseDownBackColor = Color.Indigo;
+                break;
+            case "AutoSize + AutoEllipsis":
+                button.AutoSize = false;
+                button.AutoEllipsis = true;
+                button.Size = new Size(90, 28);
+                break;
+        }
+
+        return button;
+    }
+
+    private void OnModernToggleChanged(object? sender, EventArgs e)
+    {
+        VisualStylesMode mode = _modernToggle.Checked ? VisualStylesMode.Net11 : VisualStylesMode.Classic;
+        foreach (Button button in _sampleButtons)
+        {
+            button.VisualStylesMode = mode;
+        }
+
+        foreach (CheckBox toggle in _sampleToggles)
+        {
+            toggle.VisualStylesMode = mode;
+        }
+    }
+}
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/AnimatedControlRendererTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/AnimatedControlRendererTests.cs
new file mode 100644
index 00000000000..184ecac0a60
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/AnimatedControlRendererTests.cs
@@ -0,0 +1,89 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.Drawing;
+using System.Windows.Forms.Rendering.Animation;
+
+namespace System.Windows.Forms.Tests;
+
+// NOTE: AnimationManager is a process-wide singleton driven by the real HighPrecisionTimer
+// (which raises the system timer resolution and starts a background loop). To keep these unit
+// tests deterministic and free of process-wide side effects, they exercise the
+// AnimatedControlRenderer contract that does NOT touch AnimationManager. Start/stop/cycle
+// behavior is covered by the control-level tests and manual exploratory testing.
+public class AnimatedControlRendererTests
+{
+    [WinFormsFact]
+    public void AnimatedControlRenderer_DefaultIsRunning_IsFalse()
+    {
+        using Control control = new();
+        using SubAnimatedControlRenderer renderer = new(control);
+
+        Assert.False(renderer.IsRunning);
+    }
+
+    [WinFormsTheory]
+    [InlineData(0f)]
+    [InlineData(0.5f)]
+    [InlineData(1f)]
+    public void AnimatedControlRenderer_AnimationProc_StoresProgress(float progress)
+    {
+        using Control control = new();
+        using SubAnimatedControlRenderer renderer = new(control);
+
+        renderer.AnimationProc(progress);
+
+        Assert.Equal(progress, renderer.AnimationProgressAccessor);
+    }
+
+    [WinFormsFact]
+    public void AnimatedControlRenderer_Invalidate_InvalidatesControl()
+    {
+        using SubControl control = new();
+        control.CreateControl();
+        using SubAnimatedControlRenderer renderer = new(control);
+
+        int invalidatedCount = 0;
+        control.Invalidated += (s, e) => invalidatedCount++;
+
+        renderer.Invalidate();
+
+        Assert.True(invalidatedCount >= 1);
+    }
+
+    [WinFormsFact]
+    public void AnimatedControlRenderer_Dispose_DoesNotThrow_WhenNeverStarted()
+    {
+        using Control control = new();
+        SubAnimatedControlRenderer renderer = new(control);
+
+        // Never started, so this must not require the AnimationManager singleton.
+        renderer.Dispose();
+    }
+
+    private sealed class SubControl : Control
+    {
+    }
+
+    private sealed class SubAnimatedControlRenderer(Control control) : AnimatedControlRenderer(control)
+    {
+        public float AnimationProgressAccessor => AnimationProgress;
+
+        public override void RenderControl(Graphics graphics)
+        {
+        }
+
+        protected override (int animationDuration, AnimationCycle animationCycle) OnAnimationStarted()
+            => (100, AnimationCycle.Once);
+
+        protected override void OnAnimationEnded()
+        {
+        }
+
+        protected override void OnAnimationStopped()
+        {
+        }
+    }
+}
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ButtonVisualStylesTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ButtonVisualStylesTests.cs
new file mode 100644
index 00000000000..b273f541de6
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ButtonVisualStylesTests.cs
@@ -0,0 +1,76 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.Drawing;
+
+namespace System.Windows.Forms.Tests;
+
+// Behavioral tests for the modern/conservative button renderers driven by VisualStylesMode. Renderer
+// selection itself is internal; these tests exercise the public surface and ensure the owner-drawn paths
+// do not throw. The visuals are verified through the WinformsControlsTest exploratory harness.
+public class ButtonVisualStylesTests
+{
+    [WinFormsTheory]
+    [InlineData(FlatStyle.Standard)]
+    [InlineData(FlatStyle.Flat)]
+    [InlineData(FlatStyle.Popup)]
+    [InlineData(FlatStyle.System)]
+    public void Button_VisualStylesMode_Net11_DoesNotThrowOnPaint(FlatStyle flatStyle)
+    {
+        using Button button = new()
+        {
+            FlatStyle = flatStyle,
+            VisualStylesMode = VisualStylesMode.Net11,
+            Text = "Go to",
+            Size = new Size(120, 32)
+        };
+
+        button.CreateControl();
+
+        using Bitmap bitmap = new(button.Width, button.Height);
+        button.DrawToBitmap(bitmap, new Rectangle(Point.Empty, button.Size));
+
+        Assert.Equal(VisualStylesMode.Net11, button.VisualStylesMode);
+    }
+
+    [WinFormsTheory]
+    [InlineData(FlatStyle.Standard)]
+    [InlineData(FlatStyle.Flat)]
+    [InlineData(FlatStyle.Popup)]
+    public void Button_VisualStylesMode_Net11_WithImageRenders(FlatStyle flatStyle)
+    {
+        using Bitmap image = new(16, 16);
+        using Button button = new()
+        {
+            FlatStyle = flatStyle,
+            VisualStylesMode = VisualStylesMode.Net11,
+            Text = "Go to",
+            Image = image,
+            Size = new Size(120, 32)
+        };
+
+        button.CreateControl();
+
+        using Bitmap bitmap = new(button.Width, button.Height);
+
+        // Should not throw with an image in any owner-drawn flat style.
+        button.DrawToBitmap(bitmap, new Rectangle(Point.Empty, button.Size));
+    }
+
+    [WinFormsFact]
+    public void Button_VisualStylesMode_ChangedToNet11_Invalidates()
+    {
+        using Button button = new() { Text = "Go to", Size = new Size(120, 32) };
+        button.CreateControl();
+
+        int invalidatedCount = 0;
+        button.Invalidated += (s, e) => invalidatedCount++;
+
+        button.VisualStylesMode = VisualStylesMode.Net11;
+
+        Assert.True(invalidatedCount >= 1);
+        Assert.Equal(VisualStylesMode.Net11, button.VisualStylesMode);
+    }
+}
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
new file mode 100644
index 00000000000..9d2667dbe84
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
@@ -0,0 +1,84 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+namespace System.Windows.Forms.Tests;
+
+// Behavioral tests for the modern toggle-switch CheckBox (Appearance.ToggleSwitch + VisualStylesMode.Net11).
+// These use only public surface so they remain stable; the rendering/animation itself is verified through
+// the WinformsControlsTest exploratory harness.
+public class CheckBoxToggleSwitchTests
+{
+    [WinFormsFact]
+    public void CheckBox_Appearance_ToggleSwitch_RoundTrips()
+    {
+        using CheckBox checkBox = new() { Appearance = Appearance.ToggleSwitch };
+
+        Assert.Equal(Appearance.ToggleSwitch, checkBox.Appearance);
+    }
+
+    [WinFormsFact]
+    public void CheckBox_ToggleSwitch_WithVisualStylesNet11_HasPositivePreferredSize()
+    {
+        using CheckBox checkBox = new()
+        {
+            VisualStylesMode = VisualStylesMode.Net11,
+            Appearance = Appearance.ToggleSwitch,
+            Text = "Toggle"
+        };
+
+        Size preferred = checkBox.GetPreferredSize(Size.Empty);
+
+        Assert.True(preferred.Width > 0);
+        Assert.True(preferred.Height > 0);
+    }
+
+    [WinFormsFact]
+    public void CheckBox_ToggleSwitch_CheckedRoundTrips()
+    {
+        using CheckBox checkBox = new()
+        {
+            VisualStylesMode = VisualStylesMode.Net11,
+            Appearance = Appearance.ToggleSwitch
+        };
+
+        Assert.False(checkBox.Checked);
+
+        checkBox.Checked = true;
+        Assert.True(checkBox.Checked);
+        Assert.Equal(CheckState.Checked, checkBox.CheckState);
+
+        checkBox.Checked = false;
+        Assert.False(checkBox.Checked);
+        Assert.Equal(CheckState.Unchecked, checkBox.CheckState);
+    }
+
+    [WinFormsFact]
+    public void CheckBox_ToggleSwitch_CheckStateChanged_Raised()
+    {
+        using CheckBox checkBox = new()
+        {
+            VisualStylesMode = VisualStylesMode.Net11,
+            Appearance = Appearance.ToggleSwitch
+        };
+
+        int callCount = 0;
+        checkBox.CheckStateChanged += (s, e) => callCount++;
+
+        checkBox.CheckState = CheckState.Checked;
+        Assert.Equal(1, callCount);
+
+        // Setting the same value does not raise the event.
+        checkBox.CheckState = CheckState.Checked;
+        Assert.Equal(1, callCount);
+    }
+
+    [WinFormsFact]
+    public void CheckBox_VisualStylesMode_DefaultIsAmbient()
+    {
+        using CheckBox checkBox = new();
+
+        Assert.Equal(Application.DefaultVisualStylesMode, checkBox.VisualStylesMode);
+    }
+}
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
new file mode 100644
index 00000000000..54f97540903
--- /dev/null
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
@@ -0,0 +1,143 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.ComponentModel;
+
+namespace System.Windows.Forms.Tests;
+
+public partial class ControlTests
+{
+    [WinFormsFact]
+    public void Control_VisualStylesMode_DefaultMatchesApplicationDefault()
+    {
+        using SubControlWithVisualStyles control = new();
+
+        // With no parent and no explicit value, the control inherits the application-wide default.
+        Assert.Equal(Application.DefaultVisualStylesMode, control.VisualStylesMode);
+        Assert.Equal(Application.DefaultVisualStylesMode, control.DefaultVisualStylesModeAccessor);
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsFact]
+    public void Control_VisualStylesMode_Set_GetReturnsExpected()
+    {
+        using SubControlWithVisualStyles control = new() { VisualStylesMode = VisualStylesMode.Net11 };
+        Assert.Equal(VisualStylesMode.Net11, control.VisualStylesMode);
+        Assert.False(control.IsHandleCreated);
+
+        // Set the same value again - idempotent, no handle forced.
+        control.VisualStylesMode = VisualStylesMode.Net11;
+        Assert.Equal(VisualStylesMode.Net11, control.VisualStylesMode);
+        Assert.False(control.IsHandleCreated);
+    }
+
+    [WinFormsTheory]
+    [InlineData((VisualStylesMode)(-1))]
+    [InlineData((VisualStylesMode)999)]
+    public void Control_VisualStylesMode_SetInvalid_ThrowsInvalidEnumArgumentException(VisualStylesMode value)
+    {
+        using SubControlWithVisualStyles control = new();
+        Assert.Throws<InvalidEnumArgumentException>(() => control.VisualStylesMode = value);
+    }
+
+    [WinFormsFact]
+    public void Control_VisualStylesMode_SetWithHandler_CallsVisualStylesModeChanged()
+    {
+        using SubControlWithVisualStyles control = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(control, sender);
+            Assert.Same(EventArgs.Empty, e);
+            callCount++;
+        };
+
+        control.VisualStylesModeChanged += handler;
+
+        // Set a different value - the event fires.
+        control.VisualStylesMode = VisualStylesMode.Net11;
+        Assert.Equal(VisualStylesMode.Net11, control.VisualStylesMode);
+        Assert.Equal(1, callCount);
+
+        // Set the same value - the event does not fire.
+        control.VisualStylesMode = VisualStylesMode.Net11;
+        Assert.Equal(1, callCount);
+
+        // Set another different value - the event fires again.
+        control.VisualStylesMode = VisualStylesMode.Disabled;
+        Assert.Equal(2, callCount);
+
+        // Remove the handler - the event no longer reaches it.
+        control.VisualStylesModeChanged -= handler;
+        control.VisualStylesMode = VisualStylesMode.Net11;
+        Assert.Equal(2, callCount);
+    }
+
+    [WinFormsTheory]
+    [NewAndDefaultData<EventArgs>]
+    public void Control_OnVisualStylesModeChanged_Invoke_CallsVisualStylesModeChanged(EventArgs eventArgs)
+    {
+        using SubControlWithVisualStyles control = new();
+        int callCount = 0;
+        EventHandler handler = (sender, e) =>
+        {
+            Assert.Same(control, sender);
+            Assert.Same(eventArgs, e);
+            callCount++;
+        };
+
+        // Call with the handler subscribed.
+        control.VisualStylesModeChanged += handler;
+        control.OnVisualStylesModeChanged(eventArgs);
+        Assert.Equal(1, callCount);
+
+        // Remove the handler - still callable, but the handler is not invoked.
+        control.VisualStylesModeChanged -= handler;
+        control.OnVisualStylesModeChanged(eventArgs);
+        Assert.Equal(1, callCount);
+    }
+
+    [WinFormsFact]
+    public void Control_VisualStylesMode_AmbientBehaviorTest()
+    {
+        using SubControlWithVisualStyles parent = new();
+        using SubControlWithVisualStyles child = new();
+        parent.Controls.Add(child);
+
+        // Setting the parent propagates to the child, which has no explicit value.
+        parent.VisualStylesMode = VisualStylesMode.Net11;
+        Assert.Equal(VisualStylesMode.Net11, parent.VisualStylesMode);
+        Assert.Equal(VisualStylesMode.Net11, child.VisualStylesMode);
+
+        // The child can override the inherited value.
+        child.VisualStylesMode = VisualStylesMode.Disabled;
+        Assert.Equal(VisualStylesMode.Disabled, child.VisualStylesMode);
+        Assert.Equal(VisualStylesMode.Net11, parent.VisualStylesMode);
+
+        // Setting the child back to the parent's value makes it ambient again, so a later
+        // change on the parent flows through to the child once more.
+        child.VisualStylesMode = VisualStylesMode.Net11;
+        Assert.Equal(VisualStylesMode.Net11, child.VisualStylesMode);
+
+        parent.VisualStylesMode = VisualStylesMode.Classic;
+        Assert.Equal(VisualStylesMode.Classic, parent.VisualStylesMode);
+        Assert.Equal(VisualStylesMode.Classic, child.VisualStylesMode);
+    }
+
+    [WinFormsFact]
+    public void Appearance_ToggleSwitch_HasExpectedValue()
+    {
+        Assert.Equal(2, (int)Appearance.ToggleSwitch);
+    }
+
+    private class SubControlWithVisualStyles : Control
+    {
+        public VisualStylesMode DefaultVisualStylesModeAccessor => base.DefaultVisualStylesMode;
+
+        public new void OnVisualStylesModeChanged(EventArgs e) => base.OnVisualStylesModeChanged(e);
+
+        public new void OnParentVisualStylesModeChanged(EventArgs e) => base.OnParentVisualStylesModeChanged(e);
+    }
+}

From 9cae2d9a599bba34d2866f41efaa2a053773eeef Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Sun, 14 Jun 2026 09:03:04 -0700
Subject: [PATCH 26/50] Fix minor test issue.

---
 .../WindowsFormsApplicationBase.vb            |  2 -
 .../Animation/HighPrecisionTimerTests.cs      |  6 +-
 .../Forms/Controls/TextBox/TextBoxBase.cs     | 62 ++++++-------------
 .../Forms/CheckBoxToggleSwitchTests.cs        |  4 +-
 4 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
index 9bf787859f0..bef5612714a 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
@@ -3,7 +3,6 @@
 
 Imports System.Collections.ObjectModel
 Imports System.ComponentModel
-Imports System.Diagnostics.CodeAnalysis
 Imports System.IO.Pipes
 Imports System.Reflection
 Imports System.Runtime.CompilerServices
@@ -11,7 +10,6 @@ Imports System.Runtime.InteropServices
 Imports System.Security
 Imports System.Threading
 Imports System.Windows.Forms
-Imports System.Windows.Forms.Analyzers.Diagnostics
 
 Imports VbUtils = Microsoft.VisualBasic.CompilerServices.ExceptionUtils
 
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs
index b577b820494..89d031dc1ca 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Animation/HighPrecisionTimerTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Concurrent;
@@ -111,7 +111,7 @@ public async Task SlowConsumer_DropsFramesInsteadOfQueuing()
             {
                 ticks.Add(tick);
                 // Simulate slow rendering (well over one frame time).
-                await Task.Delay((int)(HighPrecisionTimer.TargetFrameTimeMs * 3), ct);
+                await Task.Delay((int)(HighPrecisionTimer.TargetFrameTimeMs * 3), ct).ConfigureAwait(false);
             });
 
         await WaitForAsync(() => ticks.Sum(t => t.DroppedFrames) > 0, timeoutMs: 4000);
@@ -214,7 +214,7 @@ private static async Task WaitForAsync(Func<bool> condition, int timeoutMs = 500
                 throw new TimeoutException("Timed out waiting for the expected timer ticks.");
             }
 
-            await Task.Delay(25, TestContext.Current.CancellationToken);
+            await Task.Delay(25, TestContext.Current.CancellationToken).ConfigureAwait(false);
         }
     }
 }
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index bec38ade229..d4d638de6bb 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -498,14 +498,9 @@ public override Color ForeColor
     {
         get
         {
-            if (ShouldSerializeForeColor())
-            {
-                return base.ForeColor;
-            }
-            else
-            {
-                return SystemColors.WindowText;
-            }
+            return ShouldSerializeForeColor()
+                ? base.ForeColor
+                : SystemColors.WindowText;
         }
         set => base.ForeColor = value;
     }
@@ -613,14 +608,9 @@ public string[] Lines
         set
         {
             // unparse this string list...
-            if (value is not null && value.Length > 0)
-            {
-                Text = string.Join(Environment.NewLine, value);
-            }
-            else
-            {
-                Text = string.Empty;
-            }
+            Text = value is not null && value.Length > 0
+                ? string.Join(Environment.NewLine, value)
+                : string.Empty;
         }
     }
 
@@ -903,14 +893,9 @@ internal unsafe void GetSelectionStartAndLength(out int start, out int length)
 
             end = start + length - 1;
 
-            if (t is null)
-            {
-                len = 0;
-            }
-            else
-            {
-                len = t.Length;
-            }
+            len = t is null
+                ? 0
+                : t.Length;
 
             Debug.Assert(end <= len,
                 $"SelectionEnd is outside the set of valid caret positions for the current WindowText (end ={end}, WindowText.Length ={len})");
@@ -1721,14 +1706,10 @@ public void Select(int start, int length)
             // We shouldn't allow positive length if you're starting at the end, but
             // should allow negative length.
             long longLength = Math.Min(0, (long)length + start - textLen);
-            if (longLength < int.MinValue)
-            {
-                length = int.MinValue;
-            }
-            else
-            {
-                length = (int)longLength;
-            }
+
+            length = longLength < int.MinValue
+                ? int.MinValue
+                : (int)longLength;
 
             start = textLen;
         }
@@ -1815,16 +1796,9 @@ internal void AdjustSelectionStartAndEnd(int selStart, int selLength, out int st
         }
         else
         {
-            int textLength;
-
-            if (textLen >= 0)
-            {
-                textLength = textLen;
-            }
-            else
-            {
-                textLength = TextLength;
-            }
+            int textLength = textLen >= 0
+                ? textLen
+                : TextLength;
 
             if (start > textLength)
             {
@@ -2042,8 +2016,8 @@ private void WmGetDlgCode(ref Message m)
     {
         base.WndProc(ref m);
         m.ResultInternal = AcceptsTab
-            ? (LRESULT)(m.ResultInternal | (int)PInvoke.DLGC_WANTTAB)
-            : (LRESULT)(m.ResultInternal & ~(int)(PInvoke.DLGC_WANTTAB | PInvoke.DLGC_WANTALLKEYS));
+            ? (LRESULT)(nint)(m.ResultInternal | (int)PInvoke.DLGC_WANTTAB)
+            : (LRESULT)(nint)(m.ResultInternal & ~(int)(PInvoke.DLGC_WANTTAB | PInvoke.DLGC_WANTALLKEYS));
     }
 
     /// <summary>
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
index 9d2667dbe84..0b4cdadfea9 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
@@ -1,8 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #nullable disable
 
+using System.Drawing;
+
 namespace System.Windows.Forms.Tests;
 
 // Behavioral tests for the modern toggle-switch CheckBox (Appearance.ToggleSwitch + VisualStylesMode.Net11).

From 5cb2581de1ee975b4b5f28fd4d07d4b49d68f133 Mon Sep 17 00:00:00 2001
From: Klaus Loffelmann <klloeffe@microsoft.com>
Date: Fri, 26 Jun 2026 12:42:13 -0700
Subject: [PATCH 27/50] Patch XML docs for TextBoxBase' Padding property.

---
 .../GlobalSuppressions.cs                     |  1 +
 .../Forms/Controls/TextBox/TextBoxBase.cs     | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/System.Windows.Forms/GlobalSuppressions.cs b/src/System.Windows.Forms/GlobalSuppressions.cs
index 74c366ba97c..b1ed827437e 100644
--- a/src/System.Windows.Forms/GlobalSuppressions.cs
+++ b/src/System.Windows.Forms/GlobalSuppressions.cs
@@ -269,3 +269,4 @@
 [assembly: SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "Analyzer wrongly complains for new APIs - known issue.", Scope = "member", Target = "~M:System.Windows.Forms.TaskDialog.ShowDialogAsync(System.Windows.Forms.TaskDialogPage,System.Windows.Forms.TaskDialogStartupLocation)~System.Threading.Tasks.Task{System.Windows.Forms.TaskDialogButton}")]
 [assembly: SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "Analyzer wrongly complains for new APIs - known issue.", Scope = "member", Target = "~M:System.Windows.Forms.TaskDialog.ShowDialogAsync(System.Windows.Forms.IWin32Window,System.Windows.Forms.TaskDialogPage,System.Windows.Forms.TaskDialogStartupLocation)~System.Threading.Tasks.Task{System.Windows.Forms.TaskDialogButton}")]
 [assembly: SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "Analyzer wrongly complains for new APIs - known issue.", Scope = "member", Target = "~M:System.Windows.Forms.TaskDialog.ShowDialogAsync(System.IntPtr,System.Windows.Forms.TaskDialogPage,System.Windows.Forms.TaskDialogStartupLocation)~System.Threading.Tasks.Task{System.Windows.Forms.TaskDialogButton}")]
+[assembly: SuppressMessage("DocumentationAnalyzers.StyleRules", "DOC107:Use 'see cref'", Justification = "Has been referenced already in the same paragraph.", Scope = "member", Target = "~P:System.Windows.Forms.TextBoxBase.Padding")]
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index d4d638de6bb..36042d898be 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -745,8 +745,32 @@ public event EventHandler? MultilineChanged
         remove => Events.RemoveHandler(s_multilineChangedEvent, value);
     }
 
+    /// <summary>
+    ///  Gets or sets the distance, in pixels, between the text displayed in a text box control and the top, bottom and side edges of the control.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Note: While shadowing this property may seem redundant at first glance, it is necessary for binary compatibility.
+    ///   Prior to .NET 11, this property was marked with <see cref="BrowsableAttribute">Browsable(false)</see> and
+    ///   <see cref="EditorBrowsableAttribute">EditorBrowsable(EditorBrowsableState.Never)</see>,
+    ///   and was never serialized. Effectively, <see cref="Control.Padding"/> did not work before .NET 11. While this changed in .NET 11,
+    ///   removing the property shadowing would constitute a binary breaking change. Therefore, the shadowing is retained
+    ///   with updated attributes to ensure <c>Padding</c> now functions as expected.
+    ///  </para>
+    ///  <para>
+    ///   As long as the default value for the <c>Padding</c> property is not modified, <see cref="TextBoxBase"/>-derived
+    ///   controls (<see cref="TextBox"/>, <see cref="RichTextBox"/>) will behave as they always have. However, if you
+    ///   opt into modern styling by calling <see cref="Application.EnableVisualStyles"/> and set
+    ///   <see cref="VisualStylesMode"/> to a value other than <see cref="VisualStylesMode.Classic"/> or
+    ///   <see cref="VisualStylesMode.Disabled"/>, the control will automatically apply styling that conforms to the
+    ///   Windows 10+ Fluent Design Language. This provides both stylistic improvements (such as Dark Mode support) and
+    ///   functional enhancements (including increased touch targets for easier mouse and touch interaction), thereby
+    ///   meeting the accessibility requirements of modern high-resolution displays.
+    ///  </para>
+    /// </remarks>
     [Browsable(true)]
     [EditorBrowsable(EditorBrowsableState.Always)]
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
     public new Padding Padding
     {
         get => base.Padding;

From 5162aca835b05a40c93807f0db4fb545fa849a32 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Mon, 29 Jun 2026 21:51:44 -0700
Subject: [PATCH 28/50] Add work order for TextBoxBase NC painting port

* Add solution folders "Application" and "net11-VisualStylesMode" to Winforms.sln and include a detailed Markdown work order for porting non-client painting and VisualStylesMode chrome to VisualStylesNet11.

* Update solution structure to organize these items for engineering reference.
---
 .../TextBoxBase-VisualStyles-WorkOrder.md     | 137 ++++++++++++++++++
 Winforms.sln                                  |   9 ++
 2 files changed, 146 insertions(+)
 create mode 100644 .github/copilot/Application/net11-VisualStylesMode/TextBoxBase-VisualStyles-WorkOrder.md

diff --git a/.github/copilot/Application/net11-VisualStylesMode/TextBoxBase-VisualStyles-WorkOrder.md b/.github/copilot/Application/net11-VisualStylesMode/TextBoxBase-VisualStyles-WorkOrder.md
new file mode 100644
index 00000000000..09894f9d23f
--- /dev/null
+++ b/.github/copilot/Application/net11-VisualStylesMode/TextBoxBase-VisualStyles-WorkOrder.md
@@ -0,0 +1,137 @@
+# Work Order — Port `TextBoxBase` NC-Painting + `VisualStylesMode` Chrome onto `VisualStylesNet11`
+
+**Target branch:** `KlausLoeffelmann/winforms` → `VisualStylesNet11` (current-`main`-based; modern path layout, no `/src/src/` doubling; `TextBoxBase.cs` ≈ 2130 lines).
+
+**Source of the original implementation (pinned):** `KlausLoeffelmann/winforms` @ `cf32e9c4efeba9d77e1a14025a8590b104e3c705` (old `/src/System.Windows.Forms/src/...` layout; `TextBoxBase.cs` ≈ 2562 lines). Relevant files:
+- `.../Controls/TextBox/TextBoxBase.cs` — NC paint, NC calc, focus invalidation, `GetVisualStylesPadding`, helpers.
+- `.../Controls/TextBox/TextBoxBase.NonClientBitmapCache.cs` — the offscreen cache class.
+- `.../Controls/TextBox/TextBox.cs` — derived-level overrides (`CreateParams`, `WndProc`, `OnBackColorChanged`, `PRF_NONCLIENT` path).
+
+**Standing approval:** API review board sign-off from the .NET 9 cycle is still valid; DRI owns the call. This is a port + cleanup, **not** a redesign. Do not invent new public API beyond what the original exposed plus the `Padding` unshadowing called out below.
+
+**House style (apply throughout):** namespaces globally imported (no `using`/`imports` noise); C# 13/14; NRTs on; `var` only for long type names or when the type is obvious from the RHS, explicit type names for primitives; blank line between a new block and a following `return`; pattern matching / `is` / `and` / `or` / switch expressions preferred; collection expressions (`List<T> x = [];`); expression-bodied members for single-line methods/read-only props formatted with the `=>` on the next line, 1-space-indented. Generate XML doc comments; use `<remarks>`/`<para>`.
+
+---
+
+## PROMPT 1 — Carry-over / Port
+
+> **Role:** You are porting a working-but-imperfect feature across a 3-year gap in the surrounding file. Faithfully reproduce the *mechanism*; do not improve, simplify, or "modernize" the algorithm except where this document explicitly says to. Where the surrounding `VisualStylesNet11` code has moved on, rebase onto the new shape rather than pasting.
+
+**Task.** Bring the non-client (NC) painting feature for `TextBoxBase` (and the `TextBox` derived touchpoints) from the pinned SHA `cf32e9c4…` onto `VisualStylesNet11`. The target branch currently has **none** of this work (no `WmNcPaint`/`WmNcCalcSize`/`OnNcPaint`/`GetVisualStylesPadding`/`NonClientBitmapCache`), but it **does** have the `VisualStylesMode` property infrastructure referenced in doc comments — wire into that, don't redeclare it.
+
+**Steps, in order:**
+
+1. **Fetch and diff the three source files** at SHA `cf32e9c4…` against their `VisualStylesNet11` counterparts. Produce a short inventory of every member you intend to add or modify, grouped by file, before writing any code.
+
+2. **Port `TextBoxBase.cs` members:**
+   - `WmNcPaint` / `OnNcPaint` (offscreen bitmap fill → AA rounded/single chrome → blit; `GetWindowDC`/`ReleaseDC` in `finally`).
+   - `WmNcCalcSize` (carves the padding band from `NCCALCSIZE_PARAMS->rgrc[0]`; gated on the `_triggerNewClientSizeRequest` latch).
+   - `InitializeClientArea` (the one-shot `SetWindowPos(SWP_FRAMECHANGED|NOMOVE|NOSIZE|NOZORDER|NOACTIVATE)` that provokes the single NC-calc).
+   - `GetVisualStylesPadding` / `GetScrollBarPadding` and the `VisualStyles{Fixed3D|FixedSingle|NoBorder}BorderPadding`, `BorderThickness` consts.
+   - The `WM_NCCALCSIZE` / `WM_NCPAINT` cases in `WndProc`.
+   - `OnGotFocus` / `OnLostFocus` / `OnSizeChanged` NC-frame invalidation (`RedrawWindow` with `RDW_FRAME|RDW_INVALIDATE`).
+   - `PreferredHeight` split (`PreferredHeightClassic` vs `PreferredHeightCore` selected by `VisualStylesMode`).
+   - Reconcile `GetPreferredSizeCore` with the modern branch already present on target.
+
+3. **Port `TextBoxBase.NonClientBitmapCache.cs`** — BUT this is a **decision point**, see Step 6.
+
+4. **Reconcile `TextBox.cs` (derived):** the target already has `CreateParams`, `WndProc`, `OnBackColorChanged` (special-casing `Fixed3D`), `OnGotFocus`, and a `WM_PRINTCLIENT`/`PRF_NONCLIENT` + `Application.RenderWithVisualStyles` path. Merge the NC behavior so the derived overrides cooperate with the new base NC painting (no double border draw, no fighting the `PRF_NONCLIENT` path). Call out every conflict you resolve.
+
+5. **Unshadow `Padding`.** On target it is still the neutered shadow (`[Browsable(false)]`, `EditorBrowsableState.Never`, `DesignerSerializationVisibility.Hidden`, `get/set => base.Padding`). Make it a real, browsable, serializable property that feeds the NC band via `GetVisualStylesPadding`. Preserve classic-mode behavior when `VisualStylesMode` is `Disabled`/`Classic`. Note the designer-serialization and back-compat implications in the PR description.
+
+6. **Retarget the rounded-rectangle helpers to the framework.** The original called fork-local `FillRoundedRectangle`/`DrawRoundedRectangle`. These now ship as **`System.Drawing.Graphics` instance methods** (`(Pen, Rectangle, Size)` + `RectangleF`/`SizeF` overloads; landed in the .NET 9 wave, current on target). **Delete the fork-local helpers and call the shipped methods.** ⚠️ Verify a **`FillRoundedRectangle(Brush, …)`** overload actually exists on target — the public ref only enumerates the `Draw`(`Pen`) overloads. If the `Fill`/`Brush` overload is absent, STOP and flag it; do not re-add a private helper without surfacing the gap.
+
+7. **Cache → `BufferedGraphics` (DECIDED — implement, do not re-evaluate).** The original used a hand-rolled per-instance `NonClientBitmapCache` (`CreateCompatibleBitmap` + `Image.FromHbitmap` + manual `DeleteObject`, `EnsureSize` realloc). Jeremy's late "use the existing cached bitmap" is confirmed to mean WinForms' own **`BufferedGraphics`/`BufferedGraphicsContext`** (the engine behind `OptimizedDoubleBuffer`; in `System.Drawing.Common` since .NET Framework 2.0, present on target). It is **not** `System.Drawing.Imaging.CachedBitmap` — that type is a read-only, device-dependent, blit-only frozen copy (no `Graphics`, translation-only, dies on bit-depth change) and cannot be a render target. **Delete `NonClientBitmapCache` entirely** (and its file `TextBoxBase.NonClientBitmapCache.cs`) and the `_cachedBitmap` field; replace with the shared buffer. Exact wiring:
+   - Inside `OnNcPaint`, get the shared context and allocate the buffer against the **window-DC `Graphics` already created in `WmNcPaint`**, sized to the window `bounds`:
+     `BufferedGraphicsContext context = BufferedGraphicsManager.Current;`
+     `using BufferedGraphics buffer = context.Allocate(graphics, bounds);`
+     `Graphics offscreenGraphics = buffer.Graphics;`
+   - **Do NOT `using`/dispose `buffer.Graphics`** — the `buffer` owns it; `using` the **buffer** only. (The original `using`-disposed its `GetNewGraphics()` because it owned that `Graphics`; that ownership is now the buffer's.)
+   - **All drawing into `offscreenGraphics` is unchanged** — the `FillRectangle(parentBackgroundBrush…)` corner-fill, the `BorderStyle` switch, the focus line: byte-for-byte identical, just a different `Graphics` target.
+   - **`ExcludeClip(clientBounds)` stays on the *target* `graphics`** (the window-DC one), exactly where it is now, set *before* the buffer draws. It governs where `Render()` may blit, protecting the client area — unchanged semantics.
+   - Replace the final blit `graphics.DrawImageUnscaled(offscreenBitmap, Point.Empty);` with **`buffer.Render();`** (no argument — it blits to the `graphics` captured at `Allocate` time).
+   - While here, fix the pre-existing **double-dispose** in `WmNcPaint`: it has both `using Graphics graphics = …` and an explicit `graphics.Dispose()` in `finally`. Drop the explicit `Dispose()`; keep the `using` (or keep explicit and drop `using` — one, not both).
+   - **Rationale to record in PR notes:** WinForms paints NC serially (one HWND at a time on the UI thread), so a single shared buffer suffices for any number of controls; the per-instance cache kept N resident GDI bitmaps to serve a one-deep queue. Steady-state allocation is unchanged (zero — shared buffer is reused when size fits); resident GDI memory drops from N× to 1×. The only cost is buffer-resize churn if controls of *wildly varying* sizes paint in a grow/shrink-alternating order — see smoke scenario 7 instrumentation.
+
+8. **Carve clamp + chrome degradation (settled design — implement exactly as stated, do NOT add a minimum size).** The original `WmNcCalcSize` does raw subtraction on `rgrc[0]` with **no clamp**, so a large `Padding` (made worse because `GetVisualStylesPadding(true)` *adds* the live scrollbar allowance from `GetScrollBarPadding` on top of the border padding) can drive the carved client rect to **zero or inverted**. Two separate fixes, and they are deliberately *not* a `MinimumSize`:
+   - **(8a) Never-invert clamp in `WmNcCalcSize`.** Floor each carved extent so the client rect can never invert: after the four adjustments, ensure `bottom >= top` and `right >= left` (e.g. clamp so the resulting client width/height is `Math.Max(0, …)`). A 0–1px client area is **acceptable and intended** — shipping multiline `TextBox` already shrinks to ~1px with scrollbars present, and we match that exactly. **Do NOT introduce a min-height/`MinimumSize`**, and do NOT make sizing behavior differ by `VisualStylesMode` (that would fracture the appearance-only contract of the opt-in). The clamp only prevents *underflow past zero*, which raw subtraction does and plain shrinking does not.
+   - **(8b) Paint-time chrome degradation in `OnNcPaint`.** The rounded `Fixed3D` chrome (15px radius) renders as a broken lozenge below roughly `2 × cornerRadius + BorderThickness` in height. When the available band/height is below that viable threshold, **fall back to the original/simple chrome render** (flat or single-style border) instead of the rounded path. This is a *rendering* fallback only — it does not change size or layout. Rationale on record: if the box is so small there's no usable client area, the control isn't usable anyway, so graceful visual degradation (not a size floor) is the correct response.
+
+9. **Build** `System.Windows.Forms` for the target TFM. Resolve all errors. Do not suppress new analyzer warnings without a one-line justification each.
+
+**Deliverable:** a single commit (or tight series) on `VisualStylesNet11` plus a PR description that lists: members added/modified per file, every `TextBox.cs` conflict resolved, confirmation that `NonClientBitmapCache` was removed and replaced by `BufferedGraphics` (Step 7) with the resize-churn rationale, the clamp/degradation (Step 8) confirmed as render-only with no size minimum, the `Padding` unshadowing implications, and any flagged gaps (Step 6 `Fill` overload).
+
+---
+
+## PROMPT 2 — Critical Review (run AFTER Prompt 1, BEFORE smoke test)
+
+> **Role:** Adversarial reviewer. The author wants the issues a sharp WinForms maintainer would catch, not reassurance. Cite file + line for every finding. Classify each as **MUST-FIX**, **SHOULD-FIX**, or **PRESERVE (do not 'improve')**.
+
+Audit the ported code against this checklist. For each item, state the finding and the exact location.
+
+1. **DPI scaling of the corner radius.** The original hardcodes `const int cornerRadius = 15` and `BorderThickness = 1` in device-independent units, then uses them inside a DPI-scaled NC band, while `GetVisualStylesPadding` *does* take a DPI path (`_deviceDpi`). Confirm whether the radius/thickness now scale Per-Monitor-V2. If not → **MUST-FIX** (corners look proportionally too tight at 150/200%).
+
+2. **Full-frame NC repaint vs. partial `hrgnClip`.** `WmNcPaint` ignores the wParam clip region and repaints the whole frame. This is the **intended** fix for the offscreen-restore "dirty corners" artifact — verify it's preserved. But confirm `base.WndProc(ref m)` is still invoked with the original message and isn't double-painting the native border under the custom chrome. Classify the "ignore clip" behavior as **PRESERVE**.
+
+3. **Corner-blend source = `Parent?.BackColor ?? BackColor`.** This is the known ceiling: corners blend against the parent's flat back color, so they mismatch over a gradient/image/Mica/sibling. For the common case (solid form/panel) it's correct. **PRESERVE** — do not let it be "improved" into a fake general-case solution. Note it as a documented limitation only.
+
+4. **`WM_NCCALCSIZE` ↔ `Padding` round-trip + underflow.** Verify the band carved in `WmNcCalcSize` matches what `GetVisualStylesPadding(true)` reports and what `GetPreferredSizeCore`/`SizeFromClientSize` assume, for all three `BorderStyle` values × `Multiline` × scrollbars. Off-by-one here clips text or the caret. **Additionally** confirm the never-invert clamp (Prompt 1 Step 8a) is present and correct: with large `Padding` on a small multiline box *with both scrollbars*, the carved client rect must floor at 0, never invert. Remember the threshold is **border padding + live scrollbar padding** (`GetScrollBarPadding` reads `WS_HSCROLL`/`WS_VSCROLL`), so underflow hits sooner than the `Padding` value alone implies. Classify "0–1px client area is allowed, no min-size" as **PRESERVE** — do not let a reviewer or the agent add a `MinimumSize` floor.
+
+4b. **Chrome degradation below viable height.** Confirm `OnNcPaint` (Prompt 1 Step 8b) falls back to simple/flat chrome when height < ≈`2 × cornerRadius + BorderThickness`, instead of drawing a corrupted rounded rect. This is **render-only**; assert it does **not** alter size, layout, or `ClientSize`. Verify the fallback path itself is DPI-correct (the threshold scales with the radius, which per item 1 must scale).
+
+5. **`BorderStyle` fork + native edge suppression.** `Fixed3D` → rounded chrome, `FixedSingle` → single + underline, `None` → fill. Confirm the native `WS_EX_CLIENTEDGE`/`WS_BORDER` from `CreateParams` is suppressed when NC chrome is active, so the native edge isn't drawn under the custom one.
+
+6. **`VisualStylesMode` gating is total.** Every NC entry point (`WmNcPaint`, `WmNcCalcSize`, `InitializeClientArea`, the focus/size invalidations) must early-out to byte-for-byte classic behavior when `VisualStylesMode` is `Disabled`/`Classic`. One missing guard = a back-compat regression. Note the original's `OnLostFocus` was **missing** the guard that `OnGotFocus` had — verify the port fixed this asymmetry.
+
+7. **DC / GDI lifetime.** `GetWindowDC`→`ReleaseDC` in `finally`, and `Graphics.FromHdc`+`Dispose` ordering: correct **only** because `FromHdc` doesn't own the DC. **PRESERVE** — flag any "tidy into a single `using`" as a regression. Confirm the `WmNcPaint` **double-dispose** was fixed (it had both `using Graphics` and an explicit `graphics.Dispose()`). For the `BufferedGraphics` swap (Prompt 1 Step 7): verify the **buffer** is `using`-scoped but **`buffer.Graphics` is NOT separately disposed**; verify `Allocate` targets the window-DC `graphics` and `Render()` is called with no argument; confirm `NonClientBitmapCache` and the `_cachedBitmap` field are fully removed with no dangling refs. Audit for any HBITMAP/HDC leak in the new path (there should be none — the buffer owns it).
+
+8. **DPI-change without handle recreate.** `_triggerNewClientSizeRequest` is a one-shot latch reset on handle recreate. Does a DPI change that does *not* recreate the handle re-carve the band with new padding? If the band can go stale on monitor move → **MUST-FIX** or at least an explicit tracked issue.
+
+9. **Caret / IME / selection repaint.** The native `EDIT` invalidates aggressively. Confirm NC chrome doesn't go stale on caret blink/IME composition, and conversely that NC isn't thrashing-repainting on every caret tick. (Author never confirmed this was clean in the original.)
+
+10. **`TextBox.cs` derived reconciliation.** Verify the derived `WndProc`, `OnBackColorChanged` `Fixed3D` special-case, and the `PRF_NONCLIENT`/`Application.RenderWithVisualStyles` path don't conflict with base NC painting (double draw, wrong-mode paint).
+
+11. **Allocation churn.** Brushes/pens use cached scopes (`GetCachedSolidBrushScope`/`GetCachedPenScope`) — good; confirm preserved. Confirm the offscreen surface isn't reallocated per paint (only on size change).
+
+**Deliverable:** a findings list (file:line, severity, recommendation). MUST-FIX items get fixed in this pass; SHOULD-FIX either fixed or filed; PRESERVE items annotated in code with a brief `// Intentional:` comment so the next reader doesn't "fix" them.
+
+---
+
+## PROMPT 3 — Smoke Test Harness
+
+> *("Smoke test" = the shallow "does it power on without catching fire" pass — from hardware bring-up, where first power-on literally checked for smoke — run before any deep/perf testing. Goal here: broad coverage that it comes up and behaves on the obvious axes, with the two known-fragile cases as explicit named tests.)*
+
+**Task.** Build a throwaway WinForms test app (separate project, not shipped) that exercises the ported feature across its permutation space and **specifically reproduces the two regressions this feature is prone to.**
+
+**Permutation grid** — generate a form populated with `TextBox`es (and at least one `RichTextBox`, since `TextBoxBase` is the shared base) covering the cross-product of:
+- `BorderStyle`: `None` × `FixedSingle` × `Fixed3D`
+- `Multiline`: `false` × `true` (+ `WordWrap` on/off for multiline)
+- `Padding`: `Empty` × asymmetric (e.g. `2,6,2,6`) × large (`12`)
+- Scrollbars: none × vertical × both
+- `VisualStylesMode`: `Disabled`/`Classic` (must look exactly like today) × `Net10`+ (new chrome)
+- Focused vs unfocused (drive focus programmatically to capture the adorner/underline)
+
+**Named, must-pass scenarios (the ones that silently regress):**
+
+1. **Offscreen-restore ("dirty corners").** Move the window partly off the left/top screen edge, then back. Assert the NC corner regions are repainted clean (no stale pixels). This is the artifact that drove the full-frame-repaint design. Automate the drag via `SetWindowPos`/`MoveWindow`; capture before/after.
+
+2. **Partial NC invalidation.** Trigger a partial `WM_NCPAINT` (e.g. overlap then reveal a sliver of the frame) and assert the whole chrome is coherent, not just the revealed strip.
+
+3. **Per-Monitor-V2 DPI.** Run DPI-aware; move forms between a 100% and a 150%/200% monitor (or fake via `LogicalToDeviceUnits`/DPI-changed messages). Assert corner radius, border thickness, and padding band all scale; assert no clipped text/caret.
+
+4. **Classic-mode parity.** With `VisualStylesMode = Disabled`, assert the control is pixel-identical to baseline `main` (native edge, no custom NC). A regression here is the back-compat line breaking.
+
+5. **`BorderStyle` switch at runtime** (`Fixed3D`↔`FixedSingle`↔`None`) and **`Padding` change at runtime** — assert the band re-carves and chrome redraws without artifacts (exercises the `_triggerNewClientSizeRequest` reset path).
+
+6. **Focus transitions** — tab through the grid; assert the focus underline (single) / 3D focus line (Fixed3D, shortened to clear the corner curve) appears/clears correctly.
+
+7. **Shrink-to-collapse (clamp + degradation).** Take a multiline `Fixed3D` box with large `Padding` (e.g. `12`) and **both** scrollbars visible, then programmatically drag/resize its height down toward 1px. Assert: (a) **no crash / no inverted client rect** handed to the native `EDIT` — the carve floors at 0 (Step 8a); (b) below ≈`2 × cornerRadius + thickness` the chrome **falls back to flat/simple render** rather than drawing a corrupted lozenge (Step 8b); (c) the control **still collapses** to ~1px exactly like classic multiline — assert it is **not** held open by any min-size (regression if a floor appeared). Repeat at 150%/200% DPI so the degradation threshold is verified scaled, not fixed at 96-dpi pixels.
+
+8. **BufferedGraphics allocation churn (perf sanity).** Build two forms: (a) **40 same-size** textboxes, (b) **40 wildly varying-size** textboxes (mix tiny and large), all `VisualStylesMode ≥ Net10`. Force a full repaint storm (invalidate all NC frames repeatedly; resize the form to cascade re-layout). Instrument the shared buffer: wrap/observe `BufferedGraphicsManager.Current` and count actual **bitmap (re)allocations** vs. reuses across the storm. Assert: case (a) allocates the buffer ≈once then reuses (steady-state alloc ≈ 0); case (b) may reallocate on grow but must **not** allocate-per-paint. Log alloc count per case. This empirically confirms the shared-buffer reasoning from Prompt 1 Step 7 and catches any accidental per-paint allocation regression.
+
+**Harness mechanics:**
+- A "capture all" button that screenshots each form to disk per `VisualStylesMode`, for eyeball diffing classic-vs-modern and pre-vs-post-DPI.
+- A console/log line per assertion (pass/fail) so it can run semi-automated.
+- Keep it dependency-light: raw WinForms + `SetWindowPos`/`RedrawWindow` P/Invoke for the offscreen and invalidation drivers.
+
+**Deliverable:** the test project + a one-screen README naming the six scenarios and how to run them, plus a results log from one full run on the porter's machine (note DPI of monitors used).
diff --git a/Winforms.sln b/Winforms.sln
index b469fab8e51..4deb770ce1b 100644
--- a/Winforms.sln
+++ b/Winforms.sln
@@ -215,6 +215,13 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Private.Windows.P
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Private.Windows.Core", "src\System.Private.Windows.Core\src\Microsoft.Private.Windows.Core.csproj", "{36A02BBB-B60B-5F23-6AF0-F41561A9275C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{4D53E144-73EF-49BC-BF11-F416E187944A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net11-VisualStylesMode", "net11-VisualStylesMode", "{59D2720E-DBA9-4282-869E-0717D6311BDF}"
+	ProjectSection(SolutionItems) = preProject
+		.github\copilot\Application\net11-VisualStylesMode\TextBoxBase-VisualStyles-WorkOrder.md = .github\copilot\Application\net11-VisualStylesMode\TextBoxBase-VisualStyles-WorkOrder.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1185,6 +1192,8 @@ Global
 		{4A2BD741-482C-4BF7-8A2D-5535A770DB69} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 		{799CC0C2-236B-4A76-8CE3-65C346182CC1} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
 		{36A02BBB-B60B-5F23-6AF0-F41561A9275C} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
+		{4D53E144-73EF-49BC-BF11-F416E187944A} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{59D2720E-DBA9-4282-869E-0717D6311BDF} = {4D53E144-73EF-49BC-BF11-F416E187944A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136}

From 3c18a828fc12458b3cb863afac93130bfff059c5 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Mon, 29 Jun 2026 23:00:57 -0700
Subject: [PATCH 29/50] Port TextBoxBase NC-painting + VisualStylesMode chrome
 onto VisualStylesNet11

Bring the non-client (NC) painting feature for TextBoxBase/TextBox from the
pinned SHA cf32e9c4 onto the modern VisualStylesNet11 layout, with the DECIDED
design changes and the Prompt-2 MUST-FIX items applied.

TextBoxBase.cs:
* Add VisualStyles border-padding consts + BorderThickness and the
  _triggerNewClientSizeRequest latch (reset in CreateHandle).
* Split PreferredHeight into a VisualStylesMode switch over PreferredHeightCore
  (modern) and PreferredHeightClassic (Everett-compatible). Dropped the original
  [Experimental]/WFO5000 gating - VisualStyles is not experimental on this branch.
* Add GetVisualStylesPadding / virtual GetScrollBarPadding (DPI-scaled).
* Add the VisualStylesMode >= Net11 branch to GetPreferredSizeCore.
* Add WmNcPaint / OnNcPaint / InitializeClientArea / WmNcCalcSize and the
  WM_NCCALCSIZE / WM_NCPAINT WndProc cases; wire InitializeClientArea into
  InitializeDCForWmCtlColor.
* Add NC-frame invalidation to OnGotFocus / OnLostFocus / OnSizeChanged
  (OnLostFocus now correctly guarded by VisualStylesMode, fixing the original
  asymmetry).

DECIDED design (work-order steps 6-8):
* Use the shared BufferedGraphics buffer (BufferedGraphicsManager.Current) instead
  of the per-instance NonClientBitmapCache; buffer.Render() blits to the window DC.
* Use the shipped Graphics.FillRoundedRectangle / DrawRoundedRectangle methods.
* Never-invert clamp in WmNcCalcSize (no MinimumSize); paint-time chrome
  degradation in OnNcPaint below the viable rounded-chrome height.
* Fixed the WmNcPaint double-dispose.

MUST-FIX:
* DPI-scale the corner radius and border thickness (and the degradation threshold)
  via LogicalToDeviceUnits.

TextBox.cs:
* Guard the classic PRF_NONCLIENT Fixed3D border draw so it does not double-draw
  over the modern chrome when VisualStylesMode >= Net11.

NativeMethods.txt:
* Generate GetWindowDC and NCCALCSIZE_PARAMS.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/NativeMethods.txt                     |   2 +
 .../Windows/Forms/Controls/TextBox/TextBox.cs |   6 +-
 .../Forms/Controls/TextBox/TextBoxBase.cs     | 517 +++++++++++++++++-
 3 files changed, 502 insertions(+), 23 deletions(-)

diff --git a/src/System.Private.Windows.Core/src/NativeMethods.txt b/src/System.Private.Windows.Core/src/NativeMethods.txt
index 4dc96ffb830..ddea7b6c144 100644
--- a/src/System.Private.Windows.Core/src/NativeMethods.txt
+++ b/src/System.Private.Windows.Core/src/NativeMethods.txt
@@ -119,6 +119,7 @@ GetSystemMetrics
 GetThreadLocale
 GetViewportExtEx
 GetViewportOrgEx
+GetWindowDC
 GetWindowOrgEx
 GetWindowRect
 GetWindowText
@@ -190,6 +191,7 @@ MonitorFromWindow
 MONITORINFOEXW
 MONITORINFOF_*
 MultiByteToWideChar
+NCCALCSIZE_PARAMS
 NONCLIENTMETRICSW
 NS_E_WMP_CANNOT_FIND_FILE
 NS_E_WMP_DSHOW_UNSUPPORTED_FORMAT
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs
index e3fce96d521..9d425b34f40 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs
@@ -800,8 +800,12 @@ private void ResetAutoCompleteCustomSource()
     private void WmPrint(ref Message m)
     {
         base.WndProc(ref m);
+
+        // In modern Visual Styles mode the base TextBoxBase NC painting owns the border chrome, so we
+        // must not also draw the classic Fixed3D edge here - that would double-draw over the modern chrome.
         if (((nint)m.LParamInternal & PInvoke.PRF_NONCLIENT) != 0 && Application.RenderWithVisualStyles
-            && BorderStyle == BorderStyle.Fixed3D)
+            && BorderStyle == BorderStyle.Fixed3D
+            && VisualStylesMode < VisualStylesMode.Net11)
         {
             using Graphics g = Graphics.FromHdc((HDC)m.WParamInternal);
             Rectangle rect = new(0, 0, Size.Width - 1, Size.Height - 1);
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index 36042d898be..bd1aca6d75c 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Design;
+using System.Drawing.Drawing2D;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms.Layout;
@@ -52,6 +53,19 @@ public abstract partial class TextBoxBase : Control
     /// </summary>
     private BorderStyle _borderStyle = BorderStyle.Fixed3D;
 
+    // Device-independent padding (in logical units) carved from the non-client band for each
+    // border style when modern Visual Styles chrome is active. These are DPI-scaled at use time.
+    private const int VisualStylesFixed3DBorderPadding = 5;
+    private const int VisualStylesFixedSingleBorderPadding = 4;
+    private const int VisualStylesNoBorderPadding = 3;
+    private const int BorderThickness = 1;
+
+    /// <summary>
+    ///  One-shot latch that gates the single NC-calc round trip used to carve the modern Visual
+    ///  Styles padding band. Set by <see cref="InitializeClientArea"/> and reset on handle recreation.
+    /// </summary>
+    private bool _triggerNewClientSizeRequest;
+
     /// <summary>
     ///  Controls the maximum length of text in the edit control.
     ///  Matches the Windows limit.
@@ -810,13 +824,41 @@ private void ResetPadding()
     [EditorBrowsable(EditorBrowsableState.Advanced)]
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     [SRDescription(nameof(SR.TextBoxPreferredHeightDescr))]
-    public int PreferredHeight
+    public int PreferredHeight =>
+        VisualStylesMode switch
+        {
+            VisualStylesMode.Disabled => PreferredHeightClassic,
+            VisualStylesMode.Classic => PreferredHeightClassic,
+            >= VisualStylesMode.Net11 => PreferredHeightCore,
+
+            // We should never be here.
+            _ => throw new InvalidEnumArgumentException(
+                argumentName: nameof(VisualStylesMode),
+                invalidValue: (int)VisualStylesMode,
+                enumClass: typeof(VisualStylesMode))
+        };
+
+    /// <summary>
+    ///  Returns the preferred height for modern Visual Styles, taking the carved padding band
+    ///  (including the live scrollbar allowance and the user <see cref="Padding"/>) into account.
+    /// </summary>
+    private protected virtual int PreferredHeightCore =>
+        FontHeight + GetVisualStylesPadding(includeScrollbars: true).Vertical;
+
+    /// <summary>
+    ///  Returns the classic (Everett-compatible) preferred height for a single-line text box.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   COMPAT: we must return the same busted height we did in Everett, even if it does not take
+    ///   multiline and word wrap into account. For better accuracy and/or wrapping use
+    ///   <see cref="Control.GetPreferredSize(Size)"/> instead.
+    ///  </para>
+    /// </remarks>
+    private int PreferredHeightClassic
     {
         get
         {
-            // COMPAT we must return the same busted height we did in Everett, even
-            // if it doesn't take multiline and word wrap into account. For better accuracy and/or wrapping use
-            // GetPreferredSize instead.
             int height = FontHeight;
             if (_borderStyle != BorderStyle.None)
             {
@@ -827,6 +869,83 @@ public int PreferredHeight
         }
     }
 
+    /// <summary>
+    ///  Defines the visible part of the padding band carved for modern Visual Styles chrome.
+    /// </summary>
+    /// <param name="includeScrollbars">
+    ///  <see langword="true"/> to add the live scrollbar allowance (see <see cref="GetScrollBarPadding"/>)
+    ///  on top of the border padding; otherwise <see langword="false"/>.
+    /// </param>
+    /// <returns>The visible padding dimensions.</returns>
+    /// <remarks>
+    ///  <para>
+    ///   The visible part of the padding is the area by which we extend the real-estate of the control
+    ///   with its back color. The user-provided <see cref="Padding"/> is always added on top.
+    ///  </para>
+    /// </remarks>
+    private protected Padding GetVisualStylesPadding(bool includeScrollbars)
+    {
+        int offset = LogicalToDeviceUnits(BorderThickness);
+
+        Padding padding = BorderStyle switch
+        {
+            BorderStyle.Fixed3D => new Padding(
+                left: LogicalToDeviceUnits(VisualStylesFixed3DBorderPadding) + offset,
+                top: LogicalToDeviceUnits(VisualStylesFixed3DBorderPadding) + offset,
+                right: LogicalToDeviceUnits(VisualStylesFixed3DBorderPadding) + offset,
+                bottom: LogicalToDeviceUnits(VisualStylesFixed3DBorderPadding) + offset),
+
+            BorderStyle.FixedSingle => new Padding(
+                left: LogicalToDeviceUnits(VisualStylesFixedSingleBorderPadding) + offset,
+                top: LogicalToDeviceUnits(VisualStylesFixedSingleBorderPadding) + offset,
+                right: LogicalToDeviceUnits(VisualStylesFixedSingleBorderPadding) + offset,
+                bottom: LogicalToDeviceUnits(VisualStylesFixedSingleBorderPadding) + offset),
+
+            BorderStyle.None => new Padding(
+                left: LogicalToDeviceUnits(VisualStylesNoBorderPadding),
+                top: LogicalToDeviceUnits(VisualStylesNoBorderPadding),
+                right: LogicalToDeviceUnits(VisualStylesNoBorderPadding) + offset,
+                // We still need some extra space for the focus indication.
+                bottom: LogicalToDeviceUnits(VisualStylesNoBorderPadding) + offset),
+
+            _ => Padding.Empty,
+        };
+
+        if (includeScrollbars)
+        {
+            padding += GetScrollBarPadding();
+        }
+
+        padding += Padding;
+
+        return padding;
+    }
+
+    /// <summary>
+    ///  Returns the additional padding required to clear the live scrollbars, if any are currently shown.
+    /// </summary>
+    private protected virtual Padding GetScrollBarPadding()
+    {
+        Padding padding = Padding.Empty;
+
+        // Are the scrollbars visible?
+        WINDOW_STYLE style = (WINDOW_STYLE)PInvokeCore.GetWindowLong(this, WINDOW_LONG_PTR_INDEX.GWL_STYLE);
+        bool hasHScroll = (style & WINDOW_STYLE.WS_HSCROLL) != 0;
+        bool hasVScroll = (style & WINDOW_STYLE.WS_VSCROLL) != 0;
+
+        if (hasHScroll)
+        {
+            padding.Bottom += SystemInformation.GetHorizontalScrollBarHeightForDpi(DeviceDpiInternal);
+        }
+
+        if (hasVScroll)
+        {
+            padding.Right += SystemInformation.GetVerticalScrollBarWidthForDpi(DeviceDpiInternal);
+        }
+
+        return padding;
+    }
+
     // GetPreferredSizeCore
     //  This method can return a different value than PreferredHeight!  It properly handles
     //  border style + multiline and wordwrap.
@@ -838,22 +957,7 @@ internal override Size GetPreferredSizeCore(Size proposedConstraints)
         // This 3 pixel size was added in everett and we do this to maintain compat.
         // old everett behavior was FontHeight + [SystemInformation.BorderSize.Height * 4 + 3]
         // however the [ ] was only added if borderstyle was not none.
-        Size bordersAndPadding = SizeFromClientSize(Size.Empty) + Padding.Size;
-
-        if (BorderStyle != BorderStyle.None)
-        {
-            bordersAndPadding += new Size(0, 3);
-        }
-
-        if (BorderStyle == BorderStyle.FixedSingle)
-        {
-            // Bump these by 2px to match BorderStyle.Fixed3D - they'll be omitted from the SizeFromClientSize call.
-            bordersAndPadding.Width += 2;
-            bordersAndPadding.Height += 2;
-        }
-
-        // Reduce constraints by border/padding size
-        proposedConstraints -= bordersAndPadding;
+        Padding padding = default;
 
         // Fit the text to the remaining space.
         // Fixed for .NET Framework 4.0
@@ -867,11 +971,46 @@ internal override Size GetPreferredSizeCore(Size proposedConstraints)
             format |= TextFormatFlags.WordBreak;
         }
 
+        if (VisualStylesMode >= VisualStylesMode.Net11)
+        {
+            // For modern Visual Styles we take the carved adorner band (including scrollbars
+            // and the user Padding) into account when measuring.
+            padding = GetVisualStylesPadding(includeScrollbars: true);
+            proposedConstraints -= padding.Size;
+        }
+        else
+        {
+            Size bordersAndPadding = SizeFromClientSize(Size.Empty) + Padding.Size;
+
+            if (BorderStyle != BorderStyle.None)
+            {
+                bordersAndPadding += new Size(0, 3);
+            }
+
+            if (BorderStyle == BorderStyle.FixedSingle)
+            {
+                // Bump these by 2px to match BorderStyle.Fixed3D - they'll be omitted from the SizeFromClientSize call.
+                bordersAndPadding.Width += 2;
+                bordersAndPadding.Height += 2;
+            }
+
+            // We used to add the borders and padding to the returned size - this remains effectively the same:
+            padding.Left = 0;
+            padding.Top = 0;
+            padding.Right = bordersAndPadding.Width;
+            padding.Bottom = bordersAndPadding.Height;
+
+            // Reduce constraints by border/padding size
+            proposedConstraints -= bordersAndPadding;
+        }
+
         Size textSize = TextRenderer.MeasureText(Text, Font, proposedConstraints, format);
 
         // We use this old computation as a lower bound to ensure backwards compatibility.
         textSize.Height = Math.Max(textSize.Height, FontHeight);
-        Size preferredSize = textSize + bordersAndPadding;
+
+        Size preferredSize = textSize + new Size(padding.Horizontal, padding.Vertical);
+
         return preferredSize;
     }
 
@@ -1308,6 +1447,10 @@ public void ClearUndo()
 
     protected override void CreateHandle()
     {
+        // Should the handle be (re)created at this point, we need to reset the latch so the
+        // modern Visual Styles client area is re-carved against the new window.
+        _triggerNewClientSizeRequest = false;
+
         // This "creatingHandle" stuff is to avoid property change events
         // when we set the Text property.
         _textBoxFlags[s_creatingHandle] = true;
@@ -1465,6 +1608,51 @@ protected virtual void OnBorderStyleChanged(EventArgs e)
         }
     }
 
+    protected override unsafe void OnGotFocus(EventArgs e)
+    {
+        if (VisualStylesMode >= VisualStylesMode.Net11)
+        {
+            // We need to invalidate the non-client area so the focused adorners are drawn.
+            PInvoke.RedrawWindow(
+                hWnd: this,
+                lprcUpdate: null,
+                hrgnUpdate: HRGN.Null,
+                flags: REDRAW_WINDOW_FLAGS.RDW_FRAME | REDRAW_WINDOW_FLAGS.RDW_INVALIDATE);
+        }
+
+        base.OnGotFocus(e);
+    }
+
+    protected override unsafe void OnLostFocus(EventArgs e)
+    {
+        if (VisualStylesMode >= VisualStylesMode.Net11)
+        {
+            // We need to invalidate the non-client area so the un-focused adorners are drawn.
+            PInvoke.RedrawWindow(
+                hWnd: this,
+                lprcUpdate: null,
+                hrgnUpdate: HRGN.Null,
+                flags: REDRAW_WINDOW_FLAGS.RDW_FRAME | REDRAW_WINDOW_FLAGS.RDW_INVALIDATE);
+        }
+
+        base.OnLostFocus(e);
+    }
+
+    protected override unsafe void OnSizeChanged(EventArgs e)
+    {
+        if (VisualStylesMode >= VisualStylesMode.Net11)
+        {
+            // Invalidate the non-client area to ensure the border chrome is drawn correctly after a resize.
+            PInvoke.RedrawWindow(
+                hWnd: this,
+                lprcUpdate: null,
+                hrgnUpdate: HRGN.Null,
+                flags: REDRAW_WINDOW_FLAGS.RDW_FRAME | REDRAW_WINDOW_FLAGS.RDW_INVALIDATE);
+        }
+
+        base.OnSizeChanged(e);
+    }
+
     protected override void OnFontChanged(EventArgs e)
     {
         base.OnFontChanged(e);
@@ -1997,6 +2185,8 @@ internal virtual void UpdateMaxLength()
 
     internal override HBRUSH InitializeDCForWmCtlColor(HDC dc, MessageId msg)
     {
+        InitializeClientArea(dc, (HWND)Handle);
+
         if (msg == PInvokeCore.WM_CTLCOLORSTATIC && !ShouldSerializeBackColor())
         {
             // Let the Win32 Edit control handle background colors itself.
@@ -2010,6 +2200,283 @@ internal override HBRUSH InitializeDCForWmCtlColor(HDC dc, MessageId msg)
         }
     }
 
+    /// <summary>
+    ///  Provokes the single non-client calc round trip that carves the modern Visual Styles padding
+    ///  band from the client area.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   This runs only for <see cref="VisualStylesMode"/> values of <see cref="VisualStylesMode.Net11"/>
+    ///   and above, and only once per handle. The latch (<see cref="_triggerNewClientSizeRequest"/>) is
+    ///   reset on handle recreation in <see cref="CreateHandle"/>.
+    ///  </para>
+    /// </remarks>
+    private protected virtual unsafe void InitializeClientArea(HDC hDC, HWND hwnd)
+    {
+        if (VisualStylesMode < VisualStylesMode.Net11
+            || _triggerNewClientSizeRequest)
+        {
+            return;
+        }
+
+        _triggerNewClientSizeRequest = true;
+
+        // Call SetWindowPos with the current bounds and the SWP_FRAMECHANGED flag. We do not change the
+        // window position/size, but this provokes the WM_NCCALCSIZE message we need to carve the client area.
+        PInvoke.SetWindowPos(
+            hWnd: this,
+            hWndInsertAfter: HWND.HWND_TOP,
+            X: 0,
+            Y: 0,
+            cx: 0,
+            cy: 0,
+            uFlags: SET_WINDOW_POS_FLAGS.SWP_FRAMECHANGED
+                | SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE
+                | SET_WINDOW_POS_FLAGS.SWP_NOMOVE
+                | SET_WINDOW_POS_FLAGS.SWP_NOSIZE
+                | SET_WINDOW_POS_FLAGS.SWP_NOZORDER);
+
+        Invalidate(true);
+    }
+
+    /// <summary>
+    ///  Handles <c>WM_NCCALCSIZE</c> by carving the modern Visual Styles padding band from the client
+    ///  rectangle. The carve is floored so the client rectangle can never invert.
+    /// </summary>
+    private unsafe void WmNcCalcSize(ref Message m)
+    {
+        // Make sure we actually kicked this off.
+        if (_triggerNewClientSizeRequest)
+        {
+            NCCALCSIZE_PARAMS* ncCalcSizeParams = (NCCALCSIZE_PARAMS*)(void*)m.LParamInternal;
+
+            if (ncCalcSizeParams is not null)
+            {
+                Padding padding = GetVisualStylesPadding(includeScrollbars: true);
+
+                ref RECT clientRect = ref ncCalcSizeParams->rgrc._0;
+
+                // Never-invert clamp: a large Padding plus the live scrollbar allowance can drive the
+                // carved client rect to zero or inverted. A 0-1px client area is acceptable and intended
+                // (shipping multiline TextBox already collapses this way); we only prevent underflow past
+                // zero. This is deliberately NOT a MinimumSize and does not vary by VisualStylesMode.
+                int newTop = clientRect.top + padding.Top;
+                int newBottom = clientRect.bottom - padding.Bottom;
+                int newLeft = clientRect.left + padding.Left;
+                int newRight = clientRect.right - padding.Right;
+
+                clientRect.top = newTop;
+                clientRect.bottom = Math.Max(newTop, newBottom);
+                clientRect.left = newLeft;
+                clientRect.right = Math.Max(newLeft, newRight);
+
+                m.ResultInternal = (LRESULT)0;
+
+                return;
+            }
+        }
+
+        base.WndProc(ref m);
+    }
+
+    /// <summary>
+    ///  Handles <c>WM_NCPAINT</c> for modern Visual Styles by painting the custom chrome into the
+    ///  window DC. The wParam clip region is intentionally ignored and the whole frame is repainted
+    ///  to avoid the offscreen-restore "dirty corners" artifact.
+    /// </summary>
+    private void WmNcPaint(ref Message m)
+    {
+        if (VisualStylesMode < VisualStylesMode.Net11)
+        {
+            base.WndProc(ref m);
+
+            return;
+        }
+
+        HWND hwnd = (HWND)m.HWnd;
+        HDC hdc = PInvokeCore.GetWindowDC(hwnd);
+
+        // Intentional: Graphics.FromHdc does NOT own the DC, so we release the DC ourselves in the
+        // finally. Do not "tidy" the DC into a single using - that would be a regression.
+        using Graphics graphics = Graphics.FromHdc(hdc);
+
+        try
+        {
+            base.WndProc(ref m);
+            OnNcPaint(graphics);
+        }
+        finally
+        {
+            int result = PInvokeCore.ReleaseDC(hwnd, hdc);
+            Debug.Assert(result != 0);
+        }
+    }
+
+    /// <summary>
+    ///  Paints the modern Visual Styles non-client chrome (border, rounded <see cref="BorderStyle.Fixed3D"/>
+    ///  lozenge, focus line) into a shared offscreen buffer and blits it to the supplied window DC.
+    /// </summary>
+    private protected virtual void OnNcPaint(Graphics graphics)
+    {
+        int cornerRadius = LogicalToDeviceUnits(15);
+        int borderThickness = LogicalToDeviceUnits(BorderThickness);
+
+        Color adornerColor = ForeColor;
+
+        // Intentional: corners blend against the parent's flat back color, so they mismatch over a
+        // gradient/image/Mica/sibling. For the common case (solid form/panel) this is correct; this is
+        // a documented limitation, not a bug to "improve" into a fake general-case solution.
+        Color parentBackColor = Parent?.BackColor ?? BackColor;
+        Color clientBackColor = BackColor;
+
+        using var parentBackgroundBrush = parentBackColor.GetCachedSolidBrushScope();
+        using var clientBackgroundBrush = clientBackColor.GetCachedSolidBrushScope();
+        using var adornerBrush = adornerColor.GetCachedSolidBrushScope();
+        using var adornerPen = adornerColor.GetCachedPenScope(borderThickness);
+        using var focusPen = SystemColors.MenuHighlight.GetCachedPenScope(borderThickness);
+
+        Rectangle bounds = new(
+            x: 0,
+            y: 0,
+            width: Bounds.Width,
+            height: Bounds.Height);
+
+        Padding clientPadding = GetVisualStylesPadding(includeScrollbars: false);
+
+        // This is the client area without the padding.
+        Rectangle clientBounds = new(
+            clientPadding.Left,
+            clientPadding.Top,
+            bounds.Width - clientPadding.Horizontal,
+            bounds.Height - clientPadding.Vertical);
+
+        // This is the client area of the actual original edit control.
+        Rectangle deflatedBounds = bounds;
+
+        // Making sure we never color outside the lines.
+        deflatedBounds.Width -= 1;
+        deflatedBounds.Height -= 1;
+
+        // Intentional: ExcludeClip stays on the target (window-DC) graphics, set before the buffer
+        // draws. It governs where Render() may blit, protecting the client area.
+        using Region region = new(bounds);
+        graphics.Clip = region;
+        graphics.ExcludeClip(clientBounds);
+
+        // WinForms paints NC serially (one HWND at a time on the UI thread), so a single shared buffer
+        // suffices for any number of controls. The buffer is reused when the size fits; steady-state
+        // allocation is zero. We allocate against the window-DC graphics so Render() blits to it.
+        BufferedGraphicsContext context = BufferedGraphicsManager.Current;
+        using BufferedGraphics buffer = context.Allocate(graphics, bounds);
+
+        // Intentional: the buffer owns this Graphics - do NOT dispose buffer.Graphics separately.
+        Graphics offscreenGraphics = buffer.Graphics;
+
+        // We need anti-aliasing for the rounded chrome.
+        offscreenGraphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+        bounds.Inflate(1, 1);
+
+        // Fill the background with the parent's back color.
+        offscreenGraphics.FillRectangle(parentBackgroundBrush, bounds);
+
+        // Below roughly 2 * cornerRadius + thickness the rounded Fixed3D chrome renders as a broken
+        // lozenge. When the available height is below that viable threshold we fall back to flat/simple
+        // chrome. This is a render-only fallback - it does not change size, layout, or ClientSize.
+        bool canRenderRoundedChrome = deflatedBounds.Height >= (2 * cornerRadius) + borderThickness;
+
+        switch (BorderStyle)
+        {
+            case BorderStyle.None:
+
+                // Just fill a rectangle.
+                offscreenGraphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
+
+                break;
+
+            case BorderStyle.FixedSingle:
+
+                offscreenGraphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
+                offscreenGraphics.DrawRectangle(adornerPen, deflatedBounds);
+
+                break;
+
+            case BorderStyle.Fixed3D:
+
+                if (canRenderRoundedChrome)
+                {
+                    Size radius = new(cornerRadius, cornerRadius);
+
+                    offscreenGraphics.FillRoundedRectangle(clientBackgroundBrush, deflatedBounds, radius);
+                    offscreenGraphics.DrawRoundedRectangle(adornerPen, deflatedBounds, radius);
+                }
+                else
+                {
+                    // Chrome degradation fallback - flat render in place of the broken lozenge.
+                    offscreenGraphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
+                    offscreenGraphics.DrawRectangle(adornerPen, deflatedBounds);
+                }
+
+                break;
+        }
+
+        // Draw the focus as one line over the bottom border.
+        if (Focused)
+        {
+            switch (BorderStyle)
+            {
+                case BorderStyle.None:
+                case BorderStyle.FixedSingle:
+
+                    DrawStandardFocusLine(
+                        x1: deflatedBounds.Left,
+                        y1: deflatedBounds.Bottom,
+                        x2: deflatedBounds.Right,
+                        y2: deflatedBounds.Bottom);
+
+                    break;
+
+                case BorderStyle.Fixed3D:
+
+                    if (canRenderRoundedChrome)
+                    {
+                        // We must shorten the line on both sides to not draw into the curve.
+                        Draw3DFocusLine(
+                            x1: deflatedBounds.Left + ((cornerRadius - 3) / 2),
+                            y1: deflatedBounds.Bottom,
+                            x2: deflatedBounds.Right - ((cornerRadius - 3) / 2),
+                            y2: deflatedBounds.Bottom);
+                    }
+                    else
+                    {
+                        DrawStandardFocusLine(
+                            x1: deflatedBounds.Left,
+                            y1: deflatedBounds.Bottom,
+                            x2: deflatedBounds.Right,
+                            y2: deflatedBounds.Bottom);
+                    }
+
+                    break;
+            }
+        }
+
+        // Blit the buffer to the window-DC graphics captured at Allocate time.
+        buffer.Render();
+
+        void DrawStandardFocusLine(int x1, int y1, int x2, int y2)
+        {
+            offscreenGraphics.DrawLine(focusPen, x1, y1, x2, y2);
+            offscreenGraphics.DrawLine(focusPen, x1, y1 - 1, x2, y2 - 1);
+        }
+
+        void Draw3DFocusLine(int x1, int y1, int x2, int y2)
+        {
+            offscreenGraphics.DrawLine(focusPen, x1, y1, x2, y2);
+            offscreenGraphics.DrawLine(focusPen, x1 - 2, y1 - 1, x2 + 2, y2 - 1);
+            offscreenGraphics.DrawLine(focusPen, x1 - 3, y1 - 2, x2 + 3, y2 - 2);
+        }
+    }
+
     private void WmReflectCommand(ref Message m)
     {
         if (!_textBoxFlags[s_codeUpdateText] && !_textBoxFlags[s_creatingHandle])
@@ -2084,6 +2551,12 @@ protected override void WndProc(ref Message m)
     {
         switch (m.MsgInternal)
         {
+            case PInvokeCore.WM_NCCALCSIZE:
+                WmNcCalcSize(ref m);
+                break;
+            case PInvokeCore.WM_NCPAINT:
+                WmNcPaint(ref m);
+                break;
             case PInvokeCore.WM_LBUTTONDBLCLK:
                 _doubleClickFired = true;
                 base.WndProc(ref m);

From 92ee42045ac5707ba420f66f143424a5e58d2dd2 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Tue, 30 Jun 2026 07:19:36 -0700
Subject: [PATCH 30/50] Tighten OCE handling in HighPrecisionTimer callback
 dispatch

Previously InvokeCallbackAsync used 'catch (Exception ex) when (ex is not
OperationCanceledException)', which let an OperationCanceledException escape the
handler entirely. Because the callback runs as a discarded fire-and-forget task
(SyncContext.Post of '_ = InvokeCallbackAsync(...)'), the escaping OCE faulted
that task into an unobserved task exception that only surfaced via
TaskScheduler.UnobservedTaskException on GC.

Catch the OCE explicitly and ignore it when our cancellation token is signalled
(mirroring the TimerLoopAsync convention), so cancellation during timer shutdown
is a clean no-op. Genuine, non-cancellation exceptions still route to Debug.Fail.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../System/Windows/Forms/Animation/HighPrecisionTimer.cs   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs
index 9c6b1bb7cca..6499e654a72 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Animation/HighPrecisionTimer.cs
@@ -239,7 +239,12 @@ private static async Task InvokeCallbackAsync(
         {
             await registration.Callback(tick, cancellationToken).ConfigureAwait(false);
         }
-        catch (Exception ex) when (ex is not OperationCanceledException)
+        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+        {
+            // Cancellation while the timer is shutting down is a benign, expected outcome. Swallow it
+            // here so it does not fault this fire-and-forget task into an unobserved task exception.
+        }
+        catch (Exception ex)
         {
             Debug.Fail($"HighPrecisionTimer: Unhandled exception in callback: {ex.Message}");
         }

From f6db59111f375bf22133fb29a8519b433d5e0e67 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Tue, 30 Jun 2026 08:01:30 -0700
Subject: [PATCH 31/50] Add VisualStylesMode.Inherit ambient sentinel for
 designer serialization

VisualStylesMode and DataContext are ambient via property-store absence, which is
sufficient at runtime and for the normal serialization path. But a 'truly ambient'
property the designer can reset also needs a writable 'inherit' token: the CodeDOM
serializer (PropertyMemberCodeDomSerializer) substitutes an [AmbientValue] when it is
forced to emit an otherwise-ambient property (inherited/'difference' forms, member
relationships, absolute serialization). Without it the resolved concrete value is baked
in, breaking re-inheritance in those designer scenarios.

VisualStylesMode had no inherit sentinel, so [AmbientValue] had no correct value to use.
Add one, mirroring RightToLeft.Inherit:

* Add VisualStylesMode.Inherit (= -1). It is an assignable sentinel; the resolved value
  is never Inherit (the getter resolves a stored/assigned Inherit to the parent or
  Application.DefaultVisualStylesMode), so the '>= Net11' gating elsewhere is unaffected.
* Annotate Control.VisualStylesMode with [AmbientValue(VisualStylesMode.Inherit)] and make
  the setter treat Inherit (and 'equals parent') as 'clear the local override' so it
  re-inherits; raise the change event only when the resolved value changes.
* Reject VisualStylesMode.Inherit in Application.SetDefaultVisualStylesMode (the app root
  has no parent to inherit from); also validate undefined values there.
* DataContext deliberately keeps NO [AmbientValue]: its setter stores an explicit null
  rather than clearing the override, so null would be a leaky 'inherit' sentinel. Added a
  maintainer comment explaining why.

Update PublicAPI.Unshipped.txt, SR + xlf, and the VisualStylesMode unit tests (the old
'-1 is invalid' case is now Inherit; add re-inherit, never-returns-Inherit, and
SetDefaultVisualStylesMode(Inherit) throws coverage).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI.Unshipped.txt                   |  1 +
 src/System.Windows.Forms/Resources/SR.resx    |  3 ++
 .../Resources/xlf/SR.cs.xlf                   |  5 ++
 .../Resources/xlf/SR.de.xlf                   |  5 ++
 .../Resources/xlf/SR.es.xlf                   |  5 ++
 .../Resources/xlf/SR.fr.xlf                   |  5 ++
 .../Resources/xlf/SR.it.xlf                   |  5 ++
 .../Resources/xlf/SR.ja.xlf                   |  5 ++
 .../Resources/xlf/SR.ko.xlf                   |  5 ++
 .../Resources/xlf/SR.pl.xlf                   |  5 ++
 .../Resources/xlf/SR.pt-BR.xlf                |  5 ++
 .../Resources/xlf/SR.ru.xlf                   |  5 ++
 .../Resources/xlf/SR.tr.xlf                   |  5 ++
 .../Resources/xlf/SR.zh-Hans.xlf              |  5 ++
 .../Resources/xlf/SR.zh-Hant.xlf              |  5 ++
 .../System/Windows/Forms/Application.cs       | 22 ++++++++
 .../System/Windows/Forms/Control.cs           | 52 ++++++++++++++-----
 .../System/Windows/Forms/VisualStylesMode.cs  | 14 +++++
 .../Forms/ControlTests.VisualStylesMode.cs    | 41 ++++++++++++++-
 19 files changed, 183 insertions(+), 15 deletions(-)

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 8b2a5e9c16b..e892dd16fe3 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -165,6 +165,7 @@ System.Windows.Forms.Control.VisualStylesModeChanged -> System.EventHandler?
 System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Classic = 0 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Disabled = 1 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Inherit = -1 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Latest = 32767 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Net11 = 2 -> System.Windows.Forms.VisualStylesMode
 virtual System.Windows.Forms.Control.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index a50ebfcf425..6bf2ba85f58 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -174,6 +174,9 @@
   <data name="Application_VisualStylesModeCanOnlyBeSetOnce" xml:space="preserve">
     <value>The default visual styles mode can only be set once and cannot be changed afterwards.</value>
   </data>
+  <data name="Application_VisualStylesModeInheritInvalidAsDefault" xml:space="preserve">
+    <value>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</value>
+  </data>
   <data name="ApplyCaption" xml:space="preserve">
     <value>&amp;Apply</value>
   </data>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
index dc61cf6dfe0..de18bceb49e 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.cs.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Použít</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
index 6e4717ed5fb..32159c0163f 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.de.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Anwenden</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
index 720687178cd..a6f90831ddb 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.es.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Aplicar</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
index 66c1e5ca451..cbe23fac286 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.fr.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Appliquer</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
index 919e844d1cb..551b9066c86 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.it.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Applica</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
index 476c66762e8..92b67e1de12 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ja.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">適用(&amp;A)</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
index df6ba0e47cb..7c155dc0d7b 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ko.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">적용(&amp;A)</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
index 8c9555dacc5..b45249b5127 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pl.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Zastosuj</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
index ade44214e91..f24528322a6 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.pt-BR.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Aplicar</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
index ac9c5917fe8..93099aae782 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.ru.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Применить</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
index a41d2792eb4..b505965b831 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.tr.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">&amp;Uygula</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
index 7006001e4a2..5c28710618e 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hans.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">应用(&amp;A)</target>
diff --git a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
index 5e106664612..76c2c019b02 100644
--- a/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
+++ b/src/System.Windows.Forms/Resources/xlf/SR.zh-Hant.xlf
@@ -247,6 +247,11 @@
         <target state="new">The default visual styles mode can only be set once and cannot be changed afterwards.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Application_VisualStylesModeInheritInvalidAsDefault">
+        <source>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</source>
+        <target state="new">VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ApplyCaption">
         <source>&amp;Apply</source>
         <target state="translated">套用(&amp;A)</target>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
index 06a7a41b10a..394482df6b3 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
@@ -695,6 +695,13 @@ public static VisualStylesMode DefaultVisualStylesMode
     /// <exception cref="InvalidOperationException">
     ///  The default visual styles mode has already been set to a different value. It can only be set once.
     /// </exception>
+    /// <exception cref="ArgumentException">
+    ///  <paramref name="styleSetting"/> is <see cref="VisualStylesMode.Inherit"/>, which is not valid as
+    ///  the application-wide default because the application root has no parent to inherit from.
+    /// </exception>
+    /// <exception cref="InvalidEnumArgumentException">
+    ///  <paramref name="styleSetting"/> is not a defined <see cref="VisualStylesMode"/> value.
+    /// </exception>
     /// <remarks>
     ///  <para>
     ///   Call this method before creating any window. If visual styles have not been enabled through
@@ -705,6 +712,21 @@ public static VisualStylesMode DefaultVisualStylesMode
     /// </remarks>
     public static void SetDefaultVisualStylesMode(VisualStylesMode styleSetting)
     {
+        // Validate the value. Inherit is the ambient sentinel and is invalid as the application default,
+        // since the application root has no parent to inherit from. The non-contiguous members (Inherit,
+        // Latest) prevent using the source generated enum validator.
+        _ = styleSetting switch
+        {
+            VisualStylesMode.Classic => styleSetting,
+            VisualStylesMode.Disabled => styleSetting,
+            VisualStylesMode.Net11 => styleSetting,
+            VisualStylesMode.Latest => styleSetting,
+            VisualStylesMode.Inherit => throw new ArgumentException(
+                SR.Application_VisualStylesModeInheritInvalidAsDefault,
+                nameof(styleSetting)),
+            _ => throw new InvalidEnumArgumentException(nameof(styleSetting), (int)styleSetting, typeof(VisualStylesMode))
+        };
+
         if (s_defaultVisualStylesMode is { } current && current != styleSetting)
         {
             throw new InvalidOperationException(SR.Application_VisualStylesModeCanOnlyBeSetOnce);
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
index d9f2340fca1..370f3f6c8e9 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
@@ -829,6 +829,18 @@ internal HBRUSH BackColorBrush
     [SRCategory(nameof(SR.CatData))]
     [Browsable(false)]
     [Bindable(true)]
+    // Note: unlike Font/Cursor (which use [AmbientValue(null)]) or RightToLeft (which uses
+    // [AmbientValue(RightToLeft.Inherit)]), DataContext intentionally has NO [AmbientValue].
+    // [AmbientValue] only matters for the designer's CodeDOM serializer: when it is forced to emit an
+    // otherwise-ambient property (inherited/"difference" forms, member relationships, absolute
+    // serialization), it writes the AmbientValue as the "reset to ambient" sentinel. That only works
+    // when the setter treats that sentinel as "clear the local override." Font does (its setter uses
+    // AddOrRemoveValue, so Font = null re-inherits); RightToLeft does (the getter resolves Inherit to
+    // the parent). DataContext's setter instead stores an explicit null when the parent value differs
+    // (see below), so null would SUPPRESS inheritance rather than restore it - making [AmbientValue(null)]
+    // a leaky, incorrect sentinel. Combined with this property being [Browsable(false)], runtime-oriented,
+    // and typically holding a non-CodeDOM-serializable object, the forced-serialization "bake-in" is a
+    // non-issue, so we deliberately leave it off rather than introduce a setter behavior change.
     public virtual object? DataContext
     {
         get => Properties.TryGetValue(s_dataContextProperty, out object? value)
@@ -879,17 +891,27 @@ private void ResetDataContext()
     /// </remarks>
     [SRCategory(nameof(SR.CatAppearance))]
     [EditorBrowsable(EditorBrowsableState.Always)]
+    [AmbientValue(VisualStylesMode.Inherit)]
     [SRDescription(nameof(SR.ControlVisualStylesModeDescr))]
     public VisualStylesMode VisualStylesMode
     {
-        get => Properties.TryGetValue(s_visualStylesModeProperty, out VisualStylesMode value)
-            ? value
-            : ParentInternal?.VisualStylesMode ?? DefaultVisualStylesMode;
+        get
+        {
+            if (!Properties.TryGetValue(s_visualStylesModeProperty, out VisualStylesMode value)
+                || value == VisualStylesMode.Inherit)
+            {
+                value = ParentInternal?.VisualStylesMode ?? DefaultVisualStylesMode;
+            }
+
+            return value;
+        }
         set
         {
-            // Can't use the source generated enum validator here, since it cannot deal with [Experimental].
+            // Can't use the source generated enum validator here, since it cannot deal with the
+            // non-contiguous Inherit (-1) and Latest (short.MaxValue) members.
             _ = value switch
             {
+                VisualStylesMode.Inherit => value,
                 VisualStylesMode.Classic => value,
                 VisualStylesMode.Disabled => value,
                 VisualStylesMode.Net11 => value,
@@ -897,22 +919,24 @@ public VisualStylesMode VisualStylesMode
                 _ => throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(VisualStylesMode))
             };
 
-            if (value == VisualStylesMode)
+            VisualStylesMode oldValue = VisualStylesMode;
+
+            // Inherit was requested explicitly, or the requested value matches the ambient (parent) value:
+            // drop any local override so the value is inherited again.
+            if (value == VisualStylesMode.Inherit
+                || (ParentInternal is { } parent && parent.VisualStylesMode == value))
             {
-                return;
+                Properties.RemoveValue(s_visualStylesModeProperty);
+            }
+            else
+            {
+                Properties.AddValue(s_visualStylesModeProperty, value);
             }
 
-            // When VisualStylesMode differed from its parent before but is about to become the same,
-            // we remove it altogether so it can again inherit the value from its parent.
-            if (Properties.ContainsKey(s_visualStylesModeProperty) && ParentInternal?.VisualStylesMode == value)
+            if (oldValue != VisualStylesMode)
             {
-                Properties.RemoveValue(s_visualStylesModeProperty);
                 OnVisualStylesModeChanged(EventArgs.Empty);
-                return;
             }
-
-            Properties.AddValue(s_visualStylesModeProperty, value);
-            OnVisualStylesModeChanged(EventArgs.Empty);
         }
     }
 
diff --git a/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
index 2658846d23e..ee5c9d22a0c 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
@@ -15,6 +15,20 @@ namespace System.Windows.Forms;
 /// </remarks>
 public enum VisualStylesMode : short
 {
+    /// <summary>
+    ///  The control inherits its <see cref="Control.VisualStylesMode"/> from its parent, or, for a
+    ///  top-level control, from <see cref="Application.DefaultVisualStylesMode"/>. This is the ambient
+    ///  default and is never returned by <see cref="Control.VisualStylesMode"/> after resolution.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   This value is the ambient sentinel: assigning it to <see cref="Control.VisualStylesMode"/>
+    ///   clears any local override so the value is inherited again. It is not valid as the application
+    ///   default and is rejected by <see cref="Application.SetDefaultVisualStylesMode(VisualStylesMode)"/>.
+    ///  </para>
+    /// </remarks>
+    Inherit = -1,
+
     /// <summary>
     ///  The classic version of the visual renderer (.NET 8 and earlier), based on version 6 of the
     ///  common controls library.
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
index 54f97540903..7deaa728ecb 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
@@ -34,7 +34,8 @@ public void Control_VisualStylesMode_Set_GetReturnsExpected()
     }
 
     [WinFormsTheory]
-    [InlineData((VisualStylesMode)(-1))]
+    [InlineData((VisualStylesMode)(-2))]
+    [InlineData((VisualStylesMode)3)]
     [InlineData((VisualStylesMode)999)]
     public void Control_VisualStylesMode_SetInvalid_ThrowsInvalidEnumArgumentException(VisualStylesMode value)
     {
@@ -42,6 +43,44 @@ public void Control_VisualStylesMode_SetInvalid_ThrowsInvalidEnumArgumentExcepti
         Assert.Throws<InvalidEnumArgumentException>(() => control.VisualStylesMode = value);
     }
 
+    [WinFormsFact]
+    public void Control_VisualStylesMode_SetInherit_ReinheritsFromParent()
+    {
+        using SubControlWithVisualStyles parent = new() { VisualStylesMode = VisualStylesMode.Net11 };
+        using SubControlWithVisualStyles child = new();
+        parent.Controls.Add(child);
+
+        child.VisualStylesMode = VisualStylesMode.Disabled;
+        Assert.Equal(VisualStylesMode.Disabled, child.VisualStylesMode);
+
+        // Setting Inherit clears the local override so the child inherits from the parent again.
+        child.VisualStylesMode = VisualStylesMode.Inherit;
+        Assert.Equal(VisualStylesMode.Net11, child.VisualStylesMode);
+
+        // The child is ambient again, so a later change on the parent flows through.
+        parent.VisualStylesMode = VisualStylesMode.Classic;
+        Assert.Equal(VisualStylesMode.Classic, child.VisualStylesMode);
+    }
+
+    [WinFormsFact]
+    public void Control_VisualStylesMode_GetNeverReturnsInherit()
+    {
+        using SubControlWithVisualStyles control = new();
+
+        // Inherit is an assignable sentinel, but the resolved value is never Inherit.
+        control.VisualStylesMode = VisualStylesMode.Inherit;
+        Assert.NotEqual(VisualStylesMode.Inherit, control.VisualStylesMode);
+        Assert.Equal(Application.DefaultVisualStylesMode, control.VisualStylesMode);
+    }
+
+    [Fact]
+    public void Application_SetDefaultVisualStylesMode_Inherit_ThrowsArgumentException()
+    {
+        // Inherit is the ambient sentinel and is rejected before any global state is mutated, so this
+        // is safe to assert regardless of whether the default has already been set.
+        Assert.Throws<ArgumentException>(() => Application.SetDefaultVisualStylesMode(VisualStylesMode.Inherit));
+    }
+
     [WinFormsFact]
     public void Control_VisualStylesMode_SetWithHandler_CallsVisualStylesModeChanged()
     {

From 8d93e9dab8e637e6bc024ee107671864f1bd6d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:07:55 -0700
Subject: [PATCH 32/50] Add VisualStylesMode.LatestPreview support

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI.Unshipped.txt                   |  1 +
 .../System/Windows/Forms/Application.cs       | 26 ++++++++-------
 .../System/Windows/Forms/Control.cs           |  4 ++-
 .../System/Windows/Forms/VisualStylesMode.cs  | 14 +++++++-
 .../System/Windows/Forms/ApplicationTests.cs  | 25 ++++++++++++++
 .../Forms/CheckBoxToggleSwitchTests.cs        | 33 +++++++++++++++++--
 .../Forms/ControlTests.VisualStylesMode.cs    | 21 ++++++++----
 7 files changed, 101 insertions(+), 23 deletions(-)

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index e892dd16fe3..1004c0cba3a 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -167,6 +167,7 @@ System.Windows.Forms.VisualStylesMode.Classic = 0 -> System.Windows.Forms.Visual
 System.Windows.Forms.VisualStylesMode.Disabled = 1 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Inherit = -1 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Latest = 32767 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.LatestPreview = 32766 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Net11 = 2 -> System.Windows.Forms.VisualStylesMode
 virtual System.Windows.Forms.Control.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 virtual System.Windows.Forms.Control.OnParentVisualStylesModeChanged(System.EventArgs! e) -> void
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
index 394482df6b3..aafaa67d1c8 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
@@ -682,10 +682,19 @@ public static bool RenderWithVisualStyles
     ///   recompile against a newer framework keep their existing look. Opt in to a newer renderer by
     ///   calling <see cref="SetDefaultVisualStylesMode(VisualStylesMode)"/>.
     ///  </para>
+    ///  <para>
+    ///   While visual styles are disabled, the effective value remains <see cref="VisualStylesMode.Disabled"/>,
+    ///   even if a different default has already been requested through
+    ///   <see cref="SetDefaultVisualStylesMode(VisualStylesMode)"/>.
+    ///  </para>
     /// </remarks>
     public static VisualStylesMode DefaultVisualStylesMode
-        => s_defaultVisualStylesMode ??=
-            UseVisualStyles ? VisualStylesMode.Classic : VisualStylesMode.Disabled;
+        => s_defaultVisualStylesMode switch
+        {
+            { } visualStylesMode when UseVisualStyles => visualStylesMode,
+            { } => VisualStylesMode.Disabled,
+            _ => UseVisualStyles ? VisualStylesMode.Classic : VisualStylesMode.Disabled
+        };
 
     /// <summary>
     ///  Sets the default <see cref="VisualStylesMode"/> used as the rendering style guideline for the
@@ -714,12 +723,13 @@ public static void SetDefaultVisualStylesMode(VisualStylesMode styleSetting)
     {
         // Validate the value. Inherit is the ambient sentinel and is invalid as the application default,
         // since the application root has no parent to inherit from. The non-contiguous members (Inherit,
-        // Latest) prevent using the source generated enum validator.
+        // LatestPreview, Latest) prevent using the source generated enum validator.
         _ = styleSetting switch
         {
             VisualStylesMode.Classic => styleSetting,
             VisualStylesMode.Disabled => styleSetting,
             VisualStylesMode.Net11 => styleSetting,
+            VisualStylesMode.LatestPreview => styleSetting,
             VisualStylesMode.Latest => styleSetting,
             VisualStylesMode.Inherit => throw new ArgumentException(
                 SR.Application_VisualStylesModeInheritInvalidAsDefault,
@@ -732,8 +742,7 @@ public static void SetDefaultVisualStylesMode(VisualStylesMode styleSetting)
             throw new InvalidOperationException(SR.Application_VisualStylesModeCanOnlyBeSetOnce);
         }
 
-        // Without visual styles enabled, the only effective mode is Disabled.
-        s_defaultVisualStylesMode = UseVisualStyles ? styleSetting : VisualStylesMode.Disabled;
+        s_defaultVisualStylesMode = styleSetting;
     }
 
     /// <summary>
@@ -1124,13 +1133,6 @@ public static void EnableVisualStyles()
         Debug.Assert(UseVisualStyles, "Enable Visual Styles failed");
 
         s_comCtlSupportsVisualStylesInitialized = false;
-
-        // Keep the default visual styles mode in sync when EnableVisualStyles is called after
-        // SetDefaultVisualStylesMode(VisualStylesMode.Disabled): an explicitly disabled mode becomes Classic.
-        if (UseVisualStyles && s_defaultVisualStylesMode == VisualStylesMode.Disabled)
-        {
-            s_defaultVisualStylesMode = VisualStylesMode.Classic;
-        }
     }
 
     /// <summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
index 370f3f6c8e9..d5f264373b9 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
@@ -908,13 +908,15 @@ public VisualStylesMode VisualStylesMode
         set
         {
             // Can't use the source generated enum validator here, since it cannot deal with the
-            // non-contiguous Inherit (-1) and Latest (short.MaxValue) members.
+            // non-contiguous Inherit (-1), LatestPreview (short.MaxValue - 1), and Latest
+            // (short.MaxValue) members.
             _ = value switch
             {
                 VisualStylesMode.Inherit => value,
                 VisualStylesMode.Classic => value,
                 VisualStylesMode.Disabled => value,
                 VisualStylesMode.Net11 => value,
+                VisualStylesMode.LatestPreview => value,
                 VisualStylesMode.Latest => value,
                 _ => throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(VisualStylesMode))
             };
diff --git a/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
index ee5c9d22a0c..0d2937d2710 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
@@ -49,7 +49,19 @@ public enum VisualStylesMode : short
     Net11 = 2,
 
     /// <summary>
-    ///  The latest version of the visual renderer available in the running framework.
+    ///  The latest preview version of the visual renderer available in the running framework.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   This value intentionally tracks unreleased or experimental renderer behavior ahead of
+    ///   <see cref="Latest"/>. Tooling should therefore avoid treating it as a long-term stable
+    ///   serialization target.
+    ///  </para>
+    /// </remarks>
+    LatestPreview = short.MaxValue - 1,
+
+    /// <summary>
+    ///  The latest stable version of the visual renderer available in the running framework.
     /// </summary>
     Latest = short.MaxValue
 }
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
index 5aeb7d2f2e4..c12723bb4f9 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
@@ -178,6 +178,31 @@ public void Application_SetColorMode_PlausibilityTests()
         Assert.False(SystemColors.UseAlternativeColorSet ^ systemColorMode == SystemColorMode.Dark);
     }
 
+    [Fact]
+    public void Application_SetDefaultVisualStylesMode_LatestPreview_IsWriteOnce()
+    {
+        using RemoteInvokeHandle handle = RemoteExecutor.Invoke(() =>
+        {
+            Assert.Equal(short.MaxValue - 1, (short)VisualStylesMode.LatestPreview);
+
+            VisualStylesMode expectedInitialMode = Application.UseVisualStyles
+                ? VisualStylesMode.Classic
+                : VisualStylesMode.Disabled;
+            Assert.Equal(expectedInitialMode, Application.DefaultVisualStylesMode);
+
+            Application.SetDefaultVisualStylesMode(VisualStylesMode.LatestPreview);
+            Assert.Equal(
+                Application.UseVisualStyles ? VisualStylesMode.LatestPreview : VisualStylesMode.Disabled,
+                Application.DefaultVisualStylesMode);
+            Application.SetDefaultVisualStylesMode(VisualStylesMode.LatestPreview);
+
+            Assert.Throws<InvalidOperationException>(
+                () => Application.SetDefaultVisualStylesMode(VisualStylesMode.Latest));
+        });
+
+        Assert.Equal(RemoteExecutor.SuccessExitCode, handle.ExitCode);
+    }
+
 #pragma warning restore SYSLIB5002
 
 #if NET11_0_OR_GREATER
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
index 0b4cdadfea9..f082b5ae546 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
@@ -20,12 +20,15 @@ public void CheckBox_Appearance_ToggleSwitch_RoundTrips()
         Assert.Equal(Appearance.ToggleSwitch, checkBox.Appearance);
     }
 
-    [WinFormsFact]
-    public void CheckBox_ToggleSwitch_WithVisualStylesNet11_HasPositivePreferredSize()
+    [WinFormsTheory]
+    [InlineData(VisualStylesMode.Net11)]
+    [InlineData(VisualStylesMode.LatestPreview)]
+    [InlineData(VisualStylesMode.Latest)]
+    public void CheckBox_ToggleSwitch_WithModernVisualStyles_HasPositivePreferredSize(VisualStylesMode visualStylesMode)
     {
         using CheckBox checkBox = new()
         {
-            VisualStylesMode = VisualStylesMode.Net11,
+            VisualStylesMode = visualStylesMode,
             Appearance = Appearance.ToggleSwitch,
             Text = "Toggle"
         };
@@ -36,6 +39,30 @@ public void CheckBox_ToggleSwitch_WithVisualStylesNet11_HasPositivePreferredSize
         Assert.True(preferred.Height > 0);
     }
 
+    [WinFormsTheory]
+    [InlineData(VisualStylesMode.Classic)]
+    [InlineData(VisualStylesMode.Disabled)]
+    public void CheckBox_ToggleSwitch_WithoutModernVisualStyles_UsesClassicPreferredSize(VisualStylesMode visualStylesMode)
+    {
+        using CheckBox classicCheckBox = new()
+        {
+            VisualStylesMode = visualStylesMode,
+            Appearance = Appearance.Normal,
+            Text = "Toggle"
+        };
+
+        using CheckBox toggleSwitchCheckBox = new()
+        {
+            VisualStylesMode = visualStylesMode,
+            Appearance = Appearance.ToggleSwitch,
+            Text = "Toggle"
+        };
+
+        Assert.Equal(
+            classicCheckBox.GetPreferredSize(Size.Empty),
+            toggleSwitchCheckBox.GetPreferredSize(Size.Empty));
+    }
+
     [WinFormsFact]
     public void CheckBox_ToggleSwitch_CheckedRoundTrips()
     {
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
index 7deaa728ecb..39282c1af53 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
@@ -20,16 +20,25 @@ public void Control_VisualStylesMode_DefaultMatchesApplicationDefault()
         Assert.False(control.IsHandleCreated);
     }
 
-    [WinFormsFact]
-    public void Control_VisualStylesMode_Set_GetReturnsExpected()
+    [Fact]
+    public void VisualStylesMode_LatestPreview_HasExpectedValue()
     {
-        using SubControlWithVisualStyles control = new() { VisualStylesMode = VisualStylesMode.Net11 };
-        Assert.Equal(VisualStylesMode.Net11, control.VisualStylesMode);
+        Assert.Equal(short.MaxValue - 1, (short)VisualStylesMode.LatestPreview);
+    }
+
+    [WinFormsTheory]
+    [InlineData(VisualStylesMode.Net11)]
+    [InlineData(VisualStylesMode.LatestPreview)]
+    [InlineData(VisualStylesMode.Latest)]
+    public void Control_VisualStylesMode_Set_GetReturnsExpected(VisualStylesMode value)
+    {
+        using SubControlWithVisualStyles control = new() { VisualStylesMode = value };
+        Assert.Equal(value, control.VisualStylesMode);
         Assert.False(control.IsHandleCreated);
 
         // Set the same value again - idempotent, no handle forced.
-        control.VisualStylesMode = VisualStylesMode.Net11;
-        Assert.Equal(VisualStylesMode.Net11, control.VisualStylesMode);
+        control.VisualStylesMode = value;
+        Assert.Equal(value, control.VisualStylesMode);
         Assert.False(control.IsHandleCreated);
     }
 

From 68ca9cc31dc7db54365a40cba7b9176ee37cfc4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:08:09 -0700
Subject: [PATCH 33/50] Gate TextBoxBase padding to modern visual styles

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Forms/Controls/TextBox/TextBoxBase.cs     | 21 ++++---
 .../System.Windows.Forms/TextBoxBaseTests.cs  | 56 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index bd1aca6d75c..aaa0bbbe9da 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -980,28 +980,31 @@ internal override Size GetPreferredSizeCore(Size proposedConstraints)
         }
         else
         {
-            Size bordersAndPadding = SizeFromClientSize(Size.Empty) + Padding.Size;
+            // Keep the pre-.NET 11 layout contract for classic or disabled visual styles. In these
+            // modes we retain the historic border sizing, but user Padding does not participate in
+            // preferred-size calculations until a modern visual styles mode is selected explicitly.
+            Size borders = SizeFromClientSize(Size.Empty);
 
             if (BorderStyle != BorderStyle.None)
             {
-                bordersAndPadding += new Size(0, 3);
+                borders += new Size(0, 3);
             }
 
             if (BorderStyle == BorderStyle.FixedSingle)
             {
                 // Bump these by 2px to match BorderStyle.Fixed3D - they'll be omitted from the SizeFromClientSize call.
-                bordersAndPadding.Width += 2;
-                bordersAndPadding.Height += 2;
+                borders.Width += 2;
+                borders.Height += 2;
             }
 
-            // We used to add the borders and padding to the returned size - this remains effectively the same:
+            // Preserve the classic border-only measurement contract until a modern visual styles mode is selected.
             padding.Left = 0;
             padding.Top = 0;
-            padding.Right = bordersAndPadding.Width;
-            padding.Bottom = bordersAndPadding.Height;
+            padding.Right = borders.Width;
+            padding.Bottom = borders.Height;
 
-            // Reduce constraints by border/padding size
-            proposedConstraints -= bordersAndPadding;
+            // Reduce constraints by the classic border size.
+            proposedConstraints -= borders;
         }
 
         Size textSize = TextRenderer.MeasureText(Text, Font, proposedConstraints, format);
diff --git a/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs b/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs
index 47cfba21256..8f01a6c4289 100644
--- a/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs
+++ b/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs
@@ -5036,24 +5036,72 @@ public void TextBox_GetPreferredSize_Invoke_ReturnsExpected(bool multiline, bool
 
     [WinFormsTheory]
     [MemberData(nameof(GetPreferredSize_TestData))]
-    public void TextBox_GetPreferredSize_InvokeWithPadding_ReturnsExpected(bool multiline, bool wordWrap, BorderStyle borderStyle, Size proposedSize, Size expected)
+    public void TextBox_GetPreferredSize_InvokeWithPaddingWithoutModernVisualStyles_ReturnsExpected(bool multiline, bool wordWrap, BorderStyle borderStyle, Size proposedSize, Size expected)
     {
         Padding padding = new(1, 2, 3, 4);
         using SubTextBox control = new()
         {
+            VisualStylesMode = VisualStylesMode.Classic,
             Padding = padding,
             Multiline = multiline,
             WordWrap = wordWrap,
             BorderStyle = borderStyle
         };
-        Assert.Equal(expected + padding.Size, control.GetPreferredSize(proposedSize));
+        Assert.Equal(expected, control.GetPreferredSize(proposedSize));
         Assert.False(control.IsHandleCreated);
 
         // Call again.
-        Assert.Equal(expected + padding.Size, control.GetPreferredSize(proposedSize));
+        Assert.Equal(expected, control.GetPreferredSize(proposedSize));
         Assert.False(control.IsHandleCreated);
     }
 
+    [WinFormsTheory]
+    [InlineData(VisualStylesMode.Net11)]
+    [InlineData(VisualStylesMode.LatestPreview)]
+    [InlineData(VisualStylesMode.Latest)]
+    public void TextBoxBase_Padding_WithModernVisualStyles_ChangesPreferredSize(VisualStylesMode visualStylesMode)
+    {
+        Padding padding = new(1, 2, 3, 4);
+        Size proposedSize = new(200, 80);
+
+        using TextBox baseline = new()
+        {
+            VisualStylesMode = visualStylesMode
+        };
+
+        using TextBox padded = new()
+        {
+            VisualStylesMode = visualStylesMode,
+            Padding = padding
+        };
+
+        Size baselinePreferredSize = baseline.GetPreferredSize(proposedSize);
+        Size paddedPreferredSize = padded.GetPreferredSize(proposedSize);
+
+        Assert.Equal(baselinePreferredSize.Width + padding.Horizontal, paddedPreferredSize.Width);
+        Assert.Equal(baselinePreferredSize.Height + padding.Vertical, paddedPreferredSize.Height);
+    }
+
+    [WinFormsTheory]
+    [InlineData(VisualStylesMode.Net11)]
+    [InlineData(VisualStylesMode.LatestPreview)]
+    [InlineData(VisualStylesMode.Latest)]
+    public void TextBoxBase_Padding_WithModernVisualStyles_ChangesVisualStylesPadding(VisualStylesMode visualStylesMode)
+    {
+        Padding padding = new(1, 2, 3, 4);
+
+        using SubTextBox baseline = new() { VisualStylesMode = visualStylesMode };
+        using SubTextBox padded = new() { VisualStylesMode = visualStylesMode, Padding = padding };
+
+        Padding baselineVisualStylesPadding = baseline.GetVisualStylesPaddingCore(includeScrollbars: false);
+        Padding paddedVisualStylesPadding = padded.GetVisualStylesPaddingCore(includeScrollbars: false);
+
+        Assert.Equal(baselineVisualStylesPadding.Left + padding.Left, paddedVisualStylesPadding.Left);
+        Assert.Equal(baselineVisualStylesPadding.Top + padding.Top, paddedVisualStylesPadding.Top);
+        Assert.Equal(baselineVisualStylesPadding.Right + padding.Right, paddedVisualStylesPadding.Right);
+        Assert.Equal(baselineVisualStylesPadding.Bottom + padding.Bottom, paddedVisualStylesPadding.Bottom);
+    }
+
     public static IEnumerable<object[]> GetPreferredSize_WithText_TestData()
     {
         yield return new object[] { BorderStyle.Fixed3D, Size.Empty, 4, s_preferredHeight };
@@ -7718,6 +7766,8 @@ private class SubTextBox : TextBox
             set => base.FontHeight = value;
         }
 
+        public Padding GetVisualStylesPaddingCore(bool includeScrollbars) => base.GetVisualStylesPadding(includeScrollbars);
+
         public new ImeMode ImeModeBase
         {
             get => base.ImeModeBase;

From 90c1db5b9135e311ae6d5deae74ca6ba6a95b737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Wed, 1 Jul 2026 18:08:18 -0700
Subject: [PATCH 34/50] Wire VisualStylesMode through VB application defaults

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../ApplyApplicationDefaultsEventArgs.vb      | 21 ++++++---
 .../WindowsFormsApplicationBase.vb            |  7 +--
 .../Forms/WindowsFormsApplicationBaseTests.vb | 43 +++++++++++++++++++
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
index aadab446322..dac00b51b63 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/ApplyApplicationDefaultsEventArgs.vb
@@ -23,6 +23,12 @@ Namespace Microsoft.VisualBasic.ApplicationServices
         ''' </summary>
         Public Property ColorMode As SystemColorMode
 
+        ''' <summary>
+        '''  Setting this property inside the event handler determines the
+        '''  <see cref="Application.DefaultVisualStylesMode"/> for the application.
+        ''' </summary>
+        Public Property VisualStylesMode As VisualStylesMode
+
         ''' <summary>
         '''  Setting this property inside the event handler causes a
         '''  new default <see cref="Font"/> for Forms and UserControls to be set.
@@ -67,11 +73,16 @@ Namespace Microsoft.VisualBasic.ApplicationServices
         ''' </summary>
         Public Property FormRevealMode As FormRevealMode
 
-        ''' <summary>
-        '''  Setting this property inside the event handler determines the
-        '''  <see cref="Application.DefaultVisualStylesMode"/> for the application.
-        ''' </summary>
-        Public Property VisualStylesMode As VisualStylesMode
+        Friend Sub New(minimumSplashScreenDisplayTime As Integer,
+                highDpiMode As HighDpiMode,
+                colorMode As SystemColorMode,
+                visualStylesMode As VisualStylesMode)
+
+            Me.MinimumSplashScreenDisplayTime = minimumSplashScreenDisplayTime
+            Me.HighDpiMode = highDpiMode
+            Me.ColorMode = colorMode
+            Me.VisualStylesMode = visualStylesMode
+        End Sub
 
     End Class
 End Namespace
diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
index bef5612714a..cb59f1b43a4 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBase.vb
@@ -769,11 +769,8 @@ Namespace Microsoft.VisualBasic.ApplicationServices
             Dim applicationDefaultsEventArgs As New ApplyApplicationDefaultsEventArgs(
                 MinimumSplashScreenDisplayTime,
                 HighDpiMode,
-                ColorMode) With
-            {
-                .MinimumSplashScreenDisplayTime = MinimumSplashScreenDisplayTime,
-                .VisualStylesMode = VisualStylesMode
-            }
+                ColorMode,
+                VisualStylesMode)
 
             RaiseEvent ApplyApplicationDefaults(Me, applicationDefaultsEventArgs)
 
diff --git a/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb b/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb
index a03679253d7..953d748b070 100644
--- a/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb
+++ b/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb
@@ -21,6 +21,10 @@ Namespace Microsoft.VisualBasic.Forms.Tests
             ColorMode = SystemColorMode.Dark
             ColorMode.Should.Be(SystemColorMode.Dark)
 
+            VisualStylesMode.Should.Be(VisualStylesMode.Classic)
+            VisualStylesMode = VisualStylesMode.LatestPreview
+            VisualStylesMode.Should.Be(VisualStylesMode.LatestPreview)
+
             EnableVisualStyles.Should.Be(False)
             EnableVisualStyles = True
             EnableVisualStyles.Should.Be(True)
@@ -113,6 +117,31 @@ Namespace Microsoft.VisualBasic.Forms.Tests
             End If
         End Sub
 
+        <Fact>
+        Public Sub OnInitialize_ApplyApplicationDefaults_VisualStylesModeFlowsToApplication()
+            If RemoteExecutor.IsSupported Then
+                Dim test As Action =
+                    Sub()
+                        Dim appModel As New SubWindowsFormsApplicationBase() With
+                        {
+                            .EnableVisualStylesCore = True
+                        }
+
+                        AddHandler appModel.ApplyApplicationDefaults,
+                            Sub(sender, e)
+                                e.VisualStylesMode = VisualStylesMode.LatestPreview
+                            End Sub
+
+                        appModel.CallOnInitialize(Array.Empty(Of String)()).Should.BeTrue()
+                        System.Windows.Forms.Application.DefaultVisualStylesMode.Should.Be(VisualStylesMode.LatestPreview)
+                    End Sub
+
+                Using handle As RemoteInvokeHandle = RemoteExecutor.Invoke(test)
+                    handle.ExitCode.Should.Be(RemoteExecutor.SuccessExitCode)
+                End Using
+            End If
+        End Sub
+
         <Fact>
         Public Sub ShowHideSplashScreenSuccess()
             Dim testCode As Action
@@ -158,5 +187,19 @@ Namespace Microsoft.VisualBasic.Forms.Tests
             End If
         End Sub
 
+        Private NotInheritable Class SubWindowsFormsApplicationBase
+            Inherits WindowsFormsApplicationBase
+
+            Public Function CallOnInitialize(commandLineArgs As String()) As Boolean
+                Return MyBase.OnInitialize(Array.AsReadOnly(commandLineArgs))
+            End Function
+
+            Public WriteOnly Property EnableVisualStylesCore As Boolean
+                Set(value As Boolean)
+                    EnableVisualStyles = value
+                End Set
+            End Property
+        End Class
+
     End Class
 End Namespace

From c74bd1418f8b819da996c5b409aac9e73e235d92 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Sat, 4 Jul 2026 14:48:23 -0700
Subject: [PATCH 35/50] Fix modern Visual Styles NC-paint erasing TextBox
 client area; refactor TextBoxBase

WM_NCPAINT now passes base.WndProc a client-excluding update region (screen coordinates) so the default themed non-client paint no longer erases the edit client area (e.g. on hover) for scrollbar-bearing TextBox/RichTextBox.

Also: fix Release-only CS8175 by capturing the cached Pen (not the ref-struct scope) in the OnNcPaint focus-line local functions; extract the RichEdit-specific ScrollToCaret logic into a RichTextBox override of a new private protected virtual ScrollToCaretCore; and documentation/comment cleanups (GetVisualStylesPadding, GetPreferredSizeCore, WindowText, PaddingChanged) plus Everett capitalization.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Forms/Controls/RichTextBox/RichTextBox.cs |  62 ++
 .../Forms/Controls/TextBox/TextBoxBase.cs     | 555 +++++++++++-------
 2 files changed, 398 insertions(+), 219 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs
index 4a6c7972a34..4e7ef249817 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs
@@ -2246,6 +2246,68 @@ private static bool GetCharInCharSet(char c, char[] charSet, bool negate)
     public override int GetLineFromCharIndex(int index)
         => (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_EXLINEFROMCHAR, 0, index);
 
+    /// <summary>
+    ///  Scrolls the caret into view, showing as much of the surrounding text as possible. This overrides
+    ///  the base edit-control behavior so the RichEdit-specific handling lives with the RichTextBox.
+    /// </summary>
+    private protected override unsafe void ScrollToCaretCore()
+    {
+        using ComScope<IRichEditOle> richEdit = new(null);
+
+        if (PInvokeCore.SendMessage(
+            hWnd: this,
+            Msg: PInvokeCore.EM_GETOLEINTERFACE,
+            wParam: 0,
+            lParam: (void**)richEdit) == 0)
+        {
+            // No OLE interface available; fall back to the plain edit behavior.
+            base.ScrollToCaretCore();
+            return;
+        }
+
+        using var textDocument = richEdit.TryQuery<ITextDocument>(out HRESULT hr);
+
+        if (hr.Succeeded)
+        {
+            // When the user calls RichTextBox::ScrollToCaret we want the RichTextBox to show as much text as
+            // possible. Here is how we do that:
+            //
+            //  1. We scroll the RichTextBox all the way to the bottom so the last line of text is the last visible line.
+            //  2. We get the first visible line.
+            //  3. If the first visible line is smaller than the start of the selection, then we are done:
+            //      The selection fits inside the RichTextBox display rectangle.
+            //  4. Otherwise, scroll the selection to the top of the RichTextBox.
+
+            GetSelectionStartAndLength(out int selStart, out int selLength);
+            int selStartLine = GetLineFromCharIndex(selStart);
+
+            using ComScope<ITextRange> windowTextRange = new(null);
+            textDocument.Value->Range(WindowText.Length - 1, WindowText.Length - 1, windowTextRange).ThrowOnFailure();
+
+            // 1. Scroll the RichTextBox all the way to the bottom
+            windowTextRange.Value->ScrollIntoView((int)tomConstants.tomEnd).ThrowOnFailure();
+
+            // 2. Get the first visible line.
+            int firstVisibleLine = (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_GETFIRSTVISIBLELINE);
+
+            // 3. If the first visible line is smaller than the start of the selection, we are done.
+            if (firstVisibleLine <= selStartLine)
+            {
+                return;
+            }
+            else
+            {
+                // 4. Scroll the selection to the top of the RichTextBox.
+                using ComScope<ITextRange> selectionTextRange = new(null);
+                textDocument.Value->Range(selStart, selStart + selLength, selectionTextRange).ThrowOnFailure();
+                selectionTextRange.Value->ScrollIntoView((int)tomConstants.tomStart).ThrowOnFailure();
+                return;
+            }
+        }
+
+        base.ScrollToCaretCore();
+    }
+
     /// <summary>
     ///  Returns the location of the character at the given index.
     /// </summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index aaa0bbbe9da..549ea0b9164 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Specialized;
@@ -11,7 +11,6 @@
 using System.Windows.Forms.Layout;
 using Windows.Win32.System.Variant;
 using Windows.Win32.UI.Accessibility;
-using Windows.Win32.UI.Controls.RichEdit;
 
 namespace System.Windows.Forms;
 
@@ -130,10 +129,7 @@ internal TextBoxBase() : base()
     [SRDescription(nameof(SR.TextBoxAcceptsTabDescr))]
     public bool AcceptsTab
     {
-        get
-        {
-            return _textBoxFlags[s_acceptsTab];
-        }
+        get => _textBoxFlags[s_acceptsTab];
         set
         {
             if (_textBoxFlags[s_acceptsTab] != value)
@@ -162,10 +158,7 @@ public event EventHandler? AcceptsTabChanged
     [SRDescription(nameof(SR.TextBoxShortcutsEnabledDescr))]
     public virtual bool ShortcutsEnabled
     {
-        get
-        {
-            return _textBoxFlags[s_shortcutsEnabled];
-        }
+        get => _textBoxFlags[s_shortcutsEnabled];
         set
         {
             s_shortcutsToDisable ??=
@@ -256,10 +249,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
     [EditorBrowsable(EditorBrowsableState.Never)]
     public override bool AutoSize
     {
-        get
-        {
-            return _textBoxFlags[s_autoSize];
-        }
+        get => _textBoxFlags[s_autoSize];
         set
         {
             // Note that we intentionally do not call base. TextBoxes size themselves by
@@ -391,9 +381,11 @@ public event EventHandler? BorderStyleChanged
         remove => Events.RemoveHandler(s_borderStyleChangedEvent, value);
     }
 
-    internal virtual bool CanRaiseTextChangedEvent => true;
+    internal virtual bool CanRaiseTextChangedEvent
+        => true;
 
-    protected override bool CanEnableIme => !(ReadOnly || PasswordProtect) && base.CanEnableIme;
+    protected override bool CanEnableIme
+        => !(ReadOnly || PasswordProtect) && base.CanEnableIme;
 
     /// <summary>
     ///  Gets a value indicating whether the user can undo the previous operation in a text box control.
@@ -402,7 +394,9 @@ public event EventHandler? BorderStyleChanged
     [Browsable(false)]
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     [SRDescription(nameof(SR.TextBoxCanUndoDescr))]
-    public bool CanUndo => IsHandleCreated && (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_CANUNDO) != 0;
+    public bool CanUndo
+        => IsHandleCreated
+            && (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_CANUNDO) != 0;
 
     /// <summary>
     ///  Returns the parameters needed to create the handle. Inheriting classes
@@ -419,6 +413,7 @@ protected override CreateParams CreateParams
             CreateParams cp = base.CreateParams;
             cp.ClassName = PInvoke.WC_EDIT;
             cp.Style |= PInvoke.ES_AUTOHSCROLL | PInvoke.ES_AUTOVSCROLL;
+
             if (!_textBoxFlags[s_hideSelection])
             {
                 cp.Style |= PInvoke.ES_NOHIDESEL;
@@ -445,6 +440,7 @@ protected override CreateParams CreateParams
             if (_textBoxFlags[s_multiline])
             {
                 cp.Style |= PInvoke.ES_MULTILINE;
+
                 if (_textBoxFlags[s_wordWrap])
                 {
                     cp.Style &= ~PInvoke.ES_AUTOHSCROLL;
@@ -495,12 +491,7 @@ protected override Cursor DefaultCursor
     ///  This is more efficient than setting the size in the control's constructor.
     /// </summary>
     protected override Size DefaultSize
-    {
-        get
-        {
-            return new Size(100, PreferredHeight);
-        }
-    }
+        => new Size(100, PreferredHeight);
 
     /// <summary>
     ///  Gets or sets the foreground color of the control.
@@ -510,12 +501,10 @@ protected override Size DefaultSize
     [SRDescription(nameof(SR.ControlForeColorDescr))]
     public override Color ForeColor
     {
-        get
-        {
-            return ShouldSerializeForeColor()
-                ? base.ForeColor
-                : SystemColors.WindowText;
-        }
+        get => ShouldSerializeForeColor()
+            ? base.ForeColor
+            : SystemColors.WindowText;
+
         set => base.ForeColor = value;
     }
 
@@ -528,10 +517,7 @@ public override Color ForeColor
     [SRDescription(nameof(SR.TextBoxHideSelectionDescr))]
     public bool HideSelection
     {
-        get
-        {
-            return _textBoxFlags[s_hideSelection];
-        }
+        get => _textBoxFlags[s_hideSelection];
 
         set
         {
@@ -559,7 +545,10 @@ public event EventHandler? HideSelectionChanged
     /// </summary>
     protected override ImeMode ImeModeBase
     {
-        get => (DesignMode || CanEnableIme) ? base.ImeModeBase : ImeMode.Disable;
+        get => (DesignMode || CanEnableIme)
+            ? base.ImeModeBase
+            : ImeMode.Disable;
+
         set => base.ImeModeBase = value;
     }
 
@@ -585,9 +574,11 @@ public string[] Lines
             while (lineStart < text.Length)
             {
                 int lineEnd = lineStart;
+
                 for (; lineEnd < text.Length; lineEnd++)
                 {
                     char c = text[lineEnd];
+
                     if (c is '\r' or '\n')
                     {
                         break;
@@ -619,13 +610,12 @@ public string[] Lines
 
             return [.. list];
         }
-        set
-        {
+
+        set =>
             // unparse this string list...
             Text = value is not null && value.Length > 0
                 ? string.Join(Environment.NewLine, value)
                 : string.Empty;
-        }
     }
 
     /// <summary>
@@ -638,10 +628,8 @@ public string[] Lines
     [SRDescription(nameof(SR.TextBoxMaxLengthDescr))]
     public virtual int MaxLength
     {
-        get
-        {
-            return _maxLength;
-        }
+        get => _maxLength;
+
         set
         {
             ArgumentOutOfRangeException.ThrowIfNegative(value);
@@ -666,22 +654,26 @@ public bool Modified
     {
         get
         {
-            if (IsHandleCreated)
+            if (!IsHandleCreated)
             {
-                bool curState = (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_GETMODIFY) != 0;
+                return _textBoxFlags[s_modified];
+            }
+            else
+            {
+                bool curState = (int)PInvokeCore.SendMessage(
+                    this,
+                    PInvokeCore.EM_GETMODIFY) != 0;
+
                 if (_textBoxFlags[s_modified] != curState)
                 {
-                    // Raise ModifiedChanged event. See WmReflectCommand for more info.
+                    // Raise ModifiedChanged event.
+                    // See WmReflectCommand for more info.
                     _textBoxFlags[s_modified] = curState;
                     OnModifiedChanged(EventArgs.Empty);
                 }
 
                 return curState;
             }
-            else
-            {
-                return _textBoxFlags[s_modified];
-            }
         }
 
         set
@@ -690,11 +682,14 @@ public bool Modified
             {
                 if (IsHandleCreated)
                 {
-                    PInvokeCore.SendMessage(this, PInvokeCore.EM_SETMODIFY, (WPARAM)(BOOL)value);
-                    // Must maintain this state always in order for the
-                    // test in the Get method to work properly.
+                    PInvokeCore.SendMessage(
+                        this,
+                        PInvokeCore.EM_SETMODIFY,
+                        (WPARAM)(BOOL)value);
                 }
 
+                // Must maintain this state always in order for the
+                // test in the Get method to work properly.
                 _textBoxFlags[s_modified] = value;
                 OnModifiedChanged(EventArgs.Empty);
             }
@@ -720,33 +715,36 @@ public event EventHandler? ModifiedChanged
     [RefreshProperties(RefreshProperties.All)]
     public virtual bool Multiline
     {
-        get
-        {
-            return _textBoxFlags[s_multiline];
-        }
+        get => _textBoxFlags[s_multiline];
         set
         {
-            if (_textBoxFlags[s_multiline] != value)
+            if (_textBoxFlags[s_multiline] == value)
             {
-                using (LayoutTransaction.CreateTransactionIf(AutoSize, ParentInternal, this, PropertyNames.Multiline))
-                {
-                    _textBoxFlags[s_multiline] = value;
+                return;
+            }
 
-                    if (value)
-                    {
-                        // Multi-line textboxes do not have fixed height
-                        SetStyle(ControlStyles.FixedHeight, false);
-                    }
-                    else
-                    {
-                        // Single-line textboxes may have fixed height, depending on AutoSize
-                        SetStyle(ControlStyles.FixedHeight, AutoSize);
-                    }
+            using (LayoutTransaction.CreateTransactionIf(
+                condition: AutoSize,
+                controlToLayout: ParentInternal,
+                elementCausingLayout: this,
+                property: PropertyNames.Multiline))
+            {
+                _textBoxFlags[s_multiline] = value;
 
-                    RecreateHandle();
-                    AdjustHeight(false);
-                    OnMultilineChanged(EventArgs.Empty);
+                if (value)
+                {
+                    // Multi-line textboxes do not have fixed height
+                    SetStyle(ControlStyles.FixedHeight, false);
                 }
+                else
+                {
+                    // Single-line textboxes may have fixed height, depending on AutoSize
+                    SetStyle(ControlStyles.FixedHeight, AutoSize);
+                }
+
+                RecreateHandle();
+                AdjustHeight(false);
+                OnMultilineChanged(EventArgs.Empty);
             }
         }
     }
@@ -797,6 +795,9 @@ public event EventHandler? MultilineChanged
     private void ResetPadding()
         => Padding = DefaultPadding;
 
+    // Not new API and not a breaking change: TextBoxBase.PaddingChanged is already in
+    // PublicAPI.Shipped.txt. It is re-declared here with 'new' purely to apply the designer-hiding
+    // attributes below (Browsable(false) / EditorBrowsable(Never)) on top of Control.PaddingChanged.
     [Browsable(false)]
     [EditorBrowsable(EditorBrowsableState.Never)]
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
@@ -887,6 +888,13 @@ private protected Padding GetVisualStylesPadding(bool includeScrollbars)
     {
         int offset = LogicalToDeviceUnits(BorderThickness);
 
+        // The visible padding is selected per BorderStyle (not per VisualStylesMode): each border look
+        // reserves a differently sized band around the native edit's client area for the modern chrome
+        // we paint in the non-client region. Fixed3D reserves the widest uniform band for the rounded
+        // lozenge and its focus line; FixedSingle reserves a slightly smaller uniform band for the flat
+        // single-line border; None reserves only a minimal band, plus extra room on the right and bottom
+        // for the scrollbars and the focus line. BorderThickness (offset) is added so the drawn border
+        // line sits inside the reserved band rather than on its outer edge.
         Padding padding = BorderStyle switch
         {
             BorderStyle.Fixed3D => new Padding(
@@ -922,14 +930,18 @@ private protected Padding GetVisualStylesPadding(bool includeScrollbars)
     }
 
     /// <summary>
-    ///  Returns the additional padding required to clear the live scrollbars, if any are currently shown.
+    ///  Returns the additional padding required to clear the live scrollbars,
+    ///  if any are currently shown.
     /// </summary>
     private protected virtual Padding GetScrollBarPadding()
     {
         Padding padding = Padding.Empty;
 
         // Are the scrollbars visible?
-        WINDOW_STYLE style = (WINDOW_STYLE)PInvokeCore.GetWindowLong(this, WINDOW_LONG_PTR_INDEX.GWL_STYLE);
+        WINDOW_STYLE style = (WINDOW_STYLE)PInvokeCore.GetWindowLong(
+            this,
+            WINDOW_LONG_PTR_INDEX.GWL_STYLE);
+
         bool hasHScroll = (style & WINDOW_STYLE.WS_HSCROLL) != 0;
         bool hasVScroll = (style & WINDOW_STYLE.WS_VSCROLL) != 0;
 
@@ -946,22 +958,31 @@ private protected virtual Padding GetScrollBarPadding()
         return padding;
     }
 
-    // GetPreferredSizeCore
-    //  This method can return a different value than PreferredHeight!  It properly handles
-    //  border style + multiline and wordwrap.
-
+    /// <summary>
+    ///  Computes the preferred size of the control, honoring border style, multiline, and word wrap.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   This can return a different value than <see cref="PreferredHeight"/>. <see cref="PreferredHeight"/>
+    ///   is a single-line, border-only height kept for backward compatibility, whereas this method measures
+    ///   the actual text against the available width and additionally accounts for multiline and word wrap,
+    ///   and - for modern Visual Styles - the carved adorner band and the user <see cref="Padding"/>.
+    ///  </para>
+    /// </remarks>
     internal override Size GetPreferredSizeCore(Size proposedConstraints)
     {
         // 3px vertical space is required between the text and the border to keep the last
         // line from being clipped.
-        // This 3 pixel size was added in everett and we do this to maintain compat.
-        // old everett behavior was FontHeight + [SystemInformation.BorderSize.Height * 4 + 3]
-        // however the [ ] was only added if borderstyle was not none.
+
+        // This 3 pixel size was added in Everett, and we do this to maintain compat.
+        // Old Everett behavior was FontHeight + [SystemInformation.BorderSize.Height * 4 + 3],
+        // however the [ ] was only added if BorderStyle was not None.
         Padding padding = default;
 
         // Fit the text to the remaining space.
-        // Fixed for .NET Framework 4.0
+        // Originally fixed for .NET Framework 4.0
         TextFormatFlags format = TextFormatFlags.NoPrefix;
+
         if (!Multiline)
         {
             format |= TextFormatFlags.SingleLine;
@@ -997,7 +1018,8 @@ internal override Size GetPreferredSizeCore(Size proposedConstraints)
                 borders.Height += 2;
             }
 
-            // Preserve the classic border-only measurement contract until a modern visual styles mode is selected.
+            // Preserve the classic border-only measurement contract until a modern
+            // visual styles mode is selected.
             padding.Left = 0;
             padding.Top = 0;
             padding.Right = borders.Width;
@@ -1046,9 +1068,9 @@ internal unsafe void GetSelectionStartAndLength(out int start, out int length)
             // the windows call. This eliminates a problem on nt4 where
             // a huge negative # is being returned.
             start = Math.Max(0, start);
+
             // ditto for end
             end = Math.Max(0, end);
-
             length = end - start;
         }
 
@@ -1078,10 +1100,8 @@ internal unsafe void GetSelectionStartAndLength(out int start, out int length)
     [SRDescription(nameof(SR.TextBoxReadOnlyDescr))]
     public bool ReadOnly
     {
-        get
-        {
-            return _textBoxFlags[s_readOnly];
-        }
+        get => _textBoxFlags[s_readOnly];
+
         set
         {
             if (_textBoxFlags[s_readOnly] != value)
@@ -1095,7 +1115,6 @@ public bool ReadOnly
                 }
 
                 OnReadOnlyChanged(EventArgs.Empty);
-
                 VerifyImeRestrictedModeChanged();
             }
         }
@@ -1108,7 +1127,10 @@ private void EnsureReadonlyBackgroundColor(bool value)
             && DarkModeRequestState is true
             && !ShouldSerializeBackColor())
         {
-            base.BackColor = value ? SystemColors.ControlLight : SystemColors.Window;
+            base.BackColor = value
+                ? SystemColors.ControlLight
+                : SystemColors.Window;
+
             Invalidate();
         }
     }
@@ -1134,12 +1156,11 @@ public virtual string SelectedText
         get
         {
             GetSelectionStartAndLength(out int selStart, out int selLength);
+
             return Text.Substring(selStart, selLength);
         }
-        set
-        {
-            SetSelectedTextInternal(value, true);
-        }
+
+        set => SetSelectedTextInternal(value, true);
     }
 
     /// <summary>
@@ -1233,11 +1254,13 @@ public int SelectionStart
     public override string Text
     {
         get => base.Text;
+
         set
         {
             if (value != base.Text)
             {
                 base.Text = value;
+
                 if (IsHandleCreated)
                 {
                     // clear the modified flag
@@ -1254,9 +1277,16 @@ public virtual int TextLength
 
         => IsHandleCreated ? PInvokeCore.GetWindowTextLength(this) : Text.Length;
 
+    /// <summary>
+    ///  Gets or sets the underlying native window text (the edit control's caption). This is overridden
+    ///  so that setting the text from code raises a "code update" flag for the duration of the assignment:
+    ///  updating the text on a created handle produces a <c>WM_COMMAND</c> / <c>EN_CHANGE</c> notification,
+    ///  and the flag lets us swallow it so we do not raise a duplicate <see cref="Control.TextChanged"/> event.
+    /// </summary>
     internal override string WindowText
     {
         get => base.WindowText;
+
         set
         {
             value ??= string.Empty;
@@ -1267,6 +1297,7 @@ internal override string WindowText
             if (!WindowText.Equals(value))
             {
                 _textBoxFlags[s_codeUpdateText] = true;
+
                 try
                 {
                     base.WindowText = value;
@@ -1289,6 +1320,7 @@ internal void ForceWindowText(string? value)
         value ??= string.Empty;
 
         _textBoxFlags[s_codeUpdateText] = true;
+
         try
         {
             if (IsHandleCreated)
@@ -1316,13 +1348,15 @@ internal void ForceWindowText(string? value)
     [SRDescription(nameof(SR.TextBoxWordWrapDescr))]
     public bool WordWrap
     {
-        get
-        {
-            return _textBoxFlags[s_wordWrap];
-        }
+        get => _textBoxFlags[s_wordWrap];
+
         set
         {
-            using (LayoutTransaction.CreateTransactionIf(AutoSize, ParentInternal, this, PropertyNames.WordWrap))
+            using (LayoutTransaction.CreateTransactionIf(
+                condition: AutoSize,
+                controlToLayout: ParentInternal,
+                elementCausingLayout: this,
+                property: PropertyNames.WordWrap))
             {
                 if (_textBoxFlags[s_wordWrap] != value)
                 {
@@ -1341,12 +1375,15 @@ private void AdjustHeight(bool returnIfAnchored)
     {
         // If we're anchored to two opposite sides of the form, don't adjust the size because
         // we'll lose our anchored size by resetting to the requested width.
-        if (returnIfAnchored && (Anchor & (AnchorStyles.Top | AnchorStyles.Bottom)) == (AnchorStyles.Top | AnchorStyles.Bottom))
+        if (returnIfAnchored
+            && (Anchor & (AnchorStyles.Top | AnchorStyles.Bottom))
+                == (AnchorStyles.Top | AnchorStyles.Bottom))
         {
             return;
         }
 
         int saveHeight = _requestedHeight;
+
         try
         {
             if (_textBoxFlags[s_autoSize] && !_textBoxFlags[s_multiline])
@@ -1366,6 +1403,7 @@ private void AdjustHeight(bool returnIfAnchored)
                 }
 
                 _integralHeightAdjust = true;
+
                 try
                 {
                     Height = saveHeight;
@@ -1437,16 +1475,19 @@ public void ClearUndo()
 
     protected bool ContainsNavigationKeyCode(Keys keyCode) => keyCode switch
     {
-        Keys.Up or Keys.Down or Keys.PageUp or Keys.PageDown or Keys.Home or Keys.End or Keys.Left or Keys.Right => true,
+        Keys.Up or Keys.Down or Keys.PageUp or Keys.PageDown
+        or Keys.Home or Keys.End or Keys.Left or Keys.Right => true,
         _ => false,
     };
 
     /// <summary>
     ///  Copies the current selection in the text box to the Clipboard.
     /// </summary>
-    public void Copy() => PInvokeCore.SendMessage(this, PInvokeCore.WM_COPY);
+    public void Copy()
+        => PInvokeCore.SendMessage(this, PInvokeCore.WM_COPY);
 
-    protected override AccessibleObject CreateAccessibilityInstance() => new TextBoxBaseAccessibleObject(this);
+    protected override AccessibleObject CreateAccessibilityInstance()
+        => new TextBoxBaseAccessibleObject(this);
 
     protected override void CreateHandle()
     {
@@ -1457,6 +1498,7 @@ protected override void CreateHandle()
         // This "creatingHandle" stuff is to avoid property change events
         // when we set the Text property.
         _textBoxFlags[s_creatingHandle] = true;
+
         try
         {
             base.CreateHandle();
@@ -1473,52 +1515,58 @@ protected override void CreateHandle()
     /// <summary>
     ///  Moves the current selection in the text box to the Clipboard.
     /// </summary>
-    public void Cut() => PInvokeCore.SendMessage(this, PInvokeCore.WM_CUT);
+    public void Cut()
+        => PInvokeCore.SendMessage(this, PInvokeCore.WM_CUT);
 
     /// <summary>
     ///  Returns the text end position (one past the last input character). This property is virtual to allow MaskedTextBox
     ///  to set the last input char position as opposed to the last char position which may be a mask character.
     /// </summary>
-    internal virtual int GetEndPosition()
-    {
+    internal virtual int GetEndPosition() =>
         // +1 because RichTextBox has this funny EOF pseudo-character after all the text.
-        return IsHandleCreated ? TextLength + 1 : TextLength;
-    }
+        IsHandleCreated
+            ? TextLength + 1
+        : TextLength;
 
     /// <summary>
     ///  Overridden to handle TAB key.
     /// </summary>
     protected override bool IsInputKey(Keys keyData)
     {
-        if ((keyData & Keys.Alt) != Keys.Alt)
+        if ((keyData & Keys.Alt) == Keys.Alt)
         {
-            switch (keyData & Keys.KeyCode)
-            {
-                case Keys.Tab:
-                    // Single-line RichEd's want tab characters (see WM_GETDLGCODE),
-                    // so we don't ask it
-                    return Multiline && _textBoxFlags[s_acceptsTab] && ((keyData & Keys.Control) == 0);
-                case Keys.Escape:
-                    if (Multiline)
-                    {
-                        return false;
-                    }
+            return base.IsInputKey(keyData);
+        }
 
-                    break;
-                case Keys.Back:
-                    if (!ReadOnly)
-                    {
-                        return true;
-                    }
+        switch (keyData & Keys.KeyCode)
+        {
+            case Keys.Tab:
+                // Single-line RichEd's want tab characters (see WM_GETDLGCODE),
+                // so we don't ask it
+                return Multiline && _textBoxFlags[s_acceptsTab] && ((keyData & Keys.Control) == 0);
 
-                    break;
-                case Keys.PageUp:
-                case Keys.PageDown:
-                case Keys.Home:
-                case Keys.End:
+            case Keys.Escape:
+                if (Multiline)
+                {
+                    return false;
+                }
+
+                break;
+
+            case Keys.Back:
+                if (!ReadOnly)
+                {
                     return true;
-                    // else fall through to base
-            }
+                }
+
+                break;
+
+            case Keys.PageUp:
+            case Keys.PageDown:
+            case Keys.Home:
+            case Keys.End:
+                return true;
+                // else fall through to base
         }
 
         return base.IsInputKey(keyData);
@@ -1531,6 +1579,7 @@ protected override bool IsInputKey(Keys keyData)
     protected override void OnHandleCreated(EventArgs e)
     {
         base.OnHandleCreated(e);
+
         if (!IsHandleCreated)
         {
             return;
@@ -1540,8 +1589,8 @@ protected override void OnHandleCreated(EventArgs e)
         // the border size/etc.
         CommonProperties.xClearPreferredSizeCache(this);
         AdjustHeight(true);
-
         UpdateMaxLength();
+
         if (_textBoxFlags[s_modified])
         {
             PInvokeCore.SendMessage(this, PInvokeCore.EM_SETMODIFY, (WPARAM)(BOOL)true);
@@ -1568,7 +1617,8 @@ protected override void OnHandleDestroyed(EventArgs e)
     /// <summary>
     ///  Replaces the current selection in the text box with the contents of the Clipboard.
     /// </summary>
-    public void Paste() => PInvokeCore.SendMessage(this, PInvokeCore.WM_PASTE);
+    public void Paste()
+        => PInvokeCore.SendMessage(this, PInvokeCore.WM_PASTE);
 
     protected override bool ProcessDialogKey(Keys keyData)
     {
@@ -1799,7 +1849,8 @@ public virtual int GetCharIndexFromPosition(Point pt)
     ///  you pass the index of a overflowed character, GetLineFromCharIndex would
     ///  return 1 and not 0.
     /// </summary>
-    public virtual int GetLineFromCharIndex(int index) => (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_LINEFROMCHAR, (WPARAM)index);
+    public virtual int GetLineFromCharIndex(int index)
+        => (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_LINEFROMCHAR, (WPARAM)index);
 
     /// <summary>
     ///  Returns the location of the character at the given index.
@@ -1811,7 +1862,11 @@ public virtual Point GetPositionFromCharIndex(int index)
             return Point.Empty;
         }
 
-        int i = (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_POSFROMCHAR, (WPARAM)index);
+        int i = (int)PInvokeCore.SendMessage(
+            hWnd: this,
+            Msg: PInvokeCore.EM_POSFROMCHAR,
+            wParam: (WPARAM)index);
+
         return new Point(PARAM.SignedLOWORD(i), PARAM.SignedHIWORD(i));
     }
 
@@ -1822,19 +1877,26 @@ public int GetFirstCharIndexFromLine(int lineNumber)
     {
         ArgumentOutOfRangeException.ThrowIfNegative(lineNumber);
 
-        return (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_LINEINDEX, (WPARAM)lineNumber);
+        return (int)PInvokeCore.SendMessage(
+            hWnd: this,
+            Msg: PInvokeCore.EM_LINEINDEX,
+            wParam: (WPARAM)lineNumber);
     }
 
     /// <summary>
     ///  Returns the index of the first character of the line where the caret is.
     /// </summary>
-    public int GetFirstCharIndexOfCurrentLine() => (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_LINEINDEX, (WPARAM)(-1));
+    public int GetFirstCharIndexOfCurrentLine()
+        => (int)PInvokeCore.SendMessage(
+            hWnd: this,
+            Msg: PInvokeCore.EM_LINEINDEX,
+            wParam: (WPARAM)(-1));
 
     /// <summary>
     ///  Ensures that the caret is visible in the TextBox window, by scrolling the
     ///  TextBox control surface if necessary.
     /// </summary>
-    public unsafe void ScrollToCaret()
+    public void ScrollToCaret()
     {
         if (!IsHandleCreated)
         {
@@ -1848,57 +1910,23 @@ public unsafe void ScrollToCaret()
             return;
         }
 
-        using ComScope<IRichEditOle> richEdit = new(null);
-
-        if (PInvokeCore.SendMessage(this, PInvokeCore.EM_GETOLEINTERFACE, 0, (void**)richEdit) == 0)
-        {
-            PInvokeCore.SendMessage(this, PInvokeCore.EM_SCROLLCARET);
-            return;
-        }
-
-        using var textDocument = richEdit.TryQuery<ITextDocument>(out HRESULT hr);
-
-        if (hr.Succeeded)
-        {
-            // When the user calls RichTextBox::ScrollToCaret we want the RichTextBox to show as much text as
-            // possible. Here is how we do that:
-            //
-            //  1. We scroll the RichTextBox all the way to the bottom so the last line of text is the last visible line.
-            //  2. We get the first visible line.
-            //  3. If the first visible line is smaller than the start of the selection, then we are done:
-            //      The selection fits inside the RichTextBox display rectangle.
-            //  4. Otherwise, scroll the selection to the top of the RichTextBox.
-
-            GetSelectionStartAndLength(out int selStart, out int selLength);
-            int selStartLine = GetLineFromCharIndex(selStart);
-
-            using ComScope<ITextRange> windowTextRange = new(null);
-            textDocument.Value->Range(WindowText.Length - 1, WindowText.Length - 1, windowTextRange).ThrowOnFailure();
-
-            // 1. Scroll the RichTextBox all the way to the bottom
-            windowTextRange.Value->ScrollIntoView((int)tomConstants.tomEnd).ThrowOnFailure();
-
-            // 2. Get the first visible line.
-            int firstVisibleLine = (int)PInvokeCore.SendMessage(this, PInvokeCore.EM_GETFIRSTVISIBLELINE);
-
-            // 3. If the first visible line is smaller than the start of the selection, we are done.
-            if (firstVisibleLine <= selStartLine)
-            {
-                return;
-            }
-            else
-            {
-                // 4. Scroll the selection to the top of the RichTextBox.
-                using ComScope<ITextRange> selectionTextRange = new(null);
-                textDocument.Value->Range(selStart, selStart + selLength, selectionTextRange).ThrowOnFailure();
-                selectionTextRange.Value->ScrollIntoView((int)tomConstants.tomStart).ThrowOnFailure();
-                return;
-            }
-        }
-
-        PInvokeCore.SendMessage(this, PInvokeCore.EM_SCROLLCARET);
+        ScrollToCaretCore();
     }
 
+    /// <summary>
+    ///  Performs the control-specific work of scrolling the caret into view. The base implementation
+    ///  asks the native edit control to scroll the caret into view; <see cref="RichTextBox"/> overrides
+    ///  this to additionally show as much of the surrounding text as possible.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Invoked by <see cref="ScrollToCaret"/> only once the handle exists and the control has text, so
+    ///   overrides do not need to re-check those conditions.
+    ///  </para>
+    /// </remarks>
+    private protected virtual void ScrollToCaretCore()
+        => PInvokeCore.SendMessage(this, PInvokeCore.EM_SCROLLCARET);
+
     /// <summary>
     ///  Sets the SelectionLength to 0.
     /// </summary>
@@ -1943,9 +1971,22 @@ public void Select(int start, int length)
     private protected virtual void SelectInternal(int selectionStart, int selectionLength, int textLength)
     {
         // if our handle is created - send message...
-        if (IsHandleCreated)
+        if (!IsHandleCreated)
+        {
+            // otherwise, wait until handle is created to send this message.
+            // Store the indices until then...
+            _selectionStart = selectionStart;
+            _selectionLength = selectionLength;
+            _textBoxFlags[s_setSelectionOnHandleCreated] = true;
+        }
+        else
         {
-            AdjustSelectionStartAndEnd(selectionStart, selectionLength, out int start, out int end, textLength);
+            AdjustSelectionStartAndEnd(
+                selectionStart,
+                selectionLength,
+                out int start,
+                out int end,
+                textLength);
 
             PInvokeCore.SendMessage(this, PInvokeCore.EM_SETSEL, (WPARAM)start, (LPARAM)end);
 
@@ -1956,14 +1997,6 @@ private protected virtual void SelectInternal(int selectionStart, int selectionL
                     : UIA_EVENT_ID.UIA_Text_TextSelectionChangedEventId);
             }
         }
-        else
-        {
-            // otherwise, wait until handle is created to send this message.
-            // Store the indices until then...
-            _selectionStart = selectionStart;
-            _selectionLength = selectionLength;
-            _textBoxFlags[s_setSelectionOnHandleCreated] = true;
-        }
     }
 
     /// <summary>
@@ -1993,7 +2026,8 @@ protected override void SetBoundsCore(int x, int y, int width, int height, Bound
         base.SetBoundsCore(x, y, width, height, specified);
     }
 
-    private static void Swap(ref int n1, ref int n2) => (n1, n2) = (n2, n1);
+    private static void Swap(ref int n1, ref int n2)
+        => (n1, n2) = (n2, n1);
 
     // Send in -1 if you don't have the text length cached
     // when calling this method. It will be computed. If not,
@@ -2049,6 +2083,7 @@ internal void AdjustSelectionStartAndEnd(int selStart, int selLength, out int st
     internal void SetSelectionOnHandle()
     {
         Debug.Assert(IsHandleCreated, "Don't call this method until the handle is created.");
+
         if (_textBoxFlags[s_setSelectionOnHandleCreated])
         {
             _textBoxFlags[s_setSelectionOnHandleCreated] = false;
@@ -2070,6 +2105,7 @@ private static void ToUnicodeOffsets(string str, ref int start, ref int end)
         byte[] bytes = e.GetBytes(str);
 
         bool swap = start > end;
+
         if (swap)
         {
             Swap(ref start, ref end);
@@ -2116,6 +2152,7 @@ internal static void ToDbcsOffsets(string str, ref int start, ref int end)
         Encoding e = Encoding.Default;
 
         bool swap = start > end;
+
         if (swap)
         {
             Swap(ref start, ref end);
@@ -2165,6 +2202,7 @@ public override string ToString()
         string s = base.ToString();
 
         string txt = Text;
+
         if (txt.Length > 40)
         {
             txt = $"{txt.AsSpan(0, 40)}...";
@@ -2176,7 +2214,8 @@ public override string ToString()
     /// <summary>
     ///  Undoes the last edit operation in the text box.
     /// </summary>
-    public void Undo() => PInvokeCore.SendMessage(this, PInvokeCore.EM_UNDO);
+    public void Undo()
+        => PInvokeCore.SendMessage(this, PInvokeCore.EM_UNDO);
 
     internal virtual void UpdateMaxLength()
     {
@@ -2284,19 +2323,33 @@ private unsafe void WmNcCalcSize(ref Message m)
 
     /// <summary>
     ///  Handles <c>WM_NCPAINT</c> for modern Visual Styles by painting the custom chrome into the
-    ///  window DC. The wParam clip region is intentionally ignored and the whole frame is repainted
-    ///  to avoid the offscreen-restore "dirty corners" artifact.
+    ///  window DC. The <c>wParam</c> clip region is intentionally ignored for our own paint and the
+    ///  whole frame is repainted to avoid the offscreen-restore "dirty corners" artifact.
     /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   The default (themed) non-client paint for a scrollbar-bearing edit control fills the client
+    ///   rectangle, which erases the control's content on every non-client repaint - for example when
+    ///   the mouse hovers over the frame. To prevent that, the default handler is invoked with an update
+    ///   region that spans the whole window but excludes the live client rectangle, so the border and
+    ///   scrollbars still paint while the client area is left untouched.
+    ///  </para>
+    /// </remarks>
     private void WmNcPaint(ref Message m)
     {
         if (VisualStylesMode < VisualStylesMode.Net11)
         {
             base.WndProc(ref m);
-
             return;
         }
 
         HWND hwnd = (HWND)m.HWnd;
+
+        // A non-client update region (in screen coordinates, as WM_NCPAINT requires) that excludes the
+        // client rectangle. Handing this to the default handler keeps it from overpainting the client.
+        using RegionScope nonClientRegion = CreateNonClientClipRegion();
+        WPARAM originalWParam = m.WParamInternal;
+
         HDC hdc = PInvokeCore.GetWindowDC(hwnd);
 
         // Intentional: Graphics.FromHdc does NOT own the DC, so we release the DC ourselves in the
@@ -2305,7 +2358,16 @@ private void WmNcPaint(ref Message m)
 
         try
         {
+            if (!nonClientRegion.IsNull)
+            {
+                m.WParamInternal = (WPARAM)(nuint)(nint)nonClientRegion.Region;
+            }
+
             base.WndProc(ref m);
+
+            // Restore the original wParam so nothing downstream observes our temporary clip region.
+            m.WParamInternal = originalWParam;
+
             OnNcPaint(graphics);
         }
         finally
@@ -2315,6 +2377,44 @@ private void WmNcPaint(ref Message m)
         }
     }
 
+    /// <summary>
+    ///  Builds a non-client update region, in screen coordinates, that spans the whole window but
+    ///  excludes the live client rectangle. This is handed to the default <c>WM_NCPAINT</c> handler so
+    ///  it cannot overpaint (erase) the client area of scrollbar-bearing edit controls.
+    /// </summary>
+    /// <returns>
+    ///  The non-client region scope, or a null scope when the window rectangle cannot be retrieved.
+    /// </returns>
+    private RegionScope CreateNonClientClipRegion()
+    {
+        if (!PInvokeCore.GetWindowRect(this, out RECT windowRect))
+        {
+            return new RegionScope(HRGN.Null);
+        }
+
+        PInvokeCore.GetClientRect(this, out RECT clientRect);
+
+        Point clientTopLeft = default;
+        PInvoke.ClientToScreen(this, ref clientTopLeft);
+
+        RegionScope nonClientRegion = new(windowRect.left, windowRect.top, windowRect.right, windowRect.bottom);
+
+        using RegionScope clientRegion = new(
+            clientTopLeft.X,
+            clientTopLeft.Y,
+            clientTopLeft.X + clientRect.Width,
+            clientTopLeft.Y + clientRect.Height);
+
+        if (PInvokeCore.CombineRgn(nonClientRegion.Region, nonClientRegion.Region, clientRegion.Region, RGN_COMBINE_MODE.RGN_DIFF)
+            == GDI_REGION_TYPE.RGN_ERROR)
+        {
+            nonClientRegion.Dispose();
+            return new RegionScope(HRGN.Null);
+        }
+
+        return nonClientRegion;
+    }
+
     /// <summary>
     ///  Paints the modern Visual Styles non-client chrome (border, rounded <see cref="BorderStyle.Fixed3D"/>
     ///  lozenge, focus line) into a shared offscreen buffer and blits it to the supplied window DC.
@@ -2336,7 +2436,12 @@ private protected virtual void OnNcPaint(Graphics graphics)
         using var clientBackgroundBrush = clientBackColor.GetCachedSolidBrushScope();
         using var adornerBrush = adornerColor.GetCachedSolidBrushScope();
         using var adornerPen = adornerColor.GetCachedPenScope(borderThickness);
-        using var focusPen = SystemColors.MenuHighlight.GetCachedPenScope(borderThickness);
+        using var focusPenScope = SystemColors.MenuHighlight.GetCachedPenScope(borderThickness);
+
+        // The cache Scope is a ref struct in Release builds and so cannot be captured by the local
+        // focus-line helpers below (CS8175). Capture the plain cached Pen it wraps instead - the Scope
+        // stays alive (and ref-counted) for the duration of this method via the using declaration.
+        Pen focusPen = focusPenScope;
 
         Rectangle bounds = new(
             x: 0,
@@ -2394,14 +2499,12 @@ private protected virtual void OnNcPaint(Graphics graphics)
 
                 // Just fill a rectangle.
                 offscreenGraphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
-
                 break;
 
             case BorderStyle.FixedSingle:
 
                 offscreenGraphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
                 offscreenGraphics.DrawRectangle(adornerPen, deflatedBounds);
-
                 break;
 
             case BorderStyle.Fixed3D:
@@ -2482,24 +2585,28 @@ void Draw3DFocusLine(int x1, int y1, int x2, int y2)
 
     private void WmReflectCommand(ref Message m)
     {
-        if (!_textBoxFlags[s_codeUpdateText] && !_textBoxFlags[s_creatingHandle])
+        if (_textBoxFlags[s_codeUpdateText] || _textBoxFlags[s_creatingHandle])
         {
-            uint hiword = m.WParamInternal.HIWORD;
-            if (hiword == PInvoke.EN_CHANGE && CanRaiseTextChangedEvent)
-            {
-                OnTextChanged(EventArgs.Empty);
-            }
-            else if (hiword == PInvoke.EN_UPDATE)
-            {
-                // Force update to the Modified property, which will trigger ModifiedChanged event handlers
-                _ = Modified;
-            }
+            return;
+        }
+
+        uint hiword = m.WParamInternal.HIWORD;
+
+        if (hiword == PInvoke.EN_CHANGE && CanRaiseTextChangedEvent)
+        {
+            OnTextChanged(EventArgs.Empty);
+        }
+        else if (hiword == PInvoke.EN_UPDATE)
+        {
+            // Force update to the Modified property, which will trigger ModifiedChanged event handlers
+            _ = Modified;
         }
     }
 
     private void WmSetFont(ref Message m)
     {
         base.WndProc(ref m);
+
         if (!_textBoxFlags[s_multiline])
         {
             PInvokeCore.SendMessage(this, PInvokeCore.EM_SETMARGINS, (WPARAM)(PInvoke.EC_LEFTMARGIN | PInvoke.EC_RIGHTMARGIN));
@@ -2509,9 +2616,11 @@ private void WmSetFont(ref Message m)
     private void WmGetDlgCode(ref Message m)
     {
         base.WndProc(ref m);
+
         m.ResultInternal = AcceptsTab
             ? (LRESULT)(nint)(m.ResultInternal | (int)PInvoke.DLGC_WANTTAB)
-            : (LRESULT)(nint)(m.ResultInternal & ~(int)(PInvoke.DLGC_WANTTAB | PInvoke.DLGC_WANTALLKEYS));
+            : (LRESULT)(nint)(m.ResultInternal & ~(int)(PInvoke.DLGC_WANTTAB
+                | PInvoke.DLGC_WANTALLKEYS));
     }
 
     /// <summary>
@@ -2557,22 +2666,28 @@ protected override void WndProc(ref Message m)
             case PInvokeCore.WM_NCCALCSIZE:
                 WmNcCalcSize(ref m);
                 break;
+
             case PInvokeCore.WM_NCPAINT:
                 WmNcPaint(ref m);
                 break;
+
             case PInvokeCore.WM_LBUTTONDBLCLK:
                 _doubleClickFired = true;
                 base.WndProc(ref m);
                 break;
+
             case MessageId.WM_REFLECT_COMMAND:
                 WmReflectCommand(ref m);
                 break;
+
             case PInvokeCore.WM_GETDLGCODE:
                 WmGetDlgCode(ref m);
                 break;
+
             case PInvokeCore.WM_SETFONT:
                 WmSetFont(ref m);
                 break;
+
             case PInvokeCore.WM_CONTEXTMENU:
                 if (ShortcutsEnabled)
                 {
@@ -2588,6 +2703,7 @@ protected override void WndProc(ref Message m)
                 }
 
                 break;
+
             case PInvokeCore.WM_DESTROY:
                 if (TryGetAccessibilityObject(out AccessibleObject? @object) && @object is TextBoxBaseAccessibleObject accessibleObject &&
                     !RecreatingHandle)
@@ -2598,6 +2714,7 @@ protected override void WndProc(ref Message m)
                 base.WndProc(ref m);
 
                 break;
+
             default:
                 base.WndProc(ref m);
                 break;

From c5ec1184ae26bbed53b4cfe7726d6ae049508856 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Wed, 8 Jul 2026 15:03:18 -0700
Subject: [PATCH 36/50] Tighten modern Standard button body/focus-ring spacing

Shrink the gap between the rounded button body and the outer focus ring and grow the body to reclaim that space. When the focus ring is not drawn, the body now expands to fill the ring+gap band via a focus-aware GetContentPadding hook, so unfocused buttons feel less cramped without changing the control's Padding.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../DarkMode/ButtonDarkModeRendererBase.cs    | 20 +++++++++++++++++--
 .../DarkMode/ModernButtonDarkModeRenderer.cs  | 11 ++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
index b0834ee0070..269f0b58311 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
@@ -14,6 +14,21 @@ internal abstract partial class ButtonDarkModeRendererBase : IButtonRenderer
     // Define padding values for each renderer type
     private protected abstract Padding PaddingCore { get; }
 
+    /// <summary>
+    ///  Gets the padding that insets the button body from the control bounds for the given focus state.
+    /// </summary>
+    /// <param name="focusRingVisible">
+    ///  <see langword="true"/> when the focus ring will be drawn for this paint; otherwise <see langword="false"/>.
+    /// </param>
+    /// <remarks>
+    ///  <para>
+    ///   By default this returns <see cref="PaddingCore"/> regardless of focus. Renderers that reserve room for
+    ///   an outer focus ring can override this to return a smaller padding when the ring is not drawn, letting
+    ///   the button body grow into the space the ring and its gap would otherwise occupy.
+    ///  </para>
+    /// </remarks>
+    private protected virtual Padding GetContentPadding(bool focusRingVisible) => PaddingCore;
+
     /// <summary>
     ///  The device DPI of the control being rendered. Set by the adapter before each paint so renderers
     ///  can DPI-scale their logical (96-DPI) constants. Defaults to 96 (100%).
@@ -62,8 +77,9 @@ public void RenderButton(
             // Clear the background over the whole button area.
             ClearBackground(graphics, parentBackgroundColor);
 
-            // Use padding from ButtonDarkModeRenderer
-            Padding padding = PaddingCore;
+            // Use padding from the renderer. When the focus ring is not drawn, renderers may return a smaller
+            // padding so the button body expands into the space the ring and its gap would otherwise occupy.
+            Padding padding = GetContentPadding(focused && showFocusCues);
 
             Rectangle paddedBounds = new(
                 x: bounds.X + padding.Left,
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs
index ac1ea0c013e..4539a7b6256 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ModernButtonDarkModeRenderer.cs
@@ -23,7 +23,6 @@ internal sealed class ModernButtonDarkModeRenderer : ButtonDarkModeRendererBase
     // Logical (96-DPI) layout constants. DPI-scaled via the base Scale() helper.
     private const int FocusRingThicknessLogical = 2;
     private const int FocusGapThicknessLogical = 1;
-    private const int OuterBreathingLogical = 1;
     private const int CornerRadiusLogical = 6;
     private const int ContentInsetLogical = 4;
 
@@ -64,8 +63,16 @@ internal sealed class ModernButtonDarkModeRenderer : ButtonDarkModeRendererBase
 
     private int CornerRadius => Math.Max(1, Scale(CornerRadiusLogical));
 
+    // When focused, the body is inset just enough to leave room for the focus ring and a single-pixel gap,
+    // keeping that gap tight so the rounded body claims as much real estate as possible.
     private protected override Padding PaddingCore
-        => new(FocusRingThickness + FocusGapThickness + Math.Max(0, Scale(OuterBreathingLogical)));
+        => new(FocusRingThickness + FocusGapThickness);
+
+    // When the focus ring is not drawn there is nothing to inset for, so the rounded body expands to fill the
+    // whole client area - covering the band the ring and its gap would otherwise occupy. This gives the button
+    // a more generous, less cramped background without changing the control's own Padding.
+    private protected override Padding GetContentPadding(bool focusRingVisible)
+        => focusRingVisible ? PaddingCore : Padding.Empty;
 
     public override Rectangle DrawButtonBackground(
         Graphics graphics,

From ef471ab83cb780ab6306c8b0bce681fa30fee617 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Wed, 8 Jul 2026 20:35:36 -0700
Subject: [PATCH 37/50] Replace Popup button style with animated concave
 key-cap renderer

Port the prototype material key-cap renderer into System.Windows.Forms.Rendering.Button (renamed to Popup/FlatStyle conventions, no MaterialKey naming). Button owner-paints FlatStyle.Popup under modern visual styles or dark mode via a timer-driven AnimatedPopupButtonRenderer that interpolates hover/press channels through the shared AnimationManager, mirroring the CheckBox toggle switch. Border width/color are read from FlatButtonAppearance. The old PopupButtonDarkModeRenderer is removed; the dark-mode adapter keeps the modern renderer for Popup layout only.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Controls/Buttons/Button.PopupKeyCap.cs    |  63 ++
 .../Windows/Forms/Controls/Buttons/Button.cs  |  13 +-
 .../DarkMode/ButtonDarkModeAdapter.cs         |   5 +-
 .../DarkMode/PopupButtonDarkModeRenderer.cs   | 231 ------
 .../Button/AnimatedPopupButtonRenderer.cs     | 175 +++++
 .../Button/PopupButtonAnimationState.cs       |  35 +
 .../Rendering/Button/PopupButtonColorMath.cs  | 120 ++++
 .../Rendering/Button/PopupButtonEasing.cs     |  33 +
 .../Button/PopupButtonKeyCapRenderer.cs       | 660 ++++++++++++++++++
 .../Rendering/Button/PopupButtonMetric.cs     |  32 +
 .../Button/PopupButtonRenderContext.cs        | 126 ++++
 .../Button/PopupButtonRenderOptions.cs        |  92 +++
 .../Rendering/Button/PopupButtonTextEffect.cs |  26 +
 13 files changed, 1377 insertions(+), 234 deletions(-)
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs
 delete mode 100644 src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/AnimatedPopupButtonRenderer.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonAnimationState.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonColorMath.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonEasing.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonKeyCapRenderer.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonMetric.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderContext.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderOptions.cs
 create mode 100644 src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonTextEffect.cs

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs
new file mode 100644
index 00000000000..c4a7bc38e64
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs
@@ -0,0 +1,63 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Windows.Forms.Rendering.Button;
+
+namespace System.Windows.Forms;
+
+public partial class Button
+{
+    private AnimatedPopupButtonRenderer? _popupKeyCapRenderer;
+
+    private AnimatedPopupButtonRenderer PopupKeyCapRenderer =>
+        _popupKeyCapRenderer ??= new AnimatedPopupButtonRenderer(this);
+
+    /// <summary>
+    ///  Gets a value indicating whether this button paints with the animated, concave key-cap renderer used for
+    ///  <see cref="FlatStyle.Popup"/> under modern visual styles or dark mode.
+    /// </summary>
+    internal bool IsPopupKeyCapAppearance =>
+        FlatStyle == FlatStyle.Popup
+            && (Application.IsDarkModeEnabled || VisualStylesMode >= VisualStylesMode.Net11);
+
+    /// <inheritdoc/>
+    protected override void OnPaint(PaintEventArgs pevent)
+    {
+        if (IsPopupKeyCapAppearance)
+        {
+            // Owner-paint the key cap directly (bypassing the button adapters) so its hover/press animation can
+            // be driven continuously by the shared animation manager, mirroring the CheckBox toggle switch.
+            using GraphicsStateScope scope = new(pevent.Graphics);
+            PopupKeyCapRenderer.RenderControl(pevent.Graphics);
+            return;
+        }
+
+        base.OnPaint(pevent);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnMouseDown(MouseEventArgs mevent)
+    {
+        base.OnMouseDown(mevent);
+        UpdatePopupKeyCapInteractionState();
+    }
+
+    private void UpdatePopupKeyCapInteractionState()
+    {
+        if (IsPopupKeyCapAppearance)
+        {
+            PopupKeyCapRenderer.SetInteractionState(MouseIsOver, MouseIsDown);
+        }
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            _popupKeyCapRenderer?.Dispose();
+            _popupKeyCapRenderer = null;
+        }
+
+        base.Dispose(disposing);
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs
index 5843696f0cb..2a8000cd560 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs
@@ -153,12 +153,20 @@ public virtual DialogResult DialogResult
     /// <summary>
     ///  Raises the <see cref="Control.OnMouseEnter"/> event.
     /// </summary>
-    protected override void OnMouseEnter(EventArgs e) => base.OnMouseEnter(e);
+    protected override void OnMouseEnter(EventArgs e)
+    {
+        base.OnMouseEnter(e);
+        UpdatePopupKeyCapInteractionState();
+    }
 
     /// <summary>
     ///  Raises the <see cref="Control.OnMouseLeave"/> event.
     /// </summary>
-    protected override void OnMouseLeave(EventArgs e) => base.OnMouseLeave(e);
+    protected override void OnMouseLeave(EventArgs e)
+    {
+        base.OnMouseLeave(e);
+        UpdatePopupKeyCapInteractionState();
+    }
 
     /// <hideinheritance/>
     [Browsable(false)]
@@ -244,6 +252,7 @@ protected override void OnMouseUp(MouseEventArgs mevent)
         }
 
         base.OnMouseUp(mevent);
+        UpdatePopupKeyCapInteractionState();
     }
 
     protected override void OnTextChanged(EventArgs e)
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
index 8db1ce8d28b..f77bea7168a 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
@@ -22,7 +22,10 @@ internal ButtonDarkModeAdapter(ButtonBase control) : base(control)
             // path reachable and lets Standard buttons support images, focus cues, etc.
             FlatStyle.Standard => modern ? new ModernButtonDarkModeRenderer() : new SystemButtonDarkModeRenderer(),
             FlatStyle.Flat => modern ? new ModernButtonDarkModeRenderer() : new FlatButtonDarkModeRenderer(),
-            FlatStyle.Popup => modern ? new ModernButtonDarkModeRenderer() : new PopupButtonDarkModeRenderer(),
+            // FlatStyle.Popup is owner-painted directly by Button using the animated key-cap renderer (see
+            // Button.IsPopupKeyCapAppearance); the adapter is used only for layout/sizing here, for which the
+            // modern renderer's metrics are a good fit.
+            FlatStyle.Popup => new ModernButtonDarkModeRenderer(),
             FlatStyle.System => new SystemButtonDarkModeRenderer(),
             _ => throw new ArgumentOutOfRangeException(nameof(control))
         };
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs
deleted file mode 100644
index 5970ad57fca..00000000000
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Windows.Forms.VisualStyles;
-using static System.Windows.Forms.DarkModeButtonColors;
-
-namespace System.Windows.Forms;
-
-/// <summary>
-///  Provides methods for rendering a button with Popup FlatStyle in dark mode.
-/// </summary>
-internal class PopupButtonDarkModeRenderer : ButtonDarkModeRendererBase
-{
-    // UI constants
-    private const int ButtonCornerRadius = 5;
-    private const int FocusCornerRadius = 3;
-    private const int FocusPadding = 2;
-    private const int BorderThickness = 2;
-    private const int ContentOffset = 1; // Offset for content when pressed
-
-    private protected override Padding PaddingCore { get; } = new(0);
-
-    // Default border color adjustment constants
-    private const int DefaultBorderROffset = 30;
-    private const int DefaultBorderGOffset = 20;
-    private const int DefaultBorderBOffset = 40;
-
-    /// <summary>
-    ///  Draws button background with popup styling, including subtle 3D effect.
-    /// </summary>
-    public override Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault, Color backColor)
-    {
-        // Use padding from ButtonDarkModeRenderer
-        Padding padding = PaddingCore;
-        Rectangle paddedBounds = Rectangle.Inflate(bounds, -padding.Left, -padding.Top);
-
-        // Content rect will be used to position text and images
-        Rectangle contentBounds = Rectangle.Inflate(paddedBounds, -padding.Left, -padding.Top);
-
-        // Adjust content position when pressed to enhance 3D effect
-        if (state == PushButtonState.Pressed)
-        {
-            contentBounds.Offset(ContentOffset, ContentOffset);
-        }
-
-        // Create path for rounded corners
-        using GraphicsPath path = CreateRoundedRectanglePath(paddedBounds, ButtonCornerRadius);
-
-        // Fill the background using cached brush
-        using var brush = backColor.GetCachedSolidBrushScope();
-        graphics.FillPath(brush, path);
-
-        // Draw 3D effect borders
-        DrawButtonBorder(graphics, paddedBounds, state, isDefault);
-
-        // Return content bounds (area inside the button for text/image)
-        return contentBounds;
-    }
-
-    /// <summary>
-    ///  Draws a focus rectangle with dotted lines inside the button.
-    ///  Adjusts for the 3D effect based on the button's state.
-    /// </summary>
-    public override void DrawFocusIndicator(Graphics graphics, Rectangle contentBounds, bool isDefault)
-    {
-        // Create a slightly smaller rectangle for the focus indicator
-        Rectangle focusRect = Rectangle.Inflate(contentBounds, -FocusPadding, -FocusPadding);
-
-        // Create dotted pen with appropriate color
-        Color focusColor = isDefault
-            ? DefaultColors.AcceptFocusIndicatorBackColor
-            : DefaultColors.FocusIndicatorBackColor;
-
-        // See GDI+ best practices: pens with custom DashStyle must not use cached pens.
-        using var focusPen = new Pen(focusColor)
-        {
-            DashStyle = DashStyle.Dot
-        };
-
-        // Draw the focus rectangle with rounded corners
-        using GraphicsPath focusPath = CreateRoundedRectanglePath(focusRect, FocusCornerRadius);
-        graphics.DrawPath(focusPen, focusPath);
-    }
-
-    /// <summary>
-    ///  Gets the text color appropriate for the button state and type.
-    ///  Adjusts color for 3D effect when needed.
-    /// </summary>
-    public override Color GetTextColor(PushButtonState state, bool isDefault) =>
-        state == PushButtonState.Disabled
-            ? DefaultColors.DisabledTextColor
-            : isDefault
-                ? DefaultColors.AcceptButtonTextColor
-                : DefaultColors.NormalTextColor;
-
-    /// <summary>
-    ///  Gets the background color appropriate for the button state and type.
-    /// </summary>
-    public override Color GetBackgroundColor(PushButtonState state, bool isDefault) =>
-        isDefault
-            ? state switch
-            {
-                PushButtonState.Normal => DefaultColors.StandardBackColor,
-                PushButtonState.Hot => DefaultColors.HoverBackColor,
-                PushButtonState.Pressed => DefaultColors.PressedBackColor,
-                PushButtonState.Disabled => DefaultColors.DisabledBackColor,
-                _ => DefaultColors.StandardBackColor
-            }
-            : state switch
-            {
-                PushButtonState.Normal => DefaultColors.StandardBackColor,
-                PushButtonState.Hot => DefaultColors.HoverBackColor,
-                PushButtonState.Pressed => DefaultColors.PressedBackColor,
-                PushButtonState.Disabled => DefaultColors.DisabledBackColor,
-                _ => DefaultColors.StandardBackColor
-            };
-
-    /// <summary>
-    ///  Draws the 3D effect border for the button.
-    /// </summary>
-    private static void DrawButtonBorder(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault)
-    {
-        // Save original smoothing mode to restore later
-        SmoothingMode originalMode = graphics.SmoothingMode;
-
-        try
-        {
-            graphics.SmoothingMode = SmoothingMode.AntiAlias;
-
-            // Create a GraphicsPath for the border to ensure consistent alignment
-            // The path needs to match exactly the same dimensions as the filled background
-            using GraphicsPath path = CreateRoundedRectanglePath(bounds, ButtonCornerRadius);
-
-            // Popup style has a 3D effect border
-            Rectangle borderRect = bounds;
-
-            // Use slightly more contrasting border colors for dark mode 3D effect
-            Color topLeftOuter, bottomRightOuter, topLeftInner, bottomRightInner;
-
-            if (state == PushButtonState.Pressed)
-            {
-                // In pressed state, invert the 3D effect: highlight bottom/right, shadow top/left
-                topLeftOuter = DefaultColors.ShadowColor;       // shadow
-                bottomRightOuter = DefaultColors.HighlightColor; // highlight
-                topLeftInner = DefaultColors.ShadowDarkColor;   // deeper shadow
-                bottomRightInner = DefaultColors.HighlightBrightColor; // brighter highlight
-            }
-            else if (state == PushButtonState.Disabled)
-            {
-                // Disabled: subtle, low-contrast border
-                topLeftOuter = DefaultColors.DisabledBorderLightColor;
-                bottomRightOuter = DefaultColors.DisabledBorderDarkColor;
-                topLeftInner = DefaultColors.DisabledBorderMidColor;
-                bottomRightInner = DefaultColors.DisabledBorderMidColor;
-            }
-            else
-            {
-                // Normal/hot: highlight top/left, shadow bottom/right
-                topLeftOuter = DefaultColors.HighlightColor;     // highlight
-                bottomRightOuter = DefaultColors.ShadowColor;     // shadow
-                topLeftInner = DefaultColors.HighlightBrightColor; // brighter highlight
-                bottomRightInner = DefaultColors.ShadowDarkColor;  // deeper shadow
-            }
-
-            // Custom pen needed for PenAlignment.Inset - can't use cached version
-            // See GDI+ best practices: pens with custom alignment must not use cached pens.
-            using (var topLeftOuterPen = new Pen(topLeftOuter) { Alignment = PenAlignment.Inset })
-            using (var bottomRightOuterPen = new Pen(bottomRightOuter) { Alignment = PenAlignment.Inset })
-            {
-                // Draw the outer 3D border lines
-                // Top
-                graphics.DrawLine(topLeftOuterPen, borderRect.Left, borderRect.Top, borderRect.Right - 1, borderRect.Top);
-                // Left
-                graphics.DrawLine(topLeftOuterPen, borderRect.Left, borderRect.Top, borderRect.Left, borderRect.Bottom - 1);
-                // Bottom
-                graphics.DrawLine(bottomRightOuterPen, borderRect.Left, borderRect.Bottom - 1, borderRect.Right - 1, borderRect.Bottom - 1);
-                // Right
-                graphics.DrawLine(bottomRightOuterPen, borderRect.Right - 1, borderRect.Top, borderRect.Right - 1, borderRect.Bottom - 1);
-            }
-
-            // Inner border for more depth
-            borderRect.Inflate(-BorderThickness, -BorderThickness);
-
-            using (var topLeftInnerPen = new Pen(topLeftInner) { Alignment = PenAlignment.Inset })
-            using (var bottomRightInnerPen = new Pen(bottomRightInner) { Alignment = PenAlignment.Inset })
-            {
-                // Draw the inner 3D border lines
-                // Top
-                graphics.DrawLine(topLeftInnerPen, borderRect.Left, borderRect.Top, borderRect.Right - 1, borderRect.Top);
-                // Left
-                graphics.DrawLine(topLeftInnerPen, borderRect.Left, borderRect.Top, borderRect.Left, borderRect.Bottom - 1);
-                // Bottom
-                graphics.DrawLine(bottomRightInnerPen, borderRect.Left, borderRect.Bottom - 1, borderRect.Right - 1, borderRect.Bottom - 1);
-                // Right
-                graphics.DrawLine(bottomRightInnerPen, borderRect.Right - 1, borderRect.Top, borderRect.Right - 1, borderRect.Bottom - 1);
-            }
-
-            // For default buttons, add an additional inner border
-            if (isDefault && state != PushButtonState.Disabled)
-            {
-                borderRect.Inflate(-BorderThickness, -BorderThickness);
-                Color innerBorderColor = Color.FromArgb(
-                    Math.Max(0, DefaultColors.StandardBackColor.R - DefaultBorderROffset),
-                    Math.Max(0, DefaultColors.StandardBackColor.G - DefaultBorderGOffset),
-                    Math.Max(0, DefaultColors.StandardBackColor.B - DefaultBorderBOffset));
-
-                // Custom pen needed for PenAlignment.Inset - can't use cached version
-                using var defaultInnerBorderPen = new Pen(innerBorderColor) { Alignment = PenAlignment.Inset };
-                graphics.DrawRectangle(defaultInnerBorderPen, borderRect);
-            }
-        }
-        finally
-        {
-            // Restore original smoothing mode
-            graphics.SmoothingMode = originalMode;
-        }
-    }
-
-    /// <summary>
-    ///  Creates a GraphicsPath for a rounded rectangle.
-    /// </summary>
-    private static GraphicsPath CreateRoundedRectanglePath(Rectangle bounds, int radius)
-    {
-        GraphicsPath path = new();
-        path.AddRoundedRectangle(bounds, new Size(radius, radius));
-
-        return path;
-    }
-}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/AnimatedPopupButtonRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/AnimatedPopupButtonRenderer.cs
new file mode 100644
index 00000000000..5e3a9ffdbdf
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/AnimatedPopupButtonRenderer.cs
@@ -0,0 +1,175 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Drawing;
+using System.Windows.Forms.Rendering.Animation;
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Drives and renders a <see cref="Forms.Button"/> whose <see cref="Control.FlatStyle"/> is
+///  <see cref="FlatStyle.Popup"/> when modern visual styles or dark mode are active, using the concave key-cap
+///  look of <see cref="PopupButtonKeyCapRenderer"/>.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The renderer owns two interpolated animation channels (hover and press) that are advanced by the shared
+///   <see cref="AnimationManager"/> on each high-precision timer tick. When settled it simply renders the
+///   current channel values, so the same path serves both the animating and the resting button.
+///  </para>
+/// </remarks>
+internal sealed class AnimatedPopupButtonRenderer : AnimatedControlRenderer
+{
+    private const int AnimationDurationMilliseconds = 160;
+
+    private readonly PopupButtonKeyCapRenderer _renderer = PopupButtonKeyCapRenderer.Default;
+
+    private float _hoverCurrent;
+    private float _hoverStart;
+    private float _hoverTarget;
+
+    private float _pressCurrent;
+    private float _pressStart;
+    private float _pressTarget;
+
+    public AnimatedPopupButtonRenderer(Forms.Button button)
+        : base(button)
+    {
+    }
+
+    private Forms.Button Button => (Forms.Button)Control;
+
+    /// <summary>
+    ///  Updates the hover and press targets from the current interaction state and, if anything changed,
+    ///  (re)starts the interpolation from the current channel values towards the new targets.
+    /// </summary>
+    public void SetInteractionState(bool hovered, bool pressed)
+    {
+        float hoverTarget = hovered ? 1f : 0f;
+        float pressTarget = pressed ? 1f : 0f;
+
+        if (hoverTarget == _hoverTarget && pressTarget == _pressTarget)
+        {
+            return;
+        }
+
+        _hoverStart = _hoverCurrent;
+        _pressStart = _pressCurrent;
+        _hoverTarget = hoverTarget;
+        _pressTarget = pressTarget;
+
+        RestartAnimation();
+    }
+
+    protected override (int animationDuration, AnimationCycle animationCycle) OnAnimationStarted()
+        => (AnimationDurationMilliseconds, AnimationCycle.Once);
+
+    public override void AnimationProc(float animationProgress)
+    {
+        base.AnimationProc(animationProgress);
+
+        _hoverCurrent = Lerp(_hoverStart, _hoverTarget, PopupButtonEasing.EaseOutCubic(animationProgress));
+        _pressCurrent = Lerp(_pressStart, _pressTarget, PopupButtonEasing.EaseInOutQuad(animationProgress));
+
+        Invalidate();
+    }
+
+    protected override void OnAnimationEnded()
+    {
+        _hoverCurrent = _hoverTarget;
+        _pressCurrent = _pressTarget;
+        _hoverStart = _hoverCurrent;
+        _pressStart = _pressCurrent;
+
+        // The animation has reached its target; stop ticking so the settled button is not repainted every frame.
+        // A later interaction change restarts a fresh interpolation via SetInteractionState.
+        StopAnimation();
+
+        Invalidate();
+    }
+
+    protected override void OnAnimationStopped()
+    {
+        // Keep the current channel values so a restart interpolates smoothly from where we are.
+    }
+
+    /// <summary>
+    ///  Called from the button's <c>OnPaint</c>. Works both while the animation is running (driven by
+    ///  <see cref="AnimationProc"/>) and when it is settled.
+    /// </summary>
+    public override void RenderControl(Graphics graphics)
+    {
+        Forms.Button button = Button;
+
+        Color faceColor = button.BackColor;
+        FlatButtonAppearance flatAppearance = button.FlatAppearance;
+
+        Color borderColor = flatAppearance.BorderColor.IsEmpty
+            ? PopupButtonColorMath.TowardsContrast(faceColor, 0.35f)
+            : flatAppearance.BorderColor;
+
+        PopupButtonRenderContext context = new()
+        {
+            Bounds = button.ClientRectangle,
+            Text = button.Text,
+            Font = button.Font,
+            BackColor = faceColor,
+            ForeColor = button.ForeColor,
+            BorderColor = borderColor,
+            BorderWidth = flatAppearance.BorderSize,
+            Enabled = button.Enabled,
+            Focused = button.Focused && button.ShowFocusCues,
+            Pressed = button.MouseIsDown,
+            IsDefault = button.IsDefault,
+            AnimationState = new PopupButtonAnimationState(_hoverCurrent, _pressCurrent),
+            TextAlign = button.TextAlign,
+            RightToLeft = button.RightToLeft,
+            Padding = button.Padding,
+            DeviceDpi = button.DeviceDpi,
+            ShowKeyboardCues = button.ShowKeyboardCues,
+        };
+
+        Action<Rectangle>? paintImage = null;
+        Image? image = button.Image;
+
+        if (image is not null)
+        {
+            paintImage = contentBounds =>
+            {
+                Rectangle imageBounds = AlignInRectangle(contentBounds, image.Size, button.ImageAlign);
+
+                if (button.Enabled)
+                {
+                    graphics.DrawImage(image, imageBounds);
+                }
+                else
+                {
+                    ControlPaint.DrawImageDisabled(graphics, image, imageBounds.X, imageBounds.Y, faceColor);
+                }
+            };
+        }
+
+        _renderer.Render(graphics, context, paintImage);
+    }
+
+    private static float Lerp(float start, float end, float amount) => start + ((end - start) * amount);
+
+    private static Rectangle AlignInRectangle(Rectangle container, Size size, ContentAlignment alignment)
+    {
+        int x = alignment switch
+        {
+            ContentAlignment.TopLeft or ContentAlignment.MiddleLeft or ContentAlignment.BottomLeft => container.Left,
+            ContentAlignment.TopRight or ContentAlignment.MiddleRight or ContentAlignment.BottomRight => container.Right - size.Width,
+            _ => container.Left + ((container.Width - size.Width) / 2)
+        };
+
+        int y = alignment switch
+        {
+            ContentAlignment.TopLeft or ContentAlignment.TopCenter or ContentAlignment.TopRight => container.Top,
+            ContentAlignment.BottomLeft or ContentAlignment.BottomCenter or ContentAlignment.BottomRight => container.Bottom - size.Height,
+            _ => container.Top + ((container.Height - size.Height) / 2)
+        };
+
+        return new Rectangle(x, y, size.Width, size.Height);
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonAnimationState.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonAnimationState.cs
new file mode 100644
index 00000000000..f59ab86609a
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonAnimationState.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Immutable snapshot of the animation progress of a <see cref="FlatStyle.Popup"/> key-cap button.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The control owns the animation <em>timing</em> (driven by the shared animation manager and its
+///   high-precision timer); the renderer only consumes the resulting progress values. This keeps the
+///   renderer usable outside a live control (designer surfaces, preview bitmaps) where no timer exists —
+///   simply pass fixed progress values.
+///  </para>
+/// </remarks>
+/// <param name="hoverProgress">Hover progress, <c>0</c> (not hovered) to <c>1</c> (fully hovered).</param>
+/// <param name="pressProgress">Press progress, <c>0</c> (released) to <c>1</c> (fully pressed).</param>
+internal readonly struct PopupButtonAnimationState(float hoverProgress, float pressProgress)
+{
+    /// <summary>
+    ///  Gets a state with no hover and no press applied.
+    /// </summary>
+    public static PopupButtonAnimationState None => default;
+
+    /// <summary>
+    ///  Gets the hover progress in the range <c>0</c>-<c>1</c>.
+    /// </summary>
+    public float HoverProgress { get; } = Math.Clamp(hoverProgress, 0f, 1f);
+
+    /// <summary>
+    ///  Gets the press progress in the range <c>0</c>-<c>1</c>.
+    /// </summary>
+    public float PressProgress { get; } = Math.Clamp(pressProgress, 0f, 1f);
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonColorMath.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonColorMath.cs
new file mode 100644
index 00000000000..d38a84286c9
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonColorMath.cs
@@ -0,0 +1,120 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Color utilities used by the <see cref="FlatStyle.Popup"/> key-cap renderer to derive material shading
+///  colors from arbitrary effective colors.
+/// </summary>
+/// <remarks>
+///  <para>
+///   Nothing in here assumes a light or dark base color; every derivation is relative to the input, which is
+///   what makes the material effect work with saturated, neutral, light, dark and (dark-mode remapped) system
+///   colors alike.
+///  </para>
+/// </remarks>
+internal static class PopupButtonColorMath
+{
+    /// <summary>
+    ///  Gets the relative luminance of a color in the range <c>0</c>-<c>1</c>.
+    /// </summary>
+    public static float GetLuminance(Color color)
+        => ((0.299f * color.R) + (0.587f * color.G) + (0.114f * color.B)) / 255f;
+
+    /// <summary>
+    ///  Linearly blends <paramref name="baseColor"/> towards <paramref name="target"/>.
+    /// </summary>
+    /// <param name="baseColor">The starting color.</param>
+    /// <param name="target">The color to blend towards.</param>
+    /// <param name="amount">Blend amount, <c>0</c> (base) to <c>1</c> (target).</param>
+    public static Color Blend(Color baseColor, Color target, float amount)
+    {
+        amount = Math.Clamp(amount, 0f, 1f);
+
+        int r = (int)MathF.Round(baseColor.R + ((target.R - baseColor.R) * amount));
+        int g = (int)MathF.Round(baseColor.G + ((target.G - baseColor.G) * amount));
+        int b = (int)MathF.Round(baseColor.B + ((target.B - baseColor.B) * amount));
+
+        return Color.FromArgb(baseColor.A, r, g, b);
+    }
+
+    /// <summary>
+    ///  Blends the color towards white by the given amount.
+    /// </summary>
+    public static Color Lighten(Color color, float amount)
+        => Blend(color, Color.White, amount);
+
+    /// <summary>
+    ///  Blends the color towards black by the given amount.
+    /// </summary>
+    public static Color Darken(Color color, float amount)
+        => Blend(color, Color.Black, amount);
+
+    /// <summary>
+    ///  Blends the color towards the pole (black or white) that increases contrast against itself - lightens
+    ///  dark colors, darkens light colors.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Used for borders and cues that must remain visible on both light and dark surfaces.
+    ///  </para>
+    /// </remarks>
+    public static Color TowardsContrast(Color color, float amount)
+        => GetLuminance(color) > 0.5f
+            ? Darken(color, amount)
+            : Lighten(color, amount);
+
+    /// <summary>
+    ///  Desaturates the color towards a gray of the same luminance and slightly pulls it towards a mid tone.
+    ///  Used for disabled surfaces.
+    /// </summary>
+    public static Color Mute(Color color, float amount)
+    {
+        int gray = (int)MathF.Round(GetLuminance(color) * 255f);
+        Color desaturated = Blend(color, Color.FromArgb(color.A, gray, gray, gray), amount);
+
+        return Blend(desaturated, Color.FromArgb(color.A, 128, 128, 128), amount * 0.35f);
+    }
+
+    /// <summary>
+    ///  Ensures a minimum luminance difference between <paramref name="color"/> and <paramref name="against"/>
+    ///  by pushing <paramref name="color"/> away if needed.
+    /// </summary>
+    /// <param name="color">The color to adjust.</param>
+    /// <param name="against">The surface it must stay readable on.</param>
+    /// <param name="minDelta">Minimum luminance delta, <c>0</c>-<c>1</c>.</param>
+    public static Color EnsureContrast(Color color, Color against, float minDelta)
+    {
+        float delta = MathF.Abs(GetLuminance(color) - GetLuminance(against));
+
+        if (delta >= minDelta)
+        {
+            return color;
+        }
+
+        float push = minDelta - delta;
+
+        return GetLuminance(against) > 0.5f
+            ? Darken(color, push)
+            : Lighten(color, push);
+    }
+
+    /// <summary>
+    ///  Derives an opaque highlight color for text relief on the given surface.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   Opaque blended colors are used instead of alpha because GDI text rendering via
+    ///   <see cref="TextRenderer"/> ignores the alpha channel.
+    ///  </para>
+    /// </remarks>
+    public static Color GetTextHighlight(Color surface, float strength)
+        => Lighten(surface, 0.28f * strength);
+
+    /// <summary>
+    ///  Derives an opaque shadow color for text relief on the given surface.
+    /// </summary>
+    public static Color GetTextShadow(Color surface, float strength)
+        => Darken(surface, 0.34f * strength);
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonEasing.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonEasing.cs
new file mode 100644
index 00000000000..d574992ace9
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonEasing.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Easing functions for the <see cref="FlatStyle.Popup"/> key-cap state-change animations.
+/// </summary>
+internal static class PopupButtonEasing
+{
+    /// <summary>
+    ///  Cubic ease-out. Natural for hover enter/leave - fast start, gentle settle.
+    /// </summary>
+    public static float EaseOutCubic(float t)
+    {
+        t = Math.Clamp(t, 0f, 1f);
+        float inv = 1f - t;
+
+        return 1f - (inv * inv * inv);
+    }
+
+    /// <summary>
+    ///  Quadratic ease-in/ease-out. Snappy for press and release.
+    /// </summary>
+    public static float EaseInOutQuad(float t)
+    {
+        t = Math.Clamp(t, 0f, 1f);
+
+        return t < 0.5f
+            ? 2f * t * t
+            : 1f - (MathF.Pow((-2f * t) + 2f, 2f) / 2f);
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonKeyCapRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonKeyCapRenderer.cs
new file mode 100644
index 00000000000..bfa83c55b62
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonKeyCapRenderer.cs
@@ -0,0 +1,660 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Renders a concave mechanical key top - the classic table-calculator/cash-register key with a raised rim
+///  and a shallow bowl - used for the <see cref="FlatStyle.Popup"/> button visual style for arbitrary colors,
+///  DPI values and interaction states.
+/// </summary>
+/// <remarks>
+///  <para>
+///   The renderer is completely stateless with respect to any control: every input arrives via
+///   <see cref="PopupButtonRenderContext"/>. It can therefore render previews, designer adornments or key
+///   visuals inside other controls without a live control instance.
+///  </para>
+///  <para>
+///   Visual layers, back to front: ambient drop shadow, key body (rim surface), concave bowl (path gradient
+///   plus inner top-shadow and bottom-light overlays), bowl lip stroke, border, default/focus cues, the
+///   optional image, and finally the caption with a raised or engraved relief.
+///  </para>
+///  <para>
+///   In high-contrast accessibility modes the renderer falls back to a flat, high-contrast style without any
+///   material emulation.
+///  </para>
+/// </remarks>
+internal sealed class PopupButtonKeyCapRenderer
+{
+    /// <summary>
+    ///  Gets a shared default renderer instance. The renderer is stateless and thread-safe.
+    /// </summary>
+    public static PopupButtonKeyCapRenderer Default { get; } = new();
+
+    /// <summary>
+    ///  Renders the key into the given <see cref="Graphics"/>.
+    /// </summary>
+    /// <param name="graphics">The target graphics.</param>
+    /// <param name="context">The complete render context.</param>
+    /// <param name="paintImage">
+    ///  Optional callback used to paint an image onto the key surface. It is invoked after the key chrome and
+    ///  before the caption, and receives the bowl (content) rectangle.
+    /// </param>
+    public void Render(Graphics graphics, PopupButtonRenderContext context, Action<Rectangle>? paintImage = null)
+    {
+        ArgumentNullException.ThrowIfNull(graphics);
+        ArgumentNullException.ThrowIfNull(context);
+
+        Rectangle bounds = context.Bounds;
+
+        if (bounds.Width <= 0 || bounds.Height <= 0)
+        {
+            return;
+        }
+
+        // Degenerate bounds: just fill, never throw.
+        if (bounds.Width < 8 || bounds.Height < 8)
+        {
+            using SolidBrush tinyBrush = new(context.BackColor);
+            graphics.FillRectangle(tinyBrush, bounds);
+
+            return;
+        }
+
+        if (context.HighContrast)
+        {
+            RenderHighContrast(graphics, context, paintImage);
+
+            return;
+        }
+
+        Metrics metrics = Metrics.Create(context);
+        Palette palette = Palette.Create(context, metrics);
+
+        GraphicsState state = graphics.Save();
+
+        try
+        {
+            graphics.SmoothingMode = SmoothingMode.AntiAlias;
+            graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
+
+            DrawAmbientShadow(graphics, metrics, palette);
+            DrawKeyBody(graphics, metrics, palette);
+            DrawBowl(graphics, metrics, palette);
+            DrawBorder(graphics, metrics, palette);
+            DrawStateCues(graphics, context, metrics, palette);
+
+            paintImage?.Invoke(metrics.BowlRect);
+        }
+        finally
+        {
+            graphics.Restore(state);
+        }
+
+        DrawText(graphics, context, metrics, palette);
+    }
+
+    private static void DrawAmbientShadow(Graphics graphics, Metrics metrics, Palette palette)
+    {
+        // The key visually lifts off the surface; pressing it reduces the drop shadow.
+        int drop = Math.Max(1, metrics.Ambient - metrics.PressOffset);
+
+        Rectangle outer = metrics.KeyRect;
+        outer.Offset(drop / 2, drop);
+        outer.Inflate(1, 1);
+
+        Rectangle inner = metrics.KeyRect;
+        inner.Offset(drop / 2, drop);
+
+        using (GraphicsPath outerPath = CreateRoundedPath(outer, metrics.CornerRadius + 1f))
+        using (SolidBrush softBrush = new(Color.FromArgb(palette.AmbientAlpha / 3, Color.Black)))
+        {
+            graphics.FillPath(softBrush, outerPath);
+        }
+
+        using GraphicsPath innerPath = CreateRoundedPath(inner, metrics.CornerRadius);
+        using SolidBrush coreBrush = new(Color.FromArgb(palette.AmbientAlpha, Color.Black));
+        graphics.FillPath(coreBrush, innerPath);
+    }
+
+    private static void DrawKeyBody(Graphics graphics, Metrics metrics, Palette palette)
+    {
+        // The rim surface: lit from the upper left, falling into shadow at the lower right.
+        using GraphicsPath bodyPath = CreateRoundedPath(metrics.KeyRect, metrics.CornerRadius);
+        using LinearGradientBrush bodyBrush = new(
+            InflateForGradient(metrics.KeyRect),
+            palette.BodyLight,
+            palette.BodyDark,
+            LinearGradientMode.ForwardDiagonal);
+
+        graphics.FillPath(bodyBrush, bodyPath);
+    }
+
+    private static void DrawBowl(Graphics graphics, Metrics metrics, Palette palette)
+    {
+        Rectangle bowl = metrics.BowlRect;
+
+        if (bowl.Width < 2 || bowl.Height < 2)
+        {
+            return;
+        }
+
+        using GraphicsPath bowlPath = CreateRoundedPath(bowl, metrics.BowlRadius);
+
+        // 1. Radial shading: edges catch light, the center sits lower and darker - the signature concave read.
+        //    The dark center is biased towards the upper left, where a top-left light source cannot reach into
+        //    a bowl.
+        using (PathGradientBrush bowlBrush = new(bowlPath))
+        {
+            bowlBrush.CenterColor = palette.BowlCenter;
+            bowlBrush.SurroundColors = [palette.BowlEdge];
+            bowlBrush.CenterPoint = new PointF(
+                bowl.Left + (bowl.Width * 0.40f),
+                bowl.Top + (bowl.Height * 0.36f));
+            bowlBrush.FocusScales = new PointF(0.28f, 0.22f);
+
+            graphics.FillPath(bowlBrush, bowlPath);
+        }
+
+        // 2. Inner top shadow and inner bottom light, clipped to the bowl.
+        GraphicsState clipState = graphics.Save();
+
+        try
+        {
+            graphics.SetClip(bowlPath, CombineMode.Intersect);
+
+            int topHeight = Math.Max(2, (int)(bowl.Height * 0.42f));
+            Rectangle topRect = bowl with { Height = topHeight };
+
+            using (LinearGradientBrush topShadow = new(
+                InflateForGradient(topRect),
+                Color.FromArgb(palette.InnerShadowAlpha, Color.Black),
+                Color.FromArgb(0, Color.Black),
+                LinearGradientMode.Vertical))
+            {
+                graphics.FillRectangle(topShadow, topRect);
+            }
+
+            int bottomHeight = Math.Max(2, (int)(bowl.Height * 0.30f));
+            Rectangle bottomRect = new(bowl.Left, bowl.Bottom - bottomHeight, bowl.Width, bottomHeight);
+
+            using LinearGradientBrush bottomLight = new(
+                InflateForGradient(bottomRect),
+                Color.FromArgb(0, Color.White),
+                Color.FromArgb(palette.InnerLightAlpha, Color.White),
+                LinearGradientMode.Vertical);
+
+            graphics.FillRectangle(bottomLight, bottomRect);
+        }
+        finally
+        {
+            graphics.Restore(clipState);
+        }
+
+        // 3. The lip where rim and bowl meet: light on the upper left, shadow lower right - the raised edge of
+        //    the surrounding rim.
+        using LinearGradientBrush lipBrush = new(
+            InflateForGradient(Rectangle.Inflate(bowl, 1, 1)),
+            palette.LipLight,
+            palette.LipDark,
+            LinearGradientMode.ForwardDiagonal);
+        using Pen lipPen = new(lipBrush, Math.Max(1f, metrics.Scale));
+
+        graphics.DrawPath(lipPen, bowlPath);
+    }
+
+    private static void DrawBorder(Graphics graphics, Metrics metrics, Palette palette)
+    {
+        if (metrics.BorderWidth <= 0)
+        {
+            return;
+        }
+
+        float half = metrics.BorderWidth / 2f;
+        RectangleF borderRect = metrics.KeyRect;
+        borderRect.Inflate(-half, -half);
+
+        if (borderRect.Width < 1f || borderRect.Height < 1f)
+        {
+            return;
+        }
+
+        using GraphicsPath borderPath = CreateRoundedPath(
+            Rectangle.Round(borderRect),
+            Math.Max(1f, metrics.CornerRadius - half));
+        using Pen borderPen = new(palette.Border, metrics.BorderWidth);
+
+        graphics.DrawPath(borderPen, borderPath);
+    }
+
+    private static void DrawStateCues(
+        Graphics graphics,
+        PopupButtonRenderContext context,
+        Metrics metrics,
+        Palette palette)
+    {
+        if (context.IsDefault && context.Enabled)
+        {
+            // Default-button cue: an additional discreet ring just inside the border.
+            int inset = metrics.BorderWidth + Math.Max(1, (int)metrics.Scale);
+            Rectangle cueRect = Rectangle.Inflate(metrics.KeyRect, -inset, -inset);
+
+            if (cueRect.Width > 4 && cueRect.Height > 4)
+            {
+                using GraphicsPath cuePath = CreateRoundedPath(
+                    cueRect,
+                    Math.Max(1f, metrics.CornerRadius - inset));
+                using Pen cuePen = new(palette.DefaultCue, Math.Max(1f, metrics.Scale * 0.75f));
+
+                graphics.DrawPath(cuePen, cuePath);
+            }
+        }
+
+        if (context.Focused)
+        {
+            int inset = Math.Max(2, (int)MathF.Round(2.5f * metrics.Scale));
+            Rectangle focusRect = Rectangle.Inflate(metrics.BowlRect, -inset, -inset);
+
+            if (focusRect.Width > 4 && focusRect.Height > 4)
+            {
+                using GraphicsPath focusPath = CreateRoundedPath(
+                    focusRect,
+                    Math.Max(1f, metrics.BowlRadius - inset));
+                using Pen focusPen = new(palette.Focus, Math.Max(1f, metrics.Scale * 0.75f))
+                {
+                    DashStyle = DashStyle.Dot
+                };
+
+                graphics.DrawPath(focusPen, focusPath);
+            }
+        }
+    }
+
+    private static void DrawText(
+        Graphics graphics,
+        PopupButtonRenderContext context,
+        Metrics metrics,
+        Palette palette)
+    {
+        string? text = context.Text;
+
+        if (string.IsNullOrEmpty(text))
+        {
+            return;
+        }
+
+        int inset = Math.Max(1, (int)MathF.Round(1.5f * metrics.Scale));
+        Rectangle textRect = Rectangle.Inflate(metrics.BowlRect, -inset, -inset);
+        textRect = ApplyPadding(textRect, context.Padding);
+
+        if (textRect.Width <= 0 || textRect.Height <= 0)
+        {
+            return;
+        }
+
+        // The key top already moves with the press; the caption sinks a touch further, which sells the
+        // "finger pushes the key down" moment.
+        int extraSink = (int)MathF.Round(context.AnimationState.PressProgress * 0.75f * metrics.Scale);
+        textRect.Offset(0, extraSink);
+
+        TextFormatFlags flags = GetTextFormatFlags(context);
+        int reliefOffset = metrics.TextReliefOffset;
+
+        PopupButtonTextEffect effect = context.TextEffect;
+
+        if (effect is not PopupButtonTextEffect.Flat)
+        {
+            // GDI text ignores alpha, so the relief colors are opaque blends against the bowl center - see
+            // PopupButtonColorMath.GetTextHighlight/GetTextShadow.
+            (Color reliefColor, Point reliefShift) = effect switch
+            {
+                // Raised: light from the upper left casts the glyph's shadow downwards.
+                PopupButtonTextEffect.Raised => (palette.TextShadow, new Point(0, reliefOffset)),
+
+                // Engraved (letterpress): the recess's lower edge catches the light.
+                _ => (palette.TextHighlight, new Point(0, reliefOffset))
+            };
+
+            Rectangle reliefRect = textRect;
+            reliefRect.Offset(reliefShift);
+            TextRenderer.DrawText(graphics, text, context.Font, reliefRect, reliefColor, flags);
+
+            if (effect is PopupButtonTextEffect.Engraved)
+            {
+                // A faint dark edge above completes the engraving.
+                Rectangle upperRect = textRect;
+                upperRect.Offset(0, -reliefOffset);
+                Color upperShadow = PopupButtonColorMath.Blend(palette.TextShadow, palette.BowlCenter, 0.55f);
+                TextRenderer.DrawText(graphics, text, context.Font, upperRect, upperShadow, flags);
+            }
+        }
+
+        TextRenderer.DrawText(graphics, text, context.Font, textRect, palette.Text, flags);
+    }
+
+    private static void RenderHighContrast(Graphics graphics, PopupButtonRenderContext context, Action<Rectangle>? paintImage)
+    {
+        Rectangle bounds = context.Bounds;
+        bool pressed = context.Pressed;
+        float scale = context.DeviceDpi / 96f;
+
+        Color back = context.BackColor;
+        Color fore = context.Enabled ? context.ForeColor : SystemColors.GrayText;
+        Color border = context.Enabled ? context.ForeColor : SystemColors.GrayText;
+
+        using (SolidBrush backBrush = new(back))
+        {
+            graphics.FillRectangle(backBrush, bounds);
+        }
+
+        int borderWidth = Math.Max(Math.Max(1, context.BorderWidth), pressed ? (int)(2 * scale) : 1);
+        Rectangle borderRect = bounds;
+        borderRect.Width -= 1;
+        borderRect.Height -= 1;
+
+        using (Pen borderPen = new(border, borderWidth) { Alignment = PenAlignment.Inset })
+        {
+            graphics.DrawRectangle(borderPen, borderRect);
+        }
+
+        Rectangle contentRect = Rectangle.Inflate(bounds, -(int)(4 * scale), -(int)(4 * scale));
+
+        if (pressed)
+        {
+            contentRect.Offset((int)scale, (int)scale);
+        }
+
+        paintImage?.Invoke(contentRect);
+
+        Rectangle textRect = ApplyPadding(contentRect, context.Padding);
+
+        if (textRect.Width > 0 && textRect.Height > 0)
+        {
+            TextRenderer.DrawText(graphics, context.Text, context.Font, textRect, fore, GetTextFormatFlags(context));
+        }
+
+        if (context.Focused)
+        {
+            Rectangle focusRect = Rectangle.Inflate(bounds, -(int)(3 * scale), -(int)(3 * scale));
+            ControlPaint.DrawFocusRectangle(graphics, focusRect, fore, back);
+        }
+    }
+
+    /// <summary>
+    ///  Creates a rounded-rectangle path; degrades to a plain rectangle for tiny radii and clamps the radius so
+    ///  it never exceeds half of the smaller side.
+    /// </summary>
+    private static GraphicsPath CreateRoundedPath(Rectangle rect, float radius)
+    {
+        GraphicsPath path = new();
+
+        radius = Math.Min(radius, Math.Min(rect.Width, rect.Height) / 2f);
+
+        if (radius < 1f || rect.Width < 2 || rect.Height < 2)
+        {
+            path.AddRectangle(rect);
+
+            return path;
+        }
+
+        float diameter = radius * 2f;
+        RectangleF arc = new(rect.X, rect.Y, diameter, diameter);
+
+        path.AddArc(arc, 180f, 90f);
+        arc.X = rect.Right - diameter;
+        path.AddArc(arc, 270f, 90f);
+        arc.Y = rect.Bottom - diameter;
+        path.AddArc(arc, 0f, 90f);
+        arc.X = rect.X;
+        path.AddArc(arc, 90f, 90f);
+        path.CloseFigure();
+
+        return path;
+    }
+
+    private static Rectangle ApplyPadding(Rectangle rect, Padding padding)
+        => new(
+            rect.X + padding.Left,
+            rect.Y + padding.Top,
+            Math.Max(0, rect.Width - padding.Horizontal),
+            Math.Max(0, rect.Height - padding.Vertical));
+
+    /// <summary>
+    ///  Grows a gradient rectangle by one pixel to avoid GDI+ edge-seam artifacts and to guarantee non-zero
+    ///  dimensions.
+    /// </summary>
+    private static Rectangle InflateForGradient(Rectangle rect)
+    {
+        Rectangle result = Rectangle.Inflate(rect, 1, 1);
+
+        if (result.Width < 2)
+        {
+            result.Width = 2;
+        }
+
+        if (result.Height < 2)
+        {
+            result.Height = 2;
+        }
+
+        return result;
+    }
+
+    private static TextFormatFlags GetTextFormatFlags(PopupButtonRenderContext context)
+    {
+        bool rtl = context.RightToLeft == RightToLeft.Yes;
+        ContentAlignment align = rtl ? MirrorAlignment(context.TextAlign) : context.TextAlign;
+
+        TextFormatFlags flags = align switch
+        {
+            ContentAlignment.TopLeft => TextFormatFlags.Top | TextFormatFlags.Left,
+            ContentAlignment.TopCenter => TextFormatFlags.Top | TextFormatFlags.HorizontalCenter,
+            ContentAlignment.TopRight => TextFormatFlags.Top | TextFormatFlags.Right,
+            ContentAlignment.MiddleLeft => TextFormatFlags.VerticalCenter | TextFormatFlags.Left,
+            ContentAlignment.MiddleRight => TextFormatFlags.VerticalCenter | TextFormatFlags.Right,
+            ContentAlignment.BottomLeft => TextFormatFlags.Bottom | TextFormatFlags.Left,
+            ContentAlignment.BottomCenter => TextFormatFlags.Bottom | TextFormatFlags.HorizontalCenter,
+            ContentAlignment.BottomRight => TextFormatFlags.Bottom | TextFormatFlags.Right,
+            _ => TextFormatFlags.VerticalCenter | TextFormatFlags.HorizontalCenter
+        };
+
+        flags |= TextFormatFlags.EndEllipsis;
+
+        if (context.Text is not null && !context.Text.Contains('\n'))
+        {
+            flags |= TextFormatFlags.SingleLine;
+        }
+
+        if (rtl)
+        {
+            flags |= TextFormatFlags.RightToLeft;
+        }
+
+        if (!context.ShowKeyboardCues)
+        {
+            flags |= TextFormatFlags.HidePrefix;
+        }
+
+        return flags;
+    }
+
+    private static ContentAlignment MirrorAlignment(ContentAlignment alignment)
+        => alignment switch
+        {
+            ContentAlignment.TopLeft => ContentAlignment.TopRight,
+            ContentAlignment.TopRight => ContentAlignment.TopLeft,
+            ContentAlignment.MiddleLeft => ContentAlignment.MiddleRight,
+            ContentAlignment.MiddleRight => ContentAlignment.MiddleLeft,
+            ContentAlignment.BottomLeft => ContentAlignment.BottomRight,
+            ContentAlignment.BottomRight => ContentAlignment.BottomLeft,
+            _ => alignment
+        };
+
+    /// <summary>
+    ///  Device-resolved geometry and animation-modulated shading amounts for one render pass.
+    /// </summary>
+    private readonly struct Metrics
+    {
+        public float Scale { get; init; }
+        public int Ambient { get; init; }
+        public int BorderWidth { get; init; }
+        public int Rim { get; init; }
+        public float CornerRadius { get; init; }
+        public Rectangle KeyRect { get; init; }
+        public Rectangle BowlRect { get; init; }
+        public float BowlRadius { get; init; }
+        public int PressOffset { get; init; }
+        public float Hover { get; init; }
+        public float Press { get; init; }
+        public float HighlightAmount { get; init; }
+        public float ShadowAmount { get; init; }
+        public int TextReliefOffset { get; init; }
+
+        public static Metrics Create(PopupButtonRenderContext context)
+        {
+            PopupButtonRenderOptions options = context.Options;
+            Rectangle bounds = context.Bounds;
+
+            float scale = Math.Max(0.5f, context.DeviceDpi / 96f);
+            float hover = context.AnimationState.HoverProgress;
+            float press = context.AnimationState.PressProgress;
+
+            int ambient = Math.Max(1, (int)MathF.Round(2.5f * scale));
+            int maxBorder = Math.Max(0, (Math.Min(bounds.Width, bounds.Height) / 4) - 1);
+            int borderWidth = Math.Clamp(context.BorderWidth, 0, maxBorder);
+
+            Rectangle keyRect = Rectangle.Inflate(bounds, -ambient, -ambient);
+
+            // Pressing sinks the key top; the bottom edge stays put, so the cap compresses.
+            int pressOffset = (int)MathF.Round(press * 1.5f * scale);
+            keyRect.Y += pressOffset;
+            keyRect.Height = Math.Max(4, keyRect.Height - pressOffset);
+
+            int rim = Math.Max(2, (int)MathF.Round(3f * scale));
+            int bowlInset = borderWidth + rim;
+
+            if (keyRect.Width - (2 * bowlInset) < 8 || keyRect.Height - (2 * bowlInset) < 8)
+            {
+                rim = Math.Max(1, rim / 2);
+                bowlInset = borderWidth + rim;
+            }
+
+            Rectangle bowlRect = Rectangle.Inflate(keyRect, -bowlInset, -bowlInset);
+
+            if (bowlRect.Width < 2 || bowlRect.Height < 2)
+            {
+                bowlRect = Rectangle.Inflate(keyRect, -1, -1);
+            }
+
+            float cornerRadius = Math.Clamp(
+                options.GetCornerRadiusDip() * scale,
+                1f,
+                Math.Min(keyRect.Width, keyRect.Height) / 2f);
+            float bowlRadius = Math.Max(1f, cornerRadius - (rim * 0.6f));
+
+            // Pressing deepens the bowl; hovering flattens it a touch, as if the key rises to meet the finger.
+            // Highlights brighten on hover, shadows deepen on press.
+            float depth = options.GetConcavityDepth() * (1f + (press * 0.7f) - (hover * 0.12f));
+            float highlight = Math.Clamp(
+                depth * options.GetHighlightMultiplier() * (1f + (hover * 0.55f)),
+                0.02f,
+                0.6f);
+            float shadow = Math.Clamp(
+                depth * options.GetShadowMultiplier() * (1f + (press * 0.35f)),
+                0.02f,
+                0.6f);
+
+            return new Metrics
+            {
+                Scale = scale,
+                Ambient = ambient,
+                BorderWidth = borderWidth,
+                Rim = rim,
+                CornerRadius = cornerRadius,
+                KeyRect = keyRect,
+                BowlRect = bowlRect,
+                BowlRadius = bowlRadius,
+                PressOffset = pressOffset,
+                Hover = hover,
+                Press = press,
+                HighlightAmount = highlight,
+                ShadowAmount = shadow,
+                TextReliefOffset = Math.Max(1, (int)MathF.Round(0.8f * scale))
+            };
+        }
+    }
+
+    /// <summary>
+    ///  All colors of one render pass, derived from the effective context colors so the material effect adapts
+    ///  to any <c>BackColor</c>/<c>ForeColor</c> combination.
+    /// </summary>
+    private readonly struct Palette
+    {
+        public Color BodyLight { get; init; }
+        public Color BodyDark { get; init; }
+        public Color BowlEdge { get; init; }
+        public Color BowlCenter { get; init; }
+        public Color LipLight { get; init; }
+        public Color LipDark { get; init; }
+        public Color Border { get; init; }
+        public Color Text { get; init; }
+        public Color TextHighlight { get; init; }
+        public Color TextShadow { get; init; }
+        public Color Focus { get; init; }
+        public Color DefaultCue { get; init; }
+        public int AmbientAlpha { get; init; }
+        public int InnerShadowAlpha { get; init; }
+        public int InnerLightAlpha { get; init; }
+
+        public static Palette Create(PopupButtonRenderContext context, Metrics metrics)
+        {
+            bool enabled = context.Enabled;
+
+            // Disabled keys mute the material but keep the concave form readable - reduced contrast rather than
+            // flat gray.
+            Color back = enabled ? context.BackColor : PopupButtonColorMath.Mute(context.BackColor, 0.55f);
+            float contrast = enabled ? 1f : 0.35f;
+            float luminance = PopupButtonColorMath.GetLuminance(back);
+
+            Color border = enabled
+                ? context.BorderColor
+                : PopupButtonColorMath.Blend(context.BorderColor, back, 0.45f);
+
+            // Keep the border visible even if the user picked one too close to the face color.
+            border = PopupButtonColorMath.EnsureContrast(border, back, 0.08f);
+
+            Color text = enabled
+                ? context.ForeColor
+                : PopupButtonColorMath.EnsureContrast(PopupButtonColorMath.Blend(context.ForeColor, back, 0.45f), back, 0.18f);
+
+            float reliefStrength = (enabled ? 1f : 0.4f) + (metrics.Press * 0.25f);
+            Color bowlCenter = PopupButtonColorMath.Darken(back, (metrics.ShadowAmount * 0.75f * contrast) + (enabled ? 0f : 0.02f));
+
+            return new Palette
+            {
+                BodyLight = PopupButtonColorMath.Lighten(back, metrics.HighlightAmount * 0.9f * contrast),
+                BodyDark = PopupButtonColorMath.Darken(back, metrics.ShadowAmount * 0.9f * contrast),
+                BowlEdge = PopupButtonColorMath.Lighten(back, metrics.HighlightAmount * 0.55f * contrast),
+                BowlCenter = bowlCenter,
+                LipLight = PopupButtonColorMath.Lighten(back, metrics.HighlightAmount * 1.3f * contrast),
+                LipDark = PopupButtonColorMath.Darken(back, metrics.ShadowAmount * 1.2f * contrast),
+                Border = border,
+                Text = text,
+                TextHighlight = PopupButtonColorMath.GetTextHighlight(bowlCenter, reliefStrength),
+                TextShadow = PopupButtonColorMath.GetTextShadow(bowlCenter, reliefStrength),
+                Focus = PopupButtonColorMath.TowardsContrast(back, 0.55f),
+                DefaultCue = PopupButtonColorMath.TowardsContrast(border, 0.3f),
+                AmbientAlpha = (int)((luminance > 0.5f ? 55f : 85f)
+                    * (1f - (metrics.Press * 0.6f))
+                    * (enabled ? 1f : 0.5f)),
+                InnerShadowAlpha = Math.Clamp(
+                    (int)((30f + (metrics.ShadowAmount * 380f)) * contrast), 0, 120),
+                InnerLightAlpha = Math.Clamp(
+                    (int)((20f + (metrics.HighlightAmount * 300f)) * contrast), 0, 100)
+            };
+        }
+    }
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonMetric.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonMetric.cs
new file mode 100644
index 00000000000..443770afb7c
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonMetric.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  A DPI-neutral, generic magnitude used to tune the <see cref="FlatStyle.Popup"/> key-cap renderer
+///  (corner radius, concavity depth, highlight/shadow strength).
+/// </summary>
+/// <remarks>
+///  <para>
+///   Using generic magnitudes instead of pixel values allows the renderer to resolve the actual device
+///   values per call, which keeps high-DPI scenarios trivially correct.
+///  </para>
+/// </remarks>
+internal enum PopupButtonMetric
+{
+    /// <summary>
+    ///  A small magnitude.
+    /// </summary>
+    Small = 0,
+
+    /// <summary>
+    ///  A medium magnitude. This is the default.
+    /// </summary>
+    Medium = 1,
+
+    /// <summary>
+    ///  A large magnitude.
+    /// </summary>
+    Large = 2
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderContext.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderContext.cs
new file mode 100644
index 00000000000..21f7e330c82
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderContext.cs
@@ -0,0 +1,126 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Drawing;
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Carries every piece of information the <see cref="FlatStyle.Popup"/> key-cap renderer needs, without a
+///  dependency on a live control instance.
+/// </summary>
+/// <remarks>
+///  <para>
+///   Because the renderer receives all state through this context, it can be driven from a control, a designer
+///   surface or a preview-image generator. A caller only needs a <see cref="Graphics"/> target and this context.
+///  </para>
+/// </remarks>
+internal sealed class PopupButtonRenderContext
+{
+    /// <summary>
+    ///  Gets the bounds to render into, in device pixels of the target <see cref="Graphics"/>.
+    /// </summary>
+    public required Rectangle Bounds { get; init; }
+
+    /// <summary>
+    ///  Gets the caption text. May be <see langword="null"/> or empty.
+    /// </summary>
+    public string? Text { get; init; }
+
+    /// <summary>
+    ///  Gets the font used for the caption.
+    /// </summary>
+    public required Font Font { get; init; }
+
+    /// <summary>
+    ///  Gets the effective key face color.
+    /// </summary>
+    public Color BackColor { get; init; } = SystemColors.Control;
+
+    /// <summary>
+    ///  Gets the effective caption color.
+    /// </summary>
+    public Color ForeColor { get; init; } = SystemColors.ControlText;
+
+    /// <summary>
+    ///  Gets the border color of the key body.
+    /// </summary>
+    public Color BorderColor { get; init; } = SystemColors.ControlDark;
+
+    /// <summary>
+    ///  Gets the border width in device pixels. <c>0</c> renders no border.
+    /// </summary>
+    public int BorderWidth { get; init; } = 1;
+
+    /// <summary>
+    ///  Gets a value indicating whether the key is enabled.
+    /// </summary>
+    public bool Enabled { get; init; } = true;
+
+    /// <summary>
+    ///  Gets a value indicating whether the key has keyboard focus and should show a focus cue.
+    /// </summary>
+    public bool Focused { get; init; }
+
+    /// <summary>
+    ///  Gets a value indicating whether the key is currently pressed. Used for the high-contrast fallback,
+    ///  where continuous animation is not applied.
+    /// </summary>
+    public bool Pressed { get; init; }
+
+    /// <summary>
+    ///  Gets a value indicating whether the key is the default button of its dialog.
+    /// </summary>
+    public bool IsDefault { get; init; }
+
+    /// <summary>
+    ///  Gets the animation progress snapshot.
+    /// </summary>
+    public PopupButtonAnimationState AnimationState { get; init; }
+
+    /// <summary>
+    ///  Gets the caption alignment within the key top.
+    /// </summary>
+    public ContentAlignment TextAlign { get; init; } = ContentAlignment.MiddleCenter;
+
+    /// <summary>
+    ///  Gets the right-to-left setting for text rendering.
+    /// </summary>
+    public RightToLeft RightToLeft { get; init; } = RightToLeft.No;
+
+    /// <summary>
+    ///  Gets the padding applied around the caption inside the bowl.
+    /// </summary>
+    public Padding Padding { get; init; }
+
+    /// <summary>
+    ///  Gets the DPI of the target device. Used to scale all chrome metrics.
+    /// </summary>
+    public int DeviceDpi { get; init; } = 96;
+
+    /// <summary>
+    ///  Gets the caption relief effect.
+    /// </summary>
+    public PopupButtonTextEffect TextEffect { get; init; } = PopupButtonTextEffect.Raised;
+
+    /// <summary>
+    ///  Gets a value indicating whether keyboard cues (mnemonic underlines) should be shown.
+    /// </summary>
+    public bool ShowKeyboardCues { get; init; } = true;
+
+    /// <summary>
+    ///  Gets a value indicating whether a high-contrast accessibility theme is active.
+    /// </summary>
+    /// <remarks>
+    ///  <para>
+    ///   When <see langword="true"/>, the renderer falls back to a flat, higher-contrast style without material
+    ///   emulation.
+    ///  </para>
+    /// </remarks>
+    public bool HighContrast { get; init; } = SystemInformation.HighContrast;
+
+    /// <summary>
+    ///  Gets the rendering options to use. Defaults to the process-wide shared options.
+    /// </summary>
+    public PopupButtonRenderOptions Options { get; init; } = PopupButtonRenderOptions.Shared;
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderOptions.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderOptions.cs
new file mode 100644
index 00000000000..c1864d18ad2
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonRenderOptions.cs
@@ -0,0 +1,92 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Tunable rendering options for the <see cref="FlatStyle.Popup"/> key-cap renderer.
+/// </summary>
+/// <remarks>
+///  <para>
+///   All geometric magnitudes are expressed as <see cref="PopupButtonMetric"/> values and only resolved to
+///   device pixels inside the renderer, based on the DPI carried by the render context. <see cref="Shared"/>
+///   is the process-wide instance used to tune the best all-purpose defaults. Border width and color are not
+///   part of these options; they are read from the button's <see cref="FlatButtonAppearance"/>.
+///  </para>
+/// </remarks>
+internal sealed class PopupButtonRenderOptions
+{
+    /// <summary>
+    ///  Gets the process-wide shared options instance.
+    /// </summary>
+    public static PopupButtonRenderOptions Shared { get; } = new();
+
+    /// <summary>
+    ///  Gets or sets the corner radius magnitude of the key body.
+    /// </summary>
+    public PopupButtonMetric CornerRadius { get; set; } = PopupButtonMetric.Medium;
+
+    /// <summary>
+    ///  Gets or sets how deep the concave bowl of the key top appears.
+    /// </summary>
+    public PopupButtonMetric ConcavityDepth { get; set; } = PopupButtonMetric.Medium;
+
+    /// <summary>
+    ///  Gets or sets the strength of edge highlights.
+    /// </summary>
+    public PopupButtonMetric HighlightStrength { get; set; } = PopupButtonMetric.Medium;
+
+    /// <summary>
+    ///  Gets or sets the strength of edge and bowl shadows.
+    /// </summary>
+    public PopupButtonMetric ShadowStrength { get; set; } = PopupButtonMetric.Medium;
+
+    /// <summary>
+    ///  Gets or sets the base duration of state-change animations.
+    /// </summary>
+    public TimeSpan AnimationDuration { get; set; } = TimeSpan.FromMilliseconds(160);
+
+    /// <summary>
+    ///  Resolves <see cref="CornerRadius"/> to device-independent pixels (96 DPI).
+    /// </summary>
+    internal float GetCornerRadiusDip()
+        => CornerRadius switch
+        {
+            PopupButtonMetric.Small => 4f,
+            PopupButtonMetric.Large => 9f,
+            _ => 6f
+        };
+
+    /// <summary>
+    ///  Resolves <see cref="ConcavityDepth"/> to a fractional shading depth.
+    /// </summary>
+    internal float GetConcavityDepth()
+        => ConcavityDepth switch
+        {
+            PopupButtonMetric.Small => 0.07f,
+            PopupButtonMetric.Large => 0.17f,
+            _ => 0.11f
+        };
+
+    /// <summary>
+    ///  Resolves <see cref="HighlightStrength"/> to a multiplier.
+    /// </summary>
+    internal float GetHighlightMultiplier()
+        => HighlightStrength switch
+        {
+            PopupButtonMetric.Small => 0.6f,
+            PopupButtonMetric.Large => 1.5f,
+            _ => 1f
+        };
+
+    /// <summary>
+    ///  Resolves <see cref="ShadowStrength"/> to a multiplier.
+    /// </summary>
+    internal float GetShadowMultiplier()
+        => ShadowStrength switch
+        {
+            PopupButtonMetric.Small => 0.6f,
+            PopupButtonMetric.Large => 1.5f,
+            _ => 1f
+        };
+}
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonTextEffect.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonTextEffect.cs
new file mode 100644
index 00000000000..42d10cd8d5f
--- /dev/null
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/Button/PopupButtonTextEffect.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Windows.Forms.Rendering.Button;
+
+/// <summary>
+///  Determines how the caption of a <see cref="FlatStyle.Popup"/> key-cap button is physically integrated
+///  into the key surface.
+/// </summary>
+internal enum PopupButtonTextEffect
+{
+    /// <summary>
+    ///  The caption appears slightly raised above the key surface (embossed).
+    /// </summary>
+    Raised = 0,
+
+    /// <summary>
+    ///  The caption appears slightly recessed into the key surface (engraved/letterpress).
+    /// </summary>
+    Engraved = 1,
+
+    /// <summary>
+    ///  The caption is drawn flat, without any relief effect.
+    /// </summary>
+    Flat = 2
+}

From fde31a6b2f081ed0442120e93a4cf552d2e7c0ae Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Wed, 8 Jul 2026 21:40:52 -0700
Subject: [PATCH 38/50] Use modern owner-drawn renderers for Appearance.Button
 CheckBox/RadioButton

Route the Appearance.Button rendering of CheckBox and RadioButton through DarkModeAdapterFactory so it reuses the modern ButtonDarkModeAdapter/renderers under dark mode or modern visual styles, matching modern push buttons (including checked-as-pressed state). Classic mode is unchanged. The concrete-type ButtonAdapter casts are dropped so the delegated adapter can be the shared ButtonDarkModeAdapter.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../ButtonInternal/CheckBoxFlatAdapter.cs     |  4 +-
 .../ButtonInternal/CheckBoxPopupAdapter.cs    |  8 ++--
 .../ButtonInternal/CheckBoxStandardAdapter.cs |  4 +-
 .../ButtonInternal/RadioButtonFlatAdapter.cs  |  8 ++--
 .../ButtonInternal/RadioButtonPopupAdapter.cs |  8 ++--
 .../RadioButtonStandardAdapter.cs             |  4 +-
 .../System/Windows/Forms/CheckBoxTests.cs     | 43 +++++++++++++++++++
 .../System/Windows/Forms/RadioButtonTests.cs  | 43 +++++++++++++++++++
 8 files changed, 101 insertions(+), 21 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxFlatAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxFlatAdapter.cs
index c14017ce380..441bca05a33 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxFlatAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxFlatAdapter.cs
@@ -84,9 +84,7 @@ private void PaintFlatWorker(PaintEventArgs e, Color checkColor, Color checkBack
         PaintField(e, layout, colors, checkColor, drawFocus: true);
     }
 
-    private new ButtonFlatAdapter ButtonAdapter => (ButtonFlatAdapter)base.ButtonAdapter;
-
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonFlatAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateFlatAdapter(Control);
 
     protected override LayoutOptions Layout(PaintEventArgs e)
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxPopupAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxPopupAdapter.cs
index c45c832d02c..0513250b873 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxPopupAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxPopupAdapter.cs
@@ -16,7 +16,7 @@ internal override void PaintUp(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonPopupAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreatePopupAdapter(Control);
             adapter.PaintUp(e, Control.CheckState);
         }
         else
@@ -51,7 +51,7 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonPopupAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreatePopupAdapter(Control);
             adapter.PaintOver(e, Control.CheckState);
         }
         else
@@ -94,7 +94,7 @@ internal override void PaintDown(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonPopupAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreatePopupAdapter(Control);
             adapter.PaintDown(e, Control.CheckState);
         }
         else
@@ -115,7 +115,7 @@ internal override void PaintDown(PaintEventArgs e, CheckState state)
         }
     }
 
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonPopupAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreatePopupAdapter(Control);
 
     protected override LayoutOptions Layout(PaintEventArgs e)
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs
index 3a7f7d3b0c8..9768de8f69a 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs
@@ -105,9 +105,7 @@ internal override Size GetPreferredSizeCore(Size proposedSize)
         }
     }
 
-    private new ButtonStandardAdapter ButtonAdapter => (ButtonStandardAdapter)base.ButtonAdapter;
-
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonStandardAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateStandardAdapter(Control);
 
     protected override LayoutOptions Layout(PaintEventArgs e)
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonFlatAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonFlatAdapter.cs
index 9986c57642c..02aff0a81c9 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonFlatAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonFlatAdapter.cs
@@ -13,7 +13,7 @@ internal override void PaintDown(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonFlatAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreateFlatAdapter(Control);
             adapter.PaintDown(e, Control.Checked ? CheckState.Checked : CheckState.Unchecked);
             return;
         }
@@ -33,7 +33,7 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonFlatAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreateFlatAdapter(Control);
             adapter.PaintOver(e, Control.Checked ? CheckState.Checked : CheckState.Unchecked);
             return;
         }
@@ -53,7 +53,7 @@ internal override void PaintUp(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonFlatAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreateFlatAdapter(Control);
             adapter.PaintUp(e, Control.Checked ? CheckState.Checked : CheckState.Unchecked);
             return;
         }
@@ -80,7 +80,7 @@ private void PaintFlatWorker(PaintEventArgs e, Color checkColor, Color checkBack
         PaintField(e, layout, colors, checkColor, drawFocus: true);
     }
 
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonFlatAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateFlatAdapter(Control);
 
     // RadioButtonPopupLayout also uses this layout for down and over
     protected override LayoutOptions Layout(PaintEventArgs e)
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonPopupAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonPopupAdapter.cs
index bf3aa38a2fd..e59c0b91d9a 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonPopupAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonPopupAdapter.cs
@@ -11,7 +11,7 @@ internal override void PaintUp(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonPopupAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreatePopupAdapter(Control);
             adapter.PaintUp(e, Control.Checked ? CheckState.Checked : CheckState.Unchecked);
         }
         else
@@ -40,7 +40,7 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonPopupAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreatePopupAdapter(Control);
             adapter.PaintOver(e, Control.Checked ? CheckState.Checked : CheckState.Unchecked);
         }
         else
@@ -65,7 +65,7 @@ internal override void PaintDown(PaintEventArgs e, CheckState state)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonPopupAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreatePopupAdapter(Control);
             adapter.PaintDown(e, Control.Checked ? CheckState.Checked : CheckState.Unchecked);
         }
         else
@@ -85,7 +85,7 @@ internal override void PaintDown(PaintEventArgs e, CheckState state)
         }
     }
 
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonPopupAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreatePopupAdapter(Control);
 
     protected override LayoutOptions Layout(PaintEventArgs e)
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs
index 0181286c263..7546f46c31a 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs
@@ -50,9 +50,7 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
         }
     }
 
-    private new ButtonStandardAdapter ButtonAdapter => (ButtonStandardAdapter)base.ButtonAdapter;
-
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonStandardAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateStandardAdapter(Control);
 
     protected override LayoutOptions Layout(PaintEventArgs e)
     {
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs
index 506c893a1d7..c040e6a8ae7 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs
@@ -486,6 +486,49 @@ public void CheckBox_CreateStandardAdapter()
         Assert.NotNull(checkBoxSndAdptr);
     }
 
+    public static TheoryData<FlatStyle> ModernButtonFlatStyles => new()
+    {
+        FlatStyle.Standard,
+        FlatStyle.Flat,
+        FlatStyle.Popup
+    };
+
+    [WinFormsTheory]
+    [MemberData(nameof(ModernButtonFlatStyles))]
+    public void CheckBox_AppearanceButton_ModernVisualStyles_PaintsWithoutThrow(FlatStyle flatStyle)
+    {
+        using CheckBox box = new()
+        {
+            Appearance = Appearance.Button,
+            FlatStyle = flatStyle,
+            Size = new Size(120, 40),
+            Checked = true
+        };
+
+        box.VisualStylesMode = VisualStylesMode.Net11;
+
+        ButtonInternal.ButtonBaseAdapter adapter = flatStyle switch
+        {
+            FlatStyle.Standard => box.CreateStandardAdapter(),
+            FlatStyle.Popup => box.CreatePopupAdapter(),
+            _ => box.CreateFlatAdapter()
+        };
+
+        using Bitmap bitmap = new(box.Width, box.Height);
+        using Graphics graphics = Graphics.FromImage(bitmap);
+        PaintEventArgs e = new(graphics, new Rectangle(Point.Empty, box.Size));
+
+        // Appearance.Button under modern visual styles is delegated to the shared modern button renderer.
+        Exception exception = Record.Exception(() =>
+        {
+            adapter.PaintUp(e, CheckState.Checked);
+            adapter.PaintOver(e, CheckState.Checked);
+            adapter.PaintDown(e, CheckState.Checked);
+        });
+
+        Assert.Null(exception);
+    }
+
     [WinFormsFact]
     public void CheckBox_GetAutoSizeMode_Invoke_ReturnsExpected()
     {
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/RadioButtonTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/RadioButtonTests.cs
index 08142ccb0cf..4f860bdcde4 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/RadioButtonTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/RadioButtonTests.cs
@@ -15,6 +15,49 @@ namespace System.Windows.Forms.Tests;
 
 public class RadioButtonTests : AbstractButtonBaseTests
 {
+    public static TheoryData<FlatStyle> ModernButtonFlatStyles => new()
+    {
+        FlatStyle.Standard,
+        FlatStyle.Flat,
+        FlatStyle.Popup
+    };
+
+    [WinFormsTheory]
+    [MemberData(nameof(ModernButtonFlatStyles))]
+    public void RadioButton_AppearanceButton_ModernVisualStyles_PaintsWithoutThrow(FlatStyle flatStyle)
+    {
+        using RadioButton control = new()
+        {
+            Appearance = Appearance.Button,
+            FlatStyle = flatStyle,
+            Size = new Size(120, 40),
+            Checked = true
+        };
+
+        control.VisualStylesMode = VisualStylesMode.Net11;
+
+        ButtonInternal.ButtonBaseAdapter adapter = flatStyle switch
+        {
+            FlatStyle.Standard => control.CreateStandardAdapter(),
+            FlatStyle.Popup => control.CreatePopupAdapter(),
+            _ => control.CreateFlatAdapter()
+        };
+
+        using Bitmap bitmap = new(control.Width, control.Height);
+        using Graphics graphics = Graphics.FromImage(bitmap);
+        PaintEventArgs e = new(graphics, new Rectangle(Point.Empty, control.Size));
+
+        // Appearance.Button under modern visual styles is delegated to the shared modern button renderer.
+        Exception exception = Record.Exception(() =>
+        {
+            adapter.PaintUp(e, CheckState.Checked);
+            adapter.PaintOver(e, CheckState.Checked);
+            adapter.PaintDown(e, CheckState.Checked);
+        });
+
+        Assert.Null(exception);
+    }
+
     [WinFormsFact]
     public void RadioButton_Ctor_Default()
     {

From b853cea32a86faa9c601e7c2eaa63acdd4cb78d3 Mon Sep 17 00:00:00 2001
From: Klaus Loeffelmann <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 14:53:21 -0700
Subject: [PATCH 39/50] Position modern toggle switch by CheckAlign instead of
 TextAlign

The Appearance.ToggleSwitch renderer placed the switch based on TextAlign, so the default (MiddleLeft) drew the switch on the right. Drive placement from CheckAlign instead: left/center-aligned values (including the MiddleLeft default) put the switch on the left with the caption on the right, and right-aligned values put it on the right. Vertical centering is unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../CheckBox/AnimatedToggleSwitchRenderer.cs  | 30 +++---
 .../System/Windows/Forms/CheckBoxTests.cs     | 95 +++++++++++++++++++
 2 files changed, 113 insertions(+), 12 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs
index 7e0c92054e0..1faa499155b 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Rendering/CheckBox/AnimatedToggleSwitchRenderer.cs
@@ -64,22 +64,28 @@ public override void RenderControl(Graphics graphics)
 
         graphics.Clear(Control.BackColor);
 
-        switch (CheckBox.TextAlign)
+        // The switch position follows CheckAlign (as the caption sits opposite the check), so the default
+        // MiddleLeft places the switch on the left and the caption on the right. Only the horizontal component
+        // is honored; the switch stays vertically centered.
+        if (IsSwitchOnRight(CheckBox.CheckAlign))
         {
-            case ContentAlignment.MiddleLeft:
-            case ContentAlignment.TopLeft:
-            case ContentAlignment.BottomLeft:
-                RenderSwitch(graphics, new Rectangle(textSize.Width + textGap, switchY, switchWidth, switchHeight), circleDiameter);
-                RenderText(graphics, new Point(0, textY));
-                break;
-
-            default:
-                RenderSwitch(graphics, new Rectangle(0, switchY, switchWidth, switchHeight), circleDiameter);
-                RenderText(graphics, new Point(switchWidth + textGap, textY));
-                break;
+            RenderSwitch(graphics, new Rectangle(textSize.Width + textGap, switchY, switchWidth, switchHeight), circleDiameter);
+            RenderText(graphics, new Point(0, textY));
+        }
+        else
+        {
+            RenderSwitch(graphics, new Rectangle(0, switchY, switchWidth, switchHeight), circleDiameter);
+            RenderText(graphics, new Point(switchWidth + textGap, textY));
         }
     }
 
+    // The switch is drawn on the right only for the right-aligned CheckAlign values; left- and center-aligned
+    // values (including the MiddleLeft default) keep the switch on the left.
+    private static bool IsSwitchOnRight(ContentAlignment checkAlign) => checkAlign is
+        ContentAlignment.TopRight or
+        ContentAlignment.MiddleRight or
+        ContentAlignment.BottomRight;
+
     private void RenderText(Graphics graphics, Point position) =>
         TextRenderer.DrawText(graphics, CheckBox.Text, CheckBox.Font, position, CheckBox.ForeColor);
 
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs
index c040e6a8ae7..c1cfc591934 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxTests.cs
@@ -529,6 +529,101 @@ public void CheckBox_AppearanceButton_ModernVisualStyles_PaintsWithoutThrow(Flat
         Assert.Null(exception);
     }
 
+    [WinFormsTheory]
+    [InlineData(ContentAlignment.MiddleLeft, false)]
+    [InlineData(ContentAlignment.TopLeft, false)]
+    [InlineData(ContentAlignment.BottomLeft, false)]
+    [InlineData(ContentAlignment.MiddleCenter, false)]
+    [InlineData(ContentAlignment.TopCenter, false)]
+    [InlineData(ContentAlignment.MiddleRight, true)]
+    [InlineData(ContentAlignment.TopRight, true)]
+    [InlineData(ContentAlignment.BottomRight, true)]
+    public void CheckBox_ToggleSwitch_CheckAlign_PositionsSwitch(ContentAlignment checkAlign, bool switchOnRight)
+    {
+        using CheckBox box = new()
+        {
+            Appearance = Appearance.ToggleSwitch,
+            Text = "x",
+            CheckAlign = checkAlign,
+            Checked = true,
+            Size = new Size(180, 30),
+            BackColor = Color.White
+        };
+
+        box.VisualStylesMode = VisualStylesMode.Net11;
+        box.CreateControl();
+
+        using Bitmap bitmap = new(box.Width, box.Height);
+
+        // The modern toggle switch is owner-painted from CheckBox.OnPaint via the animated renderer.
+        Exception exception = Record.Exception(() => box.DrawToBitmap(bitmap, new Rectangle(Point.Empty, box.Size)));
+        Assert.Null(exception);
+
+        // Locate the switch's solid band (tall columns). Its rounded end caps are symmetric, so the only
+        // horizontal asymmetry in the non-background pixels comes from the caption: whichever side of the
+        // switch has more non-background pixels is the side the caption sits on.
+        (int switchLeft, int switchRight) = FindSwitchColumnBand(bitmap);
+        Assert.True(switchLeft >= 0, "The toggle switch was not found in the rendered bitmap.");
+
+        int pixelsLeftOfSwitch = CountNonBackgroundPixels(bitmap, 0, switchLeft);
+        int pixelsRightOfSwitch = CountNonBackgroundPixels(bitmap, switchRight + 1, box.Width);
+        bool captionOnLeft = pixelsLeftOfSwitch > pixelsRightOfSwitch;
+
+        // Caption on the left means the switch is on the right, and vice versa.
+        Assert.Equal(switchOnRight, captionOnLeft);
+    }
+
+    private static (int Left, int Right) FindSwitchColumnBand(Bitmap bitmap)
+    {
+        // Only the switch fills most of a column's height; caption glyph columns do not.
+        int threshold = bitmap.Height / 2;
+        int left = -1;
+        int right = -1;
+
+        for (int x = 0; x < bitmap.Width; x++)
+        {
+            int columnCount = 0;
+            for (int y = 0; y < bitmap.Height; y++)
+            {
+                if (bitmap.GetPixel(x, y).ToArgb() != Color.White.ToArgb())
+                {
+                    columnCount++;
+                }
+            }
+
+            if (columnCount >= threshold)
+            {
+                if (left < 0)
+                {
+                    left = x;
+                }
+
+                right = x;
+            }
+        }
+
+        return (left, right);
+    }
+
+    private static int CountNonBackgroundPixels(Bitmap bitmap, int xStart, int xEnd)
+    {
+        int background = Color.White.ToArgb();
+        int count = 0;
+
+        for (int y = 0; y < bitmap.Height; y++)
+        {
+            for (int x = xStart; x < xEnd; x++)
+            {
+                if (bitmap.GetPixel(x, y).ToArgb() != background)
+                {
+                    count++;
+                }
+            }
+        }
+
+        return count;
+    }
+
     [WinFormsFact]
     public void CheckBox_GetAutoSizeMode_Invoke_ReturnsExpected()
     {

From 0fa360bed8515bf5b224996ba7880eecf4bb656d Mon Sep 17 00:00:00 2001
From: Klaus Loffelmann <klaus.loeffelmann@microsoft.com>
Date: Fri, 3 Jul 2026 09:30:42 -0700
Subject: [PATCH 40/50] Refactor build.cmd for ARM64 and add build.cmd.ps1

* Refactored build.cmd to delegate to a new PowerShell script (build.cmd.ps1) for improved argument parsing and platform detection.

* Added support for building on Windows ARM64 via the -platform arm64 option, which sets TargetArchitecture and disables NativeToolsOnMachine.

* Updated documentation to reflect the new ARM64 build instructions.
---
 build.cmd         |  2 +-
 docs/building.md  |  1 +
 eng/build.cmd.ps1 | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 eng/build.cmd.ps1

diff --git a/build.cmd b/build.cmd
index 9852a061a26..c25a3fbebe1 100755
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +1,3 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -NativeToolsOnMachine -restore -build -bl %*"
+powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0eng\build.cmd.ps1" %*
 exit /b %ErrorLevel%
diff --git a/docs/building.md b/docs/building.md
index 25f26541301..da5a785bb75 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -10,6 +10,7 @@ Follow the prerequisites listed at [Developer Guide](developer-guide.md).
 
 * Run `.\build.cmd` from the repository root. This builds the `Winforms.sln` using the default config (Debug|Any CPU).
 * To specify a build configuration, add `-configuration` followed by the config such as `.\build -configuration Release`.
+* To build on Windows ARM64, use `.\build -platform arm64`. This maps the solution platform to `TargetArchitecture=arm64` without promoting local Visual Studio native tool paths.
 
 Note that this does **not** build using your machine-wide installed version of the dotnet sdk. It builds using the repo-local .NET SDK specified in the global.json in the repository root.
 
diff --git a/eng/build.cmd.ps1 b/eng/build.cmd.ps1
new file mode 100644
index 00000000000..50ab390e38b
--- /dev/null
+++ b/eng/build.cmd.ps1
@@ -0,0 +1,65 @@
+[CmdletBinding(PositionalBinding = $false)]
+param(
+    [Parameter(ValueFromRemainingArguments = $true)]
+    [string[]] $BuildArgs
+)
+
+$forwardArgs = [System.Collections.Generic.List[string]]::new()
+$useNativeTools = $true
+$isArm64Platform = $false
+$hasTargetArchitecture = $false
+
+for ($i = 0; $i -lt $BuildArgs.Length; $i++) {
+    $arg = $BuildArgs[$i]
+
+    if ($arg.StartsWith('/p:TargetArchitecture=', [StringComparison]::OrdinalIgnoreCase) -or
+        $arg.StartsWith('-p:TargetArchitecture=', [StringComparison]::OrdinalIgnoreCase)) {
+        $hasTargetArchitecture = $true
+    }
+
+    if ($arg.Equals('-platform', [StringComparison]::OrdinalIgnoreCase) -and
+        $i + 1 -lt $BuildArgs.Length -and
+        $BuildArgs[$i + 1].Equals('arm64', [StringComparison]::OrdinalIgnoreCase)) {
+        $isArm64Platform = $true
+        $i++
+        continue
+    }
+
+    if ($arg.Equals('/p:Platform=arm64', [StringComparison]::OrdinalIgnoreCase) -or
+        $arg.Equals('-p:Platform=arm64', [StringComparison]::OrdinalIgnoreCase)) {
+        $isArm64Platform = $true
+        continue
+    }
+
+    $forwardArgs.Add($arg)
+}
+
+if ($isArm64Platform) {
+    $useNativeTools = $false
+
+    if (!$hasTargetArchitecture) {
+        $forwardArgs.Add('/p:TargetArchitecture=arm64')
+    }
+}
+
+$buildScript = Join-Path $PSScriptRoot 'common\Build.ps1'
+$baseArgs = @()
+
+if ($useNativeTools) {
+    $baseArgs += '-NativeToolsOnMachine'
+}
+
+$processArgs = @(
+    '-ExecutionPolicy'
+    'ByPass'
+    '-NoProfile'
+    '-File'
+    $buildScript
+) + $baseArgs + @(
+    '-restore'
+    '-build'
+    '-bl'
+) + $forwardArgs
+
+& powershell @processArgs
+exit $LASTEXITCODE

From 6473a66fe16a7e30c0f1ba3a1603cb3d2fdf5af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?=
 <9663150+KlausLoeffelmann@users.noreply.github.com>
Date: Thu, 9 Jul 2026 14:57:46 -0700
Subject: [PATCH 41/50] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 eng/build.cmd.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/build.cmd.ps1 b/eng/build.cmd.ps1
index 50ab390e38b..3bfc5c85aff 100644
--- a/eng/build.cmd.ps1
+++ b/eng/build.cmd.ps1
@@ -42,7 +42,7 @@ if ($isArm64Platform) {
     }
 }
 
-$buildScript = Join-Path $PSScriptRoot 'common\Build.ps1'
+$buildScript = Join-Path $PSScriptRoot 'common\build.ps1'
 $baseArgs = @()
 
 if ($useNativeTools) {

From 1cdb1598d641de551f8783f96aec7866f98f0c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 18:27:52 -0700
Subject: [PATCH 42/50] Add EffectiveVisualStylesMode for High Contrast support

Introduce EffectiveVisualStylesMode to clamp visual styles to Classic when Windows High Contrast is active, ensuring consistent rendering and accessibility.

Update all controls to use this property for rendering and CreateParams decisions.

* Override Form.OnSystemColorsChanged to handle High Contrast transitions by recreating handles as needed. Remove VisualStylesMode.LatestPreview and update related logic.

* Expose EffectiveVisualStylesMode to owner-drawn button adapters for correct renderer selection.
---
 .../Forms/WindowsFormsApplicationBaseTests.vb |  6 ++--
 .../PublicAPI.Unshipped.txt                   |  2 +-
 .../System/Windows/Forms/Application.cs       |  9 +++---
 .../System/Windows/Forms/Control.cs           | 31 ++++++++++++++++++-
 .../Controls/Buttons/Button.PopupKeyCap.cs    |  2 +-
 .../Forms/Controls/Buttons/ButtonBase.cs      |  7 +++++
 .../DarkMode/ButtonDarkModeAdapter.cs         |  2 +-
 .../DarkMode/DarkModeAdapterFactory.cs        |  2 +-
 .../Forms/Controls/Buttons/CheckBox.cs        |  2 +-
 .../Windows/Forms/Controls/TextBox/TextBox.cs |  2 +-
 .../Forms/Controls/TextBox/TextBoxBase.cs     | 24 +++++++++-----
 .../System/Windows/Forms/Form.cs              | 29 +++++++++++++++++
 .../System/Windows/Forms/VisualStylesMode.cs  | 14 +--------
 .../Forms/CheckBoxToggleSwitchTests.cs        |  1 -
 .../Forms/ControlTests.VisualStylesMode.cs    |  9 +-----
 .../System.Windows.Forms/TextBoxBaseTests.cs  |  2 --
 16 files changed, 98 insertions(+), 46 deletions(-)

diff --git a/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb b/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb
index 953d748b070..701b5d4ca82 100644
--- a/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb
+++ b/src/Microsoft.VisualBasic.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsApplicationBaseTests.vb
@@ -22,8 +22,6 @@ Namespace Microsoft.VisualBasic.Forms.Tests
             ColorMode.Should.Be(SystemColorMode.Dark)
 
             VisualStylesMode.Should.Be(VisualStylesMode.Classic)
-            VisualStylesMode = VisualStylesMode.LatestPreview
-            VisualStylesMode.Should.Be(VisualStylesMode.LatestPreview)
 
             EnableVisualStyles.Should.Be(False)
             EnableVisualStyles = True
@@ -129,11 +127,11 @@ Namespace Microsoft.VisualBasic.Forms.Tests
 
                         AddHandler appModel.ApplyApplicationDefaults,
                             Sub(sender, e)
-                                e.VisualStylesMode = VisualStylesMode.LatestPreview
+                                e.VisualStylesMode = VisualStylesMode.Latest
                             End Sub
 
                         appModel.CallOnInitialize(Array.Empty(Of String)()).Should.BeTrue()
-                        System.Windows.Forms.Application.DefaultVisualStylesMode.Should.Be(VisualStylesMode.LatestPreview)
+                        System.Windows.Forms.Application.DefaultVisualStylesMode.Should.Be(VisualStylesMode.Latest)
                     End Sub
 
                 Using handle As RemoteInvokeHandle = RemoteExecutor.Invoke(test)
diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 1004c0cba3a..43d38a8a055 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -156,6 +156,7 @@ override System.Windows.Forms.ButtonBase.OnVisualStylesModeChanged(System.EventA
 override System.Windows.Forms.CheckBox.Dispose(bool disposing) -> void
 override System.Windows.Forms.CheckBox.OnPaint(System.Windows.Forms.PaintEventArgs! pevent) -> void
 override System.Windows.Forms.CheckBox.OnVisualStylesModeChanged(System.EventArgs! e) -> void
+override System.Windows.Forms.Form.OnSystemColorsChanged(System.EventArgs! e) -> void
 static System.Windows.Forms.Application.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 static System.Windows.Forms.Application.SetDefaultVisualStylesMode(System.Windows.Forms.VisualStylesMode styleSetting) -> void
 System.Windows.Forms.Appearance.ToggleSwitch = 2 -> System.Windows.Forms.Appearance
@@ -167,7 +168,6 @@ System.Windows.Forms.VisualStylesMode.Classic = 0 -> System.Windows.Forms.Visual
 System.Windows.Forms.VisualStylesMode.Disabled = 1 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Inherit = -1 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Latest = 32767 -> System.Windows.Forms.VisualStylesMode
-System.Windows.Forms.VisualStylesMode.LatestPreview = 32766 -> System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Net11 = 2 -> System.Windows.Forms.VisualStylesMode
 virtual System.Windows.Forms.Control.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 virtual System.Windows.Forms.Control.OnParentVisualStylesModeChanged(System.EventArgs! e) -> void
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
index aafaa67d1c8..dbec2609135 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
@@ -504,8 +504,8 @@ private static int GetSystemColorModeInternal()
         return systemColorMode;
     }
 
-    private static bool IsSystemDarkModeAvailable =>
-        !SystemInformation.HighContrast && OsVersion.IsWindows11_OrGreater();
+    private static bool IsSystemDarkModeAvailable
+        => !SystemInformation.HighContrast && OsVersion.IsWindows11_OrGreater();
 
     /// <summary>
     ///  Gets a value indicating whether the application is running in a dark system color context.
@@ -693,7 +693,9 @@ public static VisualStylesMode DefaultVisualStylesMode
         {
             { } visualStylesMode when UseVisualStyles => visualStylesMode,
             { } => VisualStylesMode.Disabled,
-            _ => UseVisualStyles ? VisualStylesMode.Classic : VisualStylesMode.Disabled
+            _ => UseVisualStyles
+                ? VisualStylesMode.Classic
+                : VisualStylesMode.Disabled
         };
 
     /// <summary>
@@ -729,7 +731,6 @@ public static void SetDefaultVisualStylesMode(VisualStylesMode styleSetting)
             VisualStylesMode.Classic => styleSetting,
             VisualStylesMode.Disabled => styleSetting,
             VisualStylesMode.Net11 => styleSetting,
-            VisualStylesMode.LatestPreview => styleSetting,
             VisualStylesMode.Latest => styleSetting,
             VisualStylesMode.Inherit => throw new ArgumentException(
                 SR.Application_VisualStylesModeInheritInvalidAsDefault,
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
index d5f264373b9..828c6c017da 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
@@ -916,7 +916,6 @@ public VisualStylesMode VisualStylesMode
                 VisualStylesMode.Classic => value,
                 VisualStylesMode.Disabled => value,
                 VisualStylesMode.Net11 => value,
-                VisualStylesMode.LatestPreview => value,
                 VisualStylesMode.Latest => value,
                 _ => throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(VisualStylesMode))
             };
@@ -948,6 +947,36 @@ private bool ShouldSerializeVisualStylesMode()
     private void ResetVisualStylesMode()
         => Properties.RemoveValue(s_visualStylesModeProperty);
 
+    /// <summary>
+    ///  Gets the <see cref="Forms.VisualStylesMode"/> that controls should actually honor when deciding
+    ///  <see cref="CreateParams"/> or paint behavior, after applying the Windows High Contrast clamp.
+    /// </summary>
+    /// <value>
+    ///  <see cref="VisualStylesMode.Disabled"/> when visual styles are explicitly disabled;
+    ///  <see cref="VisualStylesMode.Classic"/> when Windows High Contrast is active (so custom non-client
+    ///  painting, which does not honor the High Contrast palette, is bypassed); otherwise the raw
+    ///  <see cref="VisualStylesMode"/> value.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   In-box controls <b>MUST</b> read this property, not the raw <see cref="VisualStylesMode"/>, whenever they
+    ///   decide their <see cref="CreateParams"/> or paint behavior. The raw <see cref="VisualStylesMode"/> stays
+    ///   pure so that before/after comparisons across a High Contrast transition remain meaningful; the High
+    ///   Contrast clamp lives here instead.
+    ///  </para>
+    ///  <para>
+    ///   Windows High Contrast can be toggled while the application is running, so this value is <b>not stable</b>
+    ///   across such a transition and <b>must not be cached</b>. Affected controls rebuild their handles on the
+    ///   transition (see <see cref="Form.OnSystemColorsChanged(EventArgs)"/>), which re-reads this value.
+    ///  </para>
+    /// </remarks>
+    private protected VisualStylesMode EffectiveVisualStylesMode
+        => VisualStylesMode is VisualStylesMode.Disabled
+            ? VisualStylesMode.Disabled
+            : SystemInformation.HighContrast
+                ? VisualStylesMode.Classic
+                : VisualStylesMode;
+
     /// <summary>
     ///  Gets the default <see cref="Forms.VisualStylesMode"/> for the control, which is ambient to
     ///  <see cref="Application.DefaultVisualStylesMode"/>.
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs
index c4a7bc38e64..e5c82d37e80 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.PopupKeyCap.cs
@@ -18,7 +18,7 @@ public partial class Button
     /// </summary>
     internal bool IsPopupKeyCapAppearance =>
         FlatStyle == FlatStyle.Popup
-            && (Application.IsDarkModeEnabled || VisualStylesMode >= VisualStylesMode.Net11);
+            && (Application.IsDarkModeEnabled || EffectiveVisualStylesMode >= VisualStylesMode.Net11);
 
     /// <inheritdoc/>
     protected override void OnPaint(PaintEventArgs pevent)
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
index f7fe95af5ff..1e844a18b2a 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -1272,6 +1272,13 @@ protected override void OnVisualStylesModeChanged(EventArgs e)
         }
     }
 
+    /// <summary>
+    ///  Exposes the (otherwise <c>private protected</c>) <see cref="Control.EffectiveVisualStylesMode"/>
+    ///  to the owner-drawn button adapters in the <c>ButtonInternal</c> namespace, so that renderer selection
+    ///  honors the Windows High Contrast clamp just like the control's own paint and <see cref="CreateParams"/>.
+    /// </summary>
+    internal VisualStylesMode EffectiveVisualStylesModeInternal => EffectiveVisualStylesMode;
+
     protected override void OnParentChanged(EventArgs e)
     {
         base.OnParentChanged(e);
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
index f77bea7168a..f7736b8e512 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
@@ -12,7 +12,7 @@ internal class ButtonDarkModeAdapter : ButtonBaseAdapter
 
     internal ButtonDarkModeAdapter(ButtonBase control) : base(control)
     {
-        bool modern = control.VisualStylesMode >= VisualStylesMode.Net11;
+        bool modern = control.EffectiveVisualStylesModeInternal >= VisualStylesMode.Net11;
 
         _buttonDarkModeRenderer = control.FlatStyle switch
         {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs
index bf7f7144dfa..c32a3a00c79 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/DarkModeAdapterFactory.cs
@@ -9,7 +9,7 @@ internal static class DarkModeAdapterFactory
     // the control opts into the modern .NET 11 visual styles (modern renderer, in either dark or light scheme).
     private static bool UseOwnerDrawnAdapter(ButtonBase control)
     {
-        return Application.IsDarkModeEnabled || control.VisualStylesMode >= VisualStylesMode.Net11;
+        return Application.IsDarkModeEnabled || control.EffectiveVisualStylesModeInternal >= VisualStylesMode.Net11;
     }
 
     public static ButtonBaseAdapter CreateFlatAdapter(ButtonBase control) =>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
index fd532dd4d7b..f3e5373c5bb 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
@@ -122,7 +122,7 @@ private bool IsToggleSwitchAppearance
         get
         {
             return Appearance == Appearance.ToggleSwitch
-                && VisualStylesMode >= VisualStylesMode.Net11
+                && EffectiveVisualStylesMode >= VisualStylesMode.Net11
                 && !ThreeState;
         }
     }
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs
index 9d425b34f40..50299a05186 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBox.cs
@@ -805,7 +805,7 @@ private void WmPrint(ref Message m)
         // must not also draw the classic Fixed3D edge here - that would double-draw over the modern chrome.
         if (((nint)m.LParamInternal & PInvoke.PRF_NONCLIENT) != 0 && Application.RenderWithVisualStyles
             && BorderStyle == BorderStyle.Fixed3D
-            && VisualStylesMode < VisualStylesMode.Net11)
+            && EffectiveVisualStylesMode < VisualStylesMode.Net11)
         {
             using Graphics g = Graphics.FromHdc((HDC)m.WParamInternal);
             Rectangle rect = new(0, 0, Size.Width - 1, Size.Height - 1);
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index 549ea0b9164..e3e370e2b62 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -447,6 +447,16 @@ protected override CreateParams CreateParams
                 }
             }
 
+            if (EffectiveVisualStylesMode >= VisualStylesMode.Net11)
+            {
+                // Under a modern VisualStylesMode we custom-draw the frame in the non-client area (see OnNcPaint),
+                // so the natively drawn border must be suppressed to avoid a double frame. Only the effective
+                // Win32 styles are stripped here; the public BorderStyle property remains authoritative for what
+                // the custom non-client paint draws.
+                cp.Style &= ~(int)WINDOW_STYLE.WS_BORDER;
+                cp.ExStyle &= ~(int)WINDOW_EX_STYLE.WS_EX_CLIENTEDGE;
+            }
+
             return cp;
         }
     }
@@ -826,7 +836,7 @@ private void ResetPadding()
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     [SRDescription(nameof(SR.TextBoxPreferredHeightDescr))]
     public int PreferredHeight =>
-        VisualStylesMode switch
+        EffectiveVisualStylesMode switch
         {
             VisualStylesMode.Disabled => PreferredHeightClassic,
             VisualStylesMode.Classic => PreferredHeightClassic,
@@ -992,7 +1002,7 @@ internal override Size GetPreferredSizeCore(Size proposedConstraints)
             format |= TextFormatFlags.WordBreak;
         }
 
-        if (VisualStylesMode >= VisualStylesMode.Net11)
+        if (EffectiveVisualStylesMode >= VisualStylesMode.Net11)
         {
             // For modern Visual Styles we take the carved adorner band (including scrollbars
             // and the user Padding) into account when measuring.
@@ -1663,7 +1673,7 @@ protected virtual void OnBorderStyleChanged(EventArgs e)
 
     protected override unsafe void OnGotFocus(EventArgs e)
     {
-        if (VisualStylesMode >= VisualStylesMode.Net11)
+        if (EffectiveVisualStylesMode >= VisualStylesMode.Net11)
         {
             // We need to invalidate the non-client area so the focused adorners are drawn.
             PInvoke.RedrawWindow(
@@ -1678,7 +1688,7 @@ protected override unsafe void OnGotFocus(EventArgs e)
 
     protected override unsafe void OnLostFocus(EventArgs e)
     {
-        if (VisualStylesMode >= VisualStylesMode.Net11)
+        if (EffectiveVisualStylesMode >= VisualStylesMode.Net11)
         {
             // We need to invalidate the non-client area so the un-focused adorners are drawn.
             PInvoke.RedrawWindow(
@@ -1693,7 +1703,7 @@ protected override unsafe void OnLostFocus(EventArgs e)
 
     protected override unsafe void OnSizeChanged(EventArgs e)
     {
-        if (VisualStylesMode >= VisualStylesMode.Net11)
+        if (EffectiveVisualStylesMode >= VisualStylesMode.Net11)
         {
             // Invalidate the non-client area to ensure the border chrome is drawn correctly after a resize.
             PInvoke.RedrawWindow(
@@ -2255,7 +2265,7 @@ internal override HBRUSH InitializeDCForWmCtlColor(HDC dc, MessageId msg)
     /// </remarks>
     private protected virtual unsafe void InitializeClientArea(HDC hDC, HWND hwnd)
     {
-        if (VisualStylesMode < VisualStylesMode.Net11
+        if (EffectiveVisualStylesMode < VisualStylesMode.Net11
             || _triggerNewClientSizeRequest)
         {
             return;
@@ -2337,7 +2347,7 @@ private unsafe void WmNcCalcSize(ref Message m)
     /// </remarks>
     private void WmNcPaint(ref Message m)
     {
-        if (VisualStylesMode < VisualStylesMode.Net11)
+        if (EffectiveVisualStylesMode < VisualStylesMode.Net11)
         {
             base.WndProc(ref m);
             return;
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Form.cs b/src/System.Windows.Forms/System/Windows/Forms/Form.cs
index deed25e1b9c..a4eb041efb0 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Form.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Form.cs
@@ -4240,6 +4240,35 @@ protected override void OnHandleDestroyed(EventArgs e)
         }
     }
 
+    // Snapshot of the Windows High Contrast state, used to detect a transition in OnSystemColorsChanged.
+    private bool _lastHighContrast = SystemInformation.HighContrast;
+
+    /// <inheritdoc/>
+    protected override void OnSystemColorsChanged(EventArgs e)
+    {
+        base.OnSystemColorsChanged(e);
+
+        // Windows High Contrast forces Classic rendering (see Control.EffectiveVisualStylesMode), which changes
+        // CreateParams for this form and its children. When the High Contrast state actually toggles we must
+        // rebuild the handle so those CreateParams are re-read. Recreating the top-level Form destroys and
+        // rebuilds the entire child HWND tree, so the rebuild itself propagates the new mode to every child -
+        // no per-child notification is needed. Doing this only on Form (not Control) avoids recreating each
+        // child a second time as Control.OnSystemColorsChanged walks down the tree.
+        bool highContrast = SystemInformation.HighContrast;
+
+        if (highContrast != _lastHighContrast)
+        {
+            _lastHighContrast = highContrast;
+
+            // If visual styles are explicitly disabled they stay disabled regardless of High Contrast, so
+            // nothing about CreateParams changes and there is no need to recreate.
+            if (VisualStylesMode is not VisualStylesMode.Disabled)
+            {
+                RecreateHandle();
+            }
+        }
+    }
+
     /// <summary>
     ///  Handles the event that a helpButton is clicked
     /// </summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
index 0d2937d2710..f1879068e59 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/VisualStylesMode.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace System.Windows.Forms;
@@ -48,18 +48,6 @@ public enum VisualStylesMode : short
     /// </summary>
     Net11 = 2,
 
-    /// <summary>
-    ///  The latest preview version of the visual renderer available in the running framework.
-    /// </summary>
-    /// <remarks>
-    ///  <para>
-    ///   This value intentionally tracks unreleased or experimental renderer behavior ahead of
-    ///   <see cref="Latest"/>. Tooling should therefore avoid treating it as a long-term stable
-    ///   serialization target.
-    ///  </para>
-    /// </remarks>
-    LatestPreview = short.MaxValue - 1,
-
     /// <summary>
     ///  The latest stable version of the visual renderer available in the running framework.
     /// </summary>
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
index f082b5ae546..3250439aab1 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/CheckBoxToggleSwitchTests.cs
@@ -22,7 +22,6 @@ public void CheckBox_Appearance_ToggleSwitch_RoundTrips()
 
     [WinFormsTheory]
     [InlineData(VisualStylesMode.Net11)]
-    [InlineData(VisualStylesMode.LatestPreview)]
     [InlineData(VisualStylesMode.Latest)]
     public void CheckBox_ToggleSwitch_WithModernVisualStyles_HasPositivePreferredSize(VisualStylesMode visualStylesMode)
     {
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
index 39282c1af53..c57038894b3 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.VisualStylesMode.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #nullable disable
@@ -20,15 +20,8 @@ public void Control_VisualStylesMode_DefaultMatchesApplicationDefault()
         Assert.False(control.IsHandleCreated);
     }
 
-    [Fact]
-    public void VisualStylesMode_LatestPreview_HasExpectedValue()
-    {
-        Assert.Equal(short.MaxValue - 1, (short)VisualStylesMode.LatestPreview);
-    }
-
     [WinFormsTheory]
     [InlineData(VisualStylesMode.Net11)]
-    [InlineData(VisualStylesMode.LatestPreview)]
     [InlineData(VisualStylesMode.Latest)]
     public void Control_VisualStylesMode_Set_GetReturnsExpected(VisualStylesMode value)
     {
diff --git a/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs b/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs
index 8f01a6c4289..c579ca03f87 100644
--- a/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs
+++ b/src/test/unit/System.Windows.Forms/TextBoxBaseTests.cs
@@ -5057,7 +5057,6 @@ public void TextBox_GetPreferredSize_InvokeWithPaddingWithoutModernVisualStyles_
 
     [WinFormsTheory]
     [InlineData(VisualStylesMode.Net11)]
-    [InlineData(VisualStylesMode.LatestPreview)]
     [InlineData(VisualStylesMode.Latest)]
     public void TextBoxBase_Padding_WithModernVisualStyles_ChangesPreferredSize(VisualStylesMode visualStylesMode)
     {
@@ -5084,7 +5083,6 @@ public void TextBoxBase_Padding_WithModernVisualStyles_ChangesPreferredSize(Visu
 
     [WinFormsTheory]
     [InlineData(VisualStylesMode.Net11)]
-    [InlineData(VisualStylesMode.LatestPreview)]
     [InlineData(VisualStylesMode.Latest)]
     public void TextBoxBase_Padding_WithModernVisualStyles_ChangesVisualStylesPadding(VisualStylesMode visualStylesMode)
     {

From 666210e97f040bbc543cfb16cea6c97a659064b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 18:35:25 -0700
Subject: [PATCH 43/50] Fix compile break from VisualStylesMode.LatestPreview
 removal

Rewrite the write-once application default test to no longer reference the
removed VisualStylesMode.LatestPreview member. The test now uses Net11 as the
established (write-twice-with-same-value) mode and Latest as the differing
value that must throw. Also drop stale LatestPreview mentions from the
validation comments in Application.SetDefaultVisualStylesMode and
Control.VisualStylesMode.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 41e90924-3241-42a8-9556-71e100be7e59
---
 .../System/Windows/Forms/Application.cs             |  2 +-
 .../System/Windows/Forms/Control.cs                 |  3 +--
 .../System/Windows/Forms/ApplicationTests.cs        | 13 +++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
index dbec2609135..4b82d013a66 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Application.cs
@@ -725,7 +725,7 @@ public static void SetDefaultVisualStylesMode(VisualStylesMode styleSetting)
     {
         // Validate the value. Inherit is the ambient sentinel and is invalid as the application default,
         // since the application root has no parent to inherit from. The non-contiguous members (Inherit,
-        // LatestPreview, Latest) prevent using the source generated enum validator.
+        // Latest) prevent using the source generated enum validator.
         _ = styleSetting switch
         {
             VisualStylesMode.Classic => styleSetting,
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
index 828c6c017da..7d704513f80 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
@@ -908,8 +908,7 @@ public VisualStylesMode VisualStylesMode
         set
         {
             // Can't use the source generated enum validator here, since it cannot deal with the
-            // non-contiguous Inherit (-1), LatestPreview (short.MaxValue - 1), and Latest
-            // (short.MaxValue) members.
+            // non-contiguous Inherit (-1) and Latest (short.MaxValue) members.
             _ = value switch
             {
                 VisualStylesMode.Inherit => value,
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
index c12723bb4f9..70067c2d3e2 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/ApplicationTests.cs
@@ -179,23 +179,24 @@ public void Application_SetColorMode_PlausibilityTests()
     }
 
     [Fact]
-    public void Application_SetDefaultVisualStylesMode_LatestPreview_IsWriteOnce()
+    public void Application_SetDefaultVisualStylesMode_IsWriteOnce()
     {
         using RemoteInvokeHandle handle = RemoteExecutor.Invoke(() =>
         {
-            Assert.Equal(short.MaxValue - 1, (short)VisualStylesMode.LatestPreview);
-
             VisualStylesMode expectedInitialMode = Application.UseVisualStyles
                 ? VisualStylesMode.Classic
                 : VisualStylesMode.Disabled;
             Assert.Equal(expectedInitialMode, Application.DefaultVisualStylesMode);
 
-            Application.SetDefaultVisualStylesMode(VisualStylesMode.LatestPreview);
+            Application.SetDefaultVisualStylesMode(VisualStylesMode.Net11);
             Assert.Equal(
-                Application.UseVisualStyles ? VisualStylesMode.LatestPreview : VisualStylesMode.Disabled,
+                Application.UseVisualStyles ? VisualStylesMode.Net11 : VisualStylesMode.Disabled,
                 Application.DefaultVisualStylesMode);
-            Application.SetDefaultVisualStylesMode(VisualStylesMode.LatestPreview);
 
+            // Setting the same value again is allowed.
+            Application.SetDefaultVisualStylesMode(VisualStylesMode.Net11);
+
+            // Setting a different value after the mode has been established throws.
             Assert.Throws<InvalidOperationException>(
                 () => Application.SetDefaultVisualStylesMode(VisualStylesMode.Latest));
         });

From 223eacfceca757d9fb2add11e98312d4770bcc43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 18:37:20 -0700
Subject: [PATCH 44/50] Make Control.VisualStylesMode virtual

Align VisualStylesMode with the other ambient properties (BackColor, Cursor,
Font, ForeColor, RightToLeft), which are all public virtual. Making it virtual
allows derived controls to transform the ambient value that children observe
through ParentInternal.VisualStylesMode. The property is still unshipped, so
this only updates the PublicAPI.Unshipped.txt entries.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 41e90924-3241-42a8-9556-71e100be7e59
---
 src/System.Windows.Forms/PublicAPI.Unshipped.txt         | 4 ++--
 src/System.Windows.Forms/System/Windows/Forms/Control.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 43d38a8a055..d065a54da83 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -160,8 +160,6 @@ override System.Windows.Forms.Form.OnSystemColorsChanged(System.EventArgs! e) ->
 static System.Windows.Forms.Application.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 static System.Windows.Forms.Application.SetDefaultVisualStylesMode(System.Windows.Forms.VisualStylesMode styleSetting) -> void
 System.Windows.Forms.Appearance.ToggleSwitch = 2 -> System.Windows.Forms.Appearance
-System.Windows.Forms.Control.VisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
-System.Windows.Forms.Control.VisualStylesMode.set -> void
 System.Windows.Forms.Control.VisualStylesModeChanged -> System.EventHandler?
 System.Windows.Forms.VisualStylesMode
 System.Windows.Forms.VisualStylesMode.Classic = 0 -> System.Windows.Forms.VisualStylesMode
@@ -172,3 +170,5 @@ System.Windows.Forms.VisualStylesMode.Net11 = 2 -> System.Windows.Forms.VisualSt
 virtual System.Windows.Forms.Control.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 virtual System.Windows.Forms.Control.OnParentVisualStylesModeChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.Control.OnVisualStylesModeChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.Control.VisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
+virtual System.Windows.Forms.Control.VisualStylesMode.set -> void
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
index 7d704513f80..3e92663dfdd 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Control.cs
@@ -893,7 +893,7 @@ private void ResetDataContext()
     [EditorBrowsable(EditorBrowsableState.Always)]
     [AmbientValue(VisualStylesMode.Inherit)]
     [SRDescription(nameof(SR.ControlVisualStylesModeDescr))]
-    public VisualStylesMode VisualStylesMode
+    public virtual VisualStylesMode VisualStylesMode
     {
         get
         {

From e97cb717fb70912a807412cd3ab92d1e7195da9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 18:39:59 -0700
Subject: [PATCH 45/50] Pin PropertyGrid hosted controls to classic visual
 styles

Override the now-virtual Control.VisualStylesMode in PropertyGrid to always
return VisualStylesMode.Classic. The editing controls hosted inside the grid
read the ambient VisualStylesMode from their parent chain; because the property
is virtual, they resolve to Classic and never switch to a modern renderer whose
frame/glyph metrics would not line up with the grid's fixed layout.

The setter stores the requested value in a backing field for potential future
use but currently has no effect, so setting Net11/Latest is a genuine no-op.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 41e90924-3241-42a8-9556-71e100be7e59
---
 .../PublicAPI.Unshipped.txt                   |  2 +
 .../Controls/PropertyGrid/PropertyGrid.cs     | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index d065a54da83..327a7624c43 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -157,6 +157,8 @@ override System.Windows.Forms.CheckBox.Dispose(bool disposing) -> void
 override System.Windows.Forms.CheckBox.OnPaint(System.Windows.Forms.PaintEventArgs! pevent) -> void
 override System.Windows.Forms.CheckBox.OnVisualStylesModeChanged(System.EventArgs! e) -> void
 override System.Windows.Forms.Form.OnSystemColorsChanged(System.EventArgs! e) -> void
+override System.Windows.Forms.PropertyGrid.VisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
+override System.Windows.Forms.PropertyGrid.VisualStylesMode.set -> void
 static System.Windows.Forms.Application.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 static System.Windows.Forms.Application.SetDefaultVisualStylesMode(System.Windows.Forms.VisualStylesMode styleSetting) -> void
 System.Windows.Forms.Appearance.ToggleSwitch = 2 -> System.Windows.Forms.Appearance
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs
index 56110e517ac..c5ad94413eb 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs
@@ -80,6 +80,10 @@ public partial class PropertyGrid : ContainerControl, IComPropertyBrowser, IProp
     private Color _selectedItemWithFocusBackColor = SystemColors.Highlight;
     private bool _canShowVisualStyleGlyphs = true;
 
+    // The PropertyGrid pins its effective VisualStylesMode to Classic (see the VisualStylesMode override).
+    // A value assigned through the setter is remembered here for potential future use only.
+    private VisualStylesMode _requestedVisualStylesMode = VisualStylesMode.Inherit;
+
     private AttributeCollection? _browsableAttributes;
 
     private SnappableControl? _targetMove;
@@ -819,6 +823,39 @@ public Color LineColor
         remove => base.PaddingChanged -= value;
     }
 
+    /// <summary>
+    ///  Gets or sets how the <see cref="PropertyGrid"/> renders itself when visual styles are applied.
+    /// </summary>
+    /// <value>
+    ///  Always <see cref="VisualStylesMode.Classic"/>. Assigning a different value is remembered but does
+    ///  not change how the grid or its hosted editing controls render.
+    /// </value>
+    /// <remarks>
+    ///  <para>
+    ///   The <see cref="PropertyGrid"/> pins its effective <see cref="VisualStylesMode"/> to
+    ///   <see cref="VisualStylesMode.Classic"/>. The editing controls hosted inside the grid (the value
+    ///   text boxes and drop-down editors) read the ambient <see cref="VisualStylesMode"/> from their
+    ///   parent. They must render in the classic style so their frames and glyphs line up with the grid's
+    ///   own fixed layout. Because this override always returns <see cref="VisualStylesMode.Classic"/> and
+    ///   <see cref="VisualStylesMode"/> is a virtual ambient property, those children never switch to a
+    ///   modern renderer, regardless of <see cref="Application.DefaultVisualStylesMode"/> or the parent
+    ///   form's setting.
+    ///  </para>
+    ///  <para>
+    ///   A value assigned through the setter is stored for potential future use but currently has no
+    ///   effect; the getter continues to report <see cref="VisualStylesMode.Classic"/>. This keeps the
+    ///   surface forward compatible for a later release in which the grid may honor a modern mode.
+    ///  </para>
+    /// </remarks>
+    [Browsable(false)]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    public override VisualStylesMode VisualStylesMode
+    {
+        get => VisualStylesMode.Classic;
+        set => _requestedVisualStylesMode = value;
+    }
+
     /// <summary>
     ///  Sets or gets the current property sort type, which can be
     ///  PropertySort.Categorized or PropertySort.Alphabetical.

From b38cdcb98948b144166f8a1b4dd79b4965f734ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 18:48:36 -0700
Subject: [PATCH 46/50] Honor Padding in RichTextBox under modern visual styles

RichEdit (MSFTEDIT) does not send the WM_CTLCOLOR messages a plain EDIT control
uses to lazily trigger the modern Visual Styles client-area carve, so the carve
never ran and Padding had no effect. RichEdit also reserves its own border and
scrollbar space during WM_NCCALCSIZE, so the managed carve must be applied on
top of the native result rather than the raw proposed window rectangle.

- TextBoxBase: extract the carve trigger into RecalculateVisualStylesClientArea
  so it can be re-provoked, add the ReservesNativeNonClientArea hook so
  WmNcCalcSize runs the default handler first for such controls, and re-provoke
  the carve from OnPaddingChanged so runtime Padding changes apply.
- RichTextBox: opt into ReservesNativeNonClientArea, return an empty
  GetScrollBarPadding (RichEdit already reserves the scrollbars), and trigger the
  carve explicitly in OnHandleCreated since WM_CTLCOLOR never arrives.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 41e90924-3241-42a8-9556-71e100be7e59
---
 .../Forms/Controls/RichTextBox/RichTextBox.cs | 19 ++++++++-
 .../Forms/Controls/TextBox/TextBoxBase.cs     | 42 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs
index 4e7ef249817..4b4fa46bee1 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs
@@ -319,7 +319,19 @@ protected override CreateParams CreateParams
         }
     }
 
-    // public bool CanUndo {}; <-- inherited from TextBoxBase
+    /// <summary>
+    ///  RichEdit (<c>MSFTEDIT</c>) reserves its own border and scrollbar space during
+    ///  <c>WM_NCCALCSIZE</c>, so the modern Visual Styles padding band is carved on top of the client
+    ///  rectangle the native handler produces.
+    /// </summary>
+    private protected override bool ReservesNativeNonClientArea => true;
+
+    /// <summary>
+    ///  RichEdit reserves the scrollbar space itself while processing <c>WM_NCCALCSIZE</c> (see
+    ///  <see cref="ReservesNativeNonClientArea"/>), so no additional managed scrollbar allowance is
+    ///  added on top; otherwise the space would be counted twice.
+    /// </summary>
+    private protected override Padding GetScrollBarPadding() => Padding.Empty;
 
     /// <summary>
     ///  Controls whether or not the rich edit control will automatically highlight URLs.
@@ -2562,6 +2574,11 @@ protected override void OnHandleCreated(EventArgs e)
 
         SendZoomFactor(_zoomMultiplier);
 
+        // RichEdit does not send the WM_CTLCOLOR messages that a plain EDIT control uses to lazily trigger
+        // the modern Visual Styles client-area carve, so provoke it explicitly once the handle exists.
+        // This is a no-op unless EffectiveVisualStylesMode is Net11 or above.
+        RecalculateVisualStylesClientArea();
+
         SystemEvents.UserPreferenceChanged += UserPreferenceChangedHandler;
     }
 
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
index e3e370e2b62..4ec75f1db4d 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
@@ -1779,6 +1779,13 @@ protected override void OnPaddingChanged(EventArgs e)
     {
         base.OnPaddingChanged(e);
         AdjustHeight(false);
+
+        // The carved modern Visual Styles padding band includes the user Padding, so a runtime change
+        // has to re-provoke the non-client calculation for it to be reflected in the client rectangle.
+        if (EffectiveVisualStylesMode >= VisualStylesMode.Net11)
+        {
+            RecalculateVisualStylesClientArea();
+        }
     }
 
     protected virtual void OnReadOnlyChanged(EventArgs e)
@@ -2271,6 +2278,21 @@ private protected virtual unsafe void InitializeClientArea(HDC hDC, HWND hwnd)
             return;
         }
 
+        RecalculateVisualStylesClientArea();
+    }
+
+    /// <summary>
+    ///  Sets the latch and provokes the <c>WM_NCCALCSIZE</c> round trip that carves the modern Visual
+    ///  Styles padding band from the client area. Safe to call repeatedly; it re-carves against the
+    ///  current <see cref="Padding"/> and scrollbar state.
+    /// </summary>
+    private protected void RecalculateVisualStylesClientArea()
+    {
+        if (!IsHandleCreated || EffectiveVisualStylesMode < VisualStylesMode.Net11)
+        {
+            return;
+        }
+
         _triggerNewClientSizeRequest = true;
 
         // Call SetWindowPos with the current bounds and the SWP_FRAMECHANGED flag. We do not change the
@@ -2291,6 +2313,16 @@ private protected virtual unsafe void InitializeClientArea(HDC hDC, HWND hwnd)
         Invalidate(true);
     }
 
+    /// <summary>
+    ///  When <see langword="true"/>, the native window reserves its own non-client metrics (border and
+    ///  scrollbars) during <c>WM_NCCALCSIZE</c>, so the modern Visual Styles padding band is carved from
+    ///  the client rectangle the default handler produces rather than from the raw proposed window
+    ///  rectangle. The default is <see langword="false"/>: the managed carve is authoritative and the
+    ///  default handler is not invoked (a plain <c>EDIT</c> control keeps its scrollbars inside the
+    ///  managed <see cref="GetScrollBarPadding"/> allowance).
+    /// </summary>
+    private protected virtual bool ReservesNativeNonClientArea => false;
+
     /// <summary>
     ///  Handles <c>WM_NCCALCSIZE</c> by carving the modern Visual Styles padding band from the client
     ///  rectangle. The carve is floored so the client rectangle can never invert.
@@ -2304,6 +2336,16 @@ private unsafe void WmNcCalcSize(ref Message m)
 
             if (ncCalcSizeParams is not null)
             {
+                // Controls whose native window reserves its own non-client metrics (RichEdit reserves its
+                // border and scrollbars) must run the default handler first, so we carve the modern padding
+                // band from the already-adjusted client rectangle rather than the raw proposed window
+                // rectangle. Those controls report an empty GetScrollBarPadding so the scrollbar space the
+                // native handler already reserved is not counted twice.
+                if (ReservesNativeNonClientArea)
+                {
+                    base.WndProc(ref m);
+                }
+
                 Padding padding = GetVisualStylesPadding(includeScrollbars: true);
 
                 ref RECT clientRect = ref ncCalcSizeParams->rgrc._0;

From ea1f572299b5e920dd1a257175eaf8a0eaeb05a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 19:35:23 -0700
Subject: [PATCH 47/50] Add side-by-side up/down buttons for modern
 VisualStylesMode (A11y)

When a modern VisualStylesMode (Net11 or above) is in effect, lay out the
UpDownBase increment/decrement buttons side by side instead of stacked, so
each button gets a larger, more accessible click target. The decrement
(down) button sits on the leading edge and the increment (up) button on the
trailing edge, mirrored under right-to-left.

- UpDownBase: add internal UseSideBySideButtons (gated on
  EffectiveVisualStylesMode >= Net11); widen the button band to 2x in
  PositionControls when active.
- UpDownButtons: centralize hit-testing in GetButtonRectangle(ButtonID)
  (stacked = top/bottom half, side-by-side = leading/trailing half, RTL
  aware); route BeginButtonPress, OnMouseMove and accessibility bounds
  through it. Render the modern layout with DrawModernControlButton
  (light + dark) and add GetButtonState mapping enabled/pushed/hot state.
- DirectionButtonAccessibleObject: derive Bounds from the shared
  GetButtonRectangle (client coords) and map via owner.RectangleToScreen.

Classic (stacked) layout and rendering are unchanged. NumericUpDown and
DomainUpDown inherit the new behavior.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 41e90924-3241-42a8-9556-71e100be7e59
---
 ...eObject.DirectionButtonAccessibleObject.cs |  14 +--
 .../UpDown/UpDownBase.UpDownButtons.cs        | 119 ++++++++++++++----
 .../Forms/Controls/UpDown/UpDownBase.cs       |  17 ++-
 3 files changed, 110 insertions(+), 40 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs
index e6ca2322105..b037005a273 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs
@@ -33,17 +33,11 @@ public override Rectangle Bounds
                             return Rectangle.Empty;
                         }
 
-                        // Get button bounds
-                        Rectangle bounds = owner.Bounds;
-                        bounds.Height /= 2;
+                        // Get button bounds (client-relative), honoring the stacked vs side-by-side layout.
+                        Rectangle bounds = owner.GetButtonRectangle(_up ? ButtonID.Up : ButtonID.Down);
 
-                        if (!_up)
-                        {
-                            bounds.Y += bounds.Height;
-                        }
-
-                        // Convert to screen coords
-                        return owner.ParentInternal?.RectangleToScreen(bounds) ?? Rectangle.Empty;
+                        // Convert from the buttons' client coordinates to screen coordinates.
+                        return owner.RectangleToScreen(bounds);
                     }
                 }
 
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.cs
index 57e8edf7ca4..f85e0337970 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.cs
@@ -55,26 +55,52 @@ public event UpDownEventHandler? UpDown
         }
 
         /// <summary>
-        ///  Called when the mouse button is pressed - we need to start spinning the value of the up-down control.
+        ///  When <see langword="true"/> the two buttons are laid out side by side (see
+        ///  <see cref="UpDownBase.UseSideBySideButtons"/>); otherwise they are stacked vertically.
         /// </summary>
-        /// <param name="e">The mouse event arguments.</param>
-        private void BeginButtonPress(MouseEventArgs e)
+        internal bool UseSideBySideButtons => _parent.UseSideBySideButtons;
+
+        /// <summary>
+        ///  Returns the client-area rectangle occupied by the requested button. In the classic (stacked)
+        ///  layout the up button is the top half and the down button the bottom half. In the modern
+        ///  (side-by-side) layout the increment (up) button is on the trailing edge and the decrement
+        ///  (down) button on the leading edge, mirrored under right-to-left.
+        /// </summary>
+        internal Rectangle GetButtonRectangle(ButtonID button)
         {
-            int half_height = Size.Height / 2;
+            Rectangle client = ClientRectangle;
 
-            if (e.Y < half_height)
+            if (UseSideBySideButtons)
             {
-                // Up button
-                _pushed = _captured = ButtonID.Up;
-                Invalidate();
-            }
-            else
-            {
-                // Down button
-                _pushed = _captured = ButtonID.Down;
-                Invalidate();
+                int half = client.Width / 2;
+                Rectangle leadingRect = new(client.X, client.Y, half, client.Height);
+                Rectangle trailingRect = new(client.X + half, client.Y, client.Width - half, client.Height);
+
+                bool rightToLeft = _parent.RightToLeft == RightToLeft.Yes;
+                Rectangle upRect = rightToLeft ? leadingRect : trailingRect;
+                Rectangle downRect = rightToLeft ? trailingRect : leadingRect;
+
+                return button == ButtonID.Up ? upRect : downRect;
             }
 
+            int halfHeight = client.Height / 2;
+            Rectangle topRect = new(client.X, client.Y, client.Width, halfHeight);
+            Rectangle bottomRect = new(client.X, client.Y + halfHeight, client.Width, client.Height - halfHeight);
+
+            return button == ButtonID.Up ? topRect : bottomRect;
+        }
+
+        /// <summary>
+        ///  Called when the mouse button is pressed - we need to start spinning the value of the up-down control.
+        /// </summary>
+        /// <param name="e">The mouse event arguments.</param>
+        private void BeginButtonPress(MouseEventArgs e)
+        {
+            _pushed = _captured = GetButtonRectangle(ButtonID.Up).Contains(e.Location)
+                ? ButtonID.Up
+                : ButtonID.Down;
+            Invalidate();
+
             // Capture the mouse
             Capture = true;
 
@@ -148,14 +174,8 @@ protected override void OnMouseMove(MouseEventArgs e)
 
             if (Capture)
             {
-                // Determine button area
-                Rectangle rect = ClientRectangle;
-                rect.Height /= 2;
-
-                if (_captured == ButtonID.Down)
-                {
-                    rect.Y += rect.Height;
-                }
+                // Determine the captured button area
+                Rectangle rect = GetButtonRectangle(_captured);
 
                 // Test if the mouse has moved outside the button area
                 if (rect.Contains(e.X, e.Y))
@@ -188,9 +208,8 @@ protected override void OnMouseMove(MouseEventArgs e)
             }
 
             // Logic for seeing which button is Hot if any
-            Rectangle rectUp = ClientRectangle, rectDown = ClientRectangle;
-            rectUp.Height /= 2;
-            rectDown.Y += rectDown.Height / 2;
+            Rectangle rectUp = GetButtonRectangle(ButtonID.Up);
+            Rectangle rectDown = GetButtonRectangle(ButtonID.Down);
 
             // Check if the mouse is on the upper or lower button. Note that it could be in neither.
             if (rectUp.Contains(e.X, e.Y))
@@ -270,7 +289,32 @@ protected override void OnPaint(PaintEventArgs e)
             int half_height = ClientSize.Height / 2;
 
             // Draw the up and down buttons
-            if (Application.IsDarkModeEnabled)
+            if (UseSideBySideButtons)
+            {
+                // Modern side-by-side layout: decrement (down) on the leading edge, increment (up) on
+                // the trailing edge (mirrored under right-to-left via GetButtonRectangle). Rendered with
+                // the modern control-button renderer, which adapts to both light and dark modes.
+                bool isDarkMode = Application.IsDarkModeEnabled;
+
+                Graphics cachedGraphics = EnsureCachedBitmap(ClientSize.Width, ClientSize.Height);
+
+                DrawModernControlButton(
+                    cachedGraphics,
+                    GetButtonRectangle(ButtonID.Down),
+                    ModernControlButtonStyle.Down | ModernControlButtonStyle.SingleBorder,
+                    GetButtonState(ButtonID.Down),
+                    isDarkMode);
+
+                DrawModernControlButton(
+                    cachedGraphics,
+                    GetButtonRectangle(ButtonID.Up),
+                    ModernControlButtonStyle.Up | ModernControlButtonStyle.SingleBorder,
+                    GetButtonState(ButtonID.Up),
+                    isDarkMode);
+
+                e.GraphicsInternal.DrawImageUnscaled(_cachedBitmap, new Point(0, 0));
+            }
+            else if (Application.IsDarkModeEnabled)
             {
                 Graphics cachedGraphics = EnsureCachedBitmap(
                     _parent._defaultButtonsWidth,
@@ -356,7 +400,7 @@ protected override void OnPaint(PaintEventArgs e)
                     _pushed == ButtonID.Down ? ButtonState.Pushed : (Enabled ? ButtonState.Normal : ButtonState.Inactive));
             }
 
-            if (half_height != (ClientSize.Height + 1) / 2)
+            if (!UseSideBySideButtons && half_height != (ClientSize.Height + 1) / 2)
             {
                 // When control has odd height, a line needs to be drawn below the buttons with the BackColor.
                 Color color = _parent.BackColor;
@@ -374,6 +418,27 @@ protected override void OnPaint(PaintEventArgs e)
             base.OnPaint(e);
         }
 
+        /// <summary>
+        ///  Computes the modern rendering state for the requested button from the current enabled,
+        ///  pushed, and hot states.
+        /// </summary>
+        private ModernControlButtonState GetButtonState(ButtonID button)
+        {
+            if (!Enabled)
+            {
+                return ModernControlButtonState.Disabled;
+            }
+
+            if (_pushed == button)
+            {
+                return ModernControlButtonState.Pressed;
+            }
+
+            return _mouseOver == button
+                ? ModernControlButtonState.Hover
+                : ModernControlButtonState.Normal;
+        }
+
         /// <summary>
         ///  Ensures that the Bitmap has the correct size and returns the Graphics object from that Bitmap.
         /// </summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs
index 9508d76256a..bbd4a6376b0 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs
@@ -237,6 +237,14 @@ protected override CreateParams CreateParams
         }
     }
 
+    /// <summary>
+    ///  When <see langword="true"/>, the up/down buttons are laid out side by side (decrement on the
+    ///  leading edge, increment on the trailing edge) rather than stacked. This provides a larger,
+    ///  more accessible click target and is used when a modern <see cref="VisualStylesMode"/>
+    ///  (<see cref="VisualStylesMode.Net11"/> or above) is in effect.
+    /// </summary>
+    internal bool UseSideBySideButtons => EffectiveVisualStylesMode >= VisualStylesMode.Net11;
+
     /// <summary>
     ///  Deriving classes can override this to configure a default size for their control.
     ///  This is more efficient than setting the size in the control's constructor.
@@ -837,6 +845,9 @@ private void PositionControls()
         bool themed = Application.RenderWithVisualStyles;
         BorderStyle borderStyle = BorderStyle;
 
+        // In modern mode the buttons sit side by side, so the band is twice as wide.
+        int buttonsWidth = UseSideBySideButtons ? _defaultButtonsWidth * 2 : _defaultButtonsWidth;
+
         // Determine how much to squish in - Fixed3D and FixedSingle have 2PX border
         int borderWidth = (borderStyle == BorderStyle.None) ? 0 : 2;
         clientArea.Inflate(-borderWidth, -borderWidth);
@@ -845,7 +856,7 @@ private void PositionControls()
         if (_upDownEdit is not null)
         {
             upDownEditBounds = clientArea;
-            upDownEditBounds.Size = new Size(clientArea.Width - _defaultButtonsWidth, clientArea.Height);
+            upDownEditBounds.Size = new Size(clientArea.Width - buttonsWidth, clientArea.Height);
         }
 
         // Reposition and resize the updown buttons
@@ -858,9 +869,9 @@ private void PositionControls()
             }
 
             upDownButtonsBounds = new Rectangle(
-                clientArea.Right - _defaultButtonsWidth + borderFixup,
+                clientArea.Right - buttonsWidth + borderFixup,
                 clientArea.Top - borderFixup,
-                _defaultButtonsWidth,
+                buttonsWidth,
                 clientArea.Height + (borderFixup * 2));
         }
 

From 89121da8ef08226179cedd02e33a417a3138a902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Thu, 9 Jul 2026 19:53:04 -0700
Subject: [PATCH 48/50] Draw a unified modern frame around UpDownBase in modern
 VisualStylesMode

Under a modern VisualStylesMode (Net11 or above) the up/down control now draws a
single modern frame (the same rounded Fixed3D / flat FixedSingle chrome a
stand-alone modern TextBox paints) around the whole control - both the edit and
the side-by-side buttons - instead of the legacy themed single-textbox border
that only wrapped the edit.

- Add modern chrome geometry constants mirrored from TextBoxBase and a
  ModernBorderPadding helper (device-unit inset per BorderStyle).
- PositionControls: split the modern layout into PositionControlsModern, which
  insets the edit and the (2x wide) button band by ModernBorderPadding so they
  sit inside the frame and clear the rounded corners; honors UpDownAlign/RTL.
  The classic layout is restored to its original, unchanged form.
- OnPaint: in modern mode draw the frame via DrawModernBorder (corners filled
  with the parent back color so the rounded frame blends), skipping the
  themed/classic border path.
- Add UpDownBaseTests covering the modern side-by-side layout geometry and that
  the modern paint path renders (DrawToBitmap) without throwing.

Classic (non-modern) layout, rendering, and all existing UpDown tests are
unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 41e90924-3241-42a8-9556-71e100be7e59
---
 .../Forms/Controls/UpDown/UpDownBase.cs       | 156 +++++++++++++++++-
 .../System/Windows/Forms/UpDownBaseTests.cs   |  41 +++++
 2 files changed, 191 insertions(+), 6 deletions(-)

diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs
index bbd4a6376b0..6da711535d2 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Runtime.InteropServices;
 using System.Windows.Forms.VisualStyles;
 using Microsoft.Win32;
@@ -19,6 +20,16 @@ public abstract partial class UpDownBase : ContainerControl
     private const int DefaultButtonsWidth = 16;
     private const int DefaultControlWidth = 120;
     private const int ThemedBorderWidth = 1; // width of custom border we draw when themed
+
+    // Modern (Net11+) chrome geometry, mirrored from TextBoxBase so the frame we draw around the
+    // whole control matches the look of a stand-alone modern TextBox. The padding values determine how
+    // far the edit and the buttons are inset from the outer edge so they clear the drawn border and the
+    // rounded corners; the border thickness and corner radius drive the frame itself.
+    private const int ModernFixed3DBorderPadding = 5;
+    private const int ModernFixedSingleBorderPadding = 4;
+    private const int ModernNoBorderPadding = 3;
+    private const int ModernBorderThickness = 1;
+    private const int ModernCornerRadius = 15;
     private const BorderStyle DefaultBorderStyle = BorderStyle.Fixed3D;
     private const LeftRightAlignment DefaultUpDownAlign = LeftRightAlignment.Right;
     private const int DefaultTimerInterval = 500;
@@ -521,6 +532,14 @@ protected override void OnPaint(PaintEventArgs e)
     {
         base.OnPaint(e);
 
+        if (UseSideBySideButtons)
+        {
+            // In modern mode we draw a single frame around the whole control (edit and buttons); the
+            // themed/classic single-textbox border below does not apply.
+            DrawModernBorder(e);
+            return;
+        }
+
         Rectangle editBounds = _upDownEdit.Bounds;
         Color backColor = BackColor;
 
@@ -837,6 +856,12 @@ private void OnUpDown(object? source, UpDownEventArgs e)
     /// </summary>
     private void PositionControls()
     {
+        if (UseSideBySideButtons)
+        {
+            PositionControlsModern();
+            return;
+        }
+
         Rectangle upDownEditBounds = Rectangle.Empty;
         Rectangle upDownButtonsBounds = Rectangle.Empty;
 
@@ -845,9 +870,6 @@ private void PositionControls()
         bool themed = Application.RenderWithVisualStyles;
         BorderStyle borderStyle = BorderStyle;
 
-        // In modern mode the buttons sit side by side, so the band is twice as wide.
-        int buttonsWidth = UseSideBySideButtons ? _defaultButtonsWidth * 2 : _defaultButtonsWidth;
-
         // Determine how much to squish in - Fixed3D and FixedSingle have 2PX border
         int borderWidth = (borderStyle == BorderStyle.None) ? 0 : 2;
         clientArea.Inflate(-borderWidth, -borderWidth);
@@ -856,7 +878,7 @@ private void PositionControls()
         if (_upDownEdit is not null)
         {
             upDownEditBounds = clientArea;
-            upDownEditBounds.Size = new Size(clientArea.Width - buttonsWidth, clientArea.Height);
+            upDownEditBounds.Size = new Size(clientArea.Width - _defaultButtonsWidth, clientArea.Height);
         }
 
         // Reposition and resize the updown buttons
@@ -869,9 +891,9 @@ private void PositionControls()
             }
 
             upDownButtonsBounds = new Rectangle(
-                clientArea.Right - buttonsWidth + borderFixup,
+                clientArea.Right - _defaultButtonsWidth + borderFixup,
                 clientArea.Top - borderFixup,
-                buttonsWidth,
+                _defaultButtonsWidth,
                 clientArea.Height + (borderFixup * 2));
         }
 
@@ -897,6 +919,128 @@ private void PositionControls()
         }
     }
 
+    /// <summary>
+    ///  The inset, in device units, of the edit and the buttons from the outer edge when a modern
+    ///  <see cref="VisualStylesMode"/> is in effect. It matches the band a stand-alone modern TextBox
+    ///  reserves for its border so the frame we draw in <see cref="OnPaint"/> looks consistent and the
+    ///  child controls clear the rounded corners.
+    /// </summary>
+    private int ModernBorderPadding => LogicalToDeviceUnits(_borderStyle switch
+    {
+        BorderStyle.Fixed3D => ModernFixed3DBorderPadding + ModernBorderThickness,
+        BorderStyle.FixedSingle => ModernFixedSingleBorderPadding + ModernBorderThickness,
+        _ => ModernNoBorderPadding,
+    });
+
+    /// <summary>
+    ///  Calculates the size and position of the upDownEdit control and the side-by-side updown buttons
+    ///  when a modern <see cref="VisualStylesMode"/> is in effect. Both the edit and the buttons are
+    ///  inset by <see cref="ModernBorderPadding"/> so they sit inside the frame drawn by
+    ///  <see cref="OnPaint"/> and clear its rounded corners.
+    /// </summary>
+    private void PositionControlsModern()
+    {
+        Rectangle clientArea = new(Point.Empty, ClientSize);
+        int totalClientWidth = clientArea.Width;
+
+        int pad = ModernBorderPadding;
+        int buttonsWidth = _defaultButtonsWidth * 2;
+
+        Rectangle inner = clientArea;
+        inner.Inflate(-pad, -pad);
+
+        Rectangle upDownEditBounds = inner;
+        upDownEditBounds.Width = Math.Max(0, inner.Width - buttonsWidth);
+
+        Rectangle upDownButtonsBounds = new(
+            inner.Right - buttonsWidth,
+            inner.Top,
+            buttonsWidth,
+            inner.Height);
+
+        // Left/right updown align translation (also honors RTL).
+        if (RtlTranslateLeftRight(UpDownAlign) == LeftRightAlignment.Left)
+        {
+            upDownButtonsBounds.X = totalClientWidth - upDownButtonsBounds.Right;
+            upDownEditBounds.X = totalClientWidth - upDownEditBounds.Right;
+        }
+
+        _upDownEdit?.Bounds = upDownEditBounds;
+
+        if (_upDownButtons is not null)
+        {
+            _upDownButtons.Bounds = upDownButtonsBounds;
+            _upDownButtons.Invalidate();
+        }
+    }
+
+    /// <summary>
+    ///  Draws the modern frame around the whole control (edit and side-by-side buttons) using the same
+    ///  rounded/flat chrome a stand-alone modern TextBox paints in its non-client area. The corners are
+    ///  filled with the parent's back color so the rounded frame blends against it.
+    /// </summary>
+    private void DrawModernBorder(PaintEventArgs e)
+    {
+        Rectangle bounds = ClientRectangle;
+        if (bounds.Width <= 0 || bounds.Height <= 0)
+        {
+            return;
+        }
+
+        int cornerRadius = LogicalToDeviceUnits(ModernCornerRadius);
+        int borderThickness = LogicalToDeviceUnits(ModernBorderThickness);
+
+        // The adorner (border) color matches the modern TextBox chrome, which uses the fore color.
+        Color adornerColor = ForeColor;
+        Color parentBackColor = Parent?.BackColor ?? BackColor;
+        Color clientBackColor = BackColor;
+
+        using var parentBackgroundBrush = parentBackColor.GetCachedSolidBrushScope();
+        using var clientBackgroundBrush = clientBackColor.GetCachedSolidBrushScope();
+        using var adornerPen = adornerColor.GetCachedPenScope(borderThickness);
+
+        Rectangle deflatedBounds = bounds;
+        deflatedBounds.Width -= 1;
+        deflatedBounds.Height -= 1;
+
+        Graphics graphics = e.Graphics;
+        graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+        // Fill the whole client with the parent's back color; the rounded corners then blend against it.
+        graphics.FillRectangle(parentBackgroundBrush, bounds);
+
+        // Below roughly 2 * cornerRadius + thickness the rounded chrome renders as a broken lozenge; fall
+        // back to a flat rectangle in that case. This mirrors TextBoxBase.OnNcPaint.
+        bool canRenderRoundedChrome = deflatedBounds.Height >= (2 * cornerRadius) + borderThickness;
+
+        switch (_borderStyle)
+        {
+            case BorderStyle.None:
+                graphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
+                break;
+
+            case BorderStyle.FixedSingle:
+                graphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
+                graphics.DrawRectangle(adornerPen, deflatedBounds);
+                break;
+
+            case BorderStyle.Fixed3D:
+                if (canRenderRoundedChrome)
+                {
+                    Size radius = new(cornerRadius, cornerRadius);
+                    graphics.FillRoundedRectangle(clientBackgroundBrush, deflatedBounds, radius);
+                    graphics.DrawRoundedRectangle(adornerPen, deflatedBounds, radius);
+                }
+                else
+                {
+                    graphics.FillRectangle(clientBackgroundBrush, deflatedBounds);
+                    graphics.DrawRectangle(adornerPen, deflatedBounds);
+                }
+
+                break;
+        }
+    }
+
     /// <summary>
     ///  Selects a range of text in the up-down control.
     /// </summary>
diff --git a/src/test/unit/System.Windows.Forms/System/Windows/Forms/UpDownBaseTests.cs b/src/test/unit/System.Windows.Forms/System/Windows/Forms/UpDownBaseTests.cs
index 85e5bcdb179..29da40a9ebb 100644
--- a/src/test/unit/System.Windows.Forms/System/Windows/Forms/UpDownBaseTests.cs
+++ b/src/test/unit/System.Windows.Forms/System/Windows/Forms/UpDownBaseTests.cs
@@ -3043,6 +3043,47 @@ public void UpDownBase_Invokes_SetToolTip_IfExternalToolTipIsSet()
         actualButtonsToolTipText.Should().BeEmpty();
     }
 
+    [WinFormsFact]
+    public void UpDownBase_ModernVisualStylesMode_LaysOutButtonsSideBySide()
+    {
+        using SubUpDownBase upDownBase = new();
+        upDownBase.VisualStylesMode = VisualStylesMode.Net11;
+        upDownBase.Size = new Size(120, 30);
+        upDownBase.CreateControl();
+
+        // Skip when the environment forces Classic (for example High Contrast), since the modern
+        // side-by-side layout only applies under an effective modern mode.
+        if (!upDownBase.UseSideBySideButtons)
+        {
+            return;
+        }
+
+        Rectangle editBounds = upDownBase._upDownEdit.Bounds;
+        Rectangle buttonsBounds = upDownBase._upDownButtons.Bounds;
+
+        // The modern button band is twice as wide as the classic (stacked) band.
+        buttonsBounds.Width.Should().Be(upDownBase._defaultButtonsWidth * 2);
+
+        // Edit and buttons are laid out horizontally (side by side), not stacked, and do not overlap.
+        buttonsBounds.Left.Should().BeGreaterThanOrEqualTo(editBounds.Right);
+        buttonsBounds.Height.Should().BeGreaterThan(0);
+        editBounds.Width.Should().BeGreaterThan(0);
+    }
+
+    [WinFormsFact]
+    public void UpDownBase_ModernVisualStylesMode_DrawToBitmap_DoesNotThrow()
+    {
+        using SubUpDownBase upDownBase = new();
+        upDownBase.VisualStylesMode = VisualStylesMode.Net11;
+        upDownBase.Size = new Size(120, 30);
+        upDownBase.CreateControl();
+
+        using Bitmap bitmap = new(upDownBase.Width, upDownBase.Height);
+        Action drawToBitmap = () => upDownBase.DrawToBitmap(bitmap, new Rectangle(Point.Empty, upDownBase.Size));
+
+        drawToBitmap.Should().NotThrow();
+    }
+
     private class CustomValidateUpDownBase : UpDownBase
     {
         public new bool ChangingText

From 196936c8534ea7226707b60994a0498ea8d30435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Fri, 10 Jul 2026 00:44:45 -0700
Subject: [PATCH 49/50] Integration cleanup: API tracking files

---
 .../src/PublicAPI.Unshipped.txt               |   4 +-
 .../src/NativeMethods.txt                     | 111 +++---
 .../src/NativeMethods.txt                     | 369 +++++++++---------
 .../PublicAPI.Unshipped.txt                   | 207 +++++-----
 4 files changed, 326 insertions(+), 365 deletions(-)

diff --git a/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt b/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
index 93b55542d62..9cd44c0af70 100644
--- a/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.VisualBasic.Forms/src/PublicAPI.Unshipped.txt
@@ -1,8 +1,8 @@
 Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.FormRevealMode() -> System.Windows.Forms.FormRevealMode
 Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.FormRevealMode(AutoPropertyValue As System.Windows.Forms.FormRevealMode) -> Void
-Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode() -> System.Windows.Forms.FormRevealMode
-Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode(value As System.Windows.Forms.FormRevealMode) -> Void
 Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.VisualStylesMode() -> System.Windows.Forms.VisualStylesMode
 Microsoft.VisualBasic.ApplicationServices.ApplyApplicationDefaultsEventArgs.VisualStylesMode(AutoPropertyValue As System.Windows.Forms.VisualStylesMode) -> Void
+Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode() -> System.Windows.Forms.FormRevealMode
+Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.FormRevealMode(value As System.Windows.Forms.FormRevealMode) -> Void
 Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.VisualStylesMode() -> System.Windows.Forms.VisualStylesMode
 Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.VisualStylesMode(value As System.Windows.Forms.VisualStylesMode) -> Void
diff --git a/src/System.Private.Windows.Core/src/NativeMethods.txt b/src/System.Private.Windows.Core/src/NativeMethods.txt
index ddea7b6c144..168abd11e0a 100644
--- a/src/System.Private.Windows.Core/src/NativeMethods.txt
+++ b/src/System.Private.Windows.Core/src/NativeMethods.txt
@@ -1,8 +1,7 @@
-BeginPaint
 BI_COMPRESSION
-BitBlt
 BOOL
-CallWindowProc
+BeginPaint
+BitBlt
 CFSTR_DROPDESCRIPTION
 CFSTR_FILENAME
 CFSTR_FILENAMEA
@@ -10,12 +9,13 @@ CFSTR_INDRAGLOOP
 CLIPBOARD_FORMAT
 CLIPBRD_E_BAD_DATA
 CLIPBRD_E_CANT_OPEN
-CloseEnhMetaFile
 CLR_*
+CP_ACP
+CallWindowProc
+CloseEnhMetaFile
 CoCreateInstance
 CombineRgn
 CopyImage
-CP_ACP
 CreateBitmap
 CreateCompatibleBitmap
 CreateCompatibleDC
@@ -28,12 +28,8 @@ CreatePen
 CreateRectRgn
 CreateSolidBrush
 DATA_S_SAMEFORMATETC
-DefWindowProc
-DeleteDC
-DeleteEnhMetaFile
-DeleteObject
-DestroyIcon
 DEVMODEW
+DISPID_*
 DISP_E_ARRAYISLOCKED
 DISP_E_BADCALLEE
 DISP_E_BADINDEX
@@ -52,23 +48,28 @@ DISP_E_TYPEMISMATCH
 DISP_E_UNKNOWNINTERFACE
 DISP_E_UNKNOWNLCID
 DISP_E_UNKNOWNNAME
-DISPID_*
 DMORIENT_*
-DoDragDrop
-DragAcceptFiles
 DRAGDROP_E_ALREADYREGISTERED
 DRAGDROP_E_NOTREGISTERED
 DRAGDROP_S_CANCEL
 DRAGDROP_S_DROP
 DRAGDROP_S_USEDEFAULTCURSORS
-DragQueryFile
-DrawIconEx
 DROPDESCRIPTION
 DROPFILES
 DROPIMAGETYPE
 DSH_FLAGS
 DVASPECT
 DV_E_*
+DefWindowProc
+DeleteDC
+DeleteEnhMetaFile
+DeleteObject
+DestroyIcon
+DoDragDrop
+DragAcceptFiles
+DragQueryFile
+DrawIconEx
+EM_*
 E_ABORT
 E_ACCESSDENIED
 E_FAIL
@@ -80,7 +81,6 @@ E_OUTOFMEMORY
 E_PENDING
 E_POINTER
 E_UNEXPECTED
-EM_*
 EndPaint
 EnumChildWindows
 EnumDisplayMonitors
@@ -88,15 +88,14 @@ EnumEnhMetaFile
 EnumThreadWindows
 EnumWindows
 FACILITY_CODE
-fdex*
 FDEX_PROP_FLAGS
 FILETIME
+GET_CLASS_LONG_INDEX
 GdiplusStartup
 GdiplusStartupInputEx
-GET_CLASS_LONG_INDEX
 GetClientRect
-GetClipboardFormatName
 GetClipRgn
+GetClipboardFormatName
 GetCurrentThreadId
 GetDC
 GetDCEx
@@ -154,9 +153,9 @@ HRGN
 HSTRING
 HWND
 HWND_*
+IDI_*
 IDataObject
 IDataObjectAsyncCapability
-IDI_*
 IDispatchEx
 IDragSourceHelper2
 IDropSource
@@ -167,29 +166,29 @@ IEnumFORMATETC
 IEnumUnknown
 IGlobalInterfaceTable
 IInspectable
-ImageFormat*
-ImageLockMode
 INK_SERIALIZED_FORMAT
 INPLACE_E_NOTOOLSPACE
-IntersectClipRect
 IPicture
 IPictureDisp
 IStream
 ITypeInfo
 ITypeLib
 IUnknown
+ImageFormat*
+ImageLockMode
+IntersectClipRect
 LF_FACESIZE
-LoadIcon
-LoadRegTypeLib
 LPARAM
 LRESULT
-MapWindowPoints
+LoadIcon
+LoadRegTypeLib
 MAX_PATH
+MONITORINFOEXW
+MONITORINFOF_*
+MapWindowPoints
 MonitorFromPoint
 MonitorFromRect
 MonitorFromWindow
-MONITORINFOEXW
-MONITORINFOF_*
 MultiByteToWideChar
 NCCALCSIZE_PARAMS
 NONCLIENTMETRICSW
@@ -200,16 +199,16 @@ NS_E_WMP_LOGON_FAILURE
 NS_E_WMP_UNSUPPORTED_FORMAT
 NS_E_WMP_URLDOWNLOADFAILED
 NTSTATUS
-OBJ_TYPE
 OBJECT_IDENTIFIER
-OffsetViewportOrgEx
+OBJ_TYPE
+OLECMDERR_E_DISABLED
+OLECMDERR_E_NOTSUPPORTED
+OLECMDERR_E_UNKNOWNGROUP
 OLE_E_ADVISENOTSUPPORTED
 OLE_E_INVALIDRECT
 OLE_E_NOCONNECTION
 OLE_E_PROMPTSAVECANCELLED
-OLECMDERR_E_DISABLED
-OLECMDERR_E_NOTSUPPORTED
-OLECMDERR_E_UNKNOWNGROUP
+OffsetViewportOrgEx
 OleCreatePictureIndirect
 OleDuplicateData
 OleFlushClipboard
@@ -217,17 +216,22 @@ OleGetClipboard
 OleInitialize
 OleSetClipboard
 OleUninitialize
+POINTS
+PRINTDLGEX_FLAGS
+PWSTR
 PeekMessage
 PixelFormat*
-POINTS
 PostMessage
-PRINTDLGEX_FLAGS
 PropVariantClear
-PWSTR
-RealizePalette
 RECT
-Rectangle
 REGDB_E_CLASSNOTREG
+RPC_E_CHANGED_MODE
+RPC_E_DISCONNECTED
+RPC_E_SERVERFAULT
+RPC_E_SYS_CALL_FAILED
+RPC_STATUS
+RealizePalette
+Rectangle
 RegisterClipboardFormat
 RegisterDragDrop
 ReleaseDC
@@ -235,20 +239,22 @@ ReleaseStgMedium
 RestoreDC
 RevokeDragDrop
 RoActivateInstance
-RPC_E_CHANGED_MODE
-RPC_E_DISCONNECTED
-RPC_E_SERVERFAULT
-RPC_E_SYS_CALL_FAILED
-RPC_STATUS
+SAFEARRAY
+START_PAGE_GENERAL
+STATFLAG
+STATUS_NO_MEMORY
+STATUS_PENDING
+STATUS_SUCCESS
+STGTY
+STG_E_*
+STILL_ACTIVE
 S_FALSE
 S_OK
-SAFEARRAY
 SafeArrayCreate
 SafeArrayCreateEx
 SafeArrayDestroy
 SafeArrayGetElement
 SafeArrayGetRecordInfo
-SafeArrayGetRecordInfo
 SafeArrayGetVartype
 SafeArrayLock
 SafeArrayPutElement
@@ -264,25 +270,18 @@ SetMapMode
 SetROP2
 SetTextAlign
 SetTextColor
-START_PAGE_GENERAL
-STATFLAG
-STATUS_NO_MEMORY
-STATUS_PENDING
-STATUS_SUCCESS
-STG_E_*
-STGTY
-STILL_ACTIVE
 SystemParametersInfo
 SystemParametersInfoForDpi
 TYPE_E_BADMODULEKIND
 UNICODE_STRING_MAX_CHARS
 VIEW_E_DRAW
-WideCharToMultiByte
 WIN32_ERROR
 WINCODEC_ERR_*
 WINDOW_LONG_PTR_INDEX
+WM_*
+WPARAM
+WideCharToMultiByte
 WindowFromDC
 WindowsCreateString
 WindowsDeleteString
-WM_*
-WPARAM
\ No newline at end of file
+fdex*
diff --git a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
index 9afb6cfbc99..af50671bda6 100644
--- a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
+++ b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
@@ -1,51 +1,52 @@
 ACTCTX_FLAG_*
+ADVF
+ARW_*
+AUTOCOMPLETEOPTIONS
 ActivateActCtx
 ActivateKeyboardLayout
 AdjustWindowRectEx
 AdjustWindowRectExForDpi
-ADVF
 AreDpiAwarenessContextsEqual
-ARW_*
-AUTOCOMPLETEOPTIONS
-BeginDeferWindowPos
 BFFM_*
 BIF_*
 BITMAP
-BlockInput
 BM_*
 BN_*
 BROWSEINFOW
 BS_*
-CallNextHookEx
-CB_*
+BeginDeferWindowPos
+BlockInput
 CBN_*
 CBS_*
+CB_*
 CCM_*
 CDM_GETSPEC
 CDRF_*
 CFE_EFFECTS
 CFM_MASK
 CHILDID_SELF
-ChildWindowFromPointEx
 CHOOSECOLOR_FLAGS
 CHOOSEFONT_FLAGS
 CHOOSEFONT_FONT_TYPE
 CLIENTCREATESTRUCT
-ClientToScreen
 CLIPBRD_E_BAD_DATA
+CLSCTX
+COLOR_*
+COMDLG_FILTERSPEC
+COPYDATASTRUCT
+CSIDL_*
+CW_USEDEFAULT
+CallNextHookEx
+ChildWindowFromPointEx
+ClientToScreen
 ClipCursor
 CloseDesktop
 CloseHandle
 CloseThemeData
-CLSCTX
-cmb4
 CoGetClassObject
-COLOR_*
-COMDLG_FILTERSPEC
-CommandStateChangeConstants
-CommDlgExtendedError
-COPYDATASTRUCT
 CoRegisterMessageFilter
+CommDlgExtendedError
+CommandStateChangeConstants
 CreateAcceleratorTableW
 CreateActCtx
 CreateBrushIndirect
@@ -57,32 +58,35 @@ CreatePatternBrush
 CreateRectRgn
 CreateStdAccessibleObject
 CreateWindowEx
-CSIDL_*
-CW_USEDEFAULT
 DATETIMEPICK_CLASS
+DESKTOP_ACCESS_FLAGS
+DFCS_STATE
+DFC_TYPE
+DISPATCH_CONSTRUCT
+DISPATCH_FLAGS
+DISPPARAMS
+DLGC_*
+DOCHOSTUIINFO
+DPI_AWARENESS_CONTEXT_*
+DPI_HOSTING_BEHAVIOR
+DRAWITEMSTRUCT
+DTM_*
+DTN_*
+DTS_*
+DWMWINDOWATTRIBUTE
+DWM_WINDOW_CORNER_PREFERENCE
 DeactivateActCtx
 DefFrameProc
 DefMDIChildProc
 DeferWindowPos
-DESKTOP_ACCESS_FLAGS
 DestroyAcceleratorTable
 DestroyCursor
 DestroyMenu
 DestroyWindow
-DFC_TYPE
-DFCS_STATE
-DISPATCH_CONSTRUCT
-DISPATCH_FLAGS
 DispatchMessage
-DISPPARAMS
-DLGC_*
-DOCHOSTUIINFO
 DocumentProperties
-DPI_AWARENESS_CONTEXT_*
-DPI_HOSTING_BEHAVIOR
 DrawEdge
 DrawFrameControl
-DRAWITEMSTRUCT
 DrawMenuBar
 DrawText
 DrawTextEx
@@ -90,45 +94,44 @@ DrawThemeBackground
 DrawThemeEdge
 DrawThemeParentBackground
 DrawThemeText
-DTM_*
-DTN_*
-DTS_*
 DuplicateHandle
-DWMWINDOWATTRIBUTE
-DWM_WINDOW_CORNER_PREFERENCE
 DwmGetWindowAttribute
 DwmSetWindowAttribute
-EC_*
-ECO_*
 ECOOP_*
+ECO_*
+EC_*
 ELEMDESC
-Ellipse
+ENM_*
 EN_*
+ES_*
+EVENTMSG
+EXTLOGFONTW
+Ellipse
 EnableMenuItem
 EnableScrollBar
 EnableWindow
 EndDeferWindowPos
 EndDialog
-ENM_*
 EnumDisplaySettings
-ES_*
-EVENTMSG
 ExpandCollapseState
-EXTLOGFONTW
 ExtTextOut
 FDAP
-FillRect
-FindExecutable
 FINDREPLACE_FLAGS
-FindWindow
 FONTDESC
-FormatMessage
 FUNCDESC
 FUNCFLAGS
 FUNCKIND
+FillRect
+FindExecutable
+FindWindow
+FormatMessage
 GDI_ERROR
 GDTR_*
+GETPROPERTYSTOREFLAGS
+GETTEXTEX_FLAGS
+GETTEXTLENGTHEX_FLAGS
 GET_MODULE_HANDLE_EX_FLAG*
+GMR_*
 GetActiveWindow
 GetAncestor
 GetAsyncKeyState
@@ -164,10 +167,10 @@ GetErrorInfo
 GetExitCodeThread
 GetFocus
 GetHGlobalFromILockBytes
+GetKeyState
 GetKeyboardLayout
 GetKeyboardLayoutList
 GetKeyboardState
-GetKeyState
 GetLocaleInfoEx
 GetMapMode
 GetMenu
@@ -184,9 +187,8 @@ GetPhysicalCursorPos
 GetProcAddress
 GetProcessDpiAwareness
 GetProcessWindowStation
-GETPROPERTYSTOREFLAGS
-GetRgnBox
 GetROP2
+GetRgnBox
 GetScrollInfo
 GetShortPathName
 GetStartupInfo
@@ -196,9 +198,7 @@ GetSystemPaletteEntries
 GetSystemPowerStatus
 GetTextAlign
 GetTextColor
-GETTEXTEX_FLAGS
 GetTextExtentPoint32W
-GETTEXTLENGTHEX_FLAGS
 GetTextMetrics
 GetThemeAppProperties
 GetThemeBackgroundContentRect
@@ -231,11 +231,10 @@ GetWindowDisplayAffinity
 GetWindowDpiAwarenessContext
 GetWindowPlacement
 GetWindowRgn
-GMR_*
 HC_*
 HDHITTESTINFO
-HDI_MASK
 HDITEMW
+HDI_MASK
 HDLAYOUT
 HDM_*
 HDN_*
@@ -245,21 +244,20 @@ HFONT
 HH_AKLINK
 HH_FTS_QUERY
 HH_POPUP
-HideCaret
-HitTestThemeBackground
 HT*
 HTML_HELP_COMMAND
-HtmlHelp
 HTREEITEM
+HideCaret
+HitTestThemeBackground
+HtmlHelp
 IAccessible
 IAccessibleEx
 IAutoComplete2
-IClassFactory
-IClassFactory2
-IClassFactory2
 ICM_*
 ICM_MODE
 ICON_*
+IClassFactory
+IClassFactory2
 IConnectionPoint
 IConnectionPointContainer
 IDC_*
@@ -291,40 +289,11 @@ IHTMLWindow4
 IInvokeProvider
 ILegacyIAccessibleProvider
 IMAGE_LIST_WRITE_STREAM_FLAGS
-ImageList_Add
-ImageList_Create
-ImageList_Draw
-ImageList_DrawEx
-ImageList_Duplicate
-ImageList_GetIconSize
-ImageList_GetImageCount
-ImageList_GetImageInfo
-ImageList_Read
-ImageList_Remove
-ImageList_Replace
-ImageList_ReplaceIcon
-ImageList_SetBkColor
-ImageList_Write
-ImageList_WriteEx
 IME_COMPOSITION_STRING
-ImmAssociateContext
-ImmCreateContext
-ImmGetContext
-ImmGetConversionStatus
-ImmGetOpenStatus
-ImmNotifyIME
-ImmReleaseContext
-ImmSetConversionStatus
-ImmSetOpenStatus
 IMN_*
 IMPLTYPEFLAGS
 IMultipleViewProvider
-InitCommonControls
-InitCommonControlsEx
 INITCOMMONCONTROLSEX_ICC
-IntersectClipRect
-InvalidateRect
-InvalidateRgn
 IOleCommandTarget
 IOleControl
 IOleControlSite
@@ -350,28 +319,15 @@ IRawElementProviderHwndOverride
 IRecordInfo
 IRichEditOle
 IRichEditOleCallback
-IsAccelerator
-IsAppThemed
-IsChild
 IScrollItemProvider
 IScrollProvider
-IsDialogMessage
 ISelectionItemProvider
 ISelectionProvider
 IServiceProvider
 IShellItem
 ISimpleFrameSite
 ISpecifyPropertyPages
-IsProcessDPIAware
-IsThemeBackgroundPartiallyTransparent
-IsThemePartDefined
 ISupportErrorInfo
-IsValidDpiAwarenessContext
-IsWindow
-IsWindowEnabled
-IsWindowUnicode
-IsWindowVisible
-IsZoomed
 ITableItemProvider
 ITableProvider
 ITextDocument
@@ -381,18 +337,59 @@ ITextRangeProvider
 IToggleProvider
 IUIAutomation
 IUIAutomationElement
-IValueProvider
 IVBFormat
 IVBGetControl
+IValueProvider
 IViewObject
 IViewObject2
 IWebBrowser2
+ImageList_Add
+ImageList_Create
+ImageList_Draw
+ImageList_DrawEx
+ImageList_Duplicate
+ImageList_GetIconSize
+ImageList_GetImageCount
+ImageList_GetImageInfo
+ImageList_Read
+ImageList_Remove
+ImageList_Replace
+ImageList_ReplaceIcon
+ImageList_SetBkColor
+ImageList_Write
+ImageList_WriteEx
+ImmAssociateContext
+ImmCreateContext
+ImmGetContext
+ImmGetConversionStatus
+ImmGetOpenStatus
+ImmNotifyIME
+ImmReleaseContext
+ImmSetConversionStatus
+ImmSetOpenStatus
+InitCommonControls
+InitCommonControlsEx
+IntersectClipRect
+InvalidateRect
+InvalidateRgn
+IsAccelerator
+IsAppThemed
+IsChild
+IsDialogMessage
+IsProcessDPIAware
+IsThemeBackgroundPartiallyTransparent
+IsThemePartDefined
+IsValidDpiAwarenessContext
+IsWindow
+IsWindowEnabled
+IsWindowUnicode
+IsWindowVisible
+IsZoomed
 KF_*
 KillTimer
-LB_*
 LBN_*
 LBS_*
-LineTo
+LB_*
 LIST_ITEM_FLAGS
 LIST_ITEM_STATE_FLAGS
 LIST_VIEW_BACKGROUND_IMAGE_FLAGS
@@ -400,9 +397,6 @@ LIST_VIEW_GROUP_ALIGN_FLAGS
 LIST_VIEW_GROUP_STATE_FLAGS
 LIST_VIEW_ITEM_FLAGS
 LIST_VIEW_ITEM_STATE_FLAGS
-LoadCursor
-LoadLibraryEx
-LoadTypeLib
 LOCALE_IMEASURE
 LOCALE_NAME_SYSTEM_DEFAULT
 LOCALE_TRANSIENT_KEYBOARD1
@@ -412,8 +406,6 @@ LOCALE_TRANSIENT_KEYBOARD4
 LOGPALETTE
 LOGPEN
 LPtoDP
-LresultFromObject
-LV_VIEW_*
 LVA_*
 LVBKIMAGEW
 LVCOLUMNW
@@ -427,17 +419,22 @@ LVHITTESTINFO
 LVINSERTMARK
 LVIR_*
 LVM_*
-LVN_*
 LVNI_*
-LVS_*
+LVN_*
 LVSCW_*
 LVSIL_*
+LVS_*
 LVTILEVIEWINFO
 LVTILEVIEWINFO_FLAGS
 LVTILEVIEWINFO_MASK
-MA_*
-MapVirtualKey
+LV_VIEW_*
+LineTo
+LoadCursor
+LoadLibraryEx
+LoadTypeLib
+LresultFromObject
 MAX_TAB_STOPS
+MA_*
 MCGRIDINFO
 MCGRIDINFO_FLAGS
 MCGRIDINFO_PART
@@ -445,27 +442,25 @@ MCHITTESTINFO
 MCHITTESTINFO_HIT_FLAGS
 MCM_*
 MCN_*
-MCS_*
 MCSC_*
+MCS_*
 MEASUREITEMSTRUCT
 MEMBERID_NIL
-MessageBeep
-MessageBox
 MESSAGEBOX_RESULT
 MINIMIZEDMETRICS
 MINMAXINFO
 MODIFY_WORLD_TRANSFORM_MODE
-MONTH_CALDENDAR_MESSAGES_VIEW
 MONTHCAL_CLASS
+MONTH_CALDENDAR_MESSAGES_VIEW
 MOUSEHOOKSTRUCT
-MoveToEx
 MSFTEDIT_CLASS
+MapVirtualKey
+MessageBeep
+MessageBox
+MoveToEx
 MsgWaitForMultipleObjectsEx
-NavigateDirection
 NFR_*
 NIN_*
-NM_*
-NM_TREEVIEW_ACTION
 NMCUSTOMDRAW
 NMDATETIMECHANGE
 NMDATETIMECHANGE_FLAGS
@@ -478,8 +473,8 @@ NMLVCUSTOMDRAW
 NMLVCUSTOMDRAW_ITEM_TYPE
 NMLVDISPINFOW
 NMLVFINDITEMW
-NMLVGETINFOTIP_FLAGS
 NMLVGETINFOTIPW
+NMLVGETINFOTIP_FLAGS
 NMLVKEYDOWN
 NMLVLINK
 NMLVODSTATECHANGE
@@ -489,58 +484,80 @@ NMTTDISPINFOW
 NMTVCUSTOMDRAW
 NMTVDISPINFOW
 NMVIEWCHANGE
+NM_*
+NM_TREEVIEW_ACTION
 NOTIFY_ICON_DATA_FLAGS
 NOTIFY_ICON_INFOTIP_FLAGS
 NOTIFY_ICON_MESSAGE
+NavigateDirection
 NotifyWinEvent
-OemKeyScan
 OLECLOSE
 OLECMDEXECOPT
 OLECMDF
 OLECMDID
 OLECONTF
+OPEN_FILENAME_FLAGS
+OPEN_FILENAME_FLAGS_EX
+OemKeyScan
 OleCreateFontIndirect
 OleCreatePropertyFrame
 OleCreatePropertyFrameIndirect
-OPEN_FILENAME_FLAGS
-OPEN_FILENAME_FLAGS_EX
 OpenInputDesktop
 OpenThemeData
 PAGESETUPDLG_FLAGS
 PARAFORMAT_NUMBERING
-PatBlt
 PBM_*
-PBS_*
 PBST_*
+PBS_*
 PD_RESULT_*
-PostQuitMessage
+PRF_*
+PROGRESS_CLASS
+PROPERTYKEY
+PatBlt
 PostQuitMessage
 PostThreadMessage
-PowerCreateRequest
 PowerClearRequest
+PowerCreateRequest
 PowerSetRequest
-PRF_*
-PROGRESS_CLASS
-PROPERTYKEY
 ProviderOptions
-ReadClassStg
 READYSTATE
-RedrawWindow
 REGDB_E_CLASSNOTREG
+RICH_EDIT_GET_CONTEXT_MENU_SEL_TYPE
+ReadClassStg
+RedrawWindow
+RegLoadMUIString
 RegisterClass
 RegisterWindowMessage
-RegLoadMUIString
 ReleaseCapture
 ReleaseDC
-RICH_EDIT_GET_CONTEXT_MENU_SEL_TYPE
 RoundRect
 RowOrColumnMajor
-SC_*
-SC_*
 SCF_*
-SCF_*
-ScreenToClient
 SCROLLBAR_COMMAND
+SC_*
+SFF_*
+SF_*
+SHAutoComplete
+SHBrowseForFolder
+SHCreateItemFromParsingName
+SHCreateShellItem
+SHDRAGIMAGE
+SHGetKnownFolderPath
+SHGetPathFromIDListEx
+SHGetSpecialFolderLocation
+SHParseDisplayName
+SIATTRIBFLAGS
+SIGDN
+SIZE_*
+START_PAGE_GENERAL
+STATIC_STYLES
+STATUSCLASSNAME
+STGC
+STGMEDIUM
+STGTY
+SYSBUTTONSTATES
+SYSTEMTIME
+ScreenToClient
 ScrollWindow
 ScrollWindowEx
 SendDlgItemMessage
@@ -569,60 +586,33 @@ SetThreadDpiHostingBehavior
 SetTimer
 SetViewportExtEx
 SetViewportOrgEx
+SetWinEventHook
 SetWindowDisplayAffinity
 SetWindowExtEx
 SetWindowOrgEx
 SetWindowPlacement
 SetWindowPos
 SetWindowRgn
-SetWindowsHookEx
 SetWindowText
 SetWindowTheme
-SetWinEventHook
-SF_*
-SF_*
-SFF_*
-SFF_*
-SHAutoComplete
-SHBrowseForFolder
-SHCreateItemFromParsingName
-SHCreateShellItem
-SHDRAGIMAGE
+SetWindowsHookEx
 ShellExecute
-SHGetKnownFolderPath
-SHGetPathFromIDListEx
-SHGetSpecialFolderLocation
-SHGetSpecialFolderLocation
 ShowCaret
 ShowCursor
 ShowWindow
-SHParseDisplayName
-SIATTRIBFLAGS
-SIGDN
-SIZE_*
-START_PAGE_GENERAL
-STATIC_STYLES
-STATUSCLASSNAME
-stc4
-STGC
 StgCreateDocfileOnILockBytes
-STGMEDIUM
 StgOpenStorageOnILockBytes
-STGTY
 StretchDIBits
 StructureChangeType
-SYSBUTTONSTATES
-SYSTEMTIME
 TAB_CONTROL_ITEM_STATE
 TASKDIALOG_ELEMENTS
 TASKDIALOG_FLAGS
 TASKDIALOG_ICON_ELEMENTS
 TASKDIALOG_MESSAGES
 TASKDIALOG_NOTIFICATIONS
-TaskDialogIndirect
-TB_*
 TBM_*
 TBS_*
+TB_*
 TCITEMHEADERA_MASK
 TCITEMW
 TCM_*
@@ -630,14 +620,9 @@ TCN_*
 TCS_*
 THEME_PROPERTY_SYMBOL_ID
 TILE_WINDOWS_HOW
-ToggleState
-tomConstants
-TOOLTIP_FLAGS
 TOOLTIPS_CLASS
+TOOLTIP_FLAGS
 TRACKBAR_CLASS
-TrackMouseEvent
-TranslateMDISysAccel
-TranslateMessage
 TREE_VIEW_ITEM_STATE_FLAGS
 TTDT_*
 TTM_*
@@ -646,19 +631,28 @@ TTS_*
 TTTOOLINFOW
 TVGN_*
 TVHITTESTINFO
-TVI_*
 TVINSERTSTRUCTW
-TVITEM_MASK
 TVITEMW
+TVITEM_MASK
+TVI_*
 TVM_*
 TVN_*
-TVS_*
 TVSIL_*
+TVS_*
 TYPEATTR
 TYPEDESC
 TYPEKIND
+TaskDialogIndirect
+ToggleState
+TrackMouseEvent
+TranslateMDISysAccel
+TranslateMessage
 UIA_CONTROLTYPE_ID
 UIA_EVENT_ID
+UISF_*
+UIS_*
+USERCLASSTYPE
+USEROBJECTFLAGS
 UiaAppendRuntimeId
 UiaClientsAreListening
 UiaDisconnectProvider
@@ -670,24 +664,19 @@ UiaRaiseNotificationEvent
 UiaRaiseStructureChangedEvent
 UiaReturnRawElementProvider
 UiaRootObjectId
-UIS_*
-UISF_*
 UnhookWinEvent
 UpdateWindow
-USERCLASSTYPE
-USEROBJECTFLAGS
-ValidateRect
 VARDESC
 VARENUM
 VARFLAGS
-VarFormat
 VARIANT
 VARIANT_*
 VARKIND
 VIRTUAL_KEY
+ValidateRect
+VarFormat
 VkKeyScan
 WA_*
-WaitMessage
 WC_BUTTON
 WC_COMBOBOX
 WC_EDIT
@@ -698,12 +687,16 @@ WC_STATIC
 WC_TABCONTROL
 WC_TREEVIEW
 WHEEL_DELTA
-WindowFromPoint
-WTSRegisterSessionNotification
-WTSUnRegisterSessionNotification
 WINDOWPOS
 WINEVENT_INCONTEXT
 WSF_VISIBLE
+WTSRegisterSessionNotification
+WTSUnRegisterSessionNotification
+WaitMessage
+WindowFromPoint
 XBUTTON1
 XBUTTON2
 XFORMCOORDS
+cmb4
+stc4
+tomConstants
diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
index 327a7624c43..12b0e2b41ae 100644
--- a/src/System.Windows.Forms/PublicAPI.Unshipped.txt
+++ b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -1,20 +1,8 @@
-static System.Windows.Forms.Application.GetWindowsAccentColor() -> System.Drawing.Color
-static System.Windows.Forms.Application.SetSystemTextSizeAwareness(System.Windows.Forms.SystemTextSizeAwareness awareness) -> void
-static System.Windows.Forms.Application.SystemTextSize.get -> double
-static System.Windows.Forms.Application.SystemTextSizeAwareness.get -> System.Windows.Forms.SystemTextSizeAwareness
-static System.Windows.Forms.Application.SystemTextSizeChanged -> System.EventHandler?
-System.Windows.Forms.Form.SystemTextSizeChanged -> System.EventHandler?
-System.Windows.Forms.SystemTextSizeAwareness
-System.Windows.Forms.SystemTextSizeAwareness.Notify = 1 -> System.Windows.Forms.SystemTextSizeAwareness
-System.Windows.Forms.SystemTextSizeAwareness.Unaware = 0 -> System.Windows.Forms.SystemTextSizeAwareness
-virtual System.Windows.Forms.Form.OnSystemTextSizeChanged(System.EventArgs! e) -> void
-System.Windows.Forms.TreeView.NodeLeading.get -> float
-System.Windows.Forms.TreeView.NodeLeading.set -> void
-System.Windows.Forms.TreeView.NodeLeadingChanged -> System.EventHandler?
-virtual System.Windows.Forms.TreeView.OnNodeLeadingChanged(System.EventArgs! e) -> void
+#nullable enable
+System.Windows.Forms.Appearance.ToggleSwitch = 2 -> System.Windows.Forms.Appearance
+System.Windows.Forms.Control.VisualStylesModeChanged -> System.EventHandler?
 System.Windows.Forms.ControlMutationExtensions
-static System.Windows.Forms.ControlMutationExtensions.SuspendPainting(this System.Windows.Forms.ISupportSuspendPainting! target) -> System.Windows.Forms.SuspendPaintingScope!
-static System.Windows.Forms.ControlMutationExtensions.SuspendRelocation(this System.Windows.Forms.ISupportSuspendRelocation! target) -> System.Windows.Forms.SuspendRelocationScope!
+System.Windows.Forms.Form.SystemTextSizeChanged -> System.EventHandler?
 System.Windows.Forms.FormAppearanceMode
 System.Windows.Forms.FormAppearanceMode.Classic = 0 -> System.Windows.Forms.FormAppearanceMode
 System.Windows.Forms.FormAppearanceMode.Deferred = 1 -> System.Windows.Forms.FormAppearanceMode
@@ -24,97 +12,10 @@ System.Windows.Forms.ISupportSuspendPainting.EndSuspendPainting() -> void
 System.Windows.Forms.ISupportSuspendRelocation
 System.Windows.Forms.ISupportSuspendRelocation.BeginSuspendRelocation() -> void
 System.Windows.Forms.ISupportSuspendRelocation.EndSuspendRelocation() -> void
-System.Windows.Forms.SuspendPaintingScope
-System.Windows.Forms.SuspendPaintingScope.Dispose() -> void
-System.Windows.Forms.SuspendPaintingScope.SuspendPaintingScope(System.Windows.Forms.ISupportSuspendPainting? target) -> void
-System.Windows.Forms.SuspendRelocationScope
-System.Windows.Forms.SuspendRelocationScope.Dispose() -> void
-System.Windows.Forms.SuspendRelocationScope.SuspendRelocationScope(System.Windows.Forms.ISupportSuspendRelocation? target) -> void
-static System.Windows.Forms.Application.FormAppearanceMode.get -> System.Windows.Forms.FormAppearanceMode
-static System.Windows.Forms.Application.SetFormAppearanceMode(System.Windows.Forms.FormAppearanceMode mode) -> void
-virtual System.Windows.Forms.Control.BeginSuspendPaintingCore() -> void
-virtual System.Windows.Forms.Control.BeginSuspendRelocationCore() -> void
-virtual System.Windows.Forms.Control.EndSuspendPaintingCore() -> void
-virtual System.Windows.Forms.Control.EndSuspendRelocationCore() -> void
-override System.Windows.Forms.ComboBox.BeginSuspendPaintingCore() -> void
-override System.Windows.Forms.ComboBox.EndSuspendPaintingCore() -> void
-override System.Windows.Forms.ListBox.BeginSuspendPaintingCore() -> void
-override System.Windows.Forms.ListBox.EndSuspendPaintingCore() -> void
-override System.Windows.Forms.ListView.BeginSuspendPaintingCore() -> void
-override System.Windows.Forms.ListView.EndSuspendPaintingCore() -> void
-override System.Windows.Forms.RichTextBox.BeginSuspendPaintingCore() -> void
-override System.Windows.Forms.RichTextBox.EndSuspendPaintingCore() -> void
-override System.Windows.Forms.TreeView.BeginSuspendPaintingCore() -> void
-override System.Windows.Forms.TreeView.EndSuspendPaintingCore() -> void
-WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreenChanged -> System.EventHandler?
-WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreen.set -> void
-WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreen.get -> bool
-WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKeyChanged -> System.EventHandler?
-WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKey.set -> void
-WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.Forms.Keys
-WinFormsBoards.Controls.KioskModeManager.ToggleFullScreen() -> void
-WinFormsBoards.Controls.KioskModeManager.SuppressPowerSavingChanged -> System.EventHandler?
-WinFormsBoards.Controls.KioskModeManager.SuppressPowerSaving.set -> void
-WinFormsBoards.Controls.KioskModeManager.SuppressPowerSaving.get -> bool
-WinFormsBoards.Controls.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
-WinFormsBoards.Controls.KioskModeManager.KioskModeManager() -> void
-WinFormsBoards.Controls.KioskModeManager.IsFullScreen.get -> bool
-WinFormsBoards.Controls.KioskModeManager.HideTaskbarChanged -> System.EventHandler?
-WinFormsBoards.Controls.KioskModeManager.HideTaskbar.set -> void
-WinFormsBoards.Controls.KioskModeManager.HideTaskbar.get -> bool
-WinFormsBoards.Controls.KioskModeManager.FullScreenChanged -> System.EventHandler?
-WinFormsBoards.Controls.KioskModeManager.ExitFullScreen() -> void
-WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreenChanged -> System.EventHandler?
-WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreen.set -> void
-WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreen.get -> bool
-WinFormsBoards.Controls.KioskModeManager.EnterFullScreen() -> void
-WinFormsBoards.Controls.KioskModeManager.ContainerControlChanged -> System.EventHandler?
-WinFormsBoards.Controls.KioskModeManager.ContainerControl.set -> void
-WinFormsBoards.Controls.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
-WinFormsBoards.Controls.KioskModeManager
-virtual WinFormsBoards.Controls.KioskModeManager.OnTopMostInFullScreenChanged(System.EventArgs! e) -> void
-virtual WinFormsBoards.Controls.KioskModeManager.OnToggleFullScreenKeyChanged(System.EventArgs! e) -> void
-virtual WinFormsBoards.Controls.KioskModeManager.OnSuppressPowerSavingChanged(System.EventArgs! e) -> void
-virtual WinFormsBoards.Controls.KioskModeManager.OnHideTaskbarChanged(System.EventArgs! e) -> void
-virtual WinFormsBoards.Controls.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
-virtual WinFormsBoards.Controls.KioskModeManager.OnEscapeExitsFullScreenChanged(System.EventArgs! e) -> void
-virtual WinFormsBoards.Controls.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeWakeupEventHandler.Invoke(object? sender, System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnWakeup(System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
-System.Windows.Forms.KioskModeWakeupSource.Session = 3 -> System.Windows.Forms.KioskModeWakeupSource
-System.Windows.Forms.KioskModeWakeupSource.PowerResume = 2 -> System.Windows.Forms.KioskModeWakeupSource
-System.Windows.Forms.KioskModeWakeupSource.Mouse = 1 -> System.Windows.Forms.KioskModeWakeupSource
-System.Windows.Forms.KioskModeWakeupSource.Keyboard = 0 -> System.Windows.Forms.KioskModeWakeupSource
-System.Windows.Forms.KioskModeWakeupSource
-System.Windows.Forms.KioskModeWakeupEventHandler
-System.Windows.Forms.KioskModeWakeupEventArgs.Source.get -> System.Windows.Forms.KioskModeWakeupSource
-System.Windows.Forms.KioskModeWakeupEventArgs.KioskModeWakeupEventArgs(System.Windows.Forms.KioskModeWakeupSource source) -> void
-System.Windows.Forms.KioskModeWakeupEventArgs
-System.Windows.Forms.KioskModeManager.WakeUpCommand.get -> System.Windows.Input.ICommand?
-System.Windows.Forms.KioskModeManager.WakeUpCommand.set -> void
-System.Windows.Forms.KioskModeManager.Wakeup -> System.Windows.Forms.KioskModeWakeupEventHandler?
-System.Windows.Forms.KioskModeManager.TopMostInFullScreen.set -> void
-System.Windows.Forms.KioskModeManager.TopMostInFullScreen.get -> bool
-System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.set -> void
-System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.Forms.Keys
-System.Windows.Forms.KioskModeManager.ToggleFullScreen() -> void
-System.Windows.Forms.KioskModeManager.SuppressPowerSaving.set -> void
-System.Windows.Forms.KioskModeManager.SuppressPowerSaving.get -> bool
-System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.set -> void
-System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.get -> int
-System.Windows.Forms.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
-System.Windows.Forms.KioskModeManager.KioskModeManager() -> void
-System.Windows.Forms.KioskModeManager.HideTaskbar.set -> void
-System.Windows.Forms.KioskModeManager.HideTaskbar.get -> bool
-System.Windows.Forms.KioskModeManager.FullScreenChanged -> System.EventHandler?
-#nullable enable
 System.Windows.Forms.KioskModeManager
 System.Windows.Forms.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
 System.Windows.Forms.KioskModeManager.ContainerControl.set -> void
 System.Windows.Forms.KioskModeManager.ContainerControlChanged -> System.EventHandler?
-override System.Windows.Forms.KioskModeManager.Dispose(bool disposing) -> void
 System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.get -> bool
 System.Windows.Forms.KioskModeManager.EscapeExitsFullScreen.set -> void
 System.Windows.Forms.KioskModeManager.FullScreen.get -> bool
@@ -126,11 +27,6 @@ System.Windows.Forms.KioskModeManager.KioskModeManager() -> void
 System.Windows.Forms.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
 System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.get -> int
 System.Windows.Forms.KioskModeManager.MousePointerAutoHideDelay.set -> void
-virtual System.Windows.Forms.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
-virtual System.Windows.Forms.KioskModeManager.OnWakeup(System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
-override System.Windows.Forms.KioskModeManager.Site.get -> System.ComponentModel.ISite?
-override System.Windows.Forms.KioskModeManager.Site.set -> void
 System.Windows.Forms.KioskModeManager.SuppressPowerSaving.get -> bool
 System.Windows.Forms.KioskModeManager.SuppressPowerSaving.set -> void
 System.Windows.Forms.KioskModeManager.ToggleFullScreen() -> void
@@ -138,39 +34,112 @@ System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.
 System.Windows.Forms.KioskModeManager.ToggleFullScreenKey.set -> void
 System.Windows.Forms.KioskModeManager.TopMostInFullScreen.get -> bool
 System.Windows.Forms.KioskModeManager.TopMostInFullScreen.set -> void
-System.Windows.Forms.KioskModeManager.Wakeup -> System.Windows.Forms.KioskModeWakeupEventHandler?
 System.Windows.Forms.KioskModeManager.WakeUpCommand.get -> System.Windows.Input.ICommand?
 System.Windows.Forms.KioskModeManager.WakeUpCommand.set -> void
+System.Windows.Forms.KioskModeManager.Wakeup -> System.Windows.Forms.KioskModeWakeupEventHandler?
 System.Windows.Forms.KioskModeWakeupEventArgs
 System.Windows.Forms.KioskModeWakeupEventArgs.KioskModeWakeupEventArgs(System.Windows.Forms.KioskModeWakeupSource source) -> void
 System.Windows.Forms.KioskModeWakeupEventArgs.Source.get -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupEventHandler
-virtual System.Windows.Forms.KioskModeWakeupEventHandler.Invoke(object? sender, System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
 System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupSource.Keyboard = 0 -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupSource.Mouse = 1 -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupSource.PowerResume = 2 -> System.Windows.Forms.KioskModeWakeupSource
 System.Windows.Forms.KioskModeWakeupSource.Session = 3 -> System.Windows.Forms.KioskModeWakeupSource
-#nullable enable
+System.Windows.Forms.SuspendPaintingScope
+System.Windows.Forms.SuspendPaintingScope.Dispose() -> void
+System.Windows.Forms.SuspendPaintingScope.SuspendPaintingScope(System.Windows.Forms.ISupportSuspendPainting? target) -> void
+System.Windows.Forms.SuspendRelocationScope
+System.Windows.Forms.SuspendRelocationScope.Dispose() -> void
+System.Windows.Forms.SuspendRelocationScope.SuspendRelocationScope(System.Windows.Forms.ISupportSuspendRelocation? target) -> void
+System.Windows.Forms.SystemTextSizeAwareness
+System.Windows.Forms.SystemTextSizeAwareness.Notify = 1 -> System.Windows.Forms.SystemTextSizeAwareness
+System.Windows.Forms.SystemTextSizeAwareness.Unaware = 0 -> System.Windows.Forms.SystemTextSizeAwareness
+System.Windows.Forms.TreeView.NodeLeading.get -> float
+System.Windows.Forms.TreeView.NodeLeading.set -> void
+System.Windows.Forms.TreeView.NodeLeadingChanged -> System.EventHandler?
+System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Classic = 0 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Disabled = 1 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Inherit = -1 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Latest = 32767 -> System.Windows.Forms.VisualStylesMode
+System.Windows.Forms.VisualStylesMode.Net11 = 2 -> System.Windows.Forms.VisualStylesMode
+WinFormsBoards.Controls.KioskModeManager
+WinFormsBoards.Controls.KioskModeManager.ContainerControl.get -> System.Windows.Forms.ContainerControl?
+WinFormsBoards.Controls.KioskModeManager.ContainerControl.set -> void
+WinFormsBoards.Controls.KioskModeManager.ContainerControlChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.EnterFullScreen() -> void
+WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreen.get -> bool
+WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreen.set -> void
+WinFormsBoards.Controls.KioskModeManager.EscapeExitsFullScreenChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.ExitFullScreen() -> void
+WinFormsBoards.Controls.KioskModeManager.FullScreenChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.HideTaskbar.get -> bool
+WinFormsBoards.Controls.KioskModeManager.HideTaskbar.set -> void
+WinFormsBoards.Controls.KioskModeManager.HideTaskbarChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.IsFullScreen.get -> bool
+WinFormsBoards.Controls.KioskModeManager.KioskModeManager() -> void
+WinFormsBoards.Controls.KioskModeManager.KioskModeManager(System.ComponentModel.IContainer! container) -> void
+WinFormsBoards.Controls.KioskModeManager.SuppressPowerSaving.get -> bool
+WinFormsBoards.Controls.KioskModeManager.SuppressPowerSaving.set -> void
+WinFormsBoards.Controls.KioskModeManager.SuppressPowerSavingChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreen() -> void
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKey.get -> System.Windows.Forms.Keys
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKey.set -> void
+WinFormsBoards.Controls.KioskModeManager.ToggleFullScreenKeyChanged -> System.EventHandler?
+WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreen.get -> bool
+WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreen.set -> void
+WinFormsBoards.Controls.KioskModeManager.TopMostInFullScreenChanged -> System.EventHandler?
 override System.Windows.Forms.ButtonBase.OnVisualStylesModeChanged(System.EventArgs! e) -> void
 override System.Windows.Forms.CheckBox.Dispose(bool disposing) -> void
 override System.Windows.Forms.CheckBox.OnPaint(System.Windows.Forms.PaintEventArgs! pevent) -> void
 override System.Windows.Forms.CheckBox.OnVisualStylesModeChanged(System.EventArgs! e) -> void
+override System.Windows.Forms.ComboBox.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.ComboBox.EndSuspendPaintingCore() -> void
 override System.Windows.Forms.Form.OnSystemColorsChanged(System.EventArgs! e) -> void
+override System.Windows.Forms.KioskModeManager.Dispose(bool disposing) -> void
+override System.Windows.Forms.KioskModeManager.Site.get -> System.ComponentModel.ISite?
+override System.Windows.Forms.KioskModeManager.Site.set -> void
+override System.Windows.Forms.ListBox.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.ListBox.EndSuspendPaintingCore() -> void
+override System.Windows.Forms.ListView.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.ListView.EndSuspendPaintingCore() -> void
 override System.Windows.Forms.PropertyGrid.VisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 override System.Windows.Forms.PropertyGrid.VisualStylesMode.set -> void
+override System.Windows.Forms.RichTextBox.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.RichTextBox.EndSuspendPaintingCore() -> void
+override System.Windows.Forms.TreeView.BeginSuspendPaintingCore() -> void
+override System.Windows.Forms.TreeView.EndSuspendPaintingCore() -> void
 static System.Windows.Forms.Application.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
+static System.Windows.Forms.Application.FormAppearanceMode.get -> System.Windows.Forms.FormAppearanceMode
+static System.Windows.Forms.Application.GetWindowsAccentColor() -> System.Drawing.Color
 static System.Windows.Forms.Application.SetDefaultVisualStylesMode(System.Windows.Forms.VisualStylesMode styleSetting) -> void
-System.Windows.Forms.Appearance.ToggleSwitch = 2 -> System.Windows.Forms.Appearance
-System.Windows.Forms.Control.VisualStylesModeChanged -> System.EventHandler?
-System.Windows.Forms.VisualStylesMode
-System.Windows.Forms.VisualStylesMode.Classic = 0 -> System.Windows.Forms.VisualStylesMode
-System.Windows.Forms.VisualStylesMode.Disabled = 1 -> System.Windows.Forms.VisualStylesMode
-System.Windows.Forms.VisualStylesMode.Inherit = -1 -> System.Windows.Forms.VisualStylesMode
-System.Windows.Forms.VisualStylesMode.Latest = 32767 -> System.Windows.Forms.VisualStylesMode
-System.Windows.Forms.VisualStylesMode.Net11 = 2 -> System.Windows.Forms.VisualStylesMode
+static System.Windows.Forms.Application.SetFormAppearanceMode(System.Windows.Forms.FormAppearanceMode mode) -> void
+static System.Windows.Forms.Application.SetSystemTextSizeAwareness(System.Windows.Forms.SystemTextSizeAwareness awareness) -> void
+static System.Windows.Forms.Application.SystemTextSize.get -> double
+static System.Windows.Forms.Application.SystemTextSizeAwareness.get -> System.Windows.Forms.SystemTextSizeAwareness
+static System.Windows.Forms.Application.SystemTextSizeChanged -> System.EventHandler?
+static System.Windows.Forms.ControlMutationExtensions.SuspendPainting(this System.Windows.Forms.ISupportSuspendPainting! target) -> System.Windows.Forms.SuspendPaintingScope!
+static System.Windows.Forms.ControlMutationExtensions.SuspendRelocation(this System.Windows.Forms.ISupportSuspendRelocation! target) -> System.Windows.Forms.SuspendRelocationScope!
+virtual System.Windows.Forms.Control.BeginSuspendPaintingCore() -> void
+virtual System.Windows.Forms.Control.BeginSuspendRelocationCore() -> void
 virtual System.Windows.Forms.Control.DefaultVisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
+virtual System.Windows.Forms.Control.EndSuspendPaintingCore() -> void
+virtual System.Windows.Forms.Control.EndSuspendRelocationCore() -> void
 virtual System.Windows.Forms.Control.OnParentVisualStylesModeChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.Control.OnVisualStylesModeChanged(System.EventArgs! e) -> void
 virtual System.Windows.Forms.Control.VisualStylesMode.get -> System.Windows.Forms.VisualStylesMode
 virtual System.Windows.Forms.Control.VisualStylesMode.set -> void
+virtual System.Windows.Forms.Form.OnSystemTextSizeChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeManager.OnWakeup(System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
+virtual System.Windows.Forms.KioskModeWakeupEventHandler.Invoke(object? sender, System.Windows.Forms.KioskModeWakeupEventArgs! e) -> void
+virtual System.Windows.Forms.TreeView.OnNodeLeadingChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnContainerControlChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnEscapeExitsFullScreenChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnFullScreenChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnHideTaskbarChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnSuppressPowerSavingChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnToggleFullScreenKeyChanged(System.EventArgs! e) -> void
+virtual WinFormsBoards.Controls.KioskModeManager.OnTopMostInFullScreenChanged(System.EventArgs! e) -> void

From f156625a901f607abe189e5dc9a54068c571b816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20L=C3=B6ffelmann?= <klaus.loeffelmann@microsoft.com>
Date: Fri, 10 Jul 2026 00:44:46 -0700
Subject: [PATCH 50/50] Integration cleanup: resources

---
 src/System.Windows.Forms/Resources/SR.resx | 10173 +++++++++----------
 1 file changed, 5086 insertions(+), 5087 deletions(-)

diff --git a/src/System.Windows.Forms/Resources/SR.resx b/src/System.Windows.Forms/Resources/SR.resx
index 6bf2ba85f58..999bed6d05b 100644
--- a/src/System.Windows.Forms/Resources/SR.resx
+++ b/src/System.Windows.Forms/Resources/SR.resx
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,6995 +116,6995 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="AboutBoxDesc" xml:space="preserve">
-    <value>Displays the 'About' box for this component</value>
-  </data>
-  <data name="AccDGCollapse" xml:space="preserve">
-    <value>Collapse</value>
-  </data>
-  <data name="AccDGEdit" xml:space="preserve">
-    <value>Edit</value>
-  </data>
-  <data name="AccDGExpand" xml:space="preserve">
-    <value>Expand</value>
-  </data>
-  <data name="AccDGNavigate" xml:space="preserve">
-    <value>Navigate</value>
-  </data>
-  <data name="AccDGNavigateBack" xml:space="preserve">
-    <value>Navigate Back</value>
-  </data>
-  <data name="AccDGNewRow" xml:space="preserve">
-    <value>(Create New)</value>
-  </data>
-  <data name="AccDGParentRow" xml:space="preserve">
-    <value>Parent Row</value>
-  </data>
-  <data name="AccDGParentRows" xml:space="preserve">
-    <value>Parent Rows</value>
-  </data>
-  <data name="AccessibleActionCheck" xml:space="preserve">
-    <value>Check</value>
-  </data>
-  <data name="AccessibleActionClick" xml:space="preserve">
-    <value>Click</value>
-  </data>
-  <data name="AccessibleActionCollapse" xml:space="preserve">
-    <value>Collapse</value>
-  </data>
-  <data name="AccessibleActionExpand" xml:space="preserve">
-    <value>Expand</value>
-  </data>
-  <data name="AccessibleActionPress" xml:space="preserve">
-    <value>Press</value>
-  </data>
-  <data name="AccessibleActionUncheck" xml:space="preserve">
-    <value>Uncheck</value>
-  </data>
-  <data name="AddDifferentThreads" xml:space="preserve">
-    <value>Controls created on one thread cannot be parented to a control on a different thread.</value>
-  </data>
-  <data name="ApplicationCannotChangeThreadExceptionMode" xml:space="preserve">
-    <value>Thread exception mode cannot be changed once any Controls are created on the thread.</value>
-  </data>
-  <data name="ApplicationCannotChangeApplicationExceptionMode" xml:space="preserve">
-    <value>Application exception mode cannot be changed once any Controls are created in the application.</value>
-  </data>
-  <data name="Application_VisualStylesModeCanOnlyBeSetOnce" xml:space="preserve">
-    <value>The default visual styles mode can only be set once and cannot be changed afterwards.</value>
-  </data>
-  <data name="Application_VisualStylesModeInheritInvalidAsDefault" xml:space="preserve">
-    <value>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</value>
-  </data>
-  <data name="ApplyCaption" xml:space="preserve">
-    <value>&amp;Apply</value>
-  </data>
-  <data name="AutoCompleteFailure" xml:space="preserve">
-    <value>autoComplete cannot be initialized with given custom source.</value>
-  </data>
-  <data name="AutoCompleteFailureListItems" xml:space="preserve">
-    <value>autoComplete cannot be initialized with the list items.</value>
-  </data>
-  <data name="AXAddInvalidEvent" xml:space="preserve">
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+<data name="AXAddInvalidEvent" xml:space="preserve">
     <value>Event {0} is not valid on this ActiveX control.</value>
-  </data>
-  <data name="AXDuplicateControl" xml:space="preserve">
+  </data><data name="AXDuplicateControl" xml:space="preserve">
     <value>ActiveX control named '{0}' already exists in this container. Change or set the "Name" property for this ActiveX control and try again.</value>
-  </data>
-  <data name="AXEditProperties" xml:space="preserve">
+  </data><data name="AXEditProperties" xml:space="preserve">
     <value>Edit ActiveX component properties</value>
-  </data>
-  <data name="AXFontUnitNotPoint" xml:space="preserve">
+  </data><data name="AXFontUnitNotPoint" xml:space="preserve">
     <value>ActiveX controls only accept fonts that are defined in GraphicsUnit.Point.</value>
-  </data>
-  <data name="AxInterfaceNotSupported" xml:space="preserve">
-    <value>Interface is not supported.</value>
-  </data>
-  <data name="AXInvalidArgument" xml:space="preserve">
+  </data><data name="AXInvalidArgument" xml:space="preserve">
     <value>Not a valid argument.</value>
-  </data>
-  <data name="AXInvalidMethodInvoke" xml:space="preserve">
+  </data><data name="AXInvalidMethodInvoke" xml:space="preserve">
     <value>Method '{0}' cannot be invoked at this time.</value>
-  </data>
-  <data name="AXInvalidPropertyGet" xml:space="preserve">
+  </data><data name="AXInvalidPropertyGet" xml:space="preserve">
     <value>Property get of '{0}' cannot be invoked at this time.</value>
-  </data>
-  <data name="AXInvalidPropertySet" xml:space="preserve">
+  </data><data name="AXInvalidPropertySet" xml:space="preserve">
     <value>Property set of '{0}' cannot be invoked at this time.</value>
-  </data>
-  <data name="AXMTAThread" xml:space="preserve">
+  </data><data name="AXMTAThread" xml:space="preserve">
     <value>ActiveX control '{0}' cannot be instantiated because the current thread is not in a single-threaded apartment.</value>
-  </data>
-  <data name="AXNoConnectionPoint" xml:space="preserve">
+  </data><data name="AXNoConnectionPoint" xml:space="preserve">
     <value>Connection point for event interface '{0}' cannot be created.</value>
-  </data>
-  <data name="AXNoConnectionPointContainer" xml:space="preserve">
+  </data><data name="AXNoConnectionPointContainer" xml:space="preserve">
     <value>Source object does not expose IConnectionPointContainer.</value>
-  </data>
-  <data name="AXNoEventInterface" xml:space="preserve">
+  </data><data name="AXNoEventInterface" xml:space="preserve">
     <value>Source object does not expose '{0}' event interface.</value>
-  </data>
-  <data name="AXNohWnd" xml:space="preserve">
-    <value>Unable to get the window handle for the '{0}' control. Windowless ActiveX controls are not supported.</value>
-  </data>
-  <data name="AXNoLicenseToUse" xml:space="preserve">
+  </data><data name="AXNoLicenseToUse" xml:space="preserve">
     <value>You must have a license to use this ActiveX control.</value>
-  </data>
-  <data name="AXNoSinkAdvise" xml:space="preserve">
+  </data><data name="AXNoSinkAdvise" xml:space="preserve">
     <value>Could not Advise() the event interface '{0}'.</value>
-  </data>
-  <data name="AXNoSinkImplementation" xml:space="preserve">
+  </data><data name="AXNoSinkImplementation" xml:space="preserve">
     <value>Given 'sink' object does not implement '{0}' event interface.</value>
-  </data>
-  <data name="AXNoThreadInfo" xml:space="preserve">
+  </data><data name="AXNoThreadInfo" xml:space="preserve">
     <value>Unable to verify required threading model of apartment or free-threaded. This control cannot be hosted.</value>
-  </data>
-  <data name="AXNotImplemented" xml:space="preserve">
-    <value>Not implemented.</value>
-  </data>
-  <data name="AXNoTopLevelContainerControl" xml:space="preserve">
+  </data><data name="AXNoTopLevelContainerControl" xml:space="preserve">
     <value>ActiveX control must have at least one ContainerControl in its parent hierarchy to be properly instantiated. Set the ContainingControl property on '{0}' to a non-null value and try again.</value>
-  </data>
-  <data name="AXOcxStateLoaded" xml:space="preserve">
+  </data><data name="AXNohWnd" xml:space="preserve">
+    <value>Unable to get the window handle for the '{0}' control. Windowless ActiveX controls are not supported.</value>
+  </data><data name="AXNotImplemented" xml:space="preserve">
+    <value>Not implemented.</value>
+  </data><data name="AXOcxStateLoaded" xml:space="preserve">
     <value>ActiveX control cannot be reloaded with an OcxState of a different storage type.</value>
-  </data>
-  <data name="AXProperties" xml:space="preserve">
+  </data><data name="AXProperties" xml:space="preserve">
     <value>ActiveX - Properties...</value>
-  </data>
-  <data name="AXSingleThreaded" xml:space="preserve">
+  </data><data name="AXSingleThreaded" xml:space="preserve">
     <value>Control is single threaded. It cannot be hosted.</value>
-  </data>
-  <data name="AXTopLevelSource" xml:space="preserve">
+  </data><data name="AXTopLevelSource" xml:space="preserve">
     <value>Top-level Windows Forms control cannot be exposed as an ActiveX control.</value>
-  </data>
-  <data name="AXUnknownError" xml:space="preserve">
+  </data><data name="AXUnknownError" xml:space="preserve">
     <value>Unknown error.</value>
-  </data>
-  <data name="AXUnknownImage" xml:space="preserve">
+  </data><data name="AXUnknownImage" xml:space="preserve">
     <value>Unknown image type.</value>
-  </data>
-  <data name="AXWindowlessControl" xml:space="preserve">
+  </data><data name="AXWindowlessControl" xml:space="preserve">
     <value>ActiveX control is a windowless control. The control is not supported in this version of the .NET.</value>
-  </data>
-  <data name="BadDataSourceForComplexBinding" xml:space="preserve">
+  </data><data name="AboutBoxDesc" xml:space="preserve">
+    <value>Displays the 'About' box for this component</value>
+  </data><data name="AccDGCollapse" xml:space="preserve">
+    <value>Collapse</value>
+  </data><data name="AccDGEdit" xml:space="preserve">
+    <value>Edit</value>
+  </data><data name="AccDGExpand" xml:space="preserve">
+    <value>Expand</value>
+  </data><data name="AccDGNavigate" xml:space="preserve">
+    <value>Navigate</value>
+  </data><data name="AccDGNavigateBack" xml:space="preserve">
+    <value>Navigate Back</value>
+  </data><data name="AccDGNewRow" xml:space="preserve">
+    <value>(Create New)</value>
+  </data><data name="AccDGParentRow" xml:space="preserve">
+    <value>Parent Row</value>
+  </data><data name="AccDGParentRows" xml:space="preserve">
+    <value>Parent Rows</value>
+  </data><data name="AccessDenied" xml:space="preserve">
+    <value>Access denied</value>
+  </data><data name="AccessibleActionCheck" xml:space="preserve">
+    <value>Check</value>
+  </data><data name="AccessibleActionClick" xml:space="preserve">
+    <value>Click</value>
+  </data><data name="AccessibleActionCollapse" xml:space="preserve">
+    <value>Collapse</value>
+  </data><data name="AccessibleActionDoubleClick" xml:space="preserve">
+    <value>Double Click</value>
+  </data><data name="AccessibleActionExpand" xml:space="preserve">
+    <value>Expand</value>
+  </data><data name="AccessibleActionPress" xml:space="preserve">
+    <value>Press</value>
+  </data><data name="AccessibleActionUncheck" xml:space="preserve">
+    <value>Uncheck</value>
+  </data><data name="AccessibleObjectLiveRegionNotSupported" xml:space="preserve">
+    <value>The corresponding UI element is not a live region.</value>
+  </data><data name="AccessibleObjectRuntimeIdNotSupported" xml:space="preserve">
+    <value>{0} doesn't support {1} property. It must be overriden in the derived class.</value>
+  </data><data name="AddDifferentThreads" xml:space="preserve">
+    <value>Controls created on one thread cannot be parented to a control on a different thread.</value>
+  </data><data name="ApplicationCannotChangeApplicationExceptionMode" xml:space="preserve">
+    <value>Application exception mode cannot be changed once any Controls are created in the application.</value>
+  </data><data name="ApplicationCannotChangeThreadExceptionMode" xml:space="preserve">
+    <value>Thread exception mode cannot be changed once any Controls are created on the thread.</value>
+  </data><data name="Application_VisualStylesModeCanOnlyBeSetOnce" xml:space="preserve">
+    <value>The default visual styles mode can only be set once and cannot be changed afterwards.</value>
+  </data><data name="Application_VisualStylesModeInheritInvalidAsDefault" xml:space="preserve">
+    <value>VisualStylesMode.Inherit cannot be used as the application-wide default visual styles mode because the application root has no parent to inherit from.</value>
+  </data><data name="ApplyCaption" xml:space="preserve">
+    <value>&amp;Apply</value>
+  </data><data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
+    <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
+  </data><data name="Arg_NonZeroLowerBound" xml:space="preserve">
+    <value>The lower bound of target array must be zero.</value>
+  </data><data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
+    <value>Only single dimensional arrays are supported for the requested action.</value>
+  </data><data name="Argument_IncompatibleArrayType" xml:space="preserve">
+    <value>Target array type is not compatible with the type of items in the collection.</value>
+  </data><data name="AutoCompleteFailure" xml:space="preserve">
+    <value>autoComplete cannot be initialized with given custom source.</value>
+  </data><data name="AutoCompleteFailureListItems" xml:space="preserve">
+    <value>autoComplete cannot be initialized with the list items.</value>
+  </data><data name="AxInterfaceNotSupported" xml:space="preserve">
+    <value>Interface is not supported.</value>
+  </data><data name="BadDataSourceForComplexBinding" xml:space="preserve">
     <value>Complex DataBinding accepts as a data source either an IList or an IListSource.</value>
-  </data>
-  <data name="BindingManagerBadIndex" xml:space="preserve">
+  </data><data name="BinaryFormatterNotSupported" xml:space="preserve">
+    <value>BinaryFormatter serialization and deserialization are disabled within this application. See https://aka.ms/binaryformatter for more information.</value>
+  </data><data name="BinaryFormatter_NotSupported_InClipboardOrDragDrop" xml:space="preserve">
+    <value>BinaryFormatter is not supported in clipboard or drag-and-drop operations.</value>
+  </data><data name="BinaryFormatter_NotSupported_InClipboardOrDragDrop_UseTypedAPI" xml:space="preserve">
+    <value>BinaryFormatter is not supported in clipboard or drag-and-drop operations. Please enable it and use 'TryGetData&lt;T&gt;' APIs with a 'resolver' function that defines a set of allowed types to deserialize '{0}'.</value>
+  </data><data name="BindableComponentBindingContextChangedDescr" xml:space="preserve">
+    <value>Occurs when the binding context has changed.</value>
+  </data><data name="BindingComponentBindingContextDescr" xml:space="preserve">
+    <value>Gets or sets the BindingContext for this bindable Component.</value>
+  </data><data name="BindingManagerBadIndex" xml:space="preserve">
     <value>ListManager for {0} cannot be found.</value>
-  </data>
-  <data name="BindingNavigatorAddNewItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorAddNewItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that raises the 'Add new' action.</value>
-  </data>
-  <data name="BindingNavigatorAddNewItemText" xml:space="preserve">
+  </data><data name="BindingNavigatorAddNewItemText" xml:space="preserve">
     <value>Add new</value>
-  </data>
-  <data name="BindingNavigatorBindingSourcePropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorBindingSourcePropDescr" xml:space="preserve">
     <value>The BindingSource that the BindingNavigator navigates.</value>
-  </data>
-  <data name="BindingNavigatorCountItemFormat" xml:space="preserve">
+  </data><data name="BindingNavigatorCountItemFormat" xml:space="preserve">
     <value>of {0}</value>
-  </data>
-  <data name="BindingNavigatorCountItemFormatPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorCountItemFormatPropDescr" xml:space="preserve">
     <value>Formatting to apply to count displayed in the CountItem ToolStrip item.</value>
-  </data>
-  <data name="BindingNavigatorCountItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorCountItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that displays the total number of items.</value>
-  </data>
-  <data name="BindingNavigatorCountItemTip" xml:space="preserve">
+  </data><data name="BindingNavigatorCountItemTip" xml:space="preserve">
     <value>Total number of items</value>
-  </data>
-  <data name="BindingNavigatorDeleteItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorDeleteItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that raises the 'Delete' action.</value>
-  </data>
-  <data name="BindingNavigatorDeleteItemText" xml:space="preserve">
+  </data><data name="BindingNavigatorDeleteItemText" xml:space="preserve">
     <value>Delete</value>
-  </data>
-  <data name="BindingNavigatorMoveFirstItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorMoveFirstItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that raises the 'Move first' action.</value>
-  </data>
-  <data name="BindingNavigatorMoveFirstItemText" xml:space="preserve">
+  </data><data name="BindingNavigatorMoveFirstItemText" xml:space="preserve">
     <value>Move first</value>
-  </data>
-  <data name="BindingNavigatorMoveLastItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorMoveLastItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that raises the 'Move last' action.</value>
-  </data>
-  <data name="BindingNavigatorMoveLastItemText" xml:space="preserve">
+  </data><data name="BindingNavigatorMoveLastItemText" xml:space="preserve">
     <value>Move last</value>
-  </data>
-  <data name="BindingNavigatorMoveNextItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorMoveNextItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that raises the 'Move next' action.</value>
-  </data>
-  <data name="BindingNavigatorMoveNextItemText" xml:space="preserve">
+  </data><data name="BindingNavigatorMoveNextItemText" xml:space="preserve">
     <value>Move next</value>
-  </data>
-  <data name="BindingNavigatorMovePreviousItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorMovePreviousItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that raises the 'Move previous' action.</value>
-  </data>
-  <data name="BindingNavigatorMovePreviousItemText" xml:space="preserve">
+  </data><data name="BindingNavigatorMovePreviousItemText" xml:space="preserve">
     <value>Move previous</value>
-  </data>
-  <data name="BindingNavigatorPositionAccessibleName" xml:space="preserve">
+  </data><data name="BindingNavigatorPositionAccessibleName" xml:space="preserve">
     <value>Position</value>
-  </data>
-  <data name="BindingNavigatorPositionItemPropDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorPositionItemPropDescr" xml:space="preserve">
     <value>The ToolStripItem on the BindingNavigator that displays the current position.</value>
-  </data>
-  <data name="BindingNavigatorPositionItemTip" xml:space="preserve">
+  </data><data name="BindingNavigatorPositionItemTip" xml:space="preserve">
     <value>Current position</value>
-  </data>
-  <data name="BindingNavigatorRefreshItemsEventDescr" xml:space="preserve">
+  </data><data name="BindingNavigatorRefreshItemsEventDescr" xml:space="preserve">
     <value>Event raised when BindingNavigator ToolStrip items need to be refreshed to reflect current state of data.</value>
-  </data>
-  <data name="BindingNavigatorToolStripName" xml:space="preserve">
+  </data><data name="BindingNavigatorToolStripName" xml:space="preserve">
     <value>Binding Navigator</value>
-  </data>
-  <data name="BindingsCollectionAdd1" xml:space="preserve">
-    <value>dataBinding already belongs to this BindingsCollection.</value>
-  </data>
-  <data name="BindingsCollectionAdd2" xml:space="preserve">
-    <value>dataBinding belongs to another BindingsCollection.</value>
-  </data>
-  <data name="BindingsCollectionBadIndex" xml:space="preserve">
-    <value>Binding {0       } cannot be found.</value>
-  </data>
-  <data name="BindingsCollectionDup" xml:space="preserve">
-    <value>This causes two bindings in the collection to bind to the same property.</value>
-  </data>
-  <data name="BindingsCollectionForeign" xml:space="preserve">
-    <value>Binding does not belong to this BindingsCollection.</value>
-  </data>
-  <data name="BindingSourceAddingNewEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingNotSupported" xml:space="preserve">
+    <value>Binding operations are not supported when application trimming is enabled.</value>
+  </data><data name="BindingSourceAddingNewEventHandlerDescr" xml:space="preserve">
     <value>Event raised when the user calls AddNew on the BindingSource</value>
-  </data>
-  <data name="BindingSourceAllowNewDescr" xml:space="preserve">
+  </data><data name="BindingSourceAllowNewDescr" xml:space="preserve">
     <value>Determines whether the BindingSource allows new items to be added to the list.</value>
-  </data>
-  <data name="BindingSourceBadSortString" xml:space="preserve">
+  </data><data name="BindingSourceBadSortString" xml:space="preserve">
     <value>Sort string not valid.</value>
-  </data>
-  <data name="BindingSourceBindingCompleteEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourceBindingCompleteEventHandlerDescr" xml:space="preserve">
     <value>Event raised after data has been exchanged between the data source and a control property bound to that data source.</value>
-  </data>
-  <data name="BindingSourceBindingListWrapperAddToReadOnlyList" xml:space="preserve">
+  </data><data name="BindingSourceBindingListWrapperAddToReadOnlyList" xml:space="preserve">
     <value>Item cannot be added to a read-only or fixed-size list.</value>
-  </data>
-  <data name="BindingSourceBindingListWrapperNeedAParameterlessConstructor" xml:space="preserve">
+  </data><data name="BindingSourceBindingListWrapperNeedAParameterlessConstructor" xml:space="preserve">
     <value>AddNew cannot be called on the '{0}' type. This type does not have a public default constructor. You can call AddNew on the '{0}' type if you handle the AddingNew event and create the appropriate object.</value>
-  </data>
-  <data name="BindingSourceBindingListWrapperNeedToSetAllowNew" xml:space="preserve">
+  </data><data name="BindingSourceBindingListWrapperNeedToSetAllowNew" xml:space="preserve">
     <value>AddNew cannot be called on the '{0}' type. This type does not have a public default constructor. You can call AddNew on the '{0}' type if you set AllowNew=true and handle the AddingNew event.</value>
-  </data>
-  <data name="BindingSourceCurrentChangedEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourceCurrentChangedEventHandlerDescr" xml:space="preserve">
     <value>Event raised when the value of Current changes.</value>
-  </data>
-  <data name="BindingSourceCurrentItemChangedEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourceCurrentItemChangedEventHandlerDescr" xml:space="preserve">
     <value>Event raised when the value of Current changes, or a property of the current item changes.</value>
-  </data>
-  <data name="BindingSourceDataErrorEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourceDataErrorEventHandlerDescr" xml:space="preserve">
     <value>Event raised when an exception thrown during data binding is handled internally by the CurrencyManager.</value>
-  </data>
-  <data name="BindingSourceDataMemberChangedEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourceDataMemberChangedEventHandlerDescr" xml:space="preserve">
     <value>Event raised when the DataMember changes.</value>
-  </data>
-  <data name="BindingSourceDataMemberDescr" xml:space="preserve">
+  </data><data name="BindingSourceDataMemberDescr" xml:space="preserve">
     <value>Indicates a sub-list of the DataSource that the BindingSource is bound to.</value>
-  </data>
-  <data name="BindingSourceDataSourceChangedEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourceDataSourceChangedEventHandlerDescr" xml:space="preserve">
     <value>Event raised when the DataSource changes.</value>
-  </data>
-  <data name="BindingSourceDataSourceDescr" xml:space="preserve">
+  </data><data name="BindingSourceDataSourceDescr" xml:space="preserve">
     <value>Indicates the source of data for the BindingSource.</value>
-  </data>
-  <data name="BindingSourceFilterDescr" xml:space="preserve">
+  </data><data name="BindingSourceFilterDescr" xml:space="preserve">
     <value>Indicates a database column expression used to filter the set of rows returned by the data source.</value>
-  </data>
-  <data name="BindingSourceInstanceError" xml:space="preserve">
+  </data><data name="BindingSourceInstanceError" xml:space="preserve">
     <value>BindingSource unable to create list based on the Type specified in the DataSource property.</value>
-  </data>
-  <data name="BindingSourceItemChangedEventModeDescr" xml:space="preserve">
+  </data><data name="BindingSourceItemChangedEventModeDescr" xml:space="preserve">
     <value>Controls how the BindingSource raises the ListChanged event as a result of changing an item in the BindingSource.</value>
-  </data>
-  <data name="BindingSourceItemTypeIsValueType" xml:space="preserve">
+  </data><data name="BindingSourceItemTypeIsValueType" xml:space="preserve">
     <value>Cannot add null to BindingSource if the underlying list stores value types.</value>
-  </data>
-  <data name="BindingSourceItemTypeMismatchOnAdd" xml:space="preserve">
+  </data><data name="BindingSourceItemTypeMismatchOnAdd" xml:space="preserve">
     <value>Objects added to a BindingSource's list must all be of the same type.</value>
-  </data>
-  <data name="BindingSourceListChangedEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourceListChangedEventHandlerDescr" xml:space="preserve">
     <value>Event raised when a change occurs in the BindingSource's list.</value>
-  </data>
-  <data name="BindingSourcePositionChangedEventHandlerDescr" xml:space="preserve">
+  </data><data name="BindingSourcePositionChangedEventHandlerDescr" xml:space="preserve">
     <value>Event raised when the value of Position changes.</value>
-  </data>
-  <data name="BindingSourceRecursionDetected" xml:space="preserve">
+  </data><data name="BindingSourceRecursionDetected" xml:space="preserve">
     <value>BindingSource cannot be its own data source. Do not set the DataSource and DataMember properties to values that refer back to BindingSource.</value>
-  </data>
-  <data name="BindingSourceRemoveCurrentNoCurrentItem" xml:space="preserve">
+  </data><data name="BindingSourceRemoveCurrentNoCurrentItem" xml:space="preserve">
     <value>Current item cannot be removed from the list because there is no current item.</value>
-  </data>
-  <data name="BindingSourceRemoveCurrentNotAllowed" xml:space="preserve">
+  </data><data name="BindingSourceRemoveCurrentNotAllowed" xml:space="preserve">
     <value>Current item cannot be removed from the list because the list does not allow removal of items.</value>
-  </data>
-  <data name="BindingSourceSortDescr" xml:space="preserve">
+  </data><data name="BindingSourceSortDescr" xml:space="preserve">
     <value>Indicates names of database columns used to sort the set of rows returned by the data source.</value>
-  </data>
-  <data name="BindingSourceSortStringPropertyNotInIBindingList" xml:space="preserve">
+  </data><data name="BindingSourceSortStringPropertyNotInIBindingList" xml:space="preserve">
     <value>Sort string contains a property that is not in the IBindingList.</value>
-  </data>
-  <data name="BlinkRateMustBeZeroOrMore" xml:space="preserve">
+  </data><data name="BindingsCollectionAdd1" xml:space="preserve">
+    <value>dataBinding already belongs to this BindingsCollection.</value>
+  </data><data name="BindingsCollectionAdd2" xml:space="preserve">
+    <value>dataBinding belongs to another BindingsCollection.</value>
+  </data><data name="BindingsCollectionBadIndex" xml:space="preserve">
+    <value>Binding {0       } cannot be found.</value>
+  </data><data name="BindingsCollectionDup" xml:space="preserve">
+    <value>This causes two bindings in the collection to bind to the same property.</value>
+  </data><data name="BindingsCollectionForeign" xml:space="preserve">
+    <value>Binding does not belong to this BindingsCollection.</value>
+  </data><data name="BlinkRateMustBeZeroOrMore" xml:space="preserve">
     <value>BlinkRate must be zero or greater. Negative values are not permitted.</value>
-  </data>
-  <data name="borderStyleDescr" xml:space="preserve">
-    <value>The border style of the control.</value>
-  </data>
-  <data name="ButtonAutoEllipsisDescr" xml:space="preserve">
+  </data><data name="ButtonAutoEllipsisDescr" xml:space="preserve">
     <value>Enables the automatic handling of text that extends beyond the width of the button.</value>
-  </data>
-  <data name="ButtonBorderColorDescr" xml:space="preserve">
+  </data><data name="ButtonBorderColorDescr" xml:space="preserve">
     <value>For buttons whose FlatStyle is FlatStyle.Flat, this property specifies the color of the border around the button.</value>
-  </data>
-  <data name="ButtonBorderSizeDescr" xml:space="preserve">
+  </data><data name="ButtonBorderSizeDescr" xml:space="preserve">
     <value>For buttons whose FlatStyle is FlatStyle.Flat, this property specifies the size, in pixels, of the border around the button.</value>
-  </data>
-  <data name="ButtonCheckedBackColorDescr" xml:space="preserve">
+  </data><data name="ButtonCheckedBackColorDescr" xml:space="preserve">
     <value>For buttons whose FlatStyle is FlatStyle.Flat, this property specifies the color of the client area of the button when the button is checked and the mouse pointer is outside the bounds of the control.</value>
-  </data>
-  <data name="ButtonDialogResultDescr" xml:space="preserve">
+  </data><data name="ButtonDialogResultDescr" xml:space="preserve">
     <value>The dialog-box result produced in a modal form by clicking the button.</value>
-  </data>
-  <data name="ButtonFlatAppearance" xml:space="preserve">
+  </data><data name="ButtonFlatAppearance" xml:space="preserve">
     <value>For buttons whose FlatStyle is FlatStyle.Flat, determines the appearance of the border and the colors used to indicate check state and mouse state.</value>
-  </data>
-  <data name="ButtonFlatAppearanceInvalidBorderColor" xml:space="preserve">
+  </data><data name="ButtonFlatAppearanceInvalidBorderColor" xml:space="preserve">
     <value>ButtonBase controls do not support setting the BorderColor to Transparent.</value>
-  </data>
-  <data name="ButtonFlatStyleDescr" xml:space="preserve">
+  </data><data name="ButtonFlatStyleDescr" xml:space="preserve">
     <value>Determines the appearance of the control when a user moves the mouse over the control and clicks.</value>
-  </data>
-  <data name="ButtonImageAlignDescr" xml:space="preserve">
+  </data><data name="ButtonImageAlignDescr" xml:space="preserve">
     <value>The alignment of the image that will be displayed on the control.</value>
-  </data>
-  <data name="ButtonImageDescr" xml:space="preserve">
+  </data><data name="ButtonImageDescr" xml:space="preserve">
     <value>The image that will be displayed on the control.</value>
-  </data>
-  <data name="ButtonImageIndexDescr" xml:space="preserve">
+  </data><data name="ButtonImageIndexDescr" xml:space="preserve">
     <value>The index of the image in the ImageList to display on the control.</value>
-  </data>
-  <data name="ButtonImageListDescr" xml:space="preserve">
+  </data><data name="ButtonImageListDescr" xml:space="preserve">
     <value>The ImageList to get the image to display on the control.</value>
-  </data>
-  <data name="ButtonMouseDownBackColorDescr" xml:space="preserve">
+  </data><data name="ButtonMouseDownBackColorDescr" xml:space="preserve">
     <value>For buttons whose FlatStyle is FlatStyle.Flat, this property specifies the color of the client area of the button when the mouse is pressed within the bounds of the control.</value>
-  </data>
-  <data name="ButtonMouseOverBackColorDescr" xml:space="preserve">
+  </data><data name="ButtonMouseOverBackColorDescr" xml:space="preserve">
     <value>For buttons whose FlatStyle is FlatStyle.Flat, this property specifies the color of the client area of the button when the mouse pointer is within the bounds of the control.</value>
-  </data>
-  <data name="ButtonTextAlignDescr" xml:space="preserve">
+  </data><data name="ButtonTextAlignDescr" xml:space="preserve">
     <value>The alignment of the text that will be displayed on the control.</value>
-  </data>
-  <data name="ButtonTextImageRelationDescr" xml:space="preserve">
+  </data><data name="ButtonTextImageRelationDescr" xml:space="preserve">
     <value>Specifies the relative location of the image to the text on the button.</value>
-  </data>
-  <data name="ButtonUseMnemonicDescr" xml:space="preserve">
+  </data><data name="ButtonUseMnemonicDescr" xml:space="preserve">
     <value>If true, the first character preceded by an ampersand (&amp;&amp;) will be used as the button's mnemonic key.</value>
-  </data>
-  <data name="ButtonUseVisualStyleBackColorDescr" xml:space="preserve">
+  </data><data name="ButtonUseVisualStyleBackColorDescr" xml:space="preserve">
     <value>Determines whether the background is drawn using visual styles, if visual styles are supported.</value>
-  </data>
-  <data name="CancelCaption" xml:space="preserve">
+  </data><data name="CDallowFullOpenDescr" xml:space="preserve">
+    <value>Enables and disables the Define Custom Colors button.</value>
+  </data><data name="CDanyColorDescr" xml:space="preserve">
+    <value>Indicates whether the dialog box displays all available colors in the set of basic colors.</value>
+  </data><data name="CDcolorDescr" xml:space="preserve">
+    <value>The color selected in the dialog box.</value>
+  </data><data name="CDcustomColorsDescr" xml:space="preserve">
+    <value>The custom set of colors shown in the dialog box.</value>
+  </data><data name="CDfullOpenDescr" xml:space="preserve">
+    <value>Controls whether the custom color section of the dialog box is initially displayed.</value>
+  </data><data name="CDshowHelpDescr" xml:space="preserve">
+    <value>Controls whether the Help button is displayed.</value>
+  </data><data name="CDsolidColorOnlyDescr" xml:space="preserve">
+    <value>Indicates whether the dialog box will restrict users to only selecting solid colors.</value>
+  </data><data name="COM2BadHandlerType" xml:space="preserve">
+    <value>Handler type ({0} != {1}) is not valid.</value>
+  </data><data name="COM2NamesAndValuesNotEqual" xml:space="preserve">
+    <value>Names and values must be non-null and of same length.</value>
+  </data><data name="COM2ReadonlyProperty" xml:space="preserve">
+    <value>Property {0} is read-only.</value>
+  </data><data name="COM2UnhandledVT" xml:space="preserve">
+    <value>Unhandled VT: {0}.</value>
+  </data><data name="CalendarNextButtonAccessibleObjectDescription" xml:space="preserve">
+    <value>Go to next time frame</value>
+  </data><data name="CalendarPreviousButtonAccessibleObjectDescription" xml:space="preserve">
+    <value>Go to previous time frame</value>
+  </data><data name="CalendarTodayLinkAccessibleObjectDescription" xml:space="preserve">
+    <value>Go to and select today's date</value>
+  </data><data name="CancelCaption" xml:space="preserve">
     <value>Cancel</value>
-  </data>
-  <data name="CannotActivateControl" xml:space="preserve">
+  </data><data name="CannotActivateControl" xml:space="preserve">
     <value>Invisible or disabled control cannot be activated</value>
-  </data>
-  <data name="CannotChangePrintedDocument" xml:space="preserve">
+  </data><data name="CannotChangePrintedDocument" xml:space="preserve">
     <value>You cannot alter the document or add to it once you have printed it.</value>
-  </data>
-  <data name="CantNestMessageLoops" xml:space="preserve">
+  </data><data name="CantNestMessageLoops" xml:space="preserve">
     <value>Starting a second message loop on a single thread is not a valid operation. Use Form.ShowDialog instead.</value>
-  </data>
-  <data name="CantShowMBServiceWithHelp" xml:space="preserve">
+  </data><data name="CantShowMBServiceWithHelp" xml:space="preserve">
     <value>Showing a service notification message box with a Help button is not a valid operation.</value>
-  </data>
-  <data name="CantShowMBServiceWithOwner" xml:space="preserve">
+  </data><data name="CantShowMBServiceWithOwner" xml:space="preserve">
     <value>Showing a service notification message box with an owner window is not a valid operation. Use the Show method that does not take an owner.</value>
-  </data>
-  <data name="CantShowModalOnNonInteractive" xml:space="preserve">
+  </data><data name="CantShowModalOnNonInteractive" xml:space="preserve">
     <value>Showing a modal dialog box or form when the application is not running in UserInteractive mode is not a valid operation. Specify the ServiceNotification or DefaultDesktopOnly style to display a notification from a service application.</value>
-  </data>
-  <data name="CatAccessibility" xml:space="preserve">
+  </data><data name="CatAccessibility" xml:space="preserve">
     <value>Accessibility</value>
-  </data>
-  <data name="CatAction" xml:space="preserve">
+  </data><data name="CatAction" xml:space="preserve">
     <value>Action</value>
-  </data>
-  <data name="CatAppearance" xml:space="preserve">
+  </data><data name="CatAppearance" xml:space="preserve">
     <value>Appearance</value>
-  </data>
-  <data name="CatAsynchronous" xml:space="preserve">
+  </data><data name="CatAsynchronous" xml:space="preserve">
     <value>Asynchronous</value>
-  </data>
-  <data name="CatBehavior" xml:space="preserve">
+  </data><data name="CatBehavior" xml:space="preserve">
     <value>Behavior</value>
-  </data>
-  <data name="CatColors" xml:space="preserve">
+  </data><data name="CatColors" xml:space="preserve">
     <value>Colors</value>
-  </data>
-  <data name="CatData" xml:space="preserve">
+  </data><data name="CatData" xml:space="preserve">
     <value>Data</value>
-  </data>
-  <data name="CatDisplay" xml:space="preserve">
+  </data><data name="CatDisplay" xml:space="preserve">
     <value>Display</value>
-  </data>
-  <data name="CatDragDrop" xml:space="preserve">
+  </data><data name="CatDragDrop" xml:space="preserve">
     <value>Drag Drop</value>
-  </data>
-  <data name="CatFocus" xml:space="preserve">
+  </data><data name="CatFocus" xml:space="preserve">
     <value>Focus</value>
-  </data>
-  <data name="CatFolderBrowsing" xml:space="preserve">
+  </data><data name="CatFolderBrowsing" xml:space="preserve">
     <value>Folder Browsing</value>
-  </data>
-  <data name="CatItems" xml:space="preserve">
+  </data><data name="CatItems" xml:space="preserve">
     <value>Items</value>
-  </data>
-  <data name="CatKey" xml:space="preserve">
+  </data><data name="CatKey" xml:space="preserve">
     <value>Key</value>
-  </data>
-  <data name="CatLayout" xml:space="preserve">
+  </data><data name="CatLayout" xml:space="preserve">
     <value>Layout</value>
-  </data>
-  <data name="CatMouse" xml:space="preserve">
+  </data><data name="CatMouse" xml:space="preserve">
     <value>Mouse</value>
-  </data>
-  <data name="CatPrivate" xml:space="preserve">
+  </data><data name="CatPrivate" xml:space="preserve">
     <value>Private</value>
-  </data>
-  <data name="CatPropertyChanged" xml:space="preserve">
+  </data><data name="CatPropertyChanged" xml:space="preserve">
     <value>Property Changed</value>
-  </data>
-  <data name="CatWindowStyle" xml:space="preserve">
+  </data><data name="CatWindowStyle" xml:space="preserve">
     <value>Window Style</value>
-  </data>
-  <data name="CDallowFullOpenDescr" xml:space="preserve">
-    <value>Enables and disables the Define Custom Colors button.</value>
-  </data>
-  <data name="CDanyColorDescr" xml:space="preserve">
-    <value>Indicates whether the dialog box displays all available colors in the set of basic colors.</value>
-  </data>
-  <data name="CDcolorDescr" xml:space="preserve">
-    <value>The color selected in the dialog box.</value>
-  </data>
-  <data name="CDcustomColorsDescr" xml:space="preserve">
-    <value>The custom set of colors shown in the dialog box.</value>
-  </data>
-  <data name="CDfullOpenDescr" xml:space="preserve">
-    <value>Controls whether the custom color section of the dialog box is initially displayed.</value>
-  </data>
-  <data name="CDshowHelpDescr" xml:space="preserve">
-    <value>Controls whether the Help button is displayed.</value>
-  </data>
-  <data name="CDsolidColorOnlyDescr" xml:space="preserve">
-    <value>Indicates whether the dialog box will restrict users to only selecting solid colors.</value>
-  </data>
-  <data name="CheckBoxAppearanceDescr" xml:space="preserve">
+  </data><data name="CategoryPropertyGridLocalizedControlType" xml:space="preserve">
+    <value>PropertyGrid category</value>
+  </data><data name="CheckBoxAppearanceDescr" xml:space="preserve">
     <value>Controls the appearance of the check box.</value>
-  </data>
-  <data name="CheckBoxAutoCheckDescr" xml:space="preserve">
+  </data><data name="CheckBoxAutoCheckDescr" xml:space="preserve">
     <value>Causes the check box to automatically change state when clicked.</value>
-  </data>
-  <data name="CheckBoxCheckAlignDescr" xml:space="preserve">
+  </data><data name="CheckBoxCheckAlignDescr" xml:space="preserve">
     <value>Determines the location of the check box inside the control.</value>
-  </data>
-  <data name="CheckBoxCheckedDescr" xml:space="preserve">
-    <value>Indicates whether the component is in the checked state. </value>
-  </data>
-  <data name="CheckBoxCheckStateDescr" xml:space="preserve">
+  </data><data name="CheckBoxCheckStateDescr" xml:space="preserve">
     <value>Indicates the state of the component. </value>
-  </data>
-  <data name="CheckBoxOnAppearanceChangedDescr" xml:space="preserve">
+  </data><data name="CheckBoxCheckedDescr" xml:space="preserve">
+    <value>Indicates whether the component is in the checked state. </value>
+  </data><data name="CheckBoxOnAppearanceChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Appearance property is changed on CheckBox.</value>
-  </data>
-  <data name="CheckBoxOnCheckedChangedDescr" xml:space="preserve">
-    <value>Occurs whenever the Check property is changed.</value>
-  </data>
-  <data name="CheckBoxOnCheckStateChangedDescr" xml:space="preserve">
+  </data><data name="CheckBoxOnCheckStateChangedDescr" xml:space="preserve">
     <value>Occurs whenever the CheckState property is changed.</value>
-  </data>
-  <data name="CheckBoxThreeStateDescr" xml:space="preserve">
+  </data><data name="CheckBoxOnCheckedChangedDescr" xml:space="preserve">
+    <value>Occurs whenever the Check property is changed.</value>
+  </data><data name="CheckBoxThreeStateDescr" xml:space="preserve">
     <value>Indicates whether the CheckBox will allow three check states rather than two.</value>
-  </data>
-  <data name="CheckedListBoxCheckedIndexCollectionIsReadOnly" xml:space="preserve">
+  </data><data name="CheckedListBoxCheckOnClickDescr" xml:space="preserve">
+    <value>Indicates if the check box should be toggled with the first click on an item.</value>
+  </data><data name="CheckedListBoxCheckedIndexCollectionIsReadOnly" xml:space="preserve">
     <value>CheckedListBox.CheckedIndexCollection is read only.</value>
-  </data>
-  <data name="CheckedListBoxCheckedItemCollectionIsReadOnly" xml:space="preserve">
+  </data><data name="CheckedListBoxCheckedItemCollectionIsReadOnly" xml:space="preserve">
     <value>CheckedListBox.CheckedItemCollection is read only.</value>
-  </data>
-  <data name="CheckedListBoxCheckOnClickDescr" xml:space="preserve">
-    <value>Indicates if the check box should be toggled with the first click on an item.</value>
-  </data>
-  <data name="CheckedListBoxInvalidSelectionMode" xml:space="preserve">
+  </data><data name="CheckedListBoxInvalidSelectionMode" xml:space="preserve">
     <value>Multi-selection is not supported on CheckedListBox.</value>
-  </data>
-  <data name="CheckedListBoxItemCheckDescr" xml:space="preserve">
+  </data><data name="CheckedListBoxItemCheckDescr" xml:space="preserve">
     <value>Indicates that an item is about to have its checked state changed. The value is not updated until after the event occurs.</value>
-  </data>
-  <data name="CheckedListBoxThreeDCheckBoxesDescr" xml:space="preserve">
+  </data><data name="CheckedListBoxThreeDCheckBoxesDescr" xml:space="preserve">
     <value>Indicates whether check boxes have a ButtonState of Flat or Normal.</value>
-  </data>
-  <data name="CircularOwner" xml:space="preserve">
+  </data><data name="CircularOwner" xml:space="preserve">
     <value>A circular control reference has been made. A control cannot be owned by or parented to itself.</value>
-  </data>
-  <data name="Clipboard_InvalidPath" xml:space="preserve">
-    <value>Path "{0}" in the argument "{1}" is not valid.</value>
-  </data>
-  <data name="ClipboardOperationFailed" xml:space="preserve">
+  </data><data name="ClipboardOperationFailed" xml:space="preserve">
     <value>Requested Clipboard operation did not succeed.</value>
-  </data>
-  <data name="ClipboardSecurityException" xml:space="preserve">
+  </data><data name="ClipboardOrDragDrop_CannotJsonSerializeDataObject" xml:space="preserve">
+    <value>An object of type 'DataObject' will serialize as empty. Use 'DataObject.SetDataAsJson' APIs on your object to JSON-serialize the data within your object, then use the '{0}' API with your object.</value>
+  </data><data name="ClipboardOrDragDrop_InvalidFormatTypeCombination" xml:space="preserve">
+    <value>The specified type '{0}' is not compatible with the specified format '{1}'.</value>
+  </data><data name="ClipboardOrDragDrop_InvalidType" xml:space="preserve">
+    <value>'{0}' is not a concrete type, and could result in an unbounded deserialization attempt. Please use a concrete type or alternatively define a 'resolver' function that supports types that you are expecting to retrieve from the clipboard or use in drag-and-drop operations.</value>
+  </data><data name="ClipboardOrDragDrop_TypedAPI_InvalidResolver" xml:space="preserve">
+    <value>Type {0} is not found. If this type is allowed, please ensure that the 'resolver' function provided in 'TryGetData&lt;T&gt;' APIs supports it.</value>
+  </data><data name="ClipboardOrDragDrop_UseTypedAPI" xml:space="preserve">
+    <value>Please use 'TryGetData&lt;T&gt;' APIs with a 'resolver' function that defines a set of allowed types to deserialize '{0}'.</value>
+  </data><data name="ClipboardSecurityException" xml:space="preserve">
     <value>Due to security restrictions on clipboard, the specified clipboard format cannot be set.</value>
-  </data>
-  <data name="CloseCaption" xml:space="preserve">
+  </data><data name="Clipboard_InvalidPath" xml:space="preserve">
+    <value>Path "{0}" in the argument "{1}" is not valid.</value>
+  </data><data name="CloseCaption" xml:space="preserve">
     <value>Close</value>
-  </data>
-  <data name="ClosingWhileCreatingHandle" xml:space="preserve">
+  </data><data name="ClosingWhileCreatingHandle" xml:space="preserve">
     <value>Value {0}() cannot be called while doing CreateHandle().</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Occurs whenever this collection's membership changes.</value>
-  </data>
-  <data name="collectionChangingEventDescr" xml:space="preserve">
-    <value>Occurs whenever this collection's membership is about to change.</value>
-  </data>
-  <data name="CollectionEmptyException" xml:space="preserve">
+  </data><data name="CollectionEmptyException" xml:space="preserve">
     <value>Cannot operate with an empty collection.</value>
-  </data>
-  <data name="ColumnAlignment" xml:space="preserve">
+  </data><data name="ColumnAlignment" xml:space="preserve">
     <value>Indicates the horizontal alignment of the text displayed in the column header.</value>
-  </data>
-  <data name="ColumnCaption" xml:space="preserve">
+  </data><data name="ColumnCaption" xml:space="preserve">
     <value>The text displayed in the column header.</value>
-  </data>
-  <data name="ColumnHeaderBadDisplayIndex" xml:space="preserve">
+  </data><data name="ColumnHeaderBadDisplayIndex" xml:space="preserve">
     <value>DisplayIndex value is out of bounds. Value must be greater than or equal to 0 and less than or equal to number of columns minus 1.</value>
-  </data>
-  <data name="ColumnHeaderCollectionInvalidArgument" xml:space="preserve">
+  </data><data name="ColumnHeaderCollectionInvalidArgument" xml:space="preserve">
     <value>Argument must be of type ColumnHeader.</value>
-  </data>
-  <data name="ColumnHeaderDisplayIndexDescr" xml:space="preserve">
+  </data><data name="ColumnHeaderDisplayIndexDescr" xml:space="preserve">
     <value>The display index of the column</value>
-  </data>
-  <data name="ColumnHeaderNameDescr" xml:space="preserve">
+  </data><data name="ColumnHeaderNameDescr" xml:space="preserve">
     <value>The name of the column header.</value>
-  </data>
-  <data name="ColumnWidth" xml:space="preserve">
+  </data><data name="ColumnWidth" xml:space="preserve">
     <value>The visual width of the column in pixels.</value>
-  </data>
-  <data name="COM2BadHandlerType" xml:space="preserve">
-    <value>Handler type ({0} != {1}) is not valid.</value>
-  </data>
-  <data name="COM2NamesAndValuesNotEqual" xml:space="preserve">
-    <value>Names and values must be non-null and of same length.</value>
-  </data>
-  <data name="COM2ReadonlyProperty" xml:space="preserve">
-    <value>Property {0} is read-only.</value>
-  </data>
-  <data name="COM2UnhandledVT" xml:space="preserve">
-    <value>Unhandled VT: {0}.</value>
-  </data>
-  <data name="ComboBoxAutoCompleteCustomSourceDescr" xml:space="preserve">
+  </data><data name="CombinationOfAccessibilitySwitchesNotSupported" xml:space="preserve">
+    <value>Desktop applications are required to opt in to all earlier accessibility improvements to get the later improvements. To do this, ensure that if the AppContext switch 'Switch.UseLegacyAccessibilityFeatures.N' is set to 'false', then 'Switch.UseLegacyAccessibilityFeatures' and all 'Switch.UseLegacyAccessibilityFeatures.M' switches, when M &lt; N, evaluate to false as well. Note that, if a switch for a particular set of accessibility improvements is not present, its value is determined by the target framework version. You can remedy this by adding these switches and setting their value to false.</value>
+  </data><data name="ComboBoxAutoCompleteCustomSourceDescr" xml:space="preserve">
     <value>The autocomplete custom source, which is a custom StringCollection used when the AutoCompleteSource is CustomSource.</value>
-  </data>
-  <data name="ComboBoxAutoCompleteModeDescr" xml:space="preserve">
+  </data><data name="ComboBoxAutoCompleteModeDescr" xml:space="preserve">
     <value>Indicates the text completion behavior of the combo box.</value>
-  </data>
-  <data name="ComboBoxAutoCompleteModeOnlyNoneAllowed" xml:space="preserve">
+  </data><data name="ComboBoxAutoCompleteModeOnlyNoneAllowed" xml:space="preserve">
     <value>Only the value AutoCompleteMode.None can be used when DropDownStyle is ComboBoxStyle.DropDownList and AutoCompleteSource is not AutoCompleteSource.ListItems.</value>
-  </data>
-  <data name="ComboBoxAutoCompleteSourceDescr" xml:space="preserve">
+  </data><data name="ComboBoxAutoCompleteSourceDescr" xml:space="preserve">
     <value>The source of complete strings used for automatic completion.</value>
-  </data>
-  <data name="ComboBoxAutoCompleteSourceOnlyListItemsAllowed" xml:space="preserve">
+  </data><data name="ComboBoxAutoCompleteSourceOnlyListItemsAllowed" xml:space="preserve">
     <value>Only the value AutoCompleteSource.ListItems can be used when DropDownStyle is ComboBoxStyle.DropDownList and AutoCompleteMode is not AutoCompleteMode.None.</value>
-  </data>
-  <data name="ComboBoxDataSourceWithSort" xml:space="preserve">
+  </data><data name="ComboBoxDataSourceWithSort" xml:space="preserve">
     <value>DataSource cannot be set in a combo box that is sorted.</value>
-  </data>
-  <data name="ComboBoxDrawModeDescr" xml:space="preserve">
+  </data><data name="ComboBoxDrawModeDescr" xml:space="preserve">
     <value>Indicates whether the code or the operating system will handle drawing of elements in the list.</value>
-  </data>
-  <data name="ComboBoxDropDownHeightDescr" xml:space="preserve">
+  </data><data name="ComboBoxDropDownHeightDescr" xml:space="preserve">
     <value>The height, in pixels, of the drop-down box in a combo box.</value>
-  </data>
-  <data name="ComboBoxDropDownStyleChangedDescr" xml:space="preserve">
+  </data><data name="ComboBoxDropDownStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DropDownStyle property changes.</value>
-  </data>
-  <data name="ComboBoxDropDownWidthDescr" xml:space="preserve">
+  </data><data name="ComboBoxDropDownWidthDescr" xml:space="preserve">
     <value>The width, in pixels, of the drop-down box in a combo box.</value>
-  </data>
-  <data name="ComboBoxDroppedDownDescr" xml:space="preserve">
+  </data><data name="ComboBoxDroppedDownDescr" xml:space="preserve">
     <value>Indicates if the combo box is currently dropped down.</value>
-  </data>
-  <data name="ComboBoxEditDefaultAccessibleName" xml:space="preserve">
+  </data><data name="ComboBoxEditDefaultAccessibleName" xml:space="preserve">
     <value>ComboBox</value>
-  </data>
-  <data name="ComboBoxFlatStyleDescr" xml:space="preserve">
+  </data><data name="ComboBoxFlatStyleDescr" xml:space="preserve">
     <value>Determines the display of the control.</value>
-  </data>
-  <data name="ComboBoxIntegralHeightDescr" xml:space="preserve">
+  </data><data name="ComboBoxIntegralHeightDescr" xml:space="preserve">
     <value>Indicates whether the combo box should resize to avoid showing partial items.</value>
-  </data>
-  <data name="ComboBoxItemHeightDescr" xml:space="preserve">
+  </data><data name="ComboBoxItemHeightDescr" xml:space="preserve">
     <value>The height, in pixels, of items in an owner-draw combo box.</value>
-  </data>
-  <data name="ComboBoxItemOverflow" xml:space="preserve">
+  </data><data name="ComboBoxItemOverflow" xml:space="preserve">
     <value>Too many items in the combo box.</value>
-  </data>
-  <data name="ComboBoxItemsDescr" xml:space="preserve">
+  </data><data name="ComboBoxItemsDescr" xml:space="preserve">
     <value>The items in the combo box.</value>
-  </data>
-  <data name="ComboBoxMaxDropDownItemsDescr" xml:space="preserve">
+  </data><data name="ComboBoxMaxDropDownItemsDescr" xml:space="preserve">
     <value>The maximum number of entries to display in the drop-down list.</value>
-  </data>
-  <data name="ComboBoxMaxLengthDescr" xml:space="preserve">
+  </data><data name="ComboBoxMaxLengthDescr" xml:space="preserve">
     <value>Specifies the maximum number of characters that can be entered into the combo box.</value>
-  </data>
-  <data name="ComboBoxOnDropDownClosedDescr" xml:space="preserve">
+  </data><data name="ComboBoxOnDropDownClosedDescr" xml:space="preserve">
     <value>Indicates that the drop-down portion of the combo box has closed.</value>
-  </data>
-  <data name="ComboBoxOnDropDownDescr" xml:space="preserve">
+  </data><data name="ComboBoxOnDropDownDescr" xml:space="preserve">
     <value>Occurs when the drop-down portion of the combo box is shown.</value>
-  </data>
-  <data name="ComboBoxOnTextUpdateDescr" xml:space="preserve">
+  </data><data name="ComboBoxOnTextUpdateDescr" xml:space="preserve">
     <value>Occurs when the combo box text has changed.</value>
-  </data>
-  <data name="ComboBoxPreferredHeightDescr" xml:space="preserve">
+  </data><data name="ComboBoxPreferredHeightDescr" xml:space="preserve">
     <value>The preferred height of this control.</value>
-  </data>
-  <data name="ComboBoxSelectedIndexDescr" xml:space="preserve">
+  </data><data name="ComboBoxSelectedIndexDescr" xml:space="preserve">
     <value>The index of the currently selected item of the combo box.</value>
-  </data>
-  <data name="ComboBoxSelectedItemDescr" xml:space="preserve">
+  </data><data name="ComboBoxSelectedItemDescr" xml:space="preserve">
     <value>The currently selected item in the combo box, or null.</value>
-  </data>
-  <data name="ComboBoxSelectedTextDescr" xml:space="preserve">
+  </data><data name="ComboBoxSelectedTextDescr" xml:space="preserve">
     <value>The selected text in the edit component of the combo box.</value>
-  </data>
-  <data name="ComboBoxSelectionLengthDescr" xml:space="preserve">
+  </data><data name="ComboBoxSelectionLengthDescr" xml:space="preserve">
     <value>The length of the selected text in the edit component of the combo box.</value>
-  </data>
-  <data name="ComboBoxSelectionStartDescr" xml:space="preserve">
+  </data><data name="ComboBoxSelectionStartDescr" xml:space="preserve">
     <value>The index of the first character in the selected text.</value>
-  </data>
-  <data name="ComboBoxSortedDescr" xml:space="preserve">
-    <value>Specifies whether items in the list portion of the combo box are sorted.</value>
-  </data>
-  <data name="ComboBoxSortWithDataSource" xml:space="preserve">
+  </data><data name="ComboBoxSortWithDataSource" xml:space="preserve">
     <value>ComboBox that has a DataSource set cannot be sorted. Sort the data using the underlying data model.</value>
-  </data>
-  <data name="ComboBoxStyleDescr" xml:space="preserve">
+  </data><data name="ComboBoxSortedDescr" xml:space="preserve">
+    <value>Specifies whether items in the list portion of the combo box are sorted.</value>
+  </data><data name="ComboBoxStyleDescr" xml:space="preserve">
     <value>Controls the appearance and functionality of the combo box.</value>
-  </data>
-  <data name="CommandIdNotAllocated" xml:space="preserve">
+  </data><data name="ComboBoxValueSelectedFormat" xml:space="preserve">
+    <value>{0} selected</value>
+  </data><data name="ComboboxDropDownButtonCloseName" xml:space="preserve">
+    <value>Close</value>
+  </data><data name="ComboboxDropDownButtonOpenName" xml:space="preserve">
+    <value>Open</value>
+  </data><data name="CommandCanExecuteChangedEventDescr" xml:space="preserve">
+    <value>Occurs when the ICommand.CanExecute(object?) status of the command which is assigned to the Command property has changed.</value>
+  </data><data name="CommandChangedEventDescr" xml:space="preserve">
+    <value>Occurs when the assigned ICommand object of the Command property has changed.</value>
+  </data><data name="CommandComponentCommandDescr" xml:space="preserve">
+    <value>Gets or sets the ICommand object whose Execute delegate gets executed whenever the Click event of this component gets invoked.</value>
+  </data><data name="CommandComponentCommandParameterDescr" xml:space="preserve">
+    <value>Gets or sets the parameter that is passed to the Command property's object on execution or on execution context request.</value>
+  </data><data name="CommandIdNotAllocated" xml:space="preserve">
     <value>New command ID cannot be allocated.</value>
-  </data>
-  <data name="CommonDialogHelpRequested" xml:space="preserve">
+  </data><data name="CommandParameterChangedEventDescr" xml:space="preserve">
+    <value>Occurs when the value of the CommandParameter property has changed.</value>
+  </data><data name="CommonDialogHelpRequested" xml:space="preserve">
     <value>Occurs when the user clicks the Help button.</value>
-  </data>
-  <data name="ComponentEditorFormBadComponent" xml:space="preserve">
+  </data><data name="ComponentEditorFormBadComponent" xml:space="preserve">
     <value>Parameter must be of type IComponent.</value>
-  </data>
-  <data name="ComponentEditorFormProperties" xml:space="preserve">
+  </data><data name="ComponentEditorFormProperties" xml:space="preserve">
     <value>{0} Properties</value>
-  </data>
-  <data name="ComponentEditorFormPropertiesNoName" xml:space="preserve">
+  </data><data name="ComponentEditorFormPropertiesNoName" xml:space="preserve">
     <value>Properties</value>
-  </data>
-  <data name="ComponentManagerProxyOutOfMemory" xml:space="preserve">
+  </data><data name="ComponentManagerProxyOutOfMemory" xml:space="preserve">
     <value>Unable to register the IMsoComponent.  The maximum number of registered IMsoComponents has been reached.</value>
-  </data>
-  <data name="Config_base_unrecognized_attribute" xml:space="preserve">
+  </data><data name="Config_base_unrecognized_attribute" xml:space="preserve">
     <value>Server cannot recognize the attribute {0}.</value>
-  </data>
-  <data name="ConnPointAdviseFailed" xml:space="preserve">
+  </data><data name="ConnPointAdviseFailed" xml:space="preserve">
     <value>IConnectionPoint::Advise did not succeed with hr=0x{0:X} for event interface {1}.</value>
-  </data>
-  <data name="ConnPointCouldNotCreate" xml:space="preserve">
+  </data><data name="ConnPointCouldNotCreate" xml:space="preserve">
     <value>Connection point for event interface '{0}' cannot be created.</value>
-  </data>
-  <data name="ConnPointSinkIF" xml:space="preserve">
+  </data><data name="ConnPointSinkIF" xml:space="preserve">
     <value>Sink object does not implement the event interface.</value>
-  </data>
-  <data name="ConnPointSourceIF" xml:space="preserve">
+  </data><data name="ConnPointSourceIF" xml:space="preserve">
     <value>Source object does not expose the {0} event interface.</value>
-  </data>
-  <data name="ConnPointUnhandledType" xml:space="preserve">
+  </data><data name="ConnPointUnhandledType" xml:space="preserve">
     <value>Unhandled type {0}.</value>
-  </data>
-  <data name="ContainerControlActiveControlDescr" xml:space="preserve">
+  </data><data name="ConstructorArgumentInvalidValueType" xml:space="preserve">
+    <value>Argument '{0}' cannot be converted to type '{1}'.</value>
+  </data><data name="ContainerControlActiveControlDescr" xml:space="preserve">
     <value>The currently active control.</value>
-  </data>
-  <data name="ContainerControlAutoScaleModeDescr" xml:space="preserve">
+  </data><data name="ContainerControlAutoScaleModeDescr" xml:space="preserve">
     <value>Determines how the form or control will scale when screen resolution or fonts change.</value>
-  </data>
-  <data name="ContainerControlAutoValidate" xml:space="preserve">
+  </data><data name="ContainerControlAutoValidate" xml:space="preserve">
     <value>Indicates whether controls in the container will be automatically validated when the focus changes.</value>
-  </data>
-  <data name="ContainerControlBindingContextDescr" xml:space="preserve">
+  </data><data name="ContainerControlBindingContextDescr" xml:space="preserve">
     <value>The binding manager for the container control.  This manages all bindings of child controls to lists.</value>
-  </data>
-  <data name="ContainerControlInvalidAutoScaleDimensions" xml:space="preserve">
+  </data><data name="ContainerControlInvalidAutoScaleDimensions" xml:space="preserve">
     <value>The width and height of AutoScaleDimensions must be greater than or equal to zero.</value>
-  </data>
-  <data name="ContainerControlOnAutoValidateChangedDescr" xml:space="preserve">
+  </data><data name="ContainerControlOnAutoValidateChangedDescr" xml:space="preserve">
     <value>Occurs whenever the AutoValidate property is changed.</value>
-  </data>
-  <data name="ContainerControlParentFormDescr" xml:space="preserve">
+  </data><data name="ContainerControlParentFormDescr" xml:space="preserve">
     <value>The parent form of this container control.</value>
-  </data>
-  <data name="ContextMenuStripSourceControlDescr" xml:space="preserve">
+  </data><data name="ContextMenuStripSourceControlDescr" xml:space="preserve">
     <value>The last control that caused this context menu strip to be displayed.</value>
-  </data>
-  <data name="ControlAccessibleObjectInvalid" xml:space="preserve">
-    <value>Control's accessible object is in an invalid state.</value>
-  </data>
-  <data name="ControlAccessibilityObjectDescr" xml:space="preserve">
+  </data><data name="ControlAccessibilityObjectDescr" xml:space="preserve">
     <value>The accessibility object for this control.</value>
-  </data>
-  <data name="ControlAccessibleDefaultActionDescr" xml:space="preserve">
+  </data><data name="ControlAccessibleDefaultActionDescr" xml:space="preserve">
     <value>The default action description of the control.</value>
-  </data>
-  <data name="ControlAccessibleDescriptionDescr" xml:space="preserve">
+  </data><data name="ControlAccessibleDescriptionDescr" xml:space="preserve">
     <value>The description that will be reported to accessibility clients.</value>
-  </data>
-  <data name="ControlAccessibleNameDescr" xml:space="preserve">
+  </data><data name="ControlAccessibleNameDescr" xml:space="preserve">
     <value>The name that will be reported to accessibility clients.</value>
-  </data>
-  <data name="ControlAccessibleRoleDescr" xml:space="preserve">
+  </data><data name="ControlAccessibleObjectInvalid" xml:space="preserve">
+    <value>Control's accessible object is in an invalid state.</value>
+  </data><data name="ControlAccessibleRoleDescr" xml:space="preserve">
     <value>The role that will be reported to accessibility clients.</value>
-  </data>
-  <data name="ControlAllowDropDescr" xml:space="preserve">
+  </data><data name="ControlAllowDropDescr" xml:space="preserve">
     <value>Indicates whether the control can accept data that the user drags onto it.</value>
-  </data>
-  <data name="ControlAllowTransparencyDescr" xml:space="preserve">
+  </data><data name="ControlAllowTransparencyDescr" xml:space="preserve">
     <value>Indicates whether the opacity of the control can be adjusted. </value>
-  </data>
-  <data name="ControlAnchorDescr" xml:space="preserve">
+  </data><data name="ControlAnchorDescr" xml:space="preserve">
     <value>Defines the edges of the container to which a certain control is bound. When a control is anchored to an edge, the distance between the control's closest edge and the specified edge will remain constant. </value>
-  </data>
-  <data name="ControlArrayCannotAddComponentArray" xml:space="preserve">
+  </data><data name="ControlArrayCannotAddComponentArray" xml:space="preserve">
     <value>Instance '{0}' cannot be added.  This instance is of a ComponentArrayBase type.</value>
-  </data>
-  <data name="ControlArrayCannotPerformAddCopy" xml:space="preserve">
+  </data><data name="ControlArrayCannotPerformAddCopy" xml:space="preserve">
     <value>Cannot perform ControlArray.AddCopy() because the ControlArray is empty.  Add the control you want copied to the first position in the ControlArray.</value>
-  </data>
-  <data name="ControlArrayCloningException" xml:space="preserve">
+  </data><data name="ControlArrayCloningException" xml:space="preserve">
     <value>Instance '{0}' must have a default constructor or one without parameters to be copied by the ControlArray.</value>
-  </data>
-  <data name="ControlArrayDuplicateException" xml:space="preserve">
+  </data><data name="ControlArrayDuplicateException" xml:space="preserve">
     <value>Instance '{0}' cannot be added.  This instance already exists in the ControlArray '{1}'.</value>
-  </data>
-  <data name="ControlArrayValidationException" xml:space="preserve">
+  </data><data name="ControlArrayValidationException" xml:space="preserve">
     <value>Type of '{0}' cannot be added to ControlArray.  Type of '{1}', or a type derived from that type, is expected.</value>
-  </data>
-  <data name="ControlAutoRelocateDescr" xml:space="preserve">
+  </data><data name="ControlAutoRelocateDescr" xml:space="preserve">
     <value>Specifies whether the control will be auto-relocated in response to the movement of peer controls.</value>
-  </data>
-  <data name="ControlAutoSizeDescr" xml:space="preserve">
+  </data><data name="ControlAutoSizeDescr" xml:space="preserve">
     <value>Specifies whether a control will automatically size itself to fit its contents.</value>
-  </data>
-  <data name="ControlAutoSizeModeDescr" xml:space="preserve">
+  </data><data name="ControlAutoSizeModeDescr" xml:space="preserve">
     <value>Specifies the mode by which the user interface element automatically resizes itself.</value>
-  </data>
-  <data name="ControlBackColorDescr" xml:space="preserve">
+  </data><data name="ControlBackColorDescr" xml:space="preserve">
     <value>The background color of the component. </value>
-  </data>
-  <data name="ControlBackgroundImageDescr" xml:space="preserve">
+  </data><data name="ControlBackgroundImageDescr" xml:space="preserve">
     <value>The background image used for the control.</value>
-  </data>
-  <data name="ControlBackgroundImageLayoutDescr" xml:space="preserve">
+  </data><data name="ControlBackgroundImageLayoutDescr" xml:space="preserve">
     <value>The background image layout used for the component.</value>
-  </data>
-  <data name="ControlBadAsyncResult" xml:space="preserve">
+  </data><data name="ControlBadAsyncResult" xml:space="preserve">
     <value>Parameter must be of type ThreadMethodEntry.</value>
-  </data>
-  <data name="ControlBadControl" xml:space="preserve">
+  </data><data name="ControlBadControl" xml:space="preserve">
     <value>Parameter must be of type Control.</value>
-  </data>
-  <data name="ControlBindingContextDescr" xml:space="preserve">
+  </data><data name="ControlBindingContextDescr" xml:space="preserve">
     <value>The binding context for the control.</value>
-  </data>
-  <data name="ControlBindingsDescr" xml:space="preserve">
+  </data><data name="ControlBindingsDescr" xml:space="preserve">
     <value>The data bindings for the control.</value>
-  </data>
-  <data name="ControlBottomDescr" xml:space="preserve">
+  </data><data name="ControlBottomDescr" xml:space="preserve">
     <value>The bottom of the control, in container coordinates.</value>
-  </data>
-  <data name="ControlBoundsDescr" xml:space="preserve">
+  </data><data name="ControlBoundsDescr" xml:space="preserve">
     <value>The bounds of the control, in container coordinates.</value>
-  </data>
-  <data name="ControlCanFocusDescr" xml:space="preserve">
+  </data><data name="ControlCanFocusDescr" xml:space="preserve">
     <value>Checks if this control can receive the focus.</value>
-  </data>
-  <data name="ControlCannotBeNull" xml:space="preserve">
-    <value>Control cannot be null.</value>
-  </data>
-  <data name="ControlCanSelectDescr" xml:space="preserve">
+  </data><data name="ControlCanSelectDescr" xml:space="preserve">
     <value>Checks if this control can be selected.</value>
-  </data>
-  <data name="ControlCaptureDescr" xml:space="preserve">
+  </data><data name="ControlCannotBeNull" xml:space="preserve">
+    <value>Control cannot be null.</value>
+  </data><data name="ControlCaptureDescr" xml:space="preserve">
     <value>Determines if this control is currently capturing all mouse input.</value>
-  </data>
-  <data name="ControlCausesValidationDescr" xml:space="preserve">
+  </data><data name="ControlCausesValidationDescr" xml:space="preserve">
     <value>Indicates whether this component raises validation events. </value>
-  </data>
-  <data name="ControlCheckForIllegalCrossThreadCalls" xml:space="preserve">
+  </data><data name="ControlCheckForIllegalCrossThreadCalls" xml:space="preserve">
     <value>Indicates whether illegal cross-thread calls raise exceptions. This can be used as a debugging aid.</value>
-  </data>
-  <data name="ControlClientRectangleDescr" xml:space="preserve">
+  </data><data name="ControlClientRectangleDescr" xml:space="preserve">
     <value>Retrieves the rectangle of the inner area of this control.</value>
-  </data>
-  <data name="ControlClientSizeDescr" xml:space="preserve">
+  </data><data name="ControlClientSizeDescr" xml:space="preserve">
     <value>Determines the size of the inner area of this control.</value>
-  </data>
-  <data name="ControlCompanyNameDescr" xml:space="preserve">
+  </data><data name="ControlCompanyNameDescr" xml:space="preserve">
     <value>Retrieves the company name for this control.</value>
-  </data>
-  <data name="ControlContainsFocusDescr" xml:space="preserve">
+  </data><data name="ControlContainsFocusDescr" xml:space="preserve">
     <value>Determines if this control or one if its children currently has the focus.</value>
-  </data>
-  <data name="ControlContextMenuDescr" xml:space="preserve">
+  </data><data name="ControlContextMenuDescr" xml:space="preserve">
     <value>The shortcut menu to display when the user right-clicks the control.</value>
-  </data>
-  <data name="ControlContextMenuStripChangedDescr" xml:space="preserve">
+  </data><data name="ControlContextMenuStripChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the ContextMenuStrip property changes.</value>
-  </data>
-  <data name="ControlControlsDescr" xml:space="preserve">
+  </data><data name="ControlControlsDescr" xml:space="preserve">
     <value>The collection of child controls within this control.</value>
-  </data>
-  <data name="ControlCreatedDescr" xml:space="preserve">
+  </data><data name="ControlCreatedDescr" xml:space="preserve">
     <value>Determines if the control has been fully created.</value>
-  </data>
-  <data name="ControlCursorDescr" xml:space="preserve">
+  </data><data name="ControlCursorDescr" xml:space="preserve">
     <value>The cursor that appears when the pointer moves over the control.</value>
-  </data>
-  <data name="ControlDisplayRectangleDescr" xml:space="preserve">
+  </data><data name="ControlDarkModeDescr" xml:space="preserve">
+    <value>Determines the dark mode setting for the control. This ambient property inherits its value from its parent control or from the Application class.</value>
+  </data><data name="ControlDataContextChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the DataContext property changes.</value>
+  </data><data name="ControlDisplayRectangleDescr" xml:space="preserve">
     <value>Retrieves the display rectangle of this control.</value>
-  </data>
-  <data name="ControlDisposedDescr" xml:space="preserve">
+  </data><data name="ControlDisposedDescr" xml:space="preserve">
     <value>Determines if this control has been disposed.</value>
-  </data>
-  <data name="ControlDisposingDescr" xml:space="preserve">
+  </data><data name="ControlDisposingDescr" xml:space="preserve">
     <value>Determines whether this control is in the process of being disposed. </value>
-  </data>
-  <data name="ControlDockDescr" xml:space="preserve">
+  </data><data name="ControlDockDescr" xml:space="preserve">
     <value>Defines which borders of the control are bound to the container. </value>
-  </data>
-  <data name="ControlDoubleBufferedDescr" xml:space="preserve">
+  </data><data name="ControlDoubleBufferedDescr" xml:space="preserve">
     <value>Indicates whether the control will be double buffered.</value>
-  </data>
-  <data name="ControlEnabledDescr" xml:space="preserve">
+  </data><data name="ControlDpiChangeScale" xml:space="preserve">
+    <value>Enable or disable automatic scaling of this control when dpi changes.</value>
+  </data><data name="ControlEnabledDescr" xml:space="preserve">
     <value>Indicates whether the control is enabled.</value>
-  </data>
-  <data name="ControlFocusedDescr" xml:space="preserve">
+  </data><data name="ControlFocusedDescr" xml:space="preserve">
     <value>Determines if this control has focus.</value>
-  </data>
-  <data name="ControlFontDescr" xml:space="preserve">
+  </data><data name="ControlFontDescr" xml:space="preserve">
     <value>The font used to display text in the control.</value>
-  </data>
-  <data name="ControlForeColorDescr" xml:space="preserve">
+  </data><data name="ControlForeColorDescr" xml:space="preserve">
     <value>The foreground color of this component, which is used to display text.</value>
-  </data>
-  <data name="ControlHandleCreatedDescr" xml:space="preserve">
+  </data><data name="ControlHandleCreatedDescr" xml:space="preserve">
     <value>Indicates whether the control has a handle associated with it.</value>
-  </data>
-  <data name="ControlHandleDescr" xml:space="preserve">
+  </data><data name="ControlHandleDescr" xml:space="preserve">
     <value>The native handle for this control.</value>
-  </data>
-  <data name="ControlHasChildrenDescr" xml:space="preserve">
+  </data><data name="ControlHasChildrenDescr" xml:space="preserve">
     <value>Indicates whether the control contains one or more child controls.</value>
-  </data>
-  <data name="ControlHeightDescr" xml:space="preserve">
+  </data><data name="ControlHeightDescr" xml:space="preserve">
     <value>The height of the user interface element, in pixels.</value>
-  </data>
-  <data name="ControlIMEModeDescr" xml:space="preserve">
+  </data><data name="ControlIMEModeDescr" xml:space="preserve">
     <value>Determines the IME (Input Method Editor) status of the object when selected.</value>
-  </data>
-  <data name="ControlInvalidLastScalingFactor" xml:space="preserve">
+  </data><data name="ControlInvalidLastScalingFactor" xml:space="preserve">
     <value>Scaling factor cannot be zero or empty.</value>
-  </data>
-  <data name="ControlInvokeRequiredDescr" xml:space="preserve">
+  </data><data name="ControlInvokeRequiredDescr" xml:space="preserve">
     <value>Determines if Invoke or BeginInvoke should be used to access this control cross-thread.</value>
-  </data>
-  <data name="ControlIsAccessibleDescr" xml:space="preserve">
+  </data><data name="ControlIsAccessibleDescr" xml:space="preserve">
     <value>Indicates whether the control is visible to accessibility applications.</value>
-  </data>
-  <data name="ControlIsKeyLockedNumCapsScrollLockKeysSupportedOnly" xml:space="preserve">
+  </data><data name="ControlIsKeyLockedNumCapsScrollLockKeysSupportedOnly" xml:space="preserve">
     <value>Specified key is not supported.</value>
-  </data>
-  <data name="ControlLeftDescr" xml:space="preserve">
+  </data><data name="ControlLeftDescr" xml:space="preserve">
     <value>The upper left of the control, in container coordinates.</value>
-  </data>
-  <data name="ControlLocationDescr" xml:space="preserve">
+  </data><data name="ControlLocationDescr" xml:space="preserve">
     <value>The coordinates of the upper-left corner of the control relative to the upper-left corner of its container.</value>
-  </data>
-  <data name="ControlMarginDescr" xml:space="preserve">
+  </data><data name="ControlMarginDescr" xml:space="preserve">
     <value>Specifies space between this control and another control's margin.</value>
-  </data>
-  <data name="ControlMaximumSizeDescr" xml:space="preserve">
+  </data><data name="ControlMaximumSizeDescr" xml:space="preserve">
     <value>Specifies the maximum size of the control.</value>
-  </data>
-  <data name="ControlMetaFileDCWrapperSizeInvalid" xml:space="preserve">
+  </data><data name="ControlMetaFileDCWrapperSizeInvalid" xml:space="preserve">
     <value>Size cannot have negative width or height.</value>
-  </data>
-  <data name="ControlMinimumSizeDescr" xml:space="preserve">
+  </data><data name="ControlMinimumSizeDescr" xml:space="preserve">
     <value>Specifies the minimum size of the control.</value>
-  </data>
-  <data name="ControlNotChild" xml:space="preserve">
+  </data><data name="ControlNotChild" xml:space="preserve">
     <value>'child' is not a child control of this parent.</value>
-  </data>
-  <data name="ControlOnAutoSizeChangedDescr" xml:space="preserve">
+  </data><data name="ControlNotSupportedInTrimming" xml:space="preserve">
+    <value>'{0}' is not supported in trimmed applications.</value>
+  </data><data name="ControlOnAutoSizeChangedDescr" xml:space="preserve">
     <value>Occurs when the AutoSize property has changed.</value>
-  </data>
-  <data name="ControlOnBackColorChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnBackColorChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the BackColor property is changed on Control.</value>
-  </data>
-  <data name="ControlOnBackgroundImageChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnBackgroundImageChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the BackgroundImage property is changed on Control.</value>
-  </data>
-  <data name="ControlOnBackgroundImageLayoutChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnBackgroundImageLayoutChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the BackgroundImageLayout property is changed on Control.</value>
-  </data>
-  <data name="ControlOnBindingContextChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnBindingContextChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the BindingContext property is changed on Control.</value>
-  </data>
-  <data name="ControlOnCausesValidationChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnCausesValidationChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the CausesValidation property is changed on Control.</value>
-  </data>
-  <data name="ControlOnChangeUICuesDescr" xml:space="preserve">
+  </data><data name="ControlOnChangeUICuesDescr" xml:space="preserve">
     <value>Occurs when focus rectangles and keyboard cue underlines are being shown or hidden.</value>
-  </data>
-  <data name="ControlOnClickDescr" xml:space="preserve">
+  </data><data name="ControlOnClickDescr" xml:space="preserve">
     <value>Occurs when the component is clicked.</value>
-  </data>
-  <data name="ControlOnClientSizeChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnClientSizeChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the ClientSize property is changed on Control.</value>
-  </data>
-  <data name="ControlOnContextMenuChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnContextMenuChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the ContextMenu property changes.</value>
-  </data>
-  <data name="ControlOnControlAddedDescr" xml:space="preserve">
+  </data><data name="ControlOnControlAddedDescr" xml:space="preserve">
     <value>Occurs when a control is added to this control.</value>
-  </data>
-  <data name="ControlOnControlRemovedDescr" xml:space="preserve">
+  </data><data name="ControlOnControlRemovedDescr" xml:space="preserve">
     <value>Occurs when a control is removed from this control.</value>
-  </data>
-  <data name="ControlOnCreateHandleDescr" xml:space="preserve">
+  </data><data name="ControlOnCreateHandleDescr" xml:space="preserve">
     <value>Occurs when the control's native handle is created.</value>
-  </data>
-  <data name="ControlOnCursorChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnCursorChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Cursor property is changed on Control.</value>
-  </data>
-  <data name="ControlOnDestroyHandleDescr" xml:space="preserve">
+  </data><data name="ControlOnDestroyHandleDescr" xml:space="preserve">
     <value>Occurs when the control's native handle is destroyed.</value>
-  </data>
-  <data name="ControlOnDockChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnDockChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Dock property is changed on Control.</value>
-  </data>
-  <data name="ControlOnDoubleClickDescr" xml:space="preserve">
+  </data><data name="ControlOnDoubleClickDescr" xml:space="preserve">
     <value>Occurs when the component is double-clicked.</value>
-  </data>
-  <data name="ControlOnDragDropDescr" xml:space="preserve">
+  </data><data name="ControlOnDpiChangedAfterParentDescr" xml:space="preserve">
+    <value>Occurs when the top level parent of this control is moved to a monitor with a different resolution and scaling level, or when parent's monitor scaling level is changed in Windows settings. Child windows receive this message after parent window receives DpiChanged event.</value>
+  </data><data name="ControlOnDpiChangedBeforeParentDescr" xml:space="preserve">
+    <value>Occurs when the top level parent of this control is moved to a monitor with a different resolution and scaling level, or when parent's monitor scaling level is changed in Windows settings. Child windows receive this message before parent window receives DpiChanged event.</value>
+  </data><data name="ControlOnDragDropDescr" xml:space="preserve">
     <value>Occurs when a drag-and-drop operation is completed.</value>
-  </data>
-  <data name="ControlOnDragEnterDescr" xml:space="preserve">
+  </data><data name="ControlOnDragEnterDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item into the client area for this Control.</value>
-  </data>
-  <data name="ControlOnDragLeaveDescr" xml:space="preserve">
+  </data><data name="ControlOnDragLeaveDescr" xml:space="preserve">
     <value>Occurs when an object is dragged out of the control's bounds.</value>
-  </data>
-  <data name="ControlOnDragOverDescr" xml:space="preserve">
+  </data><data name="ControlOnDragOverDescr" xml:space="preserve">
     <value>Occurs when an object is dragged over the control's bounds.</value>
-  </data>
-  <data name="ControlOnEnabledChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnEnabledChangedDescr" xml:space="preserve">
     <value>Occurs when the control's enabled state changes.</value>
-  </data>
-  <data name="ControlOnEnterDescr" xml:space="preserve">
+  </data><data name="ControlOnEnterDescr" xml:space="preserve">
     <value>Occurs when the control becomes the active control of the form.</value>
-  </data>
-  <data name="ControlOnFontChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnFontChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Font property is changed on Control.</value>
-  </data>
-  <data name="ControlOnForeColorChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnForeColorChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the ForeColor property is changed on Control.</value>
-  </data>
-  <data name="ControlOnGiveFeedbackDescr" xml:space="preserve">
+  </data><data name="ControlOnGiveFeedbackDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item. The system requests that the Control provide feedback to that effect.</value>
-  </data>
-  <data name="ControlOnGotFocusDescr" xml:space="preserve">
+  </data><data name="ControlOnGotFocusDescr" xml:space="preserve">
     <value>Occurs when the control gets focus.</value>
-  </data>
-  <data name="ControlOnHelpDescr" xml:space="preserve">
+  </data><data name="ControlOnHelpDescr" xml:space="preserve">
     <value>Occurs when the user invokes Help for the control.</value>
-  </data>
-  <data name="ControlOnImeModeChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnImeModeChangedDescr" xml:space="preserve">
     <value>Occurs when the control's input method editor (IME) mode changes.</value>
-  </data>
-  <data name="ControlOnInvalidateDescr" xml:space="preserve">
+  </data><data name="ControlOnInvalidateDescr" xml:space="preserve">
     <value>Occurs when a control's display requires redrawing.</value>
-  </data>
-  <data name="ControlOnKeyDownDescr" xml:space="preserve">
+  </data><data name="ControlOnKeyDownDescr" xml:space="preserve">
     <value>Occurs when a key is first pressed.</value>
-  </data>
-  <data name="ControlOnKeyPressDescr" xml:space="preserve">
+  </data><data name="ControlOnKeyPressDescr" xml:space="preserve">
     <value>Occurs when the control has focus and the user presses and releases a key.</value>
-  </data>
-  <data name="ControlOnKeyUpDescr" xml:space="preserve">
+  </data><data name="ControlOnKeyUpDescr" xml:space="preserve">
     <value>Occurs when a key is released.</value>
-  </data>
-  <data name="ControlOnLayoutDescr" xml:space="preserve">
+  </data><data name="ControlOnLayoutDescr" xml:space="preserve">
     <value>Occurs when the control is about to lay out its contents.</value>
-  </data>
-  <data name="ControlOnLeaveDescr" xml:space="preserve">
+  </data><data name="ControlOnLeaveDescr" xml:space="preserve">
     <value>Occurs when the control is no longer the active control of the form.</value>
-  </data>
-  <data name="ControlOnLocationChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnLocationChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Location property is changed on Control.</value>
-  </data>
-  <data name="ControlOnLostFocusDescr" xml:space="preserve">
+  </data><data name="ControlOnLostFocusDescr" xml:space="preserve">
     <value>Occurs when the control loses focus.</value>
-  </data>
-  <data name="ControlOnMarginChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnMarginChangedDescr" xml:space="preserve">
     <value>Occurs when the Margin property has changed.</value>
-  </data>
-  <data name="ControlOnMouseCaptureChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseCaptureChangedDescr" xml:space="preserve">
     <value>Occurs after the mouse capture is changed.</value>
-  </data>
-  <data name="ControlOnMouseClickDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseClickDescr" xml:space="preserve">
     <value>Occurs when the control is clicked by the mouse.</value>
-  </data>
-  <data name="ControlOnMouseDoubleClickDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseDoubleClickDescr" xml:space="preserve">
     <value>Occurs when the control is double clicked by the mouse.</value>
-  </data>
-  <data name="ControlOnMouseDownDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseDownDescr" xml:space="preserve">
     <value>Occurs when the mouse pointer is over the component and a mouse button is pressed.</value>
-  </data>
-  <data name="ControlOnMouseEnterDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseEnterDescr" xml:space="preserve">
     <value>Occurs when the mouse enters the visible part of the control.</value>
-  </data>
-  <data name="ControlOnMouseHoverDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseHoverDescr" xml:space="preserve">
     <value>Occurs when the mouse remains stationary inside of the control for an amount of time.</value>
-  </data>
-  <data name="ControlOnMouseLeaveDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseLeaveDescr" xml:space="preserve">
     <value>Occurs when the mouse leaves the visible part of the control.</value>
-  </data>
-  <data name="ControlOnMouseMoveDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseMoveDescr" xml:space="preserve">
     <value>Occurs when the mouse pointer is moved over the component.</value>
-  </data>
-  <data name="ControlOnMouseUpDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseUpDescr" xml:space="preserve">
     <value>Occurs when the mouse pointer is over the component and a mouse button is released.</value>
-  </data>
-  <data name="ControlOnMouseWheelDescr" xml:space="preserve">
+  </data><data name="ControlOnMouseWheelDescr" xml:space="preserve">
     <value>Occurs when the mouse wheel moves while the control has focus.</value>
-  </data>
-  <data name="ControlOnMoveDescr" xml:space="preserve">
+  </data><data name="ControlOnMoveDescr" xml:space="preserve">
     <value>Occurs when a control is moved.</value>
-  </data>
-  <data name="ControlOnPaddingChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnPaddingChangedDescr" xml:space="preserve">
     <value>Occurs when the Padding property has changed.</value>
-  </data>
-  <data name="ControlOnPaintDescr" xml:space="preserve">
+  </data><data name="ControlOnPaintDescr" xml:space="preserve">
     <value>Occurs when a control needs repainting.</value>
-  </data>
-  <data name="ControlOnParentChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnParentChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Parent property is changed on Control.</value>
-  </data>
-  <data name="ControlOnQueryAccessibilityHelpDescr" xml:space="preserve">
+  </data><data name="ControlOnQueryAccessibilityHelpDescr" xml:space="preserve">
     <value>Occurs when an Accessibility client invokes Help for the control.</value>
-  </data>
-  <data name="ControlOnQueryContinueDragDescr" xml:space="preserve">
+  </data><data name="ControlOnQueryContinueDragDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item. The system requests whether the drag-and-drop operation should be allowed to continue.</value>
-  </data>
-  <data name="ControlOnResizeBeginDescr" xml:space="preserve">
+  </data><data name="ControlOnResizeBeginDescr" xml:space="preserve">
     <value>Occurs when the control enters the sizing modal loop.</value>
-  </data>
-  <data name="ControlOnResizeDescr" xml:space="preserve">
+  </data><data name="ControlOnResizeDescr" xml:space="preserve">
     <value>Occurs when a control is resized.</value>
-  </data>
-  <data name="ControlOnResizeEndDescr" xml:space="preserve">
+  </data><data name="ControlOnResizeEndDescr" xml:space="preserve">
     <value>Occurs when the control exits the sizing modal loop.</value>
-  </data>
-  <data name="ControlOnRightToLeftChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnRightToLeftChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the RightToLeft property changes.</value>
-  </data>
-  <data name="ControlOnRightToLeftLayoutChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnRightToLeftLayoutChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the RightToLeftLayout property changes.</value>
-  </data>
-  <data name="ControlOnSizeChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnSizeChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Size property is changed on Control.</value>
-  </data>
-  <data name="ControlOnStyleChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnStyleChangedDescr" xml:space="preserve">
     <value>Event raised when the window style of a Control is changed.</value>
-  </data>
-  <data name="ControlOnSystemColorsChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnSystemColorsChangedDescr" xml:space="preserve">
     <value>Event raised when the system colors change.</value>
-  </data>
-  <data name="ControlOnTabIndexChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnTabIndexChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the TabIndex property is changed.</value>
-  </data>
-  <data name="ControlOnTabStopChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnTabStopChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the TabStop property is changed on Control.</value>
-  </data>
-  <data name="ControlOnTextChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnTextChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Text property is changed on Control.</value>
-  </data>
-  <data name="ControlOnValidatedDescr" xml:space="preserve">
+  </data><data name="ControlOnValidatedDescr" xml:space="preserve">
     <value>Occurs after a control has been successfully validated.</value>
-  </data>
-  <data name="ControlOnValidatingDescr" xml:space="preserve">
+  </data><data name="ControlOnValidatingDescr" xml:space="preserve">
     <value>Occurs when the control is validating.</value>
-  </data>
-  <data name="ControlOnVisibleChangedDescr" xml:space="preserve">
+  </data><data name="ControlOnVisibleChangedDescr" xml:space="preserve">
     <value>Occurs when the control's visibility changes.</value>
-  </data>
-  <data name="ControlPaddingDescr" xml:space="preserve">
+  </data><data name="ControlPaddingDescr" xml:space="preserve">
     <value>Specifies the interior spacing of a control.</value>
-  </data>
-  <data name="ControlParentDescr" xml:space="preserve">
+  </data><data name="ControlParentDescr" xml:space="preserve">
     <value>The parent of this control.</value>
-  </data>
-  <data name="ControlProductNameDescr" xml:space="preserve">
+  </data><data name="ControlProductNameDescr" xml:space="preserve">
     <value>Retrieves the name of the product associated with this component.</value>
-  </data>
-  <data name="ControlProductVersionDescr" xml:space="preserve">
+  </data><data name="ControlProductVersionDescr" xml:space="preserve">
     <value>Retrieves the version of the product associated with this component.</value>
-  </data>
-  <data name="ControlRecreatingHandleDescr" xml:space="preserve">
+  </data><data name="ControlRecreatingHandleDescr" xml:space="preserve">
     <value>Determines if this control is in the process of recreating its handle.</value>
-  </data>
-  <data name="ControlRegionChangedDescr" xml:space="preserve">
+  </data><data name="ControlRegionChangedDescr" xml:space="preserve">
     <value>Event raised when the value of Region property is changed on Control.</value>
-  </data>
-  <data name="ControlRegionDescr" xml:space="preserve">
+  </data><data name="ControlRegionDescr" xml:space="preserve">
     <value>The region, or shape, of this control.</value>
-  </data>
-  <data name="ControlResizeRedrawDescr" xml:space="preserve">
+  </data><data name="ControlResizeRedrawDescr" xml:space="preserve">
     <value>Indicates whether the control should redraw itself when resized.</value>
-  </data>
-  <data name="ControlRightDescr" xml:space="preserve">
+  </data><data name="ControlRightDescr" xml:space="preserve">
     <value>The distance, in pixels, between the right edge of the control and the left edge of its container's client area.</value>
-  </data>
-  <data name="ControlRightToLeftDescr" xml:space="preserve">
+  </data><data name="ControlRightToLeftDescr" xml:space="preserve">
     <value>Indicates whether the component should draw right-to-left for RTL languages.</value>
-  </data>
-  <data name="ControlRightToLeftLayoutDescr" xml:space="preserve">
+  </data><data name="ControlRightToLeftLayoutDescr" xml:space="preserve">
     <value>Indicates whether the control layout is right-to-left when the RightToLeft property is set to Yes.</value>
-  </data>
-  <data name="ControlSizeDescr" xml:space="preserve">
+  </data><data name="ControlSizeDescr" xml:space="preserve">
     <value>The size of the control in pixels.</value>
-  </data>
-  <data name="ControlTabIndexDescr" xml:space="preserve">
+  </data><data name="ControlTabIndexDescr" xml:space="preserve">
     <value>Determines the index in the TAB order that this control will occupy.</value>
-  </data>
-  <data name="ControlTabStopDescr" xml:space="preserve">
+  </data><data name="ControlTabStopDescr" xml:space="preserve">
     <value>Indicates whether the user can use the TAB key to give focus to the control.</value>
-  </data>
-  <data name="ControlTagDescr" xml:space="preserve">
+  </data><data name="ControlTagDescr" xml:space="preserve">
     <value>User-defined data associated with the object.</value>
-  </data>
-  <data name="ControlTextDescr" xml:space="preserve">
+  </data><data name="ControlTextDescr" xml:space="preserve">
     <value>The text associated with the control.</value>
-  </data>
-  <data name="ControlTopDescr" xml:space="preserve">
+  </data><data name="ControlTopDescr" xml:space="preserve">
     <value>The top of the control, in container coordinates.</value>
-  </data>
-  <data name="ControlTopLevelControlDescr" xml:space="preserve">
+  </data><data name="ControlTopLevelControlDescr" xml:space="preserve">
     <value>Retrieves the top-level control that contains this control.</value>
-  </data>
-  <data name="ControlUnsupportedProperty" xml:space="preserve">
+  </data><data name="ControlUnsupportedProperty" xml:space="preserve">
     <value>Getting value of property '{0}' is not supported by this method.</value>
-  </data>
-  <data name="ControlUserPreferenceChangedDescr" xml:space="preserve">
+  </data><data name="ControlUseWaitCursorDescr" xml:space="preserve">
+    <value>When this property is true, the Cursor property of the control and its child controls is set to WaitCursor.</value>
+  </data><data name="ControlUserPreferenceChangedDescr" xml:space="preserve">
     <value>Event raised when SystemInformation UserPreference changed event is raised</value>
-  </data>
-  <data name="ControlUserPreferenceChangingDescr" xml:space="preserve">
+  </data><data name="ControlUserPreferenceChangingDescr" xml:space="preserve">
     <value>Event raised when SystemInformation UserPreferenceChanging event is raised</value>
-  </data>
-  <data name="ControlUseWaitCursorDescr" xml:space="preserve">
-    <value>When this property is true, the Cursor property of the control and its child controls is set to WaitCursor.</value>
-  </data>
-  <data name="ControlVisibleDescr" xml:space="preserve">
+  </data><data name="ControlVisibleDescr" xml:space="preserve">
     <value>Determines whether the control is visible or hidden.</value>
-  </data>
-  <data name="ControlWidthDescr" xml:space="preserve">
+  </data><data name="ControlVisualStylesModeChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the VisualStylesMode property changes.</value>
+  </data><data name="ControlVisualStylesModeDescr" xml:space="preserve">
+    <value>Determines how the control renders itself when visual styles are applied.</value>
+  </data><data name="ControlWidthDescr" xml:space="preserve">
     <value>The width of the control, in container coordinates.</value>
-  </data>
-  <data name="ControlWindowTargetDescr" xml:space="preserve">
+  </data><data name="ControlWindowTargetDescr" xml:space="preserve">
     <value>The location where native messages will be routed.</value>
-  </data>
-  <data name="ControlWithScrollbarsPositionDescr" xml:space="preserve">
+  </data><data name="ControlWithScrollbarsPositionDescr" xml:space="preserve">
     <value>The coordinates of the upper-left corner of the control relative to the upper-left corner of its container.</value>
-  </data>
-  <data name="ControlWithScrollbarsVirtualSizeDescr" xml:space="preserve">
+  </data><data name="ControlWithScrollbarsVirtualSizeDescr" xml:space="preserve">
     <value>The size of the control if the screen were infinitely large.</value>
-  </data>
-  <data name="CurrencyManagerCantAddNew" xml:space="preserve">
+  </data><data name="ControlsCollectionShouldNotBeEmptyInGetNextControl" xml:space="preserve">
+    <value>{0} collection shouldn't be empty for {1}.</value>
+  </data><data name="ControlsPropertyNotSetInGetNextControl" xml:space="preserve">
+    <value>{0} property should be set for {1}.</value>
+  </data><data name="CurrencyManagerCantAddNew" xml:space="preserve">
     <value>The list must be an IBindingList to AddNew.</value>
-  </data>
-  <data name="CursorCannotCovertToBytes" xml:space="preserve">
+  </data><data name="CursorCannotCovertToBytes" xml:space="preserve">
     <value>System cursors cannot be converted to byte[].</value>
-  </data>
-  <data name="CursorCannotCovertToString" xml:space="preserve">
+  </data><data name="CursorCannotCovertToString" xml:space="preserve">
     <value>Custom cursors cannot be converted to string.</value>
-  </data>
-  <data name="CursorNonSerializableHandle" xml:space="preserve">
+  </data><data name="CursorNonSerializableHandle" xml:space="preserve">
     <value>Stock cursors cannot be serialized.</value>
-  </data>
-  <data name="DataBindingAddNewNotSupportedOnPropertyManager" xml:space="preserve">
+  </data><data name="DarkModeNotSupported" xml:space="preserve">
+    <value>Dark mode cannot be activated, either because of an activated High-Contrast mode or because the underlying OS does not support it.</value>
+  </data><data name="DataBindingAddNewNotSupportedOnPropertyManager" xml:space="preserve">
     <value>AddNew is not supported for property to property binding.</value>
-  </data>
-  <data name="DataBindingCycle" xml:space="preserve">
+  </data><data name="DataBindingCycle" xml:space="preserve">
     <value>Detected a property binding cycle for the property '{0}'</value>
-  </data>
-  <data name="DataBindingPushDataException" xml:space="preserve">
+  </data><data name="DataBindingPushDataException" xml:space="preserve">
     <value>DataBinding cannot find a row in the list that is suitable for all bindings.</value>
-  </data>
-  <data name="DataBindingRemoveAtNotSupportedOnPropertyManager" xml:space="preserve">
+  </data><data name="DataBindingRemoveAtNotSupportedOnPropertyManager" xml:space="preserve">
     <value>RemoveAt is not supported for property-to-property binding.</value>
-  </data>
-  <data name="DataGridView_AccButtonCellDefaultAction" xml:space="preserve">
+  </data><data name="DataGridViewAlternatingRowsDefaultCellStyleChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AlternatingRowsDefaultCellStyle property changes.</value>
+  </data><data name="DataGridViewAutoSizeColumnModeChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AutoSizeMode property of a column changes.</value>
+  </data><data name="DataGridViewAutoSizeColumnsModeChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AutoSizeColumnsMode property changes.</value>
+  </data><data name="DataGridViewAutoSizeRowsModeChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AutoSizeRowsMode property changes.</value>
+  </data><data name="DataGridViewBackgroundColorChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the DataGridView.BackgroundColor property changes.</value>
+  </data><data name="DataGridViewBackgroundColorDescr" xml:space="preserve">
+    <value>The background color of the DataGridView.</value>
+  </data><data name="DataGridViewBand_CannotSelect" xml:space="preserve">
+    <value>Selected property cannot be altered before this object is added to a DataGridView control.</value>
+  </data><data name="DataGridViewBand_MinimumHeightSmallerThanOne" xml:space="preserve">
+    <value>Minimum height provided cannot be smaller than {0}.</value>
+  </data><data name="DataGridViewBand_MinimumWidthSmallerThanOne" xml:space="preserve">
+    <value>Minimum width provided cannot be smaller than {0}.</value>
+  </data><data name="DataGridViewBand_NewRowCannotBeInvisible" xml:space="preserve">
+    <value>Uncommitted new row cannot be made invisible.</value>
+  </data><data name="DataGridViewBeginInit" xml:space="preserve">
+    <value>BeginInit() has already been called without an EndInit().</value>
+  </data><data name="DataGridViewBorderStyleChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the BorderStyle property changes.</value>
+  </data><data name="DataGridViewCellAccessibleObject_OwnerAlreadySet" xml:space="preserve">
+    <value>The owning DataGridViewCell object is already set.</value>
+  </data><data name="DataGridViewCellAccessibleObject_OwnerNotSet" xml:space="preserve">
+    <value>The owning DataGridViewCell object has not been set.</value>
+  </data><data name="DataGridViewCellAccessibleObject_OwnerWrongType" xml:space="preserve">
+    <value>DataGridViewCell of type {0} does not provide the Toggle pattern.</value>
+  </data><data name="DataGridViewCellCollection_AtLeastOneCellIsNull" xml:space="preserve">
+    <value>At least one of the provided cells is null.</value>
+  </data><data name="DataGridViewCellCollection_CannotAddIdenticalCells" xml:space="preserve">
+    <value>At least two provided cells are identical. Each provided cell must be unique.</value>
+  </data><data name="DataGridViewCellCollection_CellAlreadyBelongsToDataGridView" xml:space="preserve">
+    <value>Cell provided already belongs to a grid. This operation is not valid.</value>
+  </data><data name="DataGridViewCellCollection_CellAlreadyBelongsToDataGridViewRow" xml:space="preserve">
+    <value>Cell provided already belongs to a row. This operation is not valid.</value>
+  </data><data name="DataGridViewCellCollection_CellNotFound" xml:space="preserve">
+    <value>Cell provided cannot be found in the collection.</value>
+  </data><data name="DataGridViewCellCollection_OwningRowAlreadyBelongsToDataGridView" xml:space="preserve">
+    <value>Collection already belongs to a DataGridView control. This operation is no longer valid.</value>
+  </data><data name="DataGridViewCellStyleAlignmentDescr" xml:space="preserve">
+    <value>Indicates the position of the content within a cell.</value>
+  </data><data name="DataGridViewCellStyle_TransparentColorNotAllowed" xml:space="preserve">
+    <value>DataGridViewCellStyle does not support transparent {0}.</value>
+  </data><data name="DataGridViewCell_CannotSetReadOnlyState" xml:space="preserve">
+    <value>ReadOnly property of a cell cannot be set before it is added to a row.</value>
+  </data><data name="DataGridViewCell_CannotSetSelectedState" xml:space="preserve">
+    <value>Selected property of a cell cannot be set before the cell is added to a DataGridView control.</value>
+  </data><data name="DataGridViewCell_FormattedValueHasWrongType" xml:space="preserve">
+    <value>Formatted value of the cell has a wrong type.</value>
+  </data><data name="DataGridViewCell_FormattedValueTypeNull" xml:space="preserve">
+    <value>FormattedValueType property of a cell cannot be null.</value>
+  </data><data name="DataGridViewCell_ValueTypeNull" xml:space="preserve">
+    <value>ValueType property of a cell in a grid cannot be null.</value>
+  </data><data name="DataGridViewCheckBoxCellCheckedStateDescription" xml:space="preserve">
+    <value>{0} check box checked</value>
+  </data><data name="DataGridViewCheckBoxCellIndeterminateStateDescription" xml:space="preserve">
+    <value>{0} check box indeterminate</value>
+  </data><data name="DataGridViewCheckBoxCellUncheckedStateDescription" xml:space="preserve">
+    <value>{0} check box unchecked</value>
+  </data><data name="DataGridViewCheckBoxCell_ClipboardChecked" xml:space="preserve">
+    <value>Selected</value>
+  </data><data name="DataGridViewCheckBoxCell_ClipboardFalse" xml:space="preserve">
+    <value>False</value>
+  </data><data name="DataGridViewCheckBoxCell_ClipboardIndeterminate" xml:space="preserve">
+    <value>Indeterminate</value>
+  </data><data name="DataGridViewCheckBoxCell_ClipboardTrue" xml:space="preserve">
+    <value>True</value>
+  </data><data name="DataGridViewCheckBoxCell_ClipboardUnchecked" xml:space="preserve">
+    <value>Cleared</value>
+  </data><data name="DataGridViewCheckBoxCell_InvalidValueType" xml:space="preserve">
+    <value>The value provided for the DataGridViewCheckBoxCell has the wrong type.</value>
+  </data><data name="DataGridViewColumnCollection_ColumnNotFound" xml:space="preserve">
+    <value>Column named {0} cannot be found.</value>
+  </data><data name="DataGridViewColumnHeaderCell_SortModeAndSortGlyphDirectionClash" xml:space="preserve">
+    <value>Column header's SortGlyphDirection cannot be set to {0} while the column's SortMode is set to NotSortable.</value>
+  </data><data name="DataGridViewColumnHeadersDefaultCellStyleChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the ColumnHeadersDefaultCellStyle property changes.</value>
+  </data><data name="DataGridViewColumnHeadersHeightChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the ColumnHeadersHeight property changes.</value>
+  </data><data name="DataGridViewColumnHeadersVisibleDescr" xml:space="preserve">
+    <value>Indicates whether the column headers row is displayed.</value>
+  </data><data name="DataGridViewColumnSortModeChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the SortMode property for a column changes.</value>
+  </data><data name="DataGridViewColumn_AutoSizeCriteriaCannotUseInvisibleHeaders" xml:space="preserve">
+    <value>Column AutoSize mode cannot be based on the column headers alone while they are invisible.</value>
+  </data><data name="DataGridViewColumn_AutoSizeModeDescr" xml:space="preserve">
+    <value>Determines the auto size mode for this column.</value>
+  </data><data name="DataGridViewColumn_CellTemplateRequired" xml:space="preserve">
+    <value>Operation cannot be completed because this DataGridViewColumn does not have a CellTemplate.</value>
+  </data><data name="DataGridViewColumn_DisplayIndexExceedsColumnCount" xml:space="preserve">
+    <value>The DisplayIndex property of a DataGridViewColumn must be smaller than the number of columns.</value>
+  </data><data name="DataGridViewColumn_DisplayIndexNegative" xml:space="preserve">
+    <value>DisplayIndex property of a DataGridViewColumn cannot be negative.</value>
+  </data><data name="DataGridViewColumn_DisplayIndexTooLarge" xml:space="preserve">
+    <value>DisplayIndex property of a DataGridViewColumn must be smaller than {0}.</value>
+  </data><data name="DataGridViewColumn_DisplayIndexTooNegative" xml:space="preserve">
+    <value>The DisplayIndex property of a detached DataGridViewColumn cannot be smaller than -1.</value>
+  </data><data name="DataGridViewColumn_FillWeightDescr" xml:space="preserve">
+    <value>The weight that is used when sizing this column in the Fill auto size mode.</value>
+  </data><data name="DataGridViewColumn_FrozenColumnCannotAutoFill" xml:space="preserve">
+    <value>Column's AutoSize mode cannot be set to Fill when it is also a frozen column.</value>
+  </data><data name="DataGridViewColumn_SortModeAndSelectionModeClash" xml:space="preserve">
+    <value>Column's SortMode cannot be set to {0} while the DataGridView control's SelectionMode is set to {1}.</value>
+  </data><data name="DataGridViewComboBoxCell_DropDownWidthOutOfRange" xml:space="preserve">
+    <value>DropDownWidth value cannot be smaller than {0}.</value>
+  </data><data name="DataGridViewComboBoxCell_InvalidValue" xml:space="preserve">
+    <value>DataGridViewComboBoxCell value is not valid.</value>
+  </data><data name="DataGridViewComboBoxCell_MaxDropDownItemsOutOfRange" xml:space="preserve">
+    <value>MaxDropDownItems value cannot be smaller than {0} or larger than {1}.</value>
+  </data><data name="DataGridViewComboBoxCell_PropertyNotFound" xml:space="preserve">
+    <value>Property called {0} does not exist.</value>
+  </data><data name="DataGridViewDataMemberChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the DataMember property changes.</value>
+  </data><data name="DataGridViewDataMemberDescr" xml:space="preserve">
+    <value>Indicates a sub-list of the DataSource to show in the DataGridView control.</value>
+  </data><data name="DataGridViewDataSourceChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the DataSource property changes.</value>
+  </data><data name="DataGridViewDataSourceDescr" xml:space="preserve">
+    <value>Indicates the source of data for the DataGridView control.</value>
+  </data><data name="DataGridViewDefaultCellStyleChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the DefaultCellStyle property changes.</value>
+  </data><data name="DataGridViewEditingPanelUiaProviderDescription" xml:space="preserve">
+    <value>DataGridView EditingPanel UI Automation provider</value>
+  </data><data name="DataGridViewElementPaintingEventArgs_ColumnIndexOutOfRange" xml:space="preserve">
+    <value>ColumnIndex property is out of range.</value>
+  </data><data name="DataGridViewElementPaintingEventArgs_RowIndexOutOfRange" xml:space="preserve">
+    <value>RowIndex property is out of range.</value>
+  </data><data name="DataGridViewGridColorDescr" xml:space="preserve">
+    <value>The color of the grid lines separating the cells of the DataGridView.</value>
+  </data><data name="DataGridViewImageColumn_DescriptionDescr" xml:space="preserve">
+    <value>User-defined text associated with the image.</value>
+  </data><data name="DataGridViewImageColumn_IconDescr" xml:space="preserve">
+    <value>The icon displayed in the cells of this column when the cell's DataGridViewCell.Value property is not set and the cell's DataGridViewImageCell.ValueIsIcon property is set to true.</value>
+  </data><data name="DataGridViewImageColumn_ImageDescr" xml:space="preserve">
+    <value>The image displayed in the cells of this column when the cell's DataGridViewCell.Value property is not set and the cell's DataGridViewImageCell.ValueIsIcon property is set to false.</value>
+  </data><data name="DataGridViewImageColumn_ImageLayoutDescr" xml:space="preserve">
+    <value>The image layout in the cells for this column.</value>
+  </data><data name="DataGridViewImageColumn_PaddingDescr" xml:space="preserve">
+    <value>ImageColumnPadding</value>
+  </data><data name="DataGridViewImageColumn_ValuesAreIconsDescr" xml:space="preserve">
+    <value>Indicates whether cells in this column display System.Drawing.Icon values.</value>
+  </data><data name="DataGridViewOnAllowUserToAddRowsChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AllowUserToAddRows property changes.</value>
+  </data><data name="DataGridViewOnAllowUserToDeleteRowsChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AllowUserToDeleteRows property changes.</value>
+  </data><data name="DataGridViewOnAllowUserToOrderColumnsChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AllowUserToOrderColumns property changes.</value>
+  </data><data name="DataGridViewOnAllowUserToResizeColumnsChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AllowUserToResizeColumns property changes.</value>
+  </data><data name="DataGridViewOnAllowUserToResizeRowsChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the AllowUserToResizeRows property changes.</value>
+  </data><data name="DataGridViewOnGridColorChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the GridColor property changes.</value>
+  </data><data name="DataGridViewOnMultiSelectChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the MultiSelect property changes.</value>
+  </data><data name="DataGridViewOnReadOnlyChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the ReadOnly property changes.</value>
+  </data><data name="DataGridViewRowAccessibleObject_OwnerAlreadySet" xml:space="preserve">
+    <value>Owning DataGridViewRow object is already set.</value>
+  </data><data name="DataGridViewRowAccessibleObject_OwnerNotSet" xml:space="preserve">
+    <value>Owning DataGridViewRow object has not been set.</value>
+  </data><data name="DataGridViewRowCollection_AddUnboundRow" xml:space="preserve">
+    <value>Rows cannot be programmatically added to the DataGridView's rows collection when the control is data-bound.</value>
+  </data><data name="DataGridViewRowCollection_CannotAddOrInsertSelectedRow" xml:space="preserve">
+    <value>Selected row cannot be added to or inserted into the DataGridView control. The row must be deselected first.</value>
+  </data><data name="DataGridViewRowCollection_CannotDeleteNewRow" xml:space="preserve">
+    <value>Uncommitted new row cannot be deleted.</value>
+  </data><data name="DataGridViewRowCollection_CantClearRowCollectionWithWrongSource" xml:space="preserve">
+    <value>Rows collection cannot be programmatically cleared when the DataGridView control is data-bound to anything else than an IBindingList that supports change notification and allows deletion.</value>
+  </data><data name="DataGridViewRowCollection_CantRemoveRowsWithWrongSource" xml:space="preserve">
+    <value>Rows cannot be programmatically removed unless the DataGridView is data-bound to an IBindingList that supports change notification and allows deletion.</value>
+  </data><data name="DataGridViewRowCollection_CountOutOfRange" xml:space="preserve">
+    <value>Number of copies to create must be strictly positive.</value>
+  </data><data name="DataGridViewRowCollection_EnumFinished" xml:space="preserve">
+    <value>Enumeration already finished.</value>
+  </data><data name="DataGridViewRowCollection_EnumNotStarted" xml:space="preserve">
+    <value>Enumeration has not started. Call MoveNext.</value>
+  </data><data name="DataGridViewRowCollection_IndexDestinationOutOfRange" xml:space="preserve">
+    <value>Index of the destination row is out of range.</value>
+  </data><data name="DataGridViewRowCollection_IndexSourceOutOfRange" xml:space="preserve">
+    <value>Index of the row to copy is out of range.</value>
+  </data><data name="DataGridViewRowCollection_NoColumns" xml:space="preserve">
+    <value>No row can be added to a DataGridView control that does not have columns. Columns must be added first.</value>
+  </data><data name="DataGridViewRowCollection_NoInsertionAfterNewRow" xml:space="preserve">
+    <value>No row can be inserted after the uncommitted new row.</value>
+  </data><data name="DataGridViewRowCollection_NoRowToDuplicate" xml:space="preserve">
+    <value>No row exists to make a copy of. A first row must be added to the DataGridView control before you can add copies of it.</value>
+  </data><data name="DataGridViewRowCollection_RowIndexOutOfRange" xml:space="preserve">
+    <value>Row index provided is out of range.</value>
+  </data><data name="DataGridViewRowCollection_RowTemplateTooManyCells" xml:space="preserve">
+    <value>The RowTemplate row contains more cells than there are columns.</value>
+  </data><data name="DataGridViewRowCollection_TooManyCells" xml:space="preserve">
+    <value>Provided row contains more cells than there are columns.</value>
+  </data><data name="DataGridViewRowHeadersDefaultCellStyleChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the RowHeadersDefaultCellStyle property changes.</value>
+  </data><data name="DataGridViewRowHeadersVisibleDescr" xml:space="preserve">
+    <value>Indicates whether the column that contains row headers is displayed.</value>
+  </data><data name="DataGridViewRowHeadersWidthChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the RowHeadersWidth property changes.</value>
+  </data><data name="DataGridViewRowsDefaultCellStyleChangedDescr" xml:space="preserve">
+    <value>Occurs when the value of the RowsDefaultCellStyle property changes.</value>
+  </data><data name="DataGridViewSortedAscendingAccessibleStatusFormat" xml:space="preserve">
+    <value>Sorted ascending by {0}.</value>
+  </data><data name="DataGridViewSortedDescendingAccessibleStatusFormat" xml:space="preserve">
+    <value>Sorted descending by {0}.</value>
+  </data><data name="DataGridViewTopRowAccessibleObject_OwnerAlreadySet" xml:space="preserve">
+    <value>The owning DataGridView control is already set.</value>
+  </data><data name="DataGridViewTopRowAccessibleObject_OwnerNotSet" xml:space="preserve">
+    <value>The owning DataGridView control has not been set.</value>
+  </data><data name="DataGridViewTypeColumn_WrongCellTemplateType" xml:space="preserve">
+    <value>Value provided for CellTemplate must be of type {0} or derive from it.</value>
+  </data><data name="DataGridViewVirtualModeDescr" xml:space="preserve">
+    <value>Indicates whether you have provided your own data-management operations for the DataGridView control. </value>
+  </data><data name="DataGridView_AColumnHasNoCellTemplate" xml:space="preserve">
+    <value>At least one of the DataGridView control's columns has no cell template.</value>
+  </data><data name="DataGridView_AccButtonCellDefaultAction" xml:space="preserve">
     <value>Press</value>
-  </data>
-  <data name="DataGridView_AccCellDefaultAction" xml:space="preserve">
+  </data><data name="DataGridView_AccCellDefaultAction" xml:space="preserve">
     <value>Edit</value>
-  </data>
-  <data name="DataGridView_AccCheckBoxCellDefaultActionCheck" xml:space="preserve">
+  </data><data name="DataGridView_AccCheckBoxCellDefaultActionCheck" xml:space="preserve">
     <value>Press to check</value>
-  </data>
-  <data name="DataGridView_AccCheckBoxCellDefaultActionUncheck" xml:space="preserve">
+  </data><data name="DataGridView_AccCheckBoxCellDefaultActionUncheck" xml:space="preserve">
     <value>Press to uncheck</value>
-  </data>
-  <data name="DataGridView_AccColumnHeaderCellDefaultAction" xml:space="preserve">
+  </data><data name="DataGridView_AccColumnHeaderCellDefaultAction" xml:space="preserve">
     <value>Press to sort column</value>
-  </data>
-  <data name="DataGridView_AccColumnHeaderCellSelectDefaultAction" xml:space="preserve">
+  </data><data name="DataGridView_AccColumnHeaderCellSelectDefaultAction" xml:space="preserve">
     <value>Press to select column</value>
-  </data>
-  <data name="DataGridView_AccDataGridViewCellName" xml:space="preserve">
+  </data><data name="DataGridView_AccDataGridViewCellName" xml:space="preserve">
     <value>{0} Row {1}</value>
-  </data>
-  <data name="DataGridView_AccEditingControlAccName" xml:space="preserve">
+  </data><data name="DataGridView_AccEditingControlAccName" xml:space="preserve">
     <value>Editing Control</value>
-  </data>
-  <data name="DataGridView_AccEditingPanelAccName" xml:space="preserve">
+  </data><data name="DataGridView_AccEditingPanelAccName" xml:space="preserve">
     <value>Editing Panel</value>
-  </data>
-  <data name="DataGridView_AccHorizontalScrollBarAccName" xml:space="preserve">
+  </data><data name="DataGridView_AccHorizontalScrollBarAccName" xml:space="preserve">
     <value>Horizontal</value>
-  </data>
-  <data name="DataGridView_AccLinkCellDefaultAction" xml:space="preserve">
+  </data><data name="DataGridView_AccLinkCellDefaultAction" xml:space="preserve">
     <value>Click</value>
-  </data>
-  <data name="DataGridView_AccNullValue" xml:space="preserve">
+  </data><data name="DataGridView_AccNullValue" xml:space="preserve">
     <value>(null)</value>
-  </data>
-  <data name="DataGridView_AccRowCreateNew" xml:space="preserve">
+  </data><data name="DataGridView_AccRowCreateNew" xml:space="preserve">
     <value>(Create New)</value>
-  </data>
-  <data name="DataGridView_AccRowName" xml:space="preserve">
+  </data><data name="DataGridView_AccRowName" xml:space="preserve">
     <value>Row {0}</value>
-  </data>
-  <data name="DataGridView_AccSelectedCellsName" xml:space="preserve">
+  </data><data name="DataGridView_AccSelectedCellsName" xml:space="preserve">
     <value>Selected Cells</value>
-  </data>
-  <data name="DataGridView_AccSelectedRowCellsName" xml:space="preserve">
+  </data><data name="DataGridView_AccSelectedRowCellsName" xml:space="preserve">
     <value>Selected Row Cells</value>
-  </data>
-  <data name="DataGridView_AccTopLeftColumnHeaderCellDefaultAction" xml:space="preserve">
+  </data><data name="DataGridView_AccTopLeftColumnHeaderCellDefaultAction" xml:space="preserve">
     <value>Press to Select All</value>
-  </data>
-  <data name="DataGridView_AccTopLeftColumnHeaderCellName" xml:space="preserve">
+  </data><data name="DataGridView_AccTopLeftColumnHeaderCellName" xml:space="preserve">
     <value>Top Left Header Cell</value>
-  </data>
-  <data name="DataGridView_AccTopLeftColumnHeaderCellNameRTL" xml:space="preserve">
+  </data><data name="DataGridView_AccTopLeftColumnHeaderCellNameRTL" xml:space="preserve">
     <value>Top Right Header Cell</value>
-  </data>
-  <data name="DataGridView_AccTopRow" xml:space="preserve">
+  </data><data name="DataGridView_AccTopRow" xml:space="preserve">
     <value>Top Row</value>
-  </data>
-  <data name="DataGridView_AccVerticalScrollBarAccName" xml:space="preserve">
+  </data><data name="DataGridView_AccVerticalScrollBarAccName" xml:space="preserve">
     <value>Vertical</value>
-  </data>
-  <data name="DataGridView_AColumnHasNoCellTemplate" xml:space="preserve">
-    <value>At least one of the DataGridView control's columns has no cell template.</value>
-  </data>
-  <data name="DataGridView_AdvancedCellBorderStyleInvalid" xml:space="preserve">
+  </data><data name="DataGridView_AdvancedCellBorderStyleInvalid" xml:space="preserve">
     <value>Property {0} cannot be set to the advanced cell border style provided.</value>
-  </data>
-  <data name="DataGridView_AllowUserToAddRowsDescr" xml:space="preserve">
+  </data><data name="DataGridView_AllowUserToAddRowsDescr" xml:space="preserve">
     <value>Indicates whether the option to add rows is displayed to the user.</value>
-  </data>
-  <data name="DataGridView_AllowUserToDeleteRowsDescr" xml:space="preserve">
+  </data><data name="DataGridView_AllowUserToDeleteRowsDescr" xml:space="preserve">
     <value>Indicates whether the user is allowed to delete rows from the DataGridView.</value>
-  </data>
-  <data name="DataGridView_AllowUserToOrderColumnsDescr" xml:space="preserve">
+  </data><data name="DataGridView_AllowUserToOrderColumnsDescr" xml:space="preserve">
     <value>Indicates whether manual column repositioning is enabled. </value>
-  </data>
-  <data name="DataGridView_AllowUserToResizeColumnsDescr" xml:space="preserve">
+  </data><data name="DataGridView_AllowUserToResizeColumnsDescr" xml:space="preserve">
     <value>Indicates whether users can resize columns.</value>
-  </data>
-  <data name="DataGridView_AllowUserToResizeRowsDescr" xml:space="preserve">
+  </data><data name="DataGridView_AllowUserToResizeRowsDescr" xml:space="preserve">
     <value>Indicates whether users can resize rows.</value>
-  </data>
-  <data name="DataGridView_AlternatingRowsDefaultCellStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_AlternatingRowsDefaultCellStyleDescr" xml:space="preserve">
     <value>The default cell style applied to odd-numbered rows. </value>
-  </data>
-  <data name="DataGridView_AtLeastOneColumnIsNull" xml:space="preserve">
+  </data><data name="DataGridView_AtLeastOneColumnIsNull" xml:space="preserve">
     <value>At least one of the provided columns is null.</value>
-  </data>
-  <data name="DataGridView_AtLeastOneRowIsNull" xml:space="preserve">
+  </data><data name="DataGridView_AtLeastOneRowIsNull" xml:space="preserve">
     <value>At least one of the provided rows is null.</value>
-  </data>
-  <data name="DataGridView_AutoSizeColumnsModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_AutoSizeColumnsModeDescr" xml:space="preserve">
     <value>Determines the auto size mode for the visible columns.</value>
-  </data>
-  <data name="DataGridView_AutoSizeRowsModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_AutoSizeRowsModeDescr" xml:space="preserve">
     <value>Determines the auto size mode for the visible rows.</value>
-  </data>
-  <data name="DataGridView_BeginEditNotReentrant" xml:space="preserve">
+  </data><data name="DataGridView_BeginEditNotReentrant" xml:space="preserve">
     <value>Operation is not valid because it results in a reentrant call to the BeginEdit function.</value>
-  </data>
-  <data name="DataGridView_BorderStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_BorderStyleDescr" xml:space="preserve">
     <value>The border style for the DataGridView.</value>
-  </data>
-  <data name="DataGridView_ButtonColumnFlatStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_ButtonColumnFlatStyleDescr" xml:space="preserve">
     <value>The flat style appearance of the button cells in the column.</value>
-  </data>
-  <data name="DataGridView_ButtonColumnTextDescr" xml:space="preserve">
+  </data><data name="DataGridView_ButtonColumnTextDescr" xml:space="preserve">
     <value>The default text displayed on the button cell.</value>
-  </data>
-  <data name="DataGridView_ButtonColumnUseColumnTextForButtonValueDescr" xml:space="preserve">
+  </data><data name="DataGridView_ButtonColumnUseColumnTextForButtonValueDescr" xml:space="preserve">
     <value>Indicates whether the DataGridViewButtonColumn.Text property value is displayed as the button text for cells in this column.</value>
-  </data>
-  <data name="DataGridView_CancelRowEditDescr" xml:space="preserve">
+  </data><data name="DataGridView_CancelRowEditDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.VirtualMode property of a DataGridView control is true and a row edit should be canceled.</value>
-  </data>
-  <data name="DataGridView_CannotAddAutoFillColumn" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddAutoFillColumn" xml:space="preserve">
     <value>Visible column cannot be added because its AutoSize mode is Fill, and the column is frozen.</value>
-  </data>
-  <data name="DataGridView_CannotAddAutoSizedColumn" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddAutoSizedColumn" xml:space="preserve">
     <value>Visible column cannot be added because its AutoSize mode includes its header, and the column headers are invisible.</value>
-  </data>
-  <data name="DataGridView_CannotAddFrozenColumn" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddFrozenColumn" xml:space="preserve">
     <value>Column cannot be added because it is frozen and placed after an unfrozen column.</value>
-  </data>
-  <data name="DataGridView_CannotAddFrozenRow" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddFrozenRow" xml:space="preserve">
     <value>Row cannot be added because it is frozen and placed after an unfrozen row.</value>
-  </data>
-  <data name="DataGridView_CannotAddIdenticalColumns" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddIdenticalColumns" xml:space="preserve">
     <value>At least two provided columns are identical. Each provided column must be unique.</value>
-  </data>
-  <data name="DataGridView_CannotAddIdenticalRows" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddIdenticalRows" xml:space="preserve">
     <value>At least two provided rows are identical. Each provided row must be unique.</value>
-  </data>
-  <data name="DataGridView_CannotAddNonFrozenColumn" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddNonFrozenColumn" xml:space="preserve">
     <value>Column cannot be added because it is unfrozen and placed before a frozen column.</value>
-  </data>
-  <data name="DataGridView_CannotAddNonFrozenRow" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddNonFrozenRow" xml:space="preserve">
     <value>Row cannot be added because it is unfrozen and placed before a frozen row.</value>
-  </data>
-  <data name="DataGridView_CannotAddUntypedColumn" xml:space="preserve">
+  </data><data name="DataGridView_CannotAddUntypedColumn" xml:space="preserve">
     <value>Column cannot be added because its CellType property is null.</value>
-  </data>
-  <data name="DataGridView_CannotAlterAutoFillColumnParameter" xml:space="preserve">
+  </data><data name="DataGridView_CannotAlterAutoFillColumnParameter" xml:space="preserve">
     <value>This operation cannot be performed while an auto-filled column is being resized.</value>
-  </data>
-  <data name="DataGridView_CannotAlterDisplayIndexWithinAdjustments" xml:space="preserve">
+  </data><data name="DataGridView_CannotAlterDisplayIndexWithinAdjustments" xml:space="preserve">
     <value>This operation cannot be performed while the DisplayIndex of a column is being adjusted.</value>
-  </data>
-  <data name="DataGridView_CannotAutoFillFrozenColumns" xml:space="preserve">
+  </data><data name="DataGridView_CannotAutoFillFrozenColumns" xml:space="preserve">
     <value>Columns AutoSize mode cannot be set to Fill because at least one visible column would inherit this AutoSize mode and is frozen.</value>
-  </data>
-  <data name="DataGridView_CannotAutoSizeColumnsInvisibleColumnHeaders" xml:space="preserve">
+  </data><data name="DataGridView_CannotAutoSizeColumnsInvisibleColumnHeaders" xml:space="preserve">
     <value>Columns AutoSize mode cannot be based exclusively on the headers because the column headers are invisible and at least one visible column would inherit this AutoSize mode.</value>
-  </data>
-  <data name="DataGridView_CannotAutoSizeInvisibleColumnHeader" xml:space="preserve">
+  </data><data name="DataGridView_CannotAutoSizeInvisibleColumnHeader" xml:space="preserve">
     <value>Column AutoSize mode cannot be based exclusively on the header because the column headers are invisible.</value>
-  </data>
-  <data name="DataGridView_CannotAutoSizeRowInvisibleRowHeader" xml:space="preserve">
+  </data><data name="DataGridView_CannotAutoSizeRowInvisibleRowHeader" xml:space="preserve">
     <value>Row AutoSize mode cannot be based on the row headers alone while they are invisible.</value>
-  </data>
-  <data name="DataGridView_CannotAutoSizeRowsInvisibleRowHeader" xml:space="preserve">
+  </data><data name="DataGridView_CannotAutoSizeRowsInvisibleRowHeader" xml:space="preserve">
     <value>Rows AutoSize mode cannot be based on the row headers alone while they are invisible.</value>
-  </data>
-  <data name="DataGridView_CannotMakeAutoSizedColumnVisible" xml:space="preserve">
+  </data><data name="DataGridView_CannotMakeAutoSizedColumnVisible" xml:space="preserve">
     <value>Column cannot be made visible because its AutoSize mode includes its header and the column headers are invisible.</value>
-  </data>
-  <data name="DataGridView_CannotMoveFrozenColumn" xml:space="preserve">
+  </data><data name="DataGridView_CannotMoveFrozenColumn" xml:space="preserve">
     <value>Frozen column cannot be moved after an unfrozen column.</value>
-  </data>
-  <data name="DataGridView_CannotMoveNonFrozenColumn" xml:space="preserve">
+  </data><data name="DataGridView_CannotMoveNonFrozenColumn" xml:space="preserve">
     <value>Unfrozen column cannot be moved before a frozen column.</value>
-  </data>
-  <data name="DataGridView_CannotSetColumnCountOnDataBoundDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_CannotSetColumnCountOnDataBoundDataGridView" xml:space="preserve">
     <value>ColumnCount property cannot be set on a data-bound DataGridView control.</value>
-  </data>
-  <data name="DataGridView_CannotSetRowCountOnDataBoundDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_CannotSetRowCountOnDataBoundDataGridView" xml:space="preserve">
     <value>RowCount property cannot be set on a data-bound DataGridView control.</value>
-  </data>
-  <data name="DataGridView_CannotSortDataBoundDataGridViewBoundToNonIBindingList" xml:space="preserve">
+  </data><data name="DataGridView_CannotSortDataBoundDataGridViewBoundToNonIBindingList" xml:space="preserve">
     <value>DataGridView control must be bound to an IBindingList object to be sorted.</value>
-  </data>
-  <data name="DataGridView_CannotThrowNullException" xml:space="preserve">
+  </data><data name="DataGridView_CannotThrowNullException" xml:space="preserve">
     <value>Exception property is not set to a valid exception. ThrowException cannot be set to true.</value>
-  </data>
-  <data name="DataGridView_CannotUseAComparerToSortDataGridViewWhenDataBound" xml:space="preserve">
+  </data><data name="DataGridView_CannotUseAComparerToSortDataGridViewWhenDataBound" xml:space="preserve">
     <value>DataGridView control is data-bound. The control cannot use the comparer to perform the sort operation.</value>
-  </data>
-  <data name="DataGridView_CellBeginEditDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellBeginEditDescr" xml:space="preserve">
     <value>Occurs when edit mode starts for the selected cell.</value>
-  </data>
-  <data name="DataGridView_CellBorderStyleChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellBorderStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the border style of a cell changes.</value>
-  </data>
-  <data name="DataGridView_CellBorderStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellBorderStyleDescr" xml:space="preserve">
     <value>The cell border style for the DataGridView.</value>
-  </data>
-  <data name="DataGridView_CellChangeCannotBeCommittedOrAborted" xml:space="preserve">
+  </data><data name="DataGridView_CellChangeCannotBeCommittedOrAborted" xml:space="preserve">
     <value>Operation did not succeed because the program cannot commit or quit a cell value change.</value>
-  </data>
-  <data name="DataGridView_CellClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellClickDescr" xml:space="preserve">
     <value>Occurs when any part of the cell is clicked.</value>
-  </data>
-  <data name="DataGridView_CellContentClick" xml:space="preserve">
+  </data><data name="DataGridView_CellContentClick" xml:space="preserve">
     <value>Occurs when the content within a cell is clicked.</value>
-  </data>
-  <data name="DataGridView_CellContentDoubleClick" xml:space="preserve">
+  </data><data name="DataGridView_CellContentDoubleClick" xml:space="preserve">
     <value>Occurs when a user double-clicks a cell's contents.</value>
-  </data>
-  <data name="DataGridView_CellContextMenuStripChanged" xml:space="preserve">
+  </data><data name="DataGridView_CellContextMenuStripChanged" xml:space="preserve">
     <value>Occurs when the DataGridViewCell.ContextMenuStrip property changes. </value>
-  </data>
-  <data name="DataGridView_CellContextMenuStripNeeded" xml:space="preserve">
+  </data><data name="DataGridView_CellContextMenuStripNeeded" xml:space="preserve">
     <value>Occurs when a cell's context menu strip is needed. </value>
-  </data>
-  <data name="DataGridView_CellDoesNotBelongToDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_CellDoesNotBelongToDataGridView" xml:space="preserve">
     <value>Provided cell does not belong to this DataGridView control.</value>
-  </data>
-  <data name="DataGridView_CellDoesNotYetBelongToDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_CellDoesNotYetBelongToDataGridView" xml:space="preserve">
     <value>Operation can only be performed on cells that belong to a DataGridView control.</value>
-  </data>
-  <data name="DataGridView_CellDoubleClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellDoubleClickDescr" xml:space="preserve">
     <value>Occurs when the user double-clicks anywhere in a cell.</value>
-  </data>
-  <data name="DataGridView_CellEndEditDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellEndEditDescr" xml:space="preserve">
     <value>Occurs when edit mode stops for the currently selected cell.</value>
-  </data>
-  <data name="DataGridView_CellEnterDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellEnterDescr" xml:space="preserve">
     <value>Occurs when the cell receives input focus, becoming the current cell in the DataGridView.</value>
-  </data>
-  <data name="DataGridView_CellErrorTextChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellErrorTextChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewCell.ErrorText property of a cell changes.</value>
-  </data>
-  <data name="DataGridView_CellErrorTextNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellErrorTextNeededDescr" xml:space="preserve">
     <value>Occurs when a cell's error text is needed.</value>
-  </data>
-  <data name="DataGridView_CellFormattingDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellFormattingDescr" xml:space="preserve">
     <value>Occurs when the contents of a cell need to be formatted for display.</value>
-  </data>
-  <data name="DataGridView_CellLeaveDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellLeaveDescr" xml:space="preserve">
     <value>Occurs when a cell loses input focus and is no longer the current cell.</value>
-  </data>
-  <data name="DataGridView_CellMouseClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellMouseClickDescr" xml:space="preserve">
     <value>Occurs whenever a mouse clicks anywhere on a cell.</value>
-  </data>
-  <data name="DataGridView_CellMouseDoubleClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellMouseDoubleClickDescr" xml:space="preserve">
     <value>Occurs when a cell within the DataGridView is double-clicked.</value>
-  </data>
-  <data name="DataGridView_CellMouseDownDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellMouseDownDescr" xml:space="preserve">
     <value>Occurs when the user presses a mouse button while the mouse pointer is within the boundaries of a cell.</value>
-  </data>
-  <data name="DataGridView_CellMouseEnterDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellMouseEnterDescr" xml:space="preserve">
     <value>Occurs when the mouse pointer enters a cell.</value>
-  </data>
-  <data name="DataGridView_CellMouseLeaveDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellMouseLeaveDescr" xml:space="preserve">
     <value>Occurs when the mouse pointer leaves a cell.</value>
-  </data>
-  <data name="DataGridView_CellMouseMoveDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellMouseMoveDescr" xml:space="preserve">
     <value>Occurs when the mouse pointer moves over the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_CellMouseUpDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellMouseUpDescr" xml:space="preserve">
     <value>Occurs when the user releases a mouse button while over a cell.</value>
-  </data>
-  <data name="DataGridView_CellNeedsDataGridViewForInheritedStyle" xml:space="preserve">
+  </data><data name="DataGridView_CellNeedsDataGridViewForInheritedStyle" xml:space="preserve">
     <value>Cell is not in a DataGridView. The cell cannot retrieve the inherited cell style.</value>
-  </data>
-  <data name="DataGridView_CellPaintingDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellPaintingDescr" xml:space="preserve">
     <value>Occurs when a cell needs to be drawn.</value>
-  </data>
-  <data name="DataGridView_CellParsingDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellParsingDescr" xml:space="preserve">
     <value>Occurs when the user leaves edit mode, regardless of whether the value of the current cell has been modified.</value>
-  </data>
-  <data name="DataGridView_CellStateChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellStateChangedDescr" xml:space="preserve">
     <value>Occurs when a cell state changes, such as when the cell loses or gains focus.</value>
-  </data>
-  <data name="DataGridView_CellStyleChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridViewCell.Style property of a DataGridViewCell changes.</value>
-  </data>
-  <data name="DataGridView_CellStyleContentChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellStyleContentChangedDescr" xml:space="preserve">
     <value>Occurs when one of the values of a cell style changes.</value>
-  </data>
-  <data name="DataGridView_CellToolTipTextChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellToolTipTextChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridViewCell.ToolTipText property value changes for a cell in the DataGridView.</value>
-  </data>
-  <data name="DataGridView_CellToolTipTextDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellToolTipTextDescr" xml:space="preserve">
     <value>The text displayed by the ToolTip associated with this cell.</value>
-  </data>
-  <data name="DataGridView_CellToolTipTextNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellToolTipTextNeededDescr" xml:space="preserve">
     <value>Occurs when a cell's ToolTip text is needed.</value>
-  </data>
-  <data name="DataGridView_CellValidatedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellValidatedDescr" xml:space="preserve">
     <value>Occurs after the cell has finished validating.</value>
-  </data>
-  <data name="DataGridView_CellValidatingDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellValidatingDescr" xml:space="preserve">
     <value>Occurs when the cell is validating.</value>
-  </data>
-  <data name="DataGridView_CellValueChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellValueChangedDescr" xml:space="preserve">
     <value>Occurs when the value of a cell changes.</value>
-  </data>
-  <data name="DataGridView_CellValueNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellValueNeededDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.VirtualMode property of the DataGridView control is true and the DataGridView requires a value for a cell in order to format and display the cell.</value>
-  </data>
-  <data name="DataGridView_CellValuePushedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CellValuePushedDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.VirtualMode property of the DataGridView control is true, and a cell value has changed and requires storage in the underlying data source.</value>
-  </data>
-  <data name="DataGridView_CheckBoxColumnFalseValueDescr" xml:space="preserve">
+  </data><data name="DataGridView_CheckBoxColumnFalseValueDescr" xml:space="preserve">
     <value>The underlying value corresponding to a cell value of false, which appears as an unchecked box.</value>
-  </data>
-  <data name="DataGridView_CheckBoxColumnFlatStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_CheckBoxColumnFlatStyleDescr" xml:space="preserve">
     <value>The flat style appearance of the check box cells.</value>
-  </data>
-  <data name="DataGridView_CheckBoxColumnIndeterminateValueDescr" xml:space="preserve">
+  </data><data name="DataGridView_CheckBoxColumnIndeterminateValueDescr" xml:space="preserve">
     <value>The underlying value corresponding to an indeterminate or null cell value, which appears as a disabled checkbox.</value>
-  </data>
-  <data name="DataGridView_CheckBoxColumnThreeStateDescr" xml:space="preserve">
+  </data><data name="DataGridView_CheckBoxColumnThreeStateDescr" xml:space="preserve">
     <value>Indicates whether the hosted check box cells will allow three check states rather than two.</value>
-  </data>
-  <data name="DataGridView_CheckBoxColumnTrueValueDescr" xml:space="preserve">
+  </data><data name="DataGridView_CheckBoxColumnTrueValueDescr" xml:space="preserve">
     <value>The underlying value corresponding to a cell value of true, which appears as a checked box.</value>
-  </data>
-  <data name="DataGridView_ClipboardCopyModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_ClipboardCopyModeDescr" xml:space="preserve">
     <value>Indicates whether users can copy cell text values to the Clipboard and whether row and column header text is included.</value>
-  </data>
-  <data name="DataGridView_ColumnAddedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnAddedDescr" xml:space="preserve">
     <value>Occurs when a column is added to the control.</value>
-  </data>
-  <data name="DataGridView_ColumnAlreadyBelongsToDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_ColumnAlreadyBelongsToDataGridView" xml:space="preserve">
     <value>Provided column already belongs to the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_ColumnBoundToAReadOnlyFieldMustRemainReadOnly" xml:space="preserve">
+  </data><data name="DataGridView_ColumnBoundToAReadOnlyFieldMustRemainReadOnly" xml:space="preserve">
     <value>DataGridView column bound to a read-only field must have ReadOnly set to True.</value>
-  </data>
-  <data name="DataGridView_ColumnContextMenuStripChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnContextMenuStripChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridViewColumn.ContextMenuStrip property of a column changes.</value>
-  </data>
-  <data name="DataGridView_ColumnContextMenuStripDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnContextMenuStripDescr" xml:space="preserve">
     <value>The shortcut menu for the column.</value>
-  </data>
-  <data name="DataGridView_ColumnDataPropertyNameChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDataPropertyNameChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewColumn.DataPropertyName property for a column changes.</value>
-  </data>
-  <data name="DataGridView_ColumnDataPropertyNameDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDataPropertyNameDescr" xml:space="preserve">
     <value>The name of the data source property or database column to which the DataGridViewColumn is bound.</value>
-  </data>
-  <data name="DataGridView_ColumnDefaultCellStyleChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDefaultCellStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewBand.DefaultCellStyle property for a column changes.</value>
-  </data>
-  <data name="DataGridView_ColumnDefaultCellStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDefaultCellStyleDescr" xml:space="preserve">
     <value>The column's default cell style.</value>
-  </data>
-  <data name="DataGridView_ColumnDisplayIndexChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDisplayIndexChangedDescr" xml:space="preserve">
     <value>Occurs when the value the DataGridViewColumn.DisplayIndex property for a column changes.</value>
-  </data>
-  <data name="DataGridView_ColumnDividerDoubleClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDividerDoubleClickDescr" xml:space="preserve">
     <value>Occurs when the user double-clicks a divider between two columns.</value>
-  </data>
-  <data name="DataGridView_ColumnDividerWidthChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDividerWidthChangedDescr" xml:space="preserve">
     <value>Occurs when DataGridViewColumn.DividerWidth changes.</value>
-  </data>
-  <data name="DataGridView_ColumnDividerWidthDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDividerWidthDescr" xml:space="preserve">
     <value>The width of the column divider in pixels.</value>
-  </data>
-  <data name="DataGridView_ColumnDoesNotBelongToDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_ColumnDoesNotBelongToDataGridView" xml:space="preserve">
     <value>Column provided does not belong to this DataGridView control.</value>
-  </data>
-  <data name="DataGridView_ColumnFrozenDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnFrozenDescr" xml:space="preserve">
     <value>Indicates whether a column will move when a user scrolls the DataGridView control horizontally.</value>
-  </data>
-  <data name="DataGridView_ColumnHeaderCellChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeaderCellChangedDescr" xml:space="preserve">
     <value>Occurs when the contents of a column header cell change.</value>
-  </data>
-  <data name="DataGridView_ColumnHeaderMouseClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeaderMouseClickDescr" xml:space="preserve">
     <value>Occurs when the user clicks a column header.</value>
-  </data>
-  <data name="DataGridView_ColumnHeaderMouseDoubleClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeaderMouseDoubleClickDescr" xml:space="preserve">
     <value>Occurs when a column header is double-clicked.</value>
-  </data>
-  <data name="DataGridView_ColumnHeadersBorderStyleChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeaderTextDescr" xml:space="preserve">
+    <value>The caption text on the column's header cell.</value>
+  </data><data name="DataGridView_ColumnHeadersBorderStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.ColumnHeadersBorderStyle property changes.</value>
-  </data>
-  <data name="DataGridView_ColumnHeadersBorderStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeadersBorderStyleDescr" xml:space="preserve">
     <value>The border style applied to the column headers.</value>
-  </data>
-  <data name="DataGridView_ColumnHeadersCannotBeInvisible" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeadersCannotBeInvisible" xml:space="preserve">
     <value>Column headers cannot be made invisible because at least one column uses its header in its AutoSize mode.</value>
-  </data>
-  <data name="DataGridView_ColumnHeadersDefaultCellStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeadersDefaultCellStyleDescr" xml:space="preserve">
     <value>The default column header style.</value>
-  </data>
-  <data name="DataGridView_ColumnHeadersHeightDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeadersHeightDescr" xml:space="preserve">
     <value>The height, in pixels, of the column headers row. </value>
-  </data>
-  <data name="DataGridView_ColumnHeadersHeightSizeModeChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeadersHeightSizeModeChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the ColumnHeadersHeightSizeMode property changes.</value>
-  </data>
-  <data name="DataGridView_ColumnHeadersHeightSizeModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnHeadersHeightSizeModeDescr" xml:space="preserve">
     <value>Determines the behavior for adjusting the column headers height.</value>
-  </data>
-  <data name="DataGridView_ColumnHeaderTextDescr" xml:space="preserve">
-    <value>The caption text on the column's header cell.</value>
-  </data>
-  <data name="DataGridView_ColumnMinimumWidthChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnMinimumWidthChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewColumn.MinimumWidth property for a column changes.</value>
-  </data>
-  <data name="DataGridView_ColumnMinimumWidthDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnMinimumWidthDescr" xml:space="preserve">
     <value>The minimum width of the column in pixels.</value>
-  </data>
-  <data name="DataGridView_ColumnNameChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnNameChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewColumn.Name property for a column changes.</value>
-  </data>
-  <data name="DataGridView_ColumnNameDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnNameDescr" xml:space="preserve">
     <value>The name of the column.</value>
-  </data>
-  <data name="DataGridView_ColumnNeedsToBeDataBoundWhenSortingDataBoundDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_ColumnNeedsToBeDataBoundWhenSortingDataBoundDataGridView" xml:space="preserve">
     <value>Data-bound DataGridView control can only be sorted on data-bound columns.</value>
-  </data>
-  <data name="DataGridView_ColumnReadOnlyDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnReadOnlyDescr" xml:space="preserve">
     <value>Indicates whether the user can edit the column's cells.</value>
-  </data>
-  <data name="DataGridView_ColumnRemovedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnRemovedDescr" xml:space="preserve">
     <value>Occurs when a column is removed from the control.</value>
-  </data>
-  <data name="DataGridView_ColumnResizableDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnResizableDescr" xml:space="preserve">
     <value>Indicates whether the column is resizable.</value>
-  </data>
-  <data name="DataGridView_ColumnSortModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnSortModeDescr" xml:space="preserve">
     <value>The sort mode for the column. </value>
-  </data>
-  <data name="DataGridView_ColumnStateChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnStateChangedDescr" xml:space="preserve">
     <value>Occurs when a column changes state, such as gaining or losing focus.</value>
-  </data>
-  <data name="DataGridView_ColumnToolTipTextChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnToolTipTextChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridViewColumn.ToolTipText property value changes for a column in the DataGridView.</value>
-  </data>
-  <data name="DataGridView_ColumnToolTipTextDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnToolTipTextDescr" xml:space="preserve">
     <value>The text used for ToolTips.</value>
-  </data>
-  <data name="DataGridView_ColumnVisibleDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnVisibleDescr" xml:space="preserve">
     <value>Indicates whether the column is visible.</value>
-  </data>
-  <data name="DataGridView_ColumnWidthChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnWidthChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewColumn.Width property for a column changes.</value>
-  </data>
-  <data name="DataGridView_ColumnWidthDescr" xml:space="preserve">
+  </data><data name="DataGridView_ColumnWidthDescr" xml:space="preserve">
     <value>The current width of the column.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnAutoCompleteDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnAutoCompleteDescr" xml:space="preserve">
     <value>Indicates whether cells in the column will match the characters being entered in the cell with one from the possible selections. </value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnDataSourceDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnDataSourceDescr" xml:space="preserve">
     <value>The data source that populates the selections for the combo boxes.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnDisplayMemberDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnDisplayMemberDescr" xml:space="preserve">
     <value>A string that specifies the property or column from which to retrieve strings for display in the combo boxes.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnDisplayStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnDisplayStyleDescr" xml:space="preserve">
     <value>Determines how the combo box is displayed when not editing.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnDisplayStyleForCurrentCellOnlyDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnDisplayStyleForCurrentCellOnlyDescr" xml:space="preserve">
     <value>Indicates if the display style only applies to the current cell.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnDropDownWidthDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnDropDownWidthDescr" xml:space="preserve">
     <value>The width of the drop-down lists of the combo boxes.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnFlatStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnFlatStyleDescr" xml:space="preserve">
     <value>The flat style appearance of the column's cells.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnItemsDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnItemsDescr" xml:space="preserve">
     <value>The collection of objects used as selections in the combo boxes.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnMaxDropDownItemsDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnMaxDropDownItemsDescr" xml:space="preserve">
     <value>The maximum number of items in the drop-down list of the cells in the column.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnSortedDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnSortedDescr" xml:space="preserve">
     <value>Indicates whether the items in the combo box are sorted.</value>
-  </data>
-  <data name="DataGridView_ComboBoxColumnValueMemberDescr" xml:space="preserve">
+  </data><data name="DataGridView_ComboBoxColumnValueMemberDescr" xml:space="preserve">
     <value>A string that specifies the property or column from which to get values that correspond to the selections in the drop-down list.</value>
-  </data>
-  <data name="DataGridView_CommitFailedCannotCompleteOperation" xml:space="preserve">
+  </data><data name="DataGridView_CommitFailedCannotCompleteOperation" xml:space="preserve">
     <value>Operation cannot be completed because the current cell could not be committed.</value>
-  </data>
-  <data name="DataGridView_CurrencyManagerRowCannotBeInvisible" xml:space="preserve">
+  </data><data name="DataGridView_CurrencyManagerRowCannotBeInvisible" xml:space="preserve">
     <value>Row associated with the currency manager's position cannot be made invisible.</value>
-  </data>
-  <data name="DataGridView_CurrentCellCannotBeInvisible" xml:space="preserve">
+  </data><data name="DataGridView_CurrentCellCannotBeInvisible" xml:space="preserve">
     <value>Current cell cannot be set to an invisible cell.</value>
-  </data>
-  <data name="DataGridView_CurrentCellChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CurrentCellChangedDescr" xml:space="preserve">
     <value>Occurs when DataGridView.CurrentCell changes.</value>
-  </data>
-  <data name="DataGridView_CurrentCellDirtyStateChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_CurrentCellDirtyStateChangedDescr" xml:space="preserve">
     <value>Occurs when the state of a cell changes in relation to a change in its contents.</value>
-  </data>
-  <data name="DataGridView_CustomCellBorderStyleInvalid" xml:space="preserve">
+  </data><data name="DataGridView_CustomCellBorderStyleInvalid" xml:space="preserve">
     <value>Value DataGridViewCellBorderStyle. Custom cannot be used to set the {0} property.</value>
-  </data>
-  <data name="DataGridView_DataBindingCompleteDescr" xml:space="preserve">
+  </data><data name="DataGridView_DataBindingCompleteDescr" xml:space="preserve">
     <value>Event raised whenever the data source list changes.</value>
-  </data>
-  <data name="DataGridView_DataErrorDescr" xml:space="preserve">
+  </data><data name="DataGridView_DataErrorDescr" xml:space="preserve">
     <value>Occurs when an external data-parsing or validation operation throws an exception, or when an attempt to commit data to a data source does not succeed.</value>
-  </data>
-  <data name="DataGridView_DefaultCellStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_DefaultCellStyleDescr" xml:space="preserve">
     <value>The DataGridViewBand.DefaultCellStyle to be applied to the DataGridView if no other style is set.</value>
-  </data>
-  <data name="DataGridView_DefaultValuesNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_DefaultValuesNeededDescr" xml:space="preserve">
     <value>Occurs when the user enters the row for new records so that it can be populated with default values.</value>
-  </data>
-  <data name="DataGridView_DisabledClipboardCopy" xml:space="preserve">
+  </data><data name="DataGridView_DisabledClipboardCopy" xml:space="preserve">
     <value>Generating Clipboard content is not supported when the ClipboardCopyMode property is Disable.</value>
-  </data>
-  <data name="DataGridView_EditingControlShowingDescr" xml:space="preserve">
-    <value>Occurs when a control for editing a cell is showing.</value>
-  </data>
-  <data name="DataGridView_EditModeChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_EditModeChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridView.EditMode property changes.</value>
-  </data>
-  <data name="DataGridView_EditModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_EditModeDescr" xml:space="preserve">
     <value>Identifies the mode that determines how cell editing is started.</value>
-  </data>
-  <data name="DataGridView_EmptyColor" xml:space="preserve">
+  </data><data name="DataGridView_EditingControlShowingDescr" xml:space="preserve">
+    <value>Occurs when a control for editing a cell is showing.</value>
+  </data><data name="DataGridView_EmptyColor" xml:space="preserve">
     <value>Value '{0}' cannot be set to an empty value.</value>
-  </data>
-  <data name="DataGridView_EnableHeadersVisualStylesDescr" xml:space="preserve">
+  </data><data name="DataGridView_EnableHeadersVisualStylesDescr" xml:space="preserve">
     <value>Indicates whether row and column headers use the visual styles of the user's current theme if visual styles are enabled for the application.</value>
-  </data>
-  <data name="DataGridView_ErrorMessageCaption" xml:space="preserve">
+  </data><data name="DataGridView_ErrorMessageCaption" xml:space="preserve">
     <value>DataGridView Default Error Dialog</value>
-  </data>
-  <data name="DataGridView_ErrorMessageText_NoException" xml:space="preserve">
+  </data><data name="DataGridView_ErrorMessageText_NoException" xml:space="preserve">
     <value>Exception occurred in the DataGridView.
 
 To replace this default dialog box, handle the DataError event.</value>
-  </data>
-  <data name="DataGridView_ErrorMessageText_WithException" xml:space="preserve">
+  </data><data name="DataGridView_ErrorMessageText_WithException" xml:space="preserve">
     <value>The following exception occurred in the DataGridView:
 
 {0}
 
 To replace this default dialog please handle the DataError event.</value>
-  </data>
-  <data name="DataGridView_FirstDisplayedCellCannotBeAHeaderOrSharedCell" xml:space="preserve">
+  </data><data name="DataGridView_FirstDisplayedCellCannotBeAHeaderOrSharedCell" xml:space="preserve">
     <value>First displayed cell cannot be set to a header or shared cell.</value>
-  </data>
-  <data name="DataGridView_FirstDisplayedCellCannotBeInvisible" xml:space="preserve">
+  </data><data name="DataGridView_FirstDisplayedCellCannotBeInvisible" xml:space="preserve">
     <value>First displayed cell cannot be set to an invisible cell.</value>
-  </data>
-  <data name="DataGridView_FirstDisplayedScrollingColumnCannotBeFrozen" xml:space="preserve">
+  </data><data name="DataGridView_FirstDisplayedScrollingColumnCannotBeFrozen" xml:space="preserve">
     <value>FirstDisplayedScrollingColumnIndex property cannot be set to a frozen column.</value>
-  </data>
-  <data name="DataGridView_FirstDisplayedScrollingColumnCannotBeInvisible" xml:space="preserve">
+  </data><data name="DataGridView_FirstDisplayedScrollingColumnCannotBeInvisible" xml:space="preserve">
     <value>FirstDisplayedScrollingColumnIndex property cannot be set to an invisible column.</value>
-  </data>
-  <data name="DataGridView_FirstDisplayedScrollingRowCannotBeFrozen" xml:space="preserve">
+  </data><data name="DataGridView_FirstDisplayedScrollingRowCannotBeFrozen" xml:space="preserve">
     <value>FirstDisplayedScrollingRowIndex property cannot be set to a frozen row.</value>
-  </data>
-  <data name="DataGridView_FirstDisplayedScrollingRowCannotBeInvisible" xml:space="preserve">
+  </data><data name="DataGridView_FirstDisplayedScrollingRowCannotBeInvisible" xml:space="preserve">
     <value>FirstDisplayedScrollingRowIndex property cannot be set to an invisible row.</value>
-  </data>
-  <data name="DataGridView_ForbiddenOperationInEventHandler" xml:space="preserve">
+  </data><data name="DataGridView_ForbiddenOperationInEventHandler" xml:space="preserve">
     <value>Operation cannot be performed in this event handler.</value>
-  </data>
-  <data name="DataGridView_FrozenColumnsPreventFirstDisplayedScrollingColumn" xml:space="preserve">
+  </data><data name="DataGridView_FrozenColumnsPreventFirstDisplayedScrollingColumn" xml:space="preserve">
     <value>The frozen columns do not leave any room for a scrolling column to be displayed.</value>
-  </data>
-  <data name="DataGridView_FrozenRowsPreventFirstDisplayedScrollingRow" xml:space="preserve">
+  </data><data name="DataGridView_FrozenRowsPreventFirstDisplayedScrollingRow" xml:space="preserve">
     <value>The frozen rows do not leave any room for a scrolling row to be displayed.</value>
-  </data>
-  <data name="DataGridView_HeaderCellReadOnlyProperty" xml:space="preserve">
+  </data><data name="DataGridView_HeaderCellReadOnlyProperty" xml:space="preserve">
     <value>Property {0} of a DataGridViewHeaderCell cell cannot be set.</value>
-  </data>
-  <data name="DataGridView_IBindingListNeedsToSupportSorting" xml:space="preserve">
+  </data><data name="DataGridView_IBindingListNeedsToSupportSorting" xml:space="preserve">
     <value>DataGridView control cannot be sorted if it is bound to an IBindingList that does not support sorting.</value>
-  </data>
-  <data name="DataGridView_InvalidDataGridViewElementStateCombination" xml:space="preserve">
+  </data><data name="DataGridView_InvalidDataGridViewElementStateCombination" xml:space="preserve">
     <value>Parameter {0} is not a valid combination of DataGridViewElementState flags.</value>
-  </data>
-  <data name="DataGridView_InvalidDataGridViewPaintPartsCombination" xml:space="preserve">
+  </data><data name="DataGridView_InvalidDataGridViewPaintPartsCombination" xml:space="preserve">
     <value>Parameter {0} is not a valid combination of DataGridViewPaintParts flags.</value>
-  </data>
-  <data name="DataGridView_InvalidEditingControl" xml:space="preserve">
+  </data><data name="DataGridView_InvalidEditingControl" xml:space="preserve">
     <value>EditType property of the current cell does not point to a class that derives from System.Windows.Forms.Control and implements the interface IDataGridViewEditingControl.</value>
-  </data>
-  <data name="DataGridView_InvalidOperationInVirtualMode" xml:space="preserve">
+  </data><data name="DataGridView_InvalidOperationInVirtualMode" xml:space="preserve">
     <value>Operation is not valid when the DataGridView control is in virtual mode.</value>
-  </data>
-  <data name="DataGridView_InvalidOperationOnSharedCell" xml:space="preserve">
+  </data><data name="DataGridView_InvalidOperationOnSharedCell" xml:space="preserve">
     <value>Operation cannot be performed on a cell of a shared row.</value>
-  </data>
-  <data name="DataGridView_InvalidOperationOnSharedRow" xml:space="preserve">
+  </data><data name="DataGridView_InvalidOperationOnSharedRow" xml:space="preserve">
     <value>Operation cannot be performed on a shared row.</value>
-  </data>
-  <data name="DataGridView_InvalidPropertyGetOnSharedCell" xml:space="preserve">
+  </data><data name="DataGridView_InvalidPropertyGetOnSharedCell" xml:space="preserve">
     <value>Getting the {0} property of a cell in a shared row is not a valid operation.</value>
-  </data>
-  <data name="DataGridView_InvalidPropertyGetOnSharedRow" xml:space="preserve">
+  </data><data name="DataGridView_InvalidPropertyGetOnSharedRow" xml:space="preserve">
     <value>Getting the {0} property of a shared row is not a valid operation.</value>
-  </data>
-  <data name="DataGridView_InvalidPropertySetOnSharedRow" xml:space="preserve">
+  </data><data name="DataGridView_InvalidPropertySetOnSharedRow" xml:space="preserve">
     <value>Setting the {0} property of a shared row is not a valid operation.</value>
-  </data>
-  <data name="DataGridView_LinkColumnActiveLinkColorDescr" xml:space="preserve">
+  </data><data name="DataGridView_LinkColumnActiveLinkColorDescr" xml:space="preserve">
     <value>The color used to display an active link within cells in the column. </value>
-  </data>
-  <data name="DataGridView_LinkColumnLinkBehaviorDescr" xml:space="preserve">
+  </data><data name="DataGridView_LinkColumnLinkBehaviorDescr" xml:space="preserve">
     <value>A value that represents the behavior of links within cells in the column.</value>
-  </data>
-  <data name="DataGridView_LinkColumnLinkColorDescr" xml:space="preserve">
+  </data><data name="DataGridView_LinkColumnLinkColorDescr" xml:space="preserve">
     <value>The color used to display an unselected link within cells in the column.</value>
-  </data>
-  <data name="DataGridView_LinkColumnTextDescr" xml:space="preserve">
+  </data><data name="DataGridView_LinkColumnTextDescr" xml:space="preserve">
     <value>The link text displayed in all of the column's cells.</value>
-  </data>
-  <data name="DataGridView_LinkColumnTrackVisitedStateDescr" xml:space="preserve">
+  </data><data name="DataGridView_LinkColumnTrackVisitedStateDescr" xml:space="preserve">
     <value>Indicates whether the link changes color if it has been visited.</value>
-  </data>
-  <data name="DataGridView_LinkColumnUseColumnTextForLinkValueDescr" xml:space="preserve">
+  </data><data name="DataGridView_LinkColumnUseColumnTextForLinkValueDescr" xml:space="preserve">
     <value>Indicates whether the DataGridViewLinkColumn.Text property value is displayed as the link text.</value>
-  </data>
-  <data name="DataGridView_LinkColumnVisitedLinkColorDescr" xml:space="preserve">
+  </data><data name="DataGridView_LinkColumnVisitedLinkColorDescr" xml:space="preserve">
     <value>The color used to display a link that has been previously visited.</value>
-  </data>
-  <data name="DataGridView_MultiSelectDescr" xml:space="preserve">
+  </data><data name="DataGridView_MultiSelectDescr" xml:space="preserve">
     <value>Indicates whether the user is allowed to select more than one cell, row, or column of the DataGridView at a time.</value>
-  </data>
-  <data name="DataGridView_NeedAutoSizingCriteria" xml:space="preserve">
+  </data><data name="DataGridView_NeedAutoSizingCriteria" xml:space="preserve">
     <value>Parameter {0} is not valid for this operation. This parameter value must specify a mode which AutoSizes.</value>
-  </data>
-  <data name="DataGridView_NeedColumnAutoSizingCriteria" xml:space="preserve">
+  </data><data name="DataGridView_NeedColumnAutoSizingCriteria" xml:space="preserve">
     <value>Parameter {0} is not valid for this operation. It cannot be NotSet, None or Fill but needs to indicate a sizing criteria.</value>
-  </data>
-  <data name="DataGridView_NewRowNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_NewRowNeededDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.VirtualMode property of the DataGridView is true and the user navigates to the new row at the bottom of the DataGridView.</value>
-  </data>
-  <data name="DataGridView_NoCurrentCell" xml:space="preserve">
+  </data><data name="DataGridView_NoCurrentCell" xml:space="preserve">
     <value>Operation cannot be performed because there is no current cell. The CurrentCell property needs to be set first.</value>
-  </data>
-  <data name="DataGridView_NoRoomForDisplayedColumns" xml:space="preserve">
+  </data><data name="DataGridView_NoRoomForDisplayedColumns" xml:space="preserve">
     <value>No room is available to display columns.</value>
-  </data>
-  <data name="DataGridView_NoRoomForDisplayedRows" xml:space="preserve">
+  </data><data name="DataGridView_NoRoomForDisplayedRows" xml:space="preserve">
     <value>No room is available to display rows.</value>
-  </data>
-  <data name="DataGridView_OperationDisabledInVirtualMode" xml:space="preserve">
+  </data><data name="DataGridView_OperationDisabledInVirtualMode" xml:space="preserve">
     <value>Operation is not supported when VirtualMode is set to true.</value>
-  </data>
-  <data name="DataGridView_PreviousModesHasWrongLength" xml:space="preserve">
+  </data><data name="DataGridView_PreviousModesHasWrongLength" xml:space="preserve">
     <value>PreviousModes array has the wrong length. Its length must be equal to the number of columns in the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_PropertyMustBeZero" xml:space="preserve">
+  </data><data name="DataGridView_PropertyMustBeZero" xml:space="preserve">
     <value>Property {0} must be set to 0.</value>
-  </data>
-  <data name="DataGridView_ReadOnlyCollection" xml:space="preserve">
+  </data><data name="DataGridView_ReadOnlyCollection" xml:space="preserve">
     <value>Operation not supported. Collection is read-only.</value>
-  </data>
-  <data name="DataGridView_ReadOnlyDescr" xml:space="preserve">
+  </data><data name="DataGridView_ReadOnlyDescr" xml:space="preserve">
     <value>Indicates whether the user can edit the cells of the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_RowAlreadyBelongsToDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_RowAddedNotification" xml:space="preserve">
+    <value>Row {0} is added</value>
+  </data><data name="DataGridView_RowAlreadyBelongsToDataGridView" xml:space="preserve">
     <value>Row provided already belongs to a DataGridView control.</value>
-  </data>
-  <data name="DataGridView_RowContextMenuStripChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowContextMenuStripChangedDescr" xml:space="preserve">
     <value>Occurs when DataGridViewRow.ContextMenuStrip changes.</value>
-  </data>
-  <data name="DataGridView_RowContextMenuStripDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowContextMenuStripDescr" xml:space="preserve">
     <value>The shortcut menu for the row.</value>
-  </data>
-  <data name="DataGridView_RowContextMenuStripNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowContextMenuStripNeededDescr" xml:space="preserve">
     <value>Occurs when the context menu strip is needed.</value>
-  </data>
-  <data name="DataGridView_RowDefaultCellStyleChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowDefaultCellStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewBand.DefaultCellStyle property for a row changes.</value>
-  </data>
-  <data name="DataGridView_RowDefaultCellStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowDefaultCellStyleDescr" xml:space="preserve">
     <value>The default cell style to be applied to the DataGridViewRow if no other style is set.</value>
-  </data>
-  <data name="DataGridView_RowDirtyStateNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowDirtyStateNeededDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.VirtualMode property of the DataGridView control is true and the DataGridView needs to determine whether the current row has uncommitted changes.</value>
-  </data>
-  <data name="DataGridView_RowDividerDoubleClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowDividerDoubleClickDescr" xml:space="preserve">
     <value>Occurs when the user double-clicks the divider between two rows.</value>
-  </data>
-  <data name="DataGridView_RowDividerHeightChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowDividerHeightChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridViewRow.DividerHeight property changes. </value>
-  </data>
-  <data name="DataGridView_RowDividerHeightDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowDividerHeightDescr" xml:space="preserve">
     <value>The height of the row divider in pixels.</value>
-  </data>
-  <data name="DataGridView_RowDoesNotBelongToDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_RowDoesNotBelongToDataGridView" xml:space="preserve">
     <value>Row provided does not belong to this DataGridView control.</value>
-  </data>
-  <data name="DataGridView_RowDoesNotYetBelongToDataGridView" xml:space="preserve">
+  </data><data name="DataGridView_RowDoesNotYetBelongToDataGridView" xml:space="preserve">
     <value>Operation can only be performed on rows that belong to a DataGridView control.</value>
-  </data>
-  <data name="DataGridView_RowEnterDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowEnterDescr" xml:space="preserve">
     <value>Occurs when a row receives input focus and becomes the current row.</value>
-  </data>
-  <data name="DataGridView_RowErrorTextChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowErrorTextChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridViewRow.ErrorText property of a row changes.</value>
-  </data>
-  <data name="DataGridView_RowErrorTextDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowErrorTextDescr" xml:space="preserve">
     <value>The error message text for row-level errors.</value>
-  </data>
-  <data name="DataGridView_RowErrorTextNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowErrorTextNeededDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.VirtualMode property of the DataGridView control is true and the DataGridViewRow.ErrorText property for a row requires a value.</value>
-  </data>
-  <data name="DataGridView_RowHeaderCellAccDefaultAction" xml:space="preserve">
+  </data><data name="DataGridView_RowHeaderCellAccDefaultAction" xml:space="preserve">
     <value>Press to select row</value>
-  </data>
-  <data name="DataGridView_RowHeaderCellChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeaderCellChangedDescr" xml:space="preserve">
     <value>Occurs when the user changes the contents of a row header cell.</value>
-  </data>
-  <data name="DataGridView_RowHeaderMouseClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeaderMouseClickDescr" xml:space="preserve">
     <value>Occurs when the user clicks within the boundaries of a row header.</value>
-  </data>
-  <data name="DataGridView_RowHeaderMouseDoubleClickDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeaderMouseDoubleClickDescr" xml:space="preserve">
     <value>Occurs when a row header is double-clicked.</value>
-  </data>
-  <data name="DataGridView_RowHeadersBorderStyleChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeadersBorderStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the DataGridView.RowHeadersBorderStyle property changes.</value>
-  </data>
-  <data name="DataGridView_RowHeadersBorderStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeadersBorderStyleDescr" xml:space="preserve">
     <value>The border style of the row header cells.</value>
-  </data>
-  <data name="DataGridView_RowHeadersCannotBeInvisible" xml:space="preserve">
+  </data><data name="DataGridView_RowHeadersCannotBeInvisible" xml:space="preserve">
     <value>Row headers cannot be made invisible because the DataGridView control includes the row headers in its AutoSize mode.</value>
-  </data>
-  <data name="DataGridView_RowHeadersDefaultCellStyleDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeadersDefaultCellStyleDescr" xml:space="preserve">
     <value>The default style applied to the row header cells.</value>
-  </data>
-  <data name="DataGridView_RowHeadersWidthDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeadersWidthDescr" xml:space="preserve">
     <value>The width, in pixels, of the column that contains the row headers.</value>
-  </data>
-  <data name="DataGridView_RowHeadersWidthSizeModeChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeadersWidthSizeModeChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the RowHeadersWidthSizeMode property changes.</value>
-  </data>
-  <data name="DataGridView_RowHeadersWidthSizeModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeadersWidthSizeModeDescr" xml:space="preserve">
     <value>Determines the behavior for adjusting the row headers width.</value>
-  </data>
-  <data name="DataGridView_RowHeightChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeightChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewRow.Height property for a row changes.</value>
-  </data>
-  <data name="DataGridView_RowHeightDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeightDescr" xml:space="preserve">
     <value>The current height of the row.</value>
-  </data>
-  <data name="DataGridView_RowHeightInfoNeededDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeightInfoNeededDescr" xml:space="preserve">
     <value>Occurs when information about row height is requested. </value>
-  </data>
-  <data name="DataGridView_RowHeightInfoPushedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowHeightInfoPushedDescr" xml:space="preserve">
     <value>Occurs when the user changes the height of a row.</value>
-  </data>
-  <data name="DataGridView_RowLeaveDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowLeaveDescr" xml:space="preserve">
     <value>Occurs when a row loses input focus and is no longer the current row.</value>
-  </data>
-  <data name="DataGridView_RowMinimumHeightChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowMinimumHeightChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the DataGridViewRow.MinimumHeight property for a row changes.</value>
-  </data>
-  <data name="DataGridView_RowMinimumHeightDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowMinimumHeightDescr" xml:space="preserve">
     <value>The minimum height of the row.</value>
-  </data>
-  <data name="DataGridView_RowMustBeUnshared" xml:space="preserve">
+  </data><data name="DataGridView_RowMustBeUnshared" xml:space="preserve">
     <value>Row provided must be unshared first.</value>
-  </data>
-  <data name="DataGridView_RowPostPaintDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowPostPaintDescr" xml:space="preserve">
     <value>Event raised to perform row level painting, after all cell painting has occurred.</value>
-  </data>
-  <data name="DataGridView_RowPrePaintDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowPrePaintDescr" xml:space="preserve">
     <value>Event raised to perform row level painting, before any cell painting has occurred.</value>
-  </data>
-  <data name="DataGridView_RowReadOnlyDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowReadOnlyDescr" xml:space="preserve">
     <value>Indicates whether the row is read-only.</value>
-  </data>
-  <data name="DataGridView_RowResizableDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowResizableDescr" xml:space="preserve">
     <value>Indicates whether users can resize the row or indicates that the behavior is inherited from the DataGridView.AllowUserToResizeRows property.</value>
-  </data>
-  <data name="DataGridView_RowsAddedDescr" xml:space="preserve">
-    <value>Event raised when one or more rows are added to the rows collection.</value>
-  </data>
-  <data name="DataGridView_RowsDefaultCellStyleDescr" xml:space="preserve">
-    <value>The default style applied to the row cells of the DataGridView.</value>
-  </data>
-  <data name="DataGridView_RowsRemovedDescr" xml:space="preserve">
-    <value>Event raised when one or more rows are removed from the rows collection.</value>
-  </data>
-  <data name="DataGridView_RowStateChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowStateChangedDescr" xml:space="preserve">
     <value>Occurs when a row changes state, such as losing or gaining input focus.</value>
-  </data>
-  <data name="DataGridView_RowTemplateDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowTemplateDescr" xml:space="preserve">
     <value>Identifies the template row whose characteristics are used as the basis for all new implicitly added rows.</value>
-  </data>
-  <data name="DataGridView_RowUnsharedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowUnsharedDescr" xml:space="preserve">
     <value>Occurs when a row's state changes from shared to unshared.</value>
-  </data>
-  <data name="DataGridView_RowValidatedDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowValidatedDescr" xml:space="preserve">
     <value>Occurs after a row has finished validating.</value>
-  </data>
-  <data name="DataGridView_RowValidatingDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowValidatingDescr" xml:space="preserve">
     <value>Occurs when a row is validating.</value>
-  </data>
-  <data name="DataGridView_ScrollBarsDescr" xml:space="preserve">
+  </data><data name="DataGridView_RowsAddedDescr" xml:space="preserve">
+    <value>Event raised when one or more rows are added to the rows collection.</value>
+  </data><data name="DataGridView_RowsDefaultCellStyleDescr" xml:space="preserve">
+    <value>The default style applied to the row cells of the DataGridView.</value>
+  </data><data name="DataGridView_RowsRemovedDescr" xml:space="preserve">
+    <value>Event raised when one or more rows are removed from the rows collection.</value>
+  </data><data name="DataGridView_ScrollBarsDescr" xml:space="preserve">
     <value>The type of scroll bars to display for the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_ScrollDescr" xml:space="preserve">
+  </data><data name="DataGridView_ScrollDescr" xml:space="preserve">
     <value>Event raised when the grid scrolls horizontally or vertically. Use the ScrollEventArgs.Orientation to determine the direction scrolled.</value>
-  </data>
-  <data name="DataGridView_SelectionChangedDescr" xml:space="preserve">
+  </data><data name="DataGridView_SelectionChangedDescr" xml:space="preserve">
     <value>Occurs when the current selection changes.</value>
-  </data>
-  <data name="DataGridView_SelectionModeAndSortModeClash" xml:space="preserve">
+  </data><data name="DataGridView_SelectionModeAndSortModeClash" xml:space="preserve">
     <value>DataGridView control's SelectionMode cannot be set to {0} while it has a column with SortMode set to DataGridViewColumnSortMode.Automatic.</value>
-  </data>
-  <data name="DataGridView_SelectionModeDescr" xml:space="preserve">
+  </data><data name="DataGridView_SelectionModeDescr" xml:space="preserve">
     <value>Indicates how the cells of the DataGridView can be selected.</value>
-  </data>
-  <data name="DataGridView_SelectionModeReset" xml:space="preserve">
+  </data><data name="DataGridView_SelectionModeReset" xml:space="preserve">
     <value>{0} The SelectionMode property was reset to its default value {1}.</value>
-  </data>
-  <data name="DataGridView_SetCurrentCellAddressCoreNotReentrant" xml:space="preserve">
+  </data><data name="DataGridView_SetCurrentCellAddressCoreNotReentrant" xml:space="preserve">
     <value>Operation is not valid because it results in a reentrant call to the SetCurrentCellAddressCore function.</value>
-  </data>
-  <data name="DataGridView_ShowCellErrorsDescr" xml:space="preserve">
+  </data><data name="DataGridView_ShowCellErrorsDescr" xml:space="preserve">
     <value>Indicates whether to show cell errors.</value>
-  </data>
-  <data name="DataGridView_ShowCellToolTipsDescr" xml:space="preserve">
+  </data><data name="DataGridView_ShowCellToolTipsDescr" xml:space="preserve">
     <value>Indicates whether or not ToolTips will show when the mouse pointer pauses on a cell.</value>
-  </data>
-  <data name="DataGridView_ShowEditingIconDescr" xml:space="preserve">
+  </data><data name="DataGridView_ShowEditingIconDescr" xml:space="preserve">
     <value>Indicates whether or not the editing glyph is visible in the row header of the cell being edited.</value>
-  </data>
-  <data name="DataGridView_ShowRowErrorsDescr" xml:space="preserve">
+  </data><data name="DataGridView_ShowRowErrorsDescr" xml:space="preserve">
     <value>Indicates whether row headers will display error glyphs for each row that contains a data entry error. </value>
-  </data>
-  <data name="DataGridView_SizeTooLarge" xml:space="preserve">
+  </data><data name="DataGridView_SizeTooLarge" xml:space="preserve">
     <value>Width and height of the control cannot be set to values larger than {0}.</value>
-  </data>
-  <data name="DataGridView_SortCompareDescr" xml:space="preserve">
+  </data><data name="DataGridView_SortCompareDescr" xml:space="preserve">
     <value>Occurs when the DataGridView compares two cell values to perform a sort operation.</value>
-  </data>
-  <data name="DataGridView_SortedDescr" xml:space="preserve">
+  </data><data name="DataGridView_SortedDescr" xml:space="preserve">
     <value>Occurs when the DataGridView control completes a sorting operation.</value>
-  </data>
-  <data name="DataGridView_StandardTabDescr" xml:space="preserve">
+  </data><data name="DataGridView_StandardTabDescr" xml:space="preserve">
     <value>Indicates whether the TAB key moves the focus to the next control in the tab order rather than moving focus to the next cell in the control.</value>
-  </data>
-  <data name="DataGridView_TextBoxColumnMaxInputLengthDescr" xml:space="preserve">
+  </data><data name="DataGridView_TextBoxColumnMaxInputLengthDescr" xml:space="preserve">
     <value>Specifies the maximum number of characters that can be entered into the text box.</value>
-  </data>
-  <data name="DataGridView_TransparentColor" xml:space="preserve">
+  </data><data name="DataGridView_TransparentColor" xml:space="preserve">
     <value>Color '{0}' cannot be set to a transparent color.</value>
-  </data>
-  <data name="DataGridView_UserAddedRowDescr" xml:space="preserve">
+  </data><data name="DataGridView_UserAddedRowDescr" xml:space="preserve">
     <value>Occurs when the user has finished adding a row to the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_UserDeletedRowDescr" xml:space="preserve">
+  </data><data name="DataGridView_UserDeletedRowDescr" xml:space="preserve">
     <value>Occurs when the user has finished deleting a row from the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_UserDeletingRowDescr" xml:space="preserve">
+  </data><data name="DataGridView_UserDeletingRowDescr" xml:space="preserve">
     <value>Occurs when the user deletes a row from the DataGridView control.</value>
-  </data>
-  <data name="DataGridView_WeightSumCannotExceedLongMaxValue" xml:space="preserve">
+  </data><data name="DataGridView_WeightSumCannotExceedLongMaxValue" xml:space="preserve">
     <value>Sum of the columns' FillWeight values cannot exceed {0}.</value>
-  </data>
-  <data name="DataGridView_WrongType" xml:space="preserve">
+  </data><data name="DataGridView_WrongType" xml:space="preserve">
     <value>Provided {0} must be of type {1} or derive from it.</value>
-  </data>
-  <data name="DataGridViewAlternatingRowsDefaultCellStyleChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AlternatingRowsDefaultCellStyle property changes.</value>
-  </data>
-  <data name="DataGridViewAutoSizeColumnModeChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AutoSizeMode property of a column changes.</value>
-  </data>
-  <data name="DataGridViewAutoSizeColumnsModeChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AutoSizeColumnsMode property changes.</value>
-  </data>
-  <data name="DataGridViewAutoSizeRowsModeChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AutoSizeRowsMode property changes.</value>
-  </data>
-  <data name="DataGridViewBackgroundColorChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the DataGridView.BackgroundColor property changes.</value>
-  </data>
-  <data name="DataGridViewBackgroundColorDescr" xml:space="preserve">
-    <value>The background color of the DataGridView.</value>
-  </data>
-  <data name="DataGridViewBand_CannotSelect" xml:space="preserve">
-    <value>Selected property cannot be altered before this object is added to a DataGridView control.</value>
-  </data>
-  <data name="DataGridViewBand_MinimumHeightSmallerThanOne" xml:space="preserve">
-    <value>Minimum height provided cannot be smaller than {0}.</value>
-  </data>
-  <data name="DataGridViewBand_MinimumWidthSmallerThanOne" xml:space="preserve">
-    <value>Minimum width provided cannot be smaller than {0}.</value>
-  </data>
-  <data name="DataGridViewBand_NewRowCannotBeInvisible" xml:space="preserve">
-    <value>Uncommitted new row cannot be made invisible.</value>
-  </data>
-  <data name="DataGridViewBeginInit" xml:space="preserve">
-    <value>BeginInit() has already been called without an EndInit().</value>
-  </data>
-  <data name="DataGridViewBorderStyleChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the BorderStyle property changes.</value>
-  </data>
-  <data name="DataGridViewCell_CannotSetReadOnlyState" xml:space="preserve">
-    <value>ReadOnly property of a cell cannot be set before it is added to a row.</value>
-  </data>
-  <data name="DataGridViewCell_CannotSetSelectedState" xml:space="preserve">
-    <value>Selected property of a cell cannot be set before the cell is added to a DataGridView control.</value>
-  </data>
-  <data name="DataGridViewCell_FormattedValueHasWrongType" xml:space="preserve">
-    <value>Formatted value of the cell has a wrong type.</value>
-  </data>
-  <data name="DataGridViewCell_FormattedValueTypeNull" xml:space="preserve">
-    <value>FormattedValueType property of a cell cannot be null.</value>
-  </data>
-  <data name="DataGridViewCell_ValueTypeNull" xml:space="preserve">
-    <value>ValueType property of a cell in a grid cannot be null.</value>
-  </data>
-  <data name="DataGridViewCellAccessibleObject_OwnerAlreadySet" xml:space="preserve">
-    <value>The owning DataGridViewCell object is already set.</value>
-  </data>
-  <data name="DataGridViewCellAccessibleObject_OwnerNotSet" xml:space="preserve">
-    <value>The owning DataGridViewCell object has not been set.</value>
-  </data>
-  <data name="DataGridViewCellAccessibleObject_OwnerWrongType" xml:space="preserve">
-    <value>DataGridViewCell of type {0} does not provide the Toggle pattern.</value>
-  </data>
-  <data name="DataGridViewCellCollection_AtLeastOneCellIsNull" xml:space="preserve">
-    <value>At least one of the provided cells is null.</value>
-  </data>
-  <data name="DataGridViewCellCollection_CannotAddIdenticalCells" xml:space="preserve">
-    <value>At least two provided cells are identical. Each provided cell must be unique.</value>
-  </data>
-  <data name="DataGridViewCellCollection_CellAlreadyBelongsToDataGridView" xml:space="preserve">
-    <value>Cell provided already belongs to a grid. This operation is not valid.</value>
-  </data>
-  <data name="DataGridViewCellCollection_CellAlreadyBelongsToDataGridViewRow" xml:space="preserve">
-    <value>Cell provided already belongs to a row. This operation is not valid.</value>
-  </data>
-  <data name="DataGridViewCellCollection_CellNotFound" xml:space="preserve">
-    <value>Cell provided cannot be found in the collection.</value>
-  </data>
-  <data name="DataGridViewCellCollection_OwningRowAlreadyBelongsToDataGridView" xml:space="preserve">
-    <value>Collection already belongs to a DataGridView control. This operation is no longer valid.</value>
-  </data>
-  <data name="DataGridViewCellStyle_TransparentColorNotAllowed" xml:space="preserve">
-    <value>DataGridViewCellStyle does not support transparent {0}.</value>
-  </data>
-  <data name="DataGridViewCellStyleAlignmentDescr" xml:space="preserve">
-    <value>Indicates the position of the content within a cell.</value>
-  </data>
-  <data name="DataGridViewCheckBoxCell_ClipboardChecked" xml:space="preserve">
-    <value>Selected</value>
-  </data>
-  <data name="DataGridViewCheckBoxCell_ClipboardFalse" xml:space="preserve">
-    <value>False</value>
-  </data>
-  <data name="DataGridViewCheckBoxCell_ClipboardIndeterminate" xml:space="preserve">
-    <value>Indeterminate</value>
-  </data>
-  <data name="DataGridViewCheckBoxCell_ClipboardTrue" xml:space="preserve">
-    <value>True</value>
-  </data>
-  <data name="DataGridViewCheckBoxCell_ClipboardUnchecked" xml:space="preserve">
-    <value>Cleared</value>
-  </data>
-  <data name="DataGridViewCheckBoxCell_InvalidValueType" xml:space="preserve">
-    <value>The value provided for the DataGridViewCheckBoxCell has the wrong type.</value>
-  </data>
-  <data name="DataGridViewColumn_AutoSizeCriteriaCannotUseInvisibleHeaders" xml:space="preserve">
-    <value>Column AutoSize mode cannot be based on the column headers alone while they are invisible.</value>
-  </data>
-  <data name="DataGridViewColumn_AutoSizeModeDescr" xml:space="preserve">
-    <value>Determines the auto size mode for this column.</value>
-  </data>
-  <data name="DataGridViewColumn_CellTemplateRequired" xml:space="preserve">
-    <value>Operation cannot be completed because this DataGridViewColumn does not have a CellTemplate.</value>
-  </data>
-  <data name="DataGridViewColumn_DisplayIndexExceedsColumnCount" xml:space="preserve">
-    <value>The DisplayIndex property of a DataGridViewColumn must be smaller than the number of columns.</value>
-  </data>
-  <data name="DataGridViewColumn_DisplayIndexNegative" xml:space="preserve">
-    <value>DisplayIndex property of a DataGridViewColumn cannot be negative.</value>
-  </data>
-  <data name="DataGridViewColumn_DisplayIndexTooLarge" xml:space="preserve">
-    <value>DisplayIndex property of a DataGridViewColumn must be smaller than {0}.</value>
-  </data>
-  <data name="DataGridViewColumn_DisplayIndexTooNegative" xml:space="preserve">
-    <value>The DisplayIndex property of a detached DataGridViewColumn cannot be smaller than -1.</value>
-  </data>
-  <data name="DataGridViewColumn_FillWeightDescr" xml:space="preserve">
-    <value>The weight that is used when sizing this column in the Fill auto size mode.</value>
-  </data>
-  <data name="DataGridViewColumn_FrozenColumnCannotAutoFill" xml:space="preserve">
-    <value>Column's AutoSize mode cannot be set to Fill when it is also a frozen column.</value>
-  </data>
-  <data name="DataGridViewColumn_SortModeAndSelectionModeClash" xml:space="preserve">
-    <value>Column's SortMode cannot be set to {0} while the DataGridView control's SelectionMode is set to {1}.</value>
-  </data>
-  <data name="DataGridViewColumnCollection_ColumnNotFound" xml:space="preserve">
-    <value>Column named {0} cannot be found.</value>
-  </data>
-  <data name="DataGridViewColumnHeaderCell_SortModeAndSortGlyphDirectionClash" xml:space="preserve">
-    <value>Column header's SortGlyphDirection cannot be set to {0} while the column's SortMode is set to NotSortable.</value>
-  </data>
-  <data name="DataGridViewColumnHeadersDefaultCellStyleChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the ColumnHeadersDefaultCellStyle property changes.</value>
-  </data>
-  <data name="DataGridViewColumnHeadersHeightChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the ColumnHeadersHeight property changes.</value>
-  </data>
-  <data name="DataGridViewColumnHeadersVisibleDescr" xml:space="preserve">
-    <value>Indicates whether the column headers row is displayed.</value>
-  </data>
-  <data name="DataGridViewColumnSortModeChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the SortMode property for a column changes.</value>
-  </data>
-  <data name="DataGridViewComboBoxCell_DropDownWidthOutOfRange" xml:space="preserve">
-    <value>DropDownWidth value cannot be smaller than {0}.</value>
-  </data>
-  <data name="DataGridViewComboBoxCell_PropertyNotFound" xml:space="preserve">
-    <value>Property called {0} does not exist.</value>
-  </data>
-  <data name="DataGridViewComboBoxCell_InvalidValue" xml:space="preserve">
-    <value>DataGridViewComboBoxCell value is not valid.</value>
-  </data>
-  <data name="DataGridViewComboBoxCell_MaxDropDownItemsOutOfRange" xml:space="preserve">
-    <value>MaxDropDownItems value cannot be smaller than {0} or larger than {1}.</value>
-  </data>
-  <data name="DataGridViewDataMemberChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the DataMember property changes.</value>
-  </data>
-  <data name="DataGridViewDataMemberDescr" xml:space="preserve">
-    <value>Indicates a sub-list of the DataSource to show in the DataGridView control.</value>
-  </data>
-  <data name="DataGridViewDataSourceChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the DataSource property changes.</value>
-  </data>
-  <data name="DataGridViewDataSourceDescr" xml:space="preserve">
-    <value>Indicates the source of data for the DataGridView control.</value>
-  </data>
-  <data name="DataGridViewDefaultCellStyleChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the DefaultCellStyle property changes.</value>
-  </data>
-  <data name="DataGridViewElementPaintingEventArgs_ColumnIndexOutOfRange" xml:space="preserve">
-    <value>ColumnIndex property is out of range.</value>
-  </data>
-  <data name="DataGridViewElementPaintingEventArgs_RowIndexOutOfRange" xml:space="preserve">
-    <value>RowIndex property is out of range.</value>
-  </data>
-  <data name="DataGridViewGridColorDescr" xml:space="preserve">
-    <value>The color of the grid lines separating the cells of the DataGridView.</value>
-  </data>
-  <data name="DataGridViewImageColumn_DescriptionDescr" xml:space="preserve">
-    <value>User-defined text associated with the image.</value>
-  </data>
-  <data name="DataGridViewImageColumn_IconDescr" xml:space="preserve">
-    <value>The icon displayed in the cells of this column when the cell's DataGridViewCell.Value property is not set and the cell's DataGridViewImageCell.ValueIsIcon property is set to true.</value>
-  </data>
-  <data name="DataGridViewImageColumn_ImageDescr" xml:space="preserve">
-    <value>The image displayed in the cells of this column when the cell's DataGridViewCell.Value property is not set and the cell's DataGridViewImageCell.ValueIsIcon property is set to false.</value>
-  </data>
-  <data name="DataGridViewImageColumn_ImageLayoutDescr" xml:space="preserve">
-    <value>The image layout in the cells for this column.</value>
-  </data>
-  <data name="DataGridViewImageColumn_PaddingDescr" xml:space="preserve">
-    <value>ImageColumnPadding</value>
-  </data>
-  <data name="DataGridViewImageColumn_ValuesAreIconsDescr" xml:space="preserve">
-    <value>Indicates whether cells in this column display System.Drawing.Icon values.</value>
-  </data>
-  <data name="DataGridViewOnAllowUserToAddRowsChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AllowUserToAddRows property changes.</value>
-  </data>
-  <data name="DataGridViewOnAllowUserToDeleteRowsChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AllowUserToDeleteRows property changes.</value>
-  </data>
-  <data name="DataGridViewOnAllowUserToOrderColumnsChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AllowUserToOrderColumns property changes.</value>
-  </data>
-  <data name="DataGridViewOnAllowUserToResizeColumnsChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AllowUserToResizeColumns property changes.</value>
-  </data>
-  <data name="DataGridViewOnAllowUserToResizeRowsChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the AllowUserToResizeRows property changes.</value>
-  </data>
-  <data name="DataGridViewOnGridColorChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the GridColor property changes.</value>
-  </data>
-  <data name="DataGridViewOnMultiSelectChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the MultiSelect property changes.</value>
-  </data>
-  <data name="DataGridViewOnReadOnlyChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the ReadOnly property changes.</value>
-  </data>
-  <data name="DataGridViewRowAccessibleObject_OwnerAlreadySet" xml:space="preserve">
-    <value>Owning DataGridViewRow object is already set.</value>
-  </data>
-  <data name="DataGridViewRowAccessibleObject_OwnerNotSet" xml:space="preserve">
-    <value>Owning DataGridViewRow object has not been set.</value>
-  </data>
-  <data name="DataGridViewRowCollection_AddUnboundRow" xml:space="preserve">
-    <value>Rows cannot be programmatically added to the DataGridView's rows collection when the control is data-bound.</value>
-  </data>
-  <data name="DataGridViewRowCollection_CannotAddOrInsertSelectedRow" xml:space="preserve">
-    <value>Selected row cannot be added to or inserted into the DataGridView control. The row must be deselected first.</value>
-  </data>
-  <data name="DataGridViewRowCollection_CannotDeleteNewRow" xml:space="preserve">
-    <value>Uncommitted new row cannot be deleted.</value>
-  </data>
-  <data name="DataGridViewRowCollection_CantClearRowCollectionWithWrongSource" xml:space="preserve">
-    <value>Rows collection cannot be programmatically cleared when the DataGridView control is data-bound to anything else than an IBindingList that supports change notification and allows deletion.</value>
-  </data>
-  <data name="DataGridViewRowCollection_CantRemoveRowsWithWrongSource" xml:space="preserve">
-    <value>Rows cannot be programmatically removed unless the DataGridView is data-bound to an IBindingList that supports change notification and allows deletion.</value>
-  </data>
-  <data name="DataGridViewRowCollection_CountOutOfRange" xml:space="preserve">
-    <value>Number of copies to create must be strictly positive.</value>
-  </data>
-  <data name="DataGridViewRowCollection_EnumFinished" xml:space="preserve">
-    <value>Enumeration already finished.</value>
-  </data>
-  <data name="DataGridViewRowCollection_EnumNotStarted" xml:space="preserve">
-    <value>Enumeration has not started. Call MoveNext.</value>
-  </data>
-  <data name="DataGridViewRowCollection_IndexDestinationOutOfRange" xml:space="preserve">
-    <value>Index of the destination row is out of range.</value>
-  </data>
-  <data name="DataGridViewRowCollection_IndexSourceOutOfRange" xml:space="preserve">
-    <value>Index of the row to copy is out of range.</value>
-  </data>
-  <data name="DataGridViewRowCollection_NoColumns" xml:space="preserve">
-    <value>No row can be added to a DataGridView control that does not have columns. Columns must be added first.</value>
-  </data>
-  <data name="DataGridViewRowCollection_NoInsertionAfterNewRow" xml:space="preserve">
-    <value>No row can be inserted after the uncommitted new row.</value>
-  </data>
-  <data name="DataGridViewRowCollection_NoRowToDuplicate" xml:space="preserve">
-    <value>No row exists to make a copy of. A first row must be added to the DataGridView control before you can add copies of it.</value>
-  </data>
-  <data name="DataGridViewRowCollection_RowIndexOutOfRange" xml:space="preserve">
-    <value>Row index provided is out of range.</value>
-  </data>
-  <data name="DataGridViewRowCollection_RowTemplateTooManyCells" xml:space="preserve">
-    <value>The RowTemplate row contains more cells than there are columns.</value>
-  </data>
-  <data name="DataGridViewRowCollection_TooManyCells" xml:space="preserve">
-    <value>Provided row contains more cells than there are columns.</value>
-  </data>
-  <data name="DataGridViewRowHeadersDefaultCellStyleChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the RowHeadersDefaultCellStyle property changes.</value>
-  </data>
-  <data name="DataGridViewRowHeadersVisibleDescr" xml:space="preserve">
-    <value>Indicates whether the column that contains row headers is displayed.</value>
-  </data>
-  <data name="DataGridViewRowHeadersWidthChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the RowHeadersWidth property changes.</value>
-  </data>
-  <data name="DataGridViewRowsDefaultCellStyleChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the RowsDefaultCellStyle property changes.</value>
-  </data>
-  <data name="DataGridViewTopRowAccessibleObject_OwnerAlreadySet" xml:space="preserve">
-    <value>The owning DataGridView control is already set.</value>
-  </data>
-  <data name="DataGridViewTopRowAccessibleObject_OwnerNotSet" xml:space="preserve">
-    <value>The owning DataGridView control has not been set.</value>
-  </data>
-  <data name="DataGridViewTypeColumn_WrongCellTemplateType" xml:space="preserve">
-    <value>Value provided for CellTemplate must be of type {0} or derive from it.</value>
-  </data>
-  <data name="DataGridViewVirtualModeDescr" xml:space="preserve">
-    <value>Indicates whether you have provided your own data-management operations for the DataGridView control. </value>
-  </data>
-  <data name="DataGridVisibleColumnCountDescr" xml:space="preserve">
+  </data><data name="DataGridVisibleColumnCountDescr" xml:space="preserve">
     <value>Returns the count of visible columns in the grid.</value>
-  </data>
-  <data name="DataGridVisibleRowCountDescr" xml:space="preserve">
+  </data><data name="DataGridVisibleRowCountDescr" xml:space="preserve">
     <value>Returns the count of visible rows in the grid.</value>
-  </data>
-  <data name="DataObjectWhitespaceEmptyFormatNotAllowed" xml:space="preserve">
-    <value>Whitespace or empty string is not a valid value for parameter 'format'.</value>
-  </data>
-  <data name="DataObjectDibNotSupported" xml:space="preserve">
+  </data><data name="DataObjectDibNotSupported" xml:space="preserve">
     <value>Bitmap object does not directly support the device-independent bitmap format.  Either specify auto-conversion or perform a SetData with the Bitmap data format.</value>
-  </data>
-  <data name="DataSourceDataMemberPropNotFound" xml:space="preserve">
+  </data><data name="DataObjectWhitespaceEmptyFormatNotAllowed" xml:space="preserve">
+    <value>Whitespace or empty string is not a valid value for parameter 'format'.</value>
+  </data><data name="DataSourceDataMemberPropNotFound" xml:space="preserve">
     <value>DataMember property '{0}' cannot be found on the DataSource.</value>
-  </data>
-  <data name="DataSourceLocksItems" xml:space="preserve">
+  </data><data name="DataSourceLocksItems" xml:space="preserve">
     <value>Items collection cannot be modified when the DataSource property is set.</value>
-  </data>
-  <data name="DataStreamWrite" xml:space="preserve">
+  </data><data name="DataStreamWrite" xml:space="preserve">
     <value>Requested number of bytes did not get written to the underlying IStream implementation.</value>
-  </data>
-  <data name="DateTimePickerCalendarFontDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCalendarFontDescr" xml:space="preserve">
     <value>The font used to display the calendar.</value>
-  </data>
-  <data name="DateTimePickerCalendarForeColorDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCalendarForeColorDescr" xml:space="preserve">
     <value>The color used to display text within a month.</value>
-  </data>
-  <data name="DateTimePickerCalendarMonthBackgroundDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCalendarMonthBackgroundDescr" xml:space="preserve">
     <value>The background color displayed within the month.</value>
-  </data>
-  <data name="DateTimePickerCalendarTitleBackColorDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCalendarTitleBackColorDescr" xml:space="preserve">
     <value>The background color displayed in the calendar's title.</value>
-  </data>
-  <data name="DateTimePickerCalendarTitleForeColorDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCalendarTitleForeColorDescr" xml:space="preserve">
     <value>The color used to display text within the calendar's title.</value>
-  </data>
-  <data name="DateTimePickerCalendarTrailingForeColorDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCalendarTrailingForeColorDescr" xml:space="preserve">
     <value>The color used to display header day and trailing day text. Header and trailing days are the days from the previous and following months that appear on the current month calendar.</value>
-  </data>
-  <data name="DateTimePickerCheckedDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCheckedDescr" xml:space="preserve">
     <value>When ShowSelectBox is true, determines if the check box is checked, indicating that the user has selected a value.</value>
-  </data>
-  <data name="DateTimePickerCustomFormatDescr" xml:space="preserve">
+  </data><data name="DateTimePickerCustomFormatDescr" xml:space="preserve">
     <value>The custom format string used to format the date and/or time displayed in the control.</value>
-  </data>
-  <data name="DateTimePickerDropDownAlignDescr" xml:space="preserve">
+  </data><data name="DateTimePickerDropDownAlignDescr" xml:space="preserve">
     <value>Controls how the month drop-down is aligned to the DateTimePicker. Can be LEFT or RIGHT.</value>
-  </data>
-  <data name="DateTimePickerFormatDescr" xml:space="preserve">
+  </data><data name="DateTimePickerFormatDescr" xml:space="preserve">
     <value>Determines whether dates and times are displayed using standard or custom formatting.</value>
-  </data>
-  <data name="DateTimePickerMaxDate" xml:space="preserve">
+  </data><data name="DateTimePickerLocalizedControlType" xml:space="preserve">
+    <value>date and time picker</value>
+  </data><data name="DateTimePickerMaxDate" xml:space="preserve">
     <value>DateTimePicker does not support dates after {0}.</value>
-  </data>
-  <data name="DateTimePickerMaxDateDescr" xml:space="preserve">
+  </data><data name="DateTimePickerMaxDateDescr" xml:space="preserve">
     <value>The maximum date that can be selected.</value>
-  </data>
-  <data name="DateTimePickerMinDate" xml:space="preserve">
+  </data><data name="DateTimePickerMinDate" xml:space="preserve">
     <value>DateTimePicker does not support dates before {0}.</value>
-  </data>
-  <data name="DateTimePickerMinDateDescr" xml:space="preserve">
+  </data><data name="DateTimePickerMinDateDescr" xml:space="preserve">
     <value>The minimum date that can be selected.</value>
-  </data>
-  <data name="DateTimePickerOnCloseUpDescr" xml:space="preserve">
+  </data><data name="DateTimePickerOnCloseUpDescr" xml:space="preserve">
     <value>Occurs when the user is finished selecting a date from the drop-down calendar.</value>
-  </data>
-  <data name="DateTimePickerOnDropDownDescr" xml:space="preserve">
+  </data><data name="DateTimePickerOnDropDownDescr" xml:space="preserve">
     <value>Occurs when the drop-down calendar is about to drop.</value>
-  </data>
-  <data name="DateTimePickerOnFormatChangedDescr" xml:space="preserve">
+  </data><data name="DateTimePickerOnFormatChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Format property is changed on DateTimePicker.</value>
-  </data>
-  <data name="DateTimePickerShowNoneDescr" xml:space="preserve">
+  </data><data name="DateTimePickerShowNoneDescr" xml:space="preserve">
     <value>Determines whether a check box is displayed in the control. When the box is unchecked, no value is selected.</value>
-  </data>
-  <data name="DateTimePickerShowUpDownDescr" xml:space="preserve">
+  </data><data name="DateTimePickerShowUpDownDescr" xml:space="preserve">
     <value>Indicates whether a spin box rather than a drop-down calendar is displayed for modifying the control value.</value>
-  </data>
-  <data name="DateTimePickerValueDescr" xml:space="preserve">
+  </data><data name="DateTimePickerValueDescr" xml:space="preserve">
     <value>The current date/time value for this control.</value>
-  </data>
-  <data name="DebuggingExceptionOnly" xml:space="preserve">
+  </data><data name="DebuggingExceptionOnly" xml:space="preserve">
     <value>{0} This exception is only raised if a debugger is attached to the process.</value>
-  </data>
-  <data name="DefManifestNotFound" xml:space="preserve">
+  </data><data name="DefManifestNotFound" xml:space="preserve">
     <value>Default manifest file required to enable visual styles cannot be found.</value>
-  </data>
-  <data name="DefaultDataGridViewButtonCellToolTipText" xml:space="preserve">
+  </data><data name="DefaultDataGridViewButtonCellToolTipText" xml:space="preserve">
     <value>Button</value>
-  </data>
-  <data name="DefaultDataGridViewComboBoxCellToolTipText" xml:space="preserve">
+  </data><data name="DefaultDataGridViewComboBoxCellToolTipText" xml:space="preserve">
     <value>ComboBox</value>
-  </data>
-  <data name="DefaultDataGridViewImageCellToolTipText" xml:space="preserve">
+  </data><data name="DefaultDataGridViewImageCellToolTipText" xml:space="preserve">
     <value>Image</value>
-  </data>
-  <data name="DefaultDataGridViewLinkCellToolTipText" xml:space="preserve">
+  </data><data name="DefaultDataGridViewLinkCellToolTipText" xml:space="preserve">
     <value>Link</value>
-  </data>
-  <data name="DefaultDataGridViewTextBoxCellToolTipText" xml:space="preserve">
+  </data><data name="DefaultDataGridViewTextBoxCellToolTipText" xml:space="preserve">
     <value>Edit</value>
-  </data>
-  <data name="DescriptionBindingNavigator" xml:space="preserve">
+  </data><data name="DefaultNumericUpDownAccessibleName" xml:space="preserve">
+    <value>NumericUpDown</value>
+  </data><data name="DefaultUpDownButtonsAccessibleName" xml:space="preserve">
+    <value>UpDown</value>
+  </data><data name="DescriptionBindingNavigator" xml:space="preserve">
     <value>Provides a user interface for navigation and manipulation of data bound to controls on a form.</value>
-  </data>
-  <data name="DescriptionBindingSource" xml:space="preserve">
+  </data><data name="DescriptionBindingSource" xml:space="preserve">
     <value>Encapsulates a data source for a form and provides navigation, filtering, sorting, and updating capabilities.</value>
-  </data>
-  <data name="DescriptionButton" xml:space="preserve">
+  </data><data name="DescriptionButton" xml:space="preserve">
     <value>Raises an event when the user clicks it.</value>
-  </data>
-  <data name="DescriptionCheckBox" xml:space="preserve">
+  </data><data name="DescriptionCheckBox" xml:space="preserve">
     <value>Enables the user to select or clear the associated option.</value>
-  </data>
-  <data name="DescriptionCheckedListBox" xml:space="preserve">
+  </data><data name="DescriptionCheckedListBox" xml:space="preserve">
     <value>Displays a list of items with a check box on the left side of each item.</value>
-  </data>
-  <data name="DescriptionColorDialog" xml:space="preserve">
+  </data><data name="DescriptionColorDialog" xml:space="preserve">
     <value>Displays available colors along with controls that enable the user to define custom colors.</value>
-  </data>
-  <data name="DescriptionComboBox" xml:space="preserve">
+  </data><data name="DescriptionComboBox" xml:space="preserve">
     <value>Displays an editable text box with a drop-down list of permitted values.</value>
-  </data>
-  <data name="DescriptionContextMenuStrip" xml:space="preserve">
+  </data><data name="DescriptionContextMenuStrip" xml:space="preserve">
     <value>Displays a shortcut menu when the user right-clicks the associated control.</value>
-  </data>
-  <data name="DescriptionDataGridView" xml:space="preserve">
+  </data><data name="DescriptionDataGridView" xml:space="preserve">
     <value>Displays rows and columns of data in a grid you can customize.</value>
-  </data>
-  <data name="DescriptionDateTimePicker" xml:space="preserve">
+  </data><data name="DescriptionDateTimePicker" xml:space="preserve">
     <value>Enables the user to select a date and time, and to display that date and time in a specified format.</value>
-  </data>
-  <data name="DescriptionDomainUpDown" xml:space="preserve">
+  </data><data name="DescriptionDomainUpDown" xml:space="preserve">
     <value>Displays a single string value that the user selected from a list of items by clicking up and down buttons in the control.</value>
-  </data>
-  <data name="DescriptionErrorProvider" xml:space="preserve">
+  </data><data name="DescriptionErrorProvider" xml:space="preserve">
     <value>Provides a user interface to indicate to the user that a control on a form has an error associated with it.</value>
-  </data>
-  <data name="DescriptionFlowLayoutPanel" xml:space="preserve">
+  </data><data name="DescriptionFlowLayoutPanel" xml:space="preserve">
     <value>Handles the layout of its components and arranges them in a flow layout automatically.</value>
-  </data>
-  <data name="DescriptionFolderBrowserDialog" xml:space="preserve">
+  </data><data name="DescriptionFolderBrowserDialog" xml:space="preserve">
     <value>Displays a dialog box that prompts the user to select a folder.</value>
-  </data>
-  <data name="DescriptionFontDialog" xml:space="preserve">
+  </data><data name="DescriptionFontDialog" xml:space="preserve">
     <value>Displays a dialog box that prompts the user to choose a font from those installed on the local computer.</value>
-  </data>
-  <data name="DescriptionGroupBox" xml:space="preserve">
+  </data><data name="DescriptionGroupBox" xml:space="preserve">
     <value>Displays a frame around a group of controls with an optional caption.</value>
-  </data>
-  <data name="DescriptionHelpProvider" xml:space="preserve">
-    <value>Provides pop-up or online Help for controls.</value>
-  </data>
-  <data name="DescriptionHScrollBar" xml:space="preserve">
+  </data><data name="DescriptionHScrollBar" xml:space="preserve">
     <value>Enables its parent component to scroll content horizontally. Unnecessary if the parent has an autoscroll attribute, and that attribute is enabled.</value>
-  </data>
-  <data name="DescriptionImageList" xml:space="preserve">
+  </data><data name="DescriptionHelpProvider" xml:space="preserve">
+    <value>Provides pop-up or online Help for controls.</value>
+  </data><data name="DescriptionImageList" xml:space="preserve">
     <value>Manages a collection of images that are typically used by other controls such as ListView, TreeView, or ToolStrip.</value>
-  </data>
-  <data name="DescriptionKioskModeManager" xml:space="preserve">
+  </data><data name="DescriptionKioskModeManager" xml:space="preserve">
     <value>Manages common fullscreen, input, cursor, and power behavior for kiosk-style WinForms applications.</value>
-  </data>
-  <data name="KioskModeManagerContainerControlDescr" xml:space="preserve">
-    <value>The container whose containing form is controlled by the kiosk mode manager.</value>
-  </data>
-  <data name="KioskModeManagerContainerControlChangedDescr" xml:space="preserve">
-    <value>Occurs when the ContainerControl property value changes.</value>
-  </data>
-  <data name="KioskModeManagerEscapeExitsFullScreenDescr" xml:space="preserve">
-    <value>Indicates whether pressing Escape exits fullscreen mode.</value>
-  </data>
-  <data name="KioskModeManagerFullScreenDescr" xml:space="preserve">
-    <value>Gets or sets a value indicating whether the resolved form is currently fullscreen.</value>
-  </data>
-  <data name="KioskModeManagerFullScreenChangedDescr" xml:space="preserve">
-    <value>Occurs when the fullscreen state changes.</value>
-  </data>
-  <data name="KioskModeManagerHideTaskbarDescr" xml:space="preserve">
-    <value>Indicates whether fullscreen mode covers the Windows taskbar.</value>
-  </data>
-  <data name="KioskModeManagerMousePointerAutoHideDelayDescr" xml:space="preserve">
-    <value>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</value>
-  </data>
-  <data name="KioskModeManagerSuppressPowerSavingDescr" xml:space="preserve">
-    <value>Indicates whether Windows should keep the display and system awake while this component is active.</value>
-  </data>
-  <data name="KioskModeManagerToggleFullScreenKeyDescr" xml:space="preserve">
-    <value>The key that toggles between fullscreen and restored mode.</value>
-  </data>
-  <data name="KioskModeManagerTopMostInFullScreenDescr" xml:space="preserve">
-    <value>Indicates whether the form is topmost while fullscreen.</value>
-  </data>
-  <data name="KioskModeManagerWakeupDescr" xml:space="preserve">
-    <value>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</value>
-  </data>
-  <data name="KioskModeManagerWakeUpCommandDescr" xml:space="preserve">
-    <value>The command that is executed whenever the kiosk experience is woken.</value>
-  </data>
-  <data name="DescriptionLabel" xml:space="preserve">
+  </data><data name="DescriptionLabel" xml:space="preserve">
     <value>Provides run-time information or descriptive text for a control.</value>
-  </data>
-  <data name="DescriptionLinkLabel" xml:space="preserve">
+  </data><data name="DescriptionLinkLabel" xml:space="preserve">
     <value>Displays a label control that supports hyperlink functionality, formatting, and tracking.</value>
-  </data>
-  <data name="DescriptionListBox" xml:space="preserve">
+  </data><data name="DescriptionListBox" xml:space="preserve">
     <value>Displays a list from which the user can select items.</value>
-  </data>
-  <data name="DescriptionListView" xml:space="preserve">
+  </data><data name="DescriptionListView" xml:space="preserve">
     <value>Displays a collection of items in one of five different views.</value>
-  </data>
-  <data name="DescriptionMaskedTextBox" xml:space="preserve">
+  </data><data name="DescriptionMaskedTextBox" xml:space="preserve">
     <value>Uses a mask to distinguish between proper and improper user input.</value>
-  </data>
-  <data name="DescriptionMenuStrip" xml:space="preserve">
+  </data><data name="DescriptionMenuStrip" xml:space="preserve">
     <value>Displays application commands and options grouped by functionality.</value>
-  </data>
-  <data name="DescriptionMonthCalendar" xml:space="preserve">
+  </data><data name="DescriptionMonthCalendar" xml:space="preserve">
     <value>Displays a monthly calendar from which the user can select a date.</value>
-  </data>
-  <data name="DescriptionNotifyIcon" xml:space="preserve">
+  </data><data name="DescriptionNotifyIcon" xml:space="preserve">
     <value>Displays an icon in the notification area, on the right side of the Windows taskbar, during run time.</value>
-  </data>
-  <data name="DescriptionNumericUpDown" xml:space="preserve">
+  </data><data name="DescriptionNumericUpDown" xml:space="preserve">
     <value>Displays a single numeric value that the user can increment and decrement by clicking up and down buttons on the control.</value>
-  </data>
-  <data name="DescriptionOpenFileDialog" xml:space="preserve">
+  </data><data name="DescriptionOpenFileDialog" xml:space="preserve">
     <value>Displays a dialog box that prompts the user to open a file.</value>
-  </data>
-  <data name="DescriptionPageSetupDialog" xml:space="preserve">
+  </data><data name="DescriptionPageSetupDialog" xml:space="preserve">
     <value>Displays a dialog box that enables the user to change page-related print settings, including margins and paper orientation.</value>
-  </data>
-  <data name="DescriptionPanel" xml:space="preserve">
+  </data><data name="DescriptionPanel" xml:space="preserve">
     <value>Enables you to group collections of controls.</value>
-  </data>
-  <data name="DescriptionPictureBox" xml:space="preserve">
+  </data><data name="DescriptionPictureBox" xml:space="preserve">
     <value>Displays an image.</value>
-  </data>
-  <data name="DescriptionPrintDialog" xml:space="preserve">
+  </data><data name="DescriptionPrintDialog" xml:space="preserve">
     <value>Displays a dialog box that enables the user to select a printer and choose other print options such as the number of copies and page orientation.</value>
-  </data>
-  <data name="DescriptionPrintPreviewControl" xml:space="preserve">
+  </data><data name="DescriptionPrintPreviewControl" xml:space="preserve">
     <value>Represents only the portion of a print preview that shows the document being previewed. Does not contain any dialog boxes or buttons.</value>
-  </data>
-  <data name="DescriptionPrintPreviewDialog" xml:space="preserve">
+  </data><data name="DescriptionPrintPreviewDialog" xml:space="preserve">
     <value>Displays a dialog box that shows the user a preview of what the associated document will look like when printed.</value>
-  </data>
-  <data name="DescriptionProgressBar" xml:space="preserve">
+  </data><data name="DescriptionProgressBar" xml:space="preserve">
     <value>Displays a bar that fills to indicate to the user the progress of an operation.</value>
-  </data>
-  <data name="DescriptionPropertyGrid" xml:space="preserve">
+  </data><data name="DescriptionPropertyGrid" xml:space="preserve">
     <value>Provides a user interface for browsing the properties of an object.</value>
-  </data>
-  <data name="DescriptionRadioButton" xml:space="preserve">
+  </data><data name="DescriptionRadioButton" xml:space="preserve">
     <value>Enables the user to select a single option from a group of choices when paired with other RadioButtons.</value>
-  </data>
-  <data name="DescriptionRichTextBox" xml:space="preserve">
+  </data><data name="DescriptionRichTextBox" xml:space="preserve">
     <value>Provides advanced text entry and editing features such as character and paragraph formatting.</value>
-  </data>
-  <data name="DescriptionSaveFileDialog" xml:space="preserve">
+  </data><data name="DescriptionSaveFileDialog" xml:space="preserve">
     <value>Displays a dialog box that prompts the user to select a location for saving a file.</value>
-  </data>
-  <data name="DescriptionSplitContainer" xml:space="preserve">
+  </data><data name="DescriptionSplitContainer" xml:space="preserve">
     <value>Divides a container's display area into two resizable panels to which you can add controls.</value>
-  </data>
-  <data name="DescriptionSplitter" xml:space="preserve">
+  </data><data name="DescriptionSplitter" xml:space="preserve">
     <value>Divides a container's display area into two areas which can be resized.</value>
-  </data>
-  <data name="DescriptionStatusStrip" xml:space="preserve">
+  </data><data name="DescriptionStatusStrip" xml:space="preserve">
     <value>Displays information to the user about the object being viewed, the object's components, or the object's operation.</value>
-  </data>
-  <data name="DescriptionTabControl" xml:space="preserve">
+  </data><data name="DescriptionTabControl" xml:space="preserve">
     <value>Manages and displays to the user a related collection of tabs that can contain controls and components.</value>
-  </data>
-  <data name="DescriptionTableLayoutPanel" xml:space="preserve">
+  </data><data name="DescriptionTableLayoutPanel" xml:space="preserve">
     <value>Handles the layout of its components and arranges them in the format of a table automatically.</value>
-  </data>
-  <data name="DescriptionTextBox" xml:space="preserve">
+  </data><data name="DescriptionTextBox" xml:space="preserve">
     <value>Enables the user to enter text, and provides multiline editing and password character masking.</value>
-  </data>
-  <data name="DescriptionTimer" xml:space="preserve">
+  </data><data name="DescriptionTimer" xml:space="preserve">
     <value>Component that raises an event at user defined intervals</value>
-  </data>
-  <data name="DescriptionToolStrip" xml:space="preserve">
+  </data><data name="DescriptionToolStrip" xml:space="preserve">
     <value>Provides toolbars and other user interface elements that support many appearance options, and that support overflow and run-time item reordering.</value>
-  </data>
-  <data name="DescriptionToolTip" xml:space="preserve">
+  </data><data name="DescriptionToolTip" xml:space="preserve">
     <value>Displays information when the user moves the pointer over an associated control.</value>
-  </data>
-  <data name="DescriptionTrackBar" xml:space="preserve">
+  </data><data name="DescriptionTrackBar" xml:space="preserve">
     <value>Enables the user to choose between a range of values by sliding a small bar along another bar.</value>
-  </data>
-  <data name="DescriptionTreeView" xml:space="preserve">
+  </data><data name="DescriptionTreeView" xml:space="preserve">
     <value>Displays a hierarchical collection of labeled items to the user that optionally contain an image.</value>
-  </data>
-  <data name="DescriptionVScrollBar" xml:space="preserve">
+  </data><data name="DescriptionVScrollBar" xml:space="preserve">
     <value>Enables its parent component to scroll content vertically. Unnecessary if the parent has an autoscroll attribute, and the attribute is enabled.</value>
-  </data>
-  <data name="DescriptionWebBrowser" xml:space="preserve">
+  </data><data name="DescriptionWebBrowser" xml:space="preserve">
     <value>Enables the user to browse Web pages inside your form.</value>
-  </data>
-  <data name="DispInvokeFailed" xml:space="preserve">
+  </data><data name="DesignTimeFeaturesNotSupported" xml:space="preserve">
+    <value>Design time features are not supported.</value>
+  </data><data name="DispInvokeFailed" xml:space="preserve">
     <value>Operation {0} on the component did not succeed, generating the error code 0x{1:X}.</value>
-  </data>
-  <data name="DomainUpDownItemsDescr" xml:space="preserve">
+  </data><data name="DomainUpDownItemsDescr" xml:space="preserve">
     <value>The allowable values of the DomainUpDown.</value>
-  </data>
-  <data name="DomainUpDownOnSelectedItemChangedDescr" xml:space="preserve">
+  </data><data name="DomainUpDownOnSelectedItemChangedDescr" xml:space="preserve">
     <value>Occurs when the selected item in the control changes.</value>
-  </data>
-  <data name="DomainUpDownSelectedIndexDescr" xml:space="preserve">
+  </data><data name="DomainUpDownSelectedIndexDescr" xml:space="preserve">
     <value>The index of the selected domain value.</value>
-  </data>
-  <data name="DomainUpDownSelectedItemDescr" xml:space="preserve">
+  </data><data name="DomainUpDownSelectedItemDescr" xml:space="preserve">
     <value>The currently selected domain value.</value>
-  </data>
-  <data name="DomainUpDownSortedDescr" xml:space="preserve">
+  </data><data name="DomainUpDownSortedDescr" xml:space="preserve">
     <value>Controls whether items in the domain list are sorted.</value>
-  </data>
-  <data name="DomainUpDownWrapDescr" xml:space="preserve">
+  </data><data name="DomainUpDownWrapDescr" xml:space="preserve">
     <value>Indicates whether values wrap around at either end of the item list.</value>
-  </data>
-  <data name="DragDropRegFailed" xml:space="preserve">
+  </data><data name="DragDropRegFailed" xml:space="preserve">
     <value>DragDrop registration did not succeed.</value>
-  </data>
-  <data name="drawItemEventDescr" xml:space="preserve">
-    <value>Occurs whenever a particular item/area needs to be painted.</value>
-  </data>
-  <data name="ErrorBadInputLanguage" xml:space="preserve">
+  </data><data name="EditDefaultAccessibleName" xml:space="preserve">
+    <value>Spinner</value>
+  </data><data name="ErrorBadInputLanguage" xml:space="preserve">
     <value>inputLanguage is not recognized by the system.</value>
-  </data>
-  <data name="ErrorCollectionFull" xml:space="preserve">
+  </data><data name="ErrorCollectionFull" xml:space="preserve">
     <value>Collection has reached its maximum capacity.</value>
-  </data>
-  <data name="ErrorCreatingHandle" xml:space="preserve">
+  </data><data name="ErrorCreatingHandle" xml:space="preserve">
     <value>Error creating window handle.</value>
-  </data>
-  <data name="ErrorNoMarshalingThread" xml:space="preserve">
+  </data><data name="ErrorNoMarshalingThread" xml:space="preserve">
     <value>Invoke or BeginInvoke cannot be called on a control until the window handle has been created.</value>
-  </data>
-  <data name="ErrorPropertyPageFailed" xml:space="preserve">
+  </data><data name="ErrorPropertyPageFailed" xml:space="preserve">
     <value>Component did not succeed to show the property page.</value>
-  </data>
-  <data name="ErrorProviderBlinkRateDescr" xml:space="preserve">
+  </data><data name="ErrorProviderBlinkRateDescr" xml:space="preserve">
     <value>The rate in milliseconds at which the error icon blinks.</value>
-  </data>
-  <data name="ErrorProviderBlinkStyleDescr" xml:space="preserve">
+  </data><data name="ErrorProviderBlinkStyleDescr" xml:space="preserve">
     <value>Controls whether the error icon blinks when an error is set.</value>
-  </data>
-  <data name="ErrorProviderContainerControlDescr" xml:space="preserve">
+  </data><data name="ErrorProviderContainerControlDescr" xml:space="preserve">
     <value>The parent control, usually the form, that contains the data-bound controls on which the ErrorProvider can display error icons.</value>
-  </data>
-  <data name="ErrorProviderDataMemberDescr" xml:space="preserve">
+  </data><data name="ErrorProviderDataMemberDescr" xml:space="preserve">
     <value>Indicates the sub-list of data from the DataSource to bind errors against.</value>
-  </data>
-  <data name="ErrorProviderDataSourceDescr" xml:space="preserve">
+  </data><data name="ErrorProviderDataSourceDescr" xml:space="preserve">
     <value>Indicates the source of data to bind errors against.</value>
-  </data>
-  <data name="ErrorProviderErrorDescr" xml:space="preserve">
+  </data><data name="ErrorProviderDefaultAccessibleName" xml:space="preserve">
+    <value>Error provider</value>
+  </data><data name="ErrorProviderErrorDescr" xml:space="preserve">
     <value>The error description for a control.</value>
-  </data>
-  <data name="ErrorProviderIconAlignmentDescr" xml:space="preserve">
+  </data><data name="ErrorProviderIconAlignmentDescr" xml:space="preserve">
     <value>The location of the error icon relative to the control.</value>
-  </data>
-  <data name="ErrorProviderIconDescr" xml:space="preserve">
+  </data><data name="ErrorProviderIconDescr" xml:space="preserve">
     <value>The icon used to indicate an error.</value>
-  </data>
-  <data name="ErrorProviderIconPaddingDescr" xml:space="preserve">
+  </data><data name="ErrorProviderIconPaddingDescr" xml:space="preserve">
     <value>The number of pixels to leave between the error icon and the control.</value>
-  </data>
-  <data name="ErrorSettingWindowRegion" xml:space="preserve">
+  </data><data name="ErrorSettingWindowRegion" xml:space="preserve">
     <value>Error occurred while trying to set the window region for the MDI client.</value>
-  </data>
-  <data name="ErrorTypeConverterFailed" xml:space="preserve">
+  </data><data name="ErrorTypeConverterFailed" xml:space="preserve">
     <value>Component did not succeed to show the editor.</value>
-  </data>
-  <data name="ExceptionCreatingCompEditorControl" xml:space="preserve">
-    <value>ComponentEditorControl: {0} cannot be created.</value>
-  </data>
-  <data name="ExceptionCreatingObject" xml:space="preserve">
-    <value>Exception occurred while trying to create an instance of {0}. The exception was "{1}".</value>
-  </data>
-  <data name="ExDlgCancel" xml:space="preserve">
+  </data><data name="ExDlgCancel" xml:space="preserve">
     <value>Cancel</value>
-  </data>
-  <data name="ExDlgCaption" xml:space="preserve">
+  </data><data name="ExDlgCaption" xml:space="preserve">
     <value>Microsoft .NET</value>
-  </data>
-  <data name="ExDlgCaption2" xml:space="preserve">
+  </data><data name="ExDlgCaption2" xml:space="preserve">
     <value>{0}</value>
-  </data>
-  <data name="ExDlgContinue" xml:space="preserve">
+  </data><data name="ExDlgContinue" xml:space="preserve">
     <value>&amp;Continue</value>
-  </data>
-  <data name="ExDlgContinueErrorText" xml:space="preserve">
+  </data><data name="ExDlgContinueErrorText" xml:space="preserve">
     <value>Unhandled exception has occurred in a component in your application. If you click Continue, the application will ignore this error and attempt to continue.
 
 {0}.</value>
-  </data>
-  <data name="ExDlgDetailsText" xml:space="preserve">
+  </data><data name="ExDlgDetailsText" xml:space="preserve">
     <value>Error Text</value>
-  </data>
-  <data name="ExDlgErrorText" xml:space="preserve">
+  </data><data name="ExDlgErrorText" xml:space="preserve">
     <value>Unhandled exception has occurred in your application. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately.
 
 {0}.</value>
-  </data>
-  <data name="ExDlgHelp" xml:space="preserve">
+  </data><data name="ExDlgHelp" xml:space="preserve">
     <value>&amp;Help</value>
-  </data>
-  <data name="ExDlgMsgExceptionSection" xml:space="preserve">
+  </data><data name="ExDlgMsgExceptionSection" xml:space="preserve">
     <value>Exception Text</value>
-  </data>
-  <data name="ExDlgMsgFooterNonSwitchable" xml:space="preserve">
+  </data><data name="ExDlgMsgFooterNonSwitchable" xml:space="preserve">
     <value>Application does not support Windows Forms just-in-time (JIT)
 debugging. Contact the application author for more
 information.
 </value>
-  </data>
-  <data name="ExDlgMsgFooterSwitchable" xml:space="preserve">
+  </data><data name="ExDlgMsgFooterSwitchable" xml:space="preserve">
     <value />
-  </data>
-  <data name="ExDlgMsgHeaderNonSwitchable" xml:space="preserve">
+  </data><data name="ExDlgMsgHeaderNonSwitchable" xml:space="preserve">
     <value>Application does not support just-in-time (JIT)
 debugging. See the end of this message for details.
 </value>
-  </data>
-  <data name="ExDlgMsgHeaderSwitchable" xml:space="preserve">
+  </data><data name="ExDlgMsgHeaderSwitchable" xml:space="preserve">
     <value>See the end of this message for details on invoking 
 just-in-time (JIT) debugging instead of this dialog box.
 </value>
-  </data>
-  <data name="ExDlgMsgJITDebuggingSection" xml:space="preserve">
+  </data><data name="ExDlgMsgJITDebuggingSection" xml:space="preserve">
     <value>JIT Debugging</value>
-  </data>
-  <data name="ExDlgMsgLoadedAssembliesEntry" xml:space="preserve">
+  </data><data name="ExDlgMsgLoadedAssembliesEntry" xml:space="preserve">
     <value>{0}
     Assembly Version: {1}
     Location: {2}
 </value>
-  </data>
-  <data name="ExDlgMsgLoadedAssembliesSection" xml:space="preserve">
+  </data><data name="ExDlgMsgLoadedAssembliesSection" xml:space="preserve">
     <value>Loaded Assemblies</value>
-  </data>
-  <data name="ExDlgMsgSectionSeparator" xml:space="preserve">
+  </data><data name="ExDlgMsgSectionSeparator" xml:space="preserve">
     <value>
 ************** {0} **************
 </value>
-  </data>
-  <data name="ExDlgMsgSeparator" xml:space="preserve">
+  </data><data name="ExDlgMsgSeparator" xml:space="preserve">
     <value>----------------------------------------
 </value>
-  </data>
-  <data name="ExDlgOk" xml:space="preserve">
+  </data><data name="ExDlgOk" xml:space="preserve">
     <value>OK</value>
-  </data>
-  <data name="ExDlgQuit" xml:space="preserve">
+  </data><data name="ExDlgQuit" xml:space="preserve">
     <value>&amp;Quit</value>
-  </data>
-  <data name="ExDlgSecurityContinueErrorText" xml:space="preserve">
+  </data><data name="ExDlgSecurityContinueErrorText" xml:space="preserve">
     <value>Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool.
 
 If you click Continue, the application will ignore this error and attempt to continue.
 
 {1}.</value>
-  </data>
-  <data name="ExDlgSecurityErrorText" xml:space="preserve">
+  </data><data name="ExDlgSecurityErrorText" xml:space="preserve">
     <value>Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool.
 
 If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately.
 
 {1}.</value>
-  </data>
-  <data name="ExDlgShowDetails" xml:space="preserve">
+  </data><data name="ExDlgShowDetails" xml:space="preserve">
     <value>&amp;Details</value>
-  </data>
-  <data name="ExDlgWarningText" xml:space="preserve">
+  </data><data name="ExDlgWarningText" xml:space="preserve">
     <value>{0}.</value>
-  </data>
-  <data name="ExternalException" xml:space="preserve">
+  </data><data name="ExceptionCreatingCompEditorControl" xml:space="preserve">
+    <value>ComponentEditorControl: {0} cannot be created.</value>
+  </data><data name="ExceptionCreatingObject" xml:space="preserve">
+    <value>Exception occurred while trying to create an instance of {0}. The exception was "{1}".</value>
+  </data><data name="ExpandedStateName" xml:space="preserve">
+    <value>Expanded</value>
+  </data><data name="ExternalException" xml:space="preserve">
     <value>External exception</value>
-  </data>
-  <data name="FDaddExtensionDescr" xml:space="preserve">
+  </data><data name="FDFileNamesDescr" xml:space="preserve">
+    <value>Retrieves the file names of all selected files in the dialog box.</value>
+  </data><data name="FDaddExtensionDescr" xml:space="preserve">
     <value>Controls whether extensions are automatically added to file names.</value>
-  </data>
-  <data name="FDcheckFileExistsDescr" xml:space="preserve">
+  </data><data name="FDcheckFileExistsDescr" xml:space="preserve">
     <value>Checks that the specified file exists before returning from the dialog.</value>
-  </data>
-  <data name="FDcheckPathExistsDescr" xml:space="preserve">
+  </data><data name="FDcheckPathExistsDescr" xml:space="preserve">
     <value>Checks that the specified path exists before returning from the dialog.</value>
-  </data>
-  <data name="FDdefaultExtDescr" xml:space="preserve">
+  </data><data name="FDdefaultExtDescr" xml:space="preserve">
     <value>The default file name extension. If the user types a file name, this extension is added at the end of the file name if one is not specified.</value>
-  </data>
-  <data name="FDdereferenceLinksDescr" xml:space="preserve">
+  </data><data name="FDdereferenceLinksDescr" xml:space="preserve">
     <value>Controls whether shortcuts are dereferenced before returning from the dialog.</value>
-  </data>
-  <data name="FDfileNameDescr" xml:space="preserve">
+  </data><data name="FDfileNameDescr" xml:space="preserve">
     <value>The file first shown in the dialog box, or the last one selected by the user.</value>
-  </data>
-  <data name="FDFileNamesDescr" xml:space="preserve">
-    <value>Retrieves the file names of all selected files in the dialog box.</value>
-  </data>
-  <data name="FDfileOkDescr" xml:space="preserve">
+  </data><data name="FDfileOkDescr" xml:space="preserve">
     <value>Occurs when the user clicks the Open or Save button in the dialog box.</value>
-  </data>
-  <data name="FDfilterDescr" xml:space="preserve">
+  </data><data name="FDfilterDescr" xml:space="preserve">
     <value>The file filters to display in the dialog box, for example, "C# files|*.cs|All files|*.*".</value>
-  </data>
-  <data name="FDfilterIndexDescr" xml:space="preserve">
+  </data><data name="FDfilterIndexDescr" xml:space="preserve">
     <value>The index of the file filter selected in the dialog box. The first item has an index of 1.</value>
-  </data>
-  <data name="FDinitialDirDescr" xml:space="preserve">
+  </data><data name="FDinitialDirDescr" xml:space="preserve">
     <value>The initial directory for the dialog box.</value>
-  </data>
-  <data name="FDrestoreDirectoryDescr" xml:space="preserve">
+  </data><data name="FDrestoreDirectoryDescr" xml:space="preserve">
     <value>Controls whether the dialog box restores the current directory before closing.</value>
-  </data>
-  <data name="FDshowHelpDescr" xml:space="preserve">
+  </data><data name="FDshowHelpDescr" xml:space="preserve">
     <value>Enables the Help button.</value>
-  </data>
-  <data name="FDsupportMultiDottedExtensionsDescr" xml:space="preserve">
+  </data><data name="FDsupportMultiDottedExtensionsDescr" xml:space="preserve">
     <value>Controls whether multi-dotted extensions are supported.</value>
-  </data>
-  <data name="FDtitleDescr" xml:space="preserve">
+  </data><data name="FDtitleDescr" xml:space="preserve">
     <value>The string to display in the title bar of the dialog box.</value>
-  </data>
-  <data name="FDvalidateNamesDescr" xml:space="preserve">
+  </data><data name="FDvalidateNamesDescr" xml:space="preserve">
     <value>Controls whether the dialog box ensures that file names do not contain invalid characters or sequences.</value>
-  </data>
-  <data name="FileDialogBufferTooSmall" xml:space="preserve">
+  </data><data name="FailedToLoadCursor" xml:space="preserve">
+    <value>Failed to load cursor. Error '{1}'.</value>
+  </data><data name="FileDialogAddToRecentDescr" xml:space="preserve">
+    <value>Controls whether to add the file being opened or saved to the recent list.</value>
+  </data><data name="FileDialogBufferTooSmall" xml:space="preserve">
     <value>Too many files selected. Select fewer files and try again.</value>
-  </data>
-  <data name="FileDialogCreatePrompt" xml:space="preserve">
+  </data><data name="FileDialogCreatePrompt" xml:space="preserve">
     <value>File {0} does not exist.
 Do you want to create it?</value>
-  </data>
-  <data name="FileDialogFileNotFound" xml:space="preserve">
+  </data><data name="FileDialogFileNotFound" xml:space="preserve">
     <value>File {0} does not exist.
 Verify that the correct file name was given.</value>
-  </data>
-  <data name="FileDialogInvalidFileName" xml:space="preserve">
+  </data><data name="FileDialogInvalidFileName" xml:space="preserve">
     <value>File {0} is not a valid file name.</value>
-  </data>
-  <data name="FileDialogInvalidFilter" xml:space="preserve">
+  </data><data name="FileDialogInvalidFilter" xml:space="preserve">
     <value>Filter string you provided is not valid. The filter string must contain a description of the filter, followed by the vertical bar (|) and the filter pattern. The strings for different filtering options must also be separated by the vertical bar. Example: "Text files (*.txt)|*.txt|All files (*.*)|*.*"</value>
-  </data>
-  <data name="FileDialogInvalidFilterIndex" xml:space="preserve">
+  </data><data name="FileDialogInvalidFilterIndex" xml:space="preserve">
     <value>Filter index not valid.</value>
-  </data>
-  <data name="FileDialogOverwritePrompt" xml:space="preserve">
+  </data><data name="FileDialogOkRequiresInteractionDescr" xml:space="preserve">
+    <value>Controls whether the OK button of the dialog box is disabled until the user navigates the view or edits the filename (if applicable). Note: Disabling of the OK button does not prevent the dialog from being submitted by the Enter key.</value>
+  </data><data name="FileDialogOverwritePrompt" xml:space="preserve">
     <value>File {0} already exists.
 Do you want to replace it?</value>
-  </data>
-  <data name="FileDialogSubLassFailure" xml:space="preserve">
+  </data><data name="FileDialogShowHiddenFilesDescr" xml:space="preserve">
+    <value>Controls whether the dialog box displays hidden and system files.</value>
+  </data><data name="FileDialogShowPinnedPlacesDescr" xml:space="preserve">
+    <value>Controls whether the items shown by default in the view's navigation pane are shown.</value>
+  </data><data name="FileDialogSubLassFailure" xml:space="preserve">
     <value>Attempt to subclass a list box did not succeed. Not enough memory is available.</value>
-  </data>
-  <data name="FilterRequiresIBindingListView" xml:space="preserve">
+  </data><data name="FilterRequiresIBindingListView" xml:space="preserve">
     <value>Can only set filter on an IBindingListView where SupportsFiltering is true.</value>
-  </data>
-  <data name="FindKeyMayNotBeEmptyOrNull" xml:space="preserve">
+  </data><data name="FindKeyMayNotBeEmptyOrNull" xml:space="preserve">
     <value>Key specified was either empty or null.</value>
-  </data>
-  <data name="FlowPanelFlowDirectionDescr" xml:space="preserve">
+  </data><data name="FlowPanelFlowDirectionDescr" xml:space="preserve">
     <value>Specifies the direction in which controls are laid out.</value>
-  </data>
-  <data name="FlowPanelWrapContentsDescr" xml:space="preserve">
+  </data><data name="FlowPanelWrapContentsDescr" xml:space="preserve">
     <value>Indicates whether contents are wrapped or clipped at the control boundary.</value>
-  </data>
-  <data name="FnDallowScriptChangeDescr" xml:space="preserve">
+  </data><data name="FnDallowScriptChangeDescr" xml:space="preserve">
     <value>Controls whether the character set of the font can be changed.</value>
-  </data>
-  <data name="FnDallowSimulationsDescr" xml:space="preserve">
+  </data><data name="FnDallowSimulationsDescr" xml:space="preserve">
     <value>Controls whether GDI font simulations are allowed.</value>
-  </data>
-  <data name="FnDallowVectorFontsDescr" xml:space="preserve">
+  </data><data name="FnDallowVectorFontsDescr" xml:space="preserve">
     <value>Controls whether vector fonts can be selected.</value>
-  </data>
-  <data name="FnDallowVerticalFontsDescr" xml:space="preserve">
+  </data><data name="FnDallowVerticalFontsDescr" xml:space="preserve">
     <value>Controls whether vertical fonts can be selected.</value>
-  </data>
-  <data name="FnDapplyDescr" xml:space="preserve">
+  </data><data name="FnDapplyDescr" xml:space="preserve">
     <value>Occurs when the user clicks the Apply button.</value>
-  </data>
-  <data name="FnDcolorDescr" xml:space="preserve">
+  </data><data name="FnDcolorDescr" xml:space="preserve">
     <value>The color selected in the dialog box.</value>
-  </data>
-  <data name="FnDfixedPitchOnlyDescr" xml:space="preserve">
+  </data><data name="FnDfixedPitchOnlyDescr" xml:space="preserve">
     <value>Controls whether only fixed pitch fonts can be selected.</value>
-  </data>
-  <data name="FnDfontDescr" xml:space="preserve">
+  </data><data name="FnDfontDescr" xml:space="preserve">
     <value>The font selected in the dialog box.</value>
-  </data>
-  <data name="FnDfontMustExistDescr" xml:space="preserve">
+  </data><data name="FnDfontMustExistDescr" xml:space="preserve">
     <value>Controls whether to report an error if the selected font does not exist.</value>
-  </data>
-  <data name="FnDmaxSizeDescr" xml:space="preserve">
+  </data><data name="FnDmaxSizeDescr" xml:space="preserve">
     <value>The maximum point size that can be Selected (or zero to disable).</value>
-  </data>
-  <data name="FnDminSizeDescr" xml:space="preserve">
+  </data><data name="FnDminSizeDescr" xml:space="preserve">
     <value>The minimum point size that can be Selected (or zero to disable).</value>
-  </data>
-  <data name="FnDscriptsOnlyDescr" xml:space="preserve">
+  </data><data name="FnDscriptsOnlyDescr" xml:space="preserve">
     <value>Controls whether to exclude OEM and Symbol character sets.</value>
-  </data>
-  <data name="FnDshowApplyDescr" xml:space="preserve">
+  </data><data name="FnDshowApplyDescr" xml:space="preserve">
     <value>Controls whether to show the Apply button.</value>
-  </data>
-  <data name="FnDshowColorDescr" xml:space="preserve">
+  </data><data name="FnDshowColorDescr" xml:space="preserve">
     <value>Controls whether to show a color choice.</value>
-  </data>
-  <data name="FnDshowEffectsDescr" xml:space="preserve">
+  </data><data name="FnDshowEffectsDescr" xml:space="preserve">
     <value>Controls whether to show the underline, strikeout, and font color selections.</value>
-  </data>
-  <data name="FnDshowHelpDescr" xml:space="preserve">
+  </data><data name="FnDshowHelpDescr" xml:space="preserve">
     <value>Controls whether to show the Help button.</value>
-  </data>
-  <data name="FolderBrowserDialogDescription" xml:space="preserve">
+  </data><data name="FolderBrowserDialogAddToRecent" xml:space="preserve">
+    <value>Controls whether the dialog box adds the folder being selected to the recent list.</value>
+  </data><data name="FolderBrowserDialogDescription" xml:space="preserve">
     <value>The string that is displayed above the tree view control in the dialog box. This string can be used to specify instructions to the user.</value>
-  </data>
-  <data name="FolderBrowserDialogRootFolder" xml:space="preserve">
+  </data><data name="FolderBrowserDialogMultiSelectDescr" xml:space="preserve">
+    <value>Controls whether multiple folders can be selected in the dialog.</value>
+  </data><data name="FolderBrowserDialogOkRequiresInteraction" xml:space="preserve">
+    <value>Controls whether the OK button of the dialog box is disabled until the user navigates the view or edits the filename (if applicable). Note: Disabling of the OK button does not prevent the dialog from being submitted by the Enter key.</value>
+  </data><data name="FolderBrowserDialogRootFolder" xml:space="preserve">
     <value>The location of the root folder from which to start browsing. Only the specified folder and any subfolders that are beneath it will appear in the dialog box.</value>
-  </data>
-  <data name="FolderBrowserDialogSelectedPath" xml:space="preserve">
+  </data><data name="FolderBrowserDialogSelectedPath" xml:space="preserve">
     <value>The path of the folder first selected in the dialog or the last one selected by the user.</value>
-  </data>
-  <data name="FolderBrowserDialogShowNewFolderButton" xml:space="preserve">
+  </data><data name="FolderBrowserDialogSelectedPathsDescr" xml:space="preserve">
+    <value>Retrieves the paths of all selected folders in the dialog box.</value>
+  </data><data name="FolderBrowserDialogShowHiddenFiles" xml:space="preserve">
+    <value>Controls whether the dialog box displays hidden and system files.</value>
+  </data><data name="FolderBrowserDialogShowNewFolderButton" xml:space="preserve">
     <value>Include the New Folder button in the dialog box.</value>
-  </data>
-  <data name="FormAcceptButtonDescr" xml:space="preserve">
+  </data><data name="FolderBrowserDialogShowPinnedPlaces" xml:space="preserve">
+    <value>Controls whether the items shown by default in the view's navigation pane are shown.</value>
+  </data><data name="FolderBrowserDialogUseDescriptionForTitle" xml:space="preserve">
+    <value>A value that indicates whether to use the value of the Description property as the dialog title for Vista style dialogs. This property has no effect on old style dialogs.</value>
+  </data><data name="FormAcceptButtonDescr" xml:space="preserve">
     <value>The accept button of the form. If this is set, the button is 'clicked' whenever the user presses the 'ENTER' key.</value>
-  </data>
-  <data name="FormActiveMDIChildDescr" xml:space="preserve">
+  </data><data name="FormActiveMDIChildDescr" xml:space="preserve">
     <value>The currently active MDI child form.</value>
-  </data>
-  <data name="FormatControlFormatDescr" xml:space="preserve">
-    <value>Indicates the Format object that this control is currently using to format its values.</value>
-  </data>
-  <data name="Formatter_CantConvert" xml:space="preserve">
-    <value>Value '{0}' cannot be converted to type '{1}'.</value>
-  </data>
-  <data name="Formatter_CantConvertNull" xml:space="preserve">
-    <value>Null value cannot be converted to type '{1}'.</value>
-  </data>
-  <data name="FormAutoScaleDescr" xml:space="preserve">
+  </data><data name="FormAutoScaleDescr" xml:space="preserve">
     <value>If set to true, the form will automatically scale with the screen font.</value>
-  </data>
-  <data name="FormAutoScrollDescr" xml:space="preserve">
+  </data><data name="FormAutoScrollDescr" xml:space="preserve">
     <value>Indicates whether scroll bars automatically appear when the control contents are larger than its visible area.</value>
-  </data>
-  <data name="FormAutoScrollMarginDescr" xml:space="preserve">
+  </data><data name="FormAutoScrollMarginDescr" xml:space="preserve">
     <value>The margin around controls during auto scroll.</value>
-  </data>
-  <data name="FormAutoScrollMinSizeDescr" xml:space="preserve">
+  </data><data name="FormAutoScrollMinSizeDescr" xml:space="preserve">
     <value>The minimum logical size for the auto scroll region.</value>
-  </data>
-  <data name="FormAutoScrollPositionDescr" xml:space="preserve">
+  </data><data name="FormAutoScrollPositionDescr" xml:space="preserve">
     <value>The current position of the auto-scrolling scroll bar.</value>
-  </data>
-  <data name="FormBorderStyleDescr" xml:space="preserve">
+  </data><data name="FormBorderColorChangedDescr" xml:space="preserve">
+    <value>Occurs whenever the FormBorderColor property is changed.</value>
+  </data><data name="FormBorderColorDescr" xml:space="preserve">
+    <value>The color of the Form's border.</value>
+  </data><data name="FormBorderStyleDescr" xml:space="preserve">
     <value>Indicates the appearance and behavior of the border and title bar of the form.</value>
-  </data>
-  <data name="FormCancelButtonDescr" xml:space="preserve">
+  </data><data name="FormCancelButtonDescr" xml:space="preserve">
     <value>The cancel button of the form. If this property is set, the button is 'clicked' whenever the user presses the 'ESC' key.</value>
-  </data>
-  <data name="FormControlBoxDescr" xml:space="preserve">
+  </data><data name="FormCaptionBackColorChangedDescr" xml:space="preserve">
+    <value>Occurs whenever the FormCaptionBackColor property is changed.</value>
+  </data><data name="FormCaptionBackColorDescr" xml:space="preserve">
+    <value>The back color of the Form's caption (title bar).</value>
+  </data><data name="FormCaptionTextColorChangedDescr" xml:space="preserve">
+    <value>Occurs whenever the FormCaptionTextColor property is changed.</value>
+  </data><data name="FormCaptionTextColorDescr" xml:space="preserve">
+    <value>The color of the Form's text caption (title bar text).</value>
+  </data><data name="FormControlBoxDescr" xml:space="preserve">
     <value>Determines whether a form has a Control/System menu box.</value>
-  </data>
-  <data name="FormDesktopBoundsDescr" xml:space="preserve">
+  </data><data name="FormCornerPreferenceChangedDescr" xml:space="preserve">
+    <value>Occurs whenever the FormCornerPreference property is changed.</value>
+  </data><data name="FormCornerPreferenceDescr" xml:space="preserve">
+    <value>The rounding style of the Form's border.</value>
+  </data><data name="FormDesktopBoundsDescr" xml:space="preserve">
     <value>The bounds of this form in desktop coordinates.</value>
-  </data>
-  <data name="FormDesktopLocationDescr" xml:space="preserve">
+  </data><data name="FormDesktopLocationDescr" xml:space="preserve">
     <value>The location of this form in desktop coordinates.</value>
-  </data>
-  <data name="FormDialogResultDescr" xml:space="preserve">
+  </data><data name="FormDialogResultDescr" xml:space="preserve">
     <value>The value this form will return if displayed as a dialog box.</value>
-  </data>
-  <data name="FormHelpButtonClickedDescr" xml:space="preserve">
+  </data><data name="FormFormRevealModeDescr" xml:space="preserve">
+    <value>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</value>
+  </data><data name="FormHelpButtonClickedDescr" xml:space="preserve">
     <value>Event raised when the help button is clicked.</value>
-  </data>
-  <data name="FormHelpButtonDescr" xml:space="preserve">
+  </data><data name="FormHelpButtonDescr" xml:space="preserve">
     <value>Determines whether a form has a Help button on the caption bar.</value>
-  </data>
-  <data name="FormIconDescr" xml:space="preserve">
+  </data><data name="FormIconDescr" xml:space="preserve">
     <value>Indicates the icon for a form. This icon is displayed in the form's system menu box and when the form is minimized.</value>
-  </data>
-  <data name="FormIsMDIChildDescr" xml:space="preserve">
+  </data><data name="FormIsMDIChildDescr" xml:space="preserve">
     <value>Determines whether the form is a child of a MDI container.</value>
-  </data>
-  <data name="FormIsMDIContainerDescr" xml:space="preserve">
+  </data><data name="FormIsMDIContainerDescr" xml:space="preserve">
     <value>Determines whether the form is an MDI container.</value>
-  </data>
-  <data name="FormKeyPreviewDescr" xml:space="preserve">
+  </data><data name="FormKeyPreviewDescr" xml:space="preserve">
     <value>Determines whether keyboard events for controls on the form are registered with the form.</value>
-  </data>
-  <data name="FormMaximizeBoxDescr" xml:space="preserve">
-    <value>Determines whether a form has a maximize box in the upper-right corner of its caption bar.</value>
-  </data>
-  <data name="FormMaximumSizeDescr" xml:space="preserve">
-    <value>The maximum size the form can be resized to.</value>
-  </data>
-  <data name="FormMDIChildrenDescr" xml:space="preserve">
+  </data><data name="FormMDIChildrenDescr" xml:space="preserve">
     <value>Retrieves the MDI children of this form.</value>
-  </data>
-  <data name="FormMdiChildrenMinimizedAnchorBottomDescr" xml:space="preserve">
-    <value>Gets or sets the anchoring for minimized MDI children.</value>
-  </data>
-  <data name="FormMDIParentAndChild" xml:space="preserve">
+  </data><data name="FormMDIParentAndChild" xml:space="preserve">
     <value>Form cannot be both an MDI child and MDI parent.</value>
-  </data>
-  <data name="FormMDIParentCannotAdd" xml:space="preserve">
+  </data><data name="FormMDIParentCannotAdd" xml:space="preserve">
     <value>Form cannot be added to the Controls collection that has a valid MDI parent.</value>
-  </data>
-  <data name="FormMDIParentDescr" xml:space="preserve">
+  </data><data name="FormMDIParentDescr" xml:space="preserve">
     <value>Retrieves the MDI parent of this form.</value>
-  </data>
-  <data name="FormMenuStripDescr" xml:space="preserve">
+  </data><data name="FormMaximizeBoxDescr" xml:space="preserve">
+    <value>Determines whether a form has a maximize box in the upper-right corner of its caption bar.</value>
+  </data><data name="FormMaximumSizeDescr" xml:space="preserve">
+    <value>The maximum size the form can be resized to.</value>
+  </data><data name="FormMdiChildrenMinimizedAnchorBottomDescr" xml:space="preserve">
+    <value>Gets or sets the anchoring for minimized MDI children.</value>
+  </data><data name="FormMenuStripDescr" xml:space="preserve">
     <value>Specifies the primary MenuStrip for the Form. This property is used for keyboard activation and automatic merging in MDI.</value>
-  </data>
-  <data name="FormMinimizeBoxDescr" xml:space="preserve">
+  </data><data name="FormMinimizeBoxDescr" xml:space="preserve">
     <value>Determines whether a form has a minimize box in the upper-right corner of its caption bar.</value>
-  </data>
-  <data name="FormMinimumSizeDescr" xml:space="preserve">
+  </data><data name="FormMinimumSizeDescr" xml:space="preserve">
     <value>The minimum size the form can be resized to.</value>
-  </data>
-  <data name="FormModalDescr" xml:space="preserve">
+  </data><data name="FormModalDescr" xml:space="preserve">
     <value>Indicates if this form is currently being displayed as a modal dialog box.</value>
-  </data>
-  <data name="FormOnActivateDescr" xml:space="preserve">
+  </data><data name="FormOnActivateDescr" xml:space="preserve">
     <value>Occurs whenever the form is activated.</value>
-  </data>
-  <data name="FormOnClosedDescr" xml:space="preserve">
+  </data><data name="FormOnClosedDescr" xml:space="preserve">
     <value>Occurs whenever the user closes the form, after the form has been closed.</value>
-  </data>
-  <data name="FormOnClosingDescr" xml:space="preserve">
+  </data><data name="FormOnClosingDescr" xml:space="preserve">
     <value>Occurs whenever the user closes the form, before the form has been closed.</value>
-  </data>
-  <data name="FormOnDeactivateDescr" xml:space="preserve">
+  </data><data name="FormOnDeactivateDescr" xml:space="preserve">
     <value>Occurs whenever the form is deactivated.</value>
-  </data>
-  <data name="FormOnFormClosedDescr" xml:space="preserve">
+  </data><data name="FormOnDpiChangedDescr" xml:space="preserve">
+    <value>Occurs when form is moved to a monitor with a different resolution and scaling level, or when form's monitor scaling level is changed in the Windows settings.</value>
+  </data><data name="FormOnFormClosedDescr" xml:space="preserve">
     <value>Occurs whenever the user closes the form, after the form has been closed and specifies the close reason.</value>
-  </data>
-  <data name="FormOnFormClosingDescr" xml:space="preserve">
+  </data><data name="FormOnFormClosingDescr" xml:space="preserve">
     <value>Occurs whenever the user closes the form, before the form has been closed and specifies the close reason.</value>
-  </data>
-  <data name="FormOnInputLangChangeDescr" xml:space="preserve">
+  </data><data name="FormOnInputLangChangeDescr" xml:space="preserve">
     <value>Occurs whenever the language used for input for this form changes.</value>
-  </data>
-  <data name="FormOnInputLangChangeRequestDescr" xml:space="preserve">
+  </data><data name="FormOnInputLangChangeRequestDescr" xml:space="preserve">
     <value>A request by the system to change the input language for this form. This request can be refused.</value>
-  </data>
-  <data name="FormOnLoadDescr" xml:space="preserve">
+  </data><data name="FormOnLoadDescr" xml:space="preserve">
     <value>Occurs whenever the user loads the form.</value>
-  </data>
-  <data name="FormOnMaximizedBoundsChangedDescr" xml:space="preserve">
+  </data><data name="FormOnMDIChildActivateDescr" xml:space="preserve">
+    <value>Occurs when an MDI Child window is activated.</value>
+  </data><data name="FormOnMaximizedBoundsChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the MaximizedBounds property is changed on Form.</value>
-  </data>
-  <data name="FormOnMaximumSizeChangedDescr" xml:space="preserve">
+  </data><data name="FormOnMaximumSizeChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the MaximumSize property is changed on Form.</value>
-  </data>
-  <data name="FormOnMDIChildActivateDescr" xml:space="preserve">
-    <value>Occurs when an MDI Child window is activated.</value>
-  </data>
-  <data name="FormOnMenuCompleteDescr" xml:space="preserve">
+  </data><data name="FormOnMenuCompleteDescr" xml:space="preserve">
     <value>Occurs when menu selection is completed and menu modal message loop has exited.</value>
-  </data>
-  <data name="FormOnMenuStartDescr" xml:space="preserve">
+  </data><data name="FormOnMenuStartDescr" xml:space="preserve">
     <value>Occurs when any menu is displayed and menu modal message loop is entered.</value>
-  </data>
-  <data name="FormOnMinimumSizeChangedDescr" xml:space="preserve">
+  </data><data name="FormOnMinimumSizeChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the MinimumSize property is changed on Form.</value>
-  </data>
-  <data name="FormOnResizeBeginDescr" xml:space="preserve">
+  </data><data name="FormOnResizeBeginDescr" xml:space="preserve">
     <value>Occurs when the form enters the sizing modal loop.</value>
-  </data>
-  <data name="FormOnResizeEndDescr" xml:space="preserve">
+  </data><data name="FormOnResizeEndDescr" xml:space="preserve">
     <value>Occurs when the form exits the sizing modal loop.</value>
-  </data>
-  <data name="FormOnShownDescr" xml:space="preserve">
+  </data><data name="FormOnShownDescr" xml:space="preserve">
     <value>Occurs whenever the form is first shown.</value>
-  </data>
-  <data name="FormOpacityDescr" xml:space="preserve">
+  </data><data name="FormOnSystemTextSizeChangedDescr" xml:space="preserve">
+    <value>Occurs when the Windows Accessibility text size setting changes for this top-level form.</value>
+  </data><data name="FormOpacityDescr" xml:space="preserve">
     <value>The opacity percentage of the control. </value>
-  </data>
-  <data name="FormOwnedFormsDescr" xml:space="preserve">
+  </data><data name="FormOrTaskDialog_NoSyncContextForShowAsync" xml:space="preserve">
+    <value>Failed to retrieve the Synchronization Context for showing the Form asynchronously.</value>
+  </data><data name="FormOwnedFormsDescr" xml:space="preserve">
     <value>Array of forms owned by this form.</value>
-  </data>
-  <data name="FormOwnerDescr" xml:space="preserve">
+  </data><data name="FormOwnerDescr" xml:space="preserve">
     <value>The owner of this form.</value>
-  </data>
-  <data name="FormShowIconDescr" xml:space="preserve">
+  </data><data name="FormScreenCaptureModeDescr" xml:space="preserve">
+    <value>Gets or sets the behavior for preventing screen capture/video recording of the form's content via screen capture applications based on the Windows APIs.</value>
+  </data><data name="FormScreenCaptureModeRequiresTopLevel" xml:space="preserve">
+    <value>The FormScreenCaptureMode property can only be changed on top-level Forms with their TopLevel property set to true.</value>
+  </data><data name="FormShowIconDescr" xml:space="preserve">
     <value>Indicates whether an icon is displayed in the title bar of the form.</value>
-  </data>
-  <data name="FormShowInTaskbarDescr" xml:space="preserve">
+  </data><data name="FormShowInTaskbarDescr" xml:space="preserve">
     <value>Determines whether the form appears in the Windows Taskbar.</value>
-  </data>
-  <data name="FormSizeGripStyleDescr" xml:space="preserve">
+  </data><data name="FormSizeGripStyleDescr" xml:space="preserve">
     <value>Determines when the SizeGrip will be displayed for the form.</value>
-  </data>
-  <data name="FormStartPositionDescr" xml:space="preserve">
+  </data><data name="FormStartPositionDescr" xml:space="preserve">
     <value>Determines the position of a form when it first appears.</value>
-  </data>
-  <data name="FormTopMostDescr" xml:space="preserve">
+  </data><data name="FormTopMostDescr" xml:space="preserve">
     <value>Indicates whether the form always appears above all other forms that do not have this property set to true.</value>
-  </data>
-  <data name="FormFormRevealModeDescr" xml:space="preserve">
-    <value>Indicates how the form is presented while its initial appearance is prepared. Classic never defers reveal. Deferred hides the form behind a DWM cloak until its background has painted, to reduce startup flash. Inherit resolves from the application-wide default.</value>
-  </data>
-  <data name="FormTransparencyKeyDescr" xml:space="preserve">
+  </data><data name="FormTransparencyKeyDescr" xml:space="preserve">
     <value>A color which will appear transparent when painted on the form.</value>
-  </data>
-  <data name="FormWindowStateDescr" xml:space="preserve">
+  </data><data name="FormWindowStateDescr" xml:space="preserve">
     <value>Determines the initial visual state of the form.</value>
-  </data>
-  <data name="GridItemNotExpandable" xml:space="preserve">
+  </data><data name="Form_HasAlreadyBeenShownAsync" xml:space="preserve">
+    <value>The form has already been shown asynchronously.</value>
+  </data><data name="FormatControlFormatDescr" xml:space="preserve">
+    <value>Indicates the Format object that this control is currently using to format its values.</value>
+  </data><data name="Formatter_CantConvert" xml:space="preserve">
+    <value>Value '{0}' cannot be converted to type '{1}'.</value>
+  </data><data name="Formatter_CantConvertNull" xml:space="preserve">
+    <value>Null value cannot be converted to type '{1}'.</value>
+  </data><data name="GridItemNotExpandable" xml:space="preserve">
     <value>The GridItem cannot be expanded.</value>
-  </data>
-  <data name="GridPanelCellPositionDescr" xml:space="preserve">
+  </data><data name="GridPanelCellPositionDescr" xml:space="preserve">
     <value>Specifies the Row and Column position of the control.</value>
-  </data>
-  <data name="GridPanelColumnDescr" xml:space="preserve">
+  </data><data name="GridPanelColumnDescr" xml:space="preserve">
     <value>The column position of the specified child control.</value>
-  </data>
-  <data name="GridPanelColumnsDescr" xml:space="preserve">
-    <value>The number of columns on the table.</value>
-  </data>
-  <data name="GridPanelColumnStylesDescr" xml:space="preserve">
+  </data><data name="GridPanelColumnStylesDescr" xml:space="preserve">
     <value>The column styles of the table.</value>
-  </data>
-  <data name="GridPanelGetAlignmentDescr" xml:space="preserve">
+  </data><data name="GridPanelColumnsDescr" xml:space="preserve">
+    <value>The number of columns on the table.</value>
+  </data><data name="GridPanelGetAlignmentDescr" xml:space="preserve">
     <value>The alignment of the control.</value>
-  </data>
-  <data name="GridPanelGetBoxStretchDescr" xml:space="preserve">
+  </data><data name="GridPanelGetBoxStretchDescr" xml:space="preserve">
     <value>The box stretch of the control.</value>
-  </data>
-  <data name="GridPanelGetColumnSpanDescr" xml:space="preserve">
+  </data><data name="GridPanelGetColumnSpanDescr" xml:space="preserve">
     <value>The column span of the control.</value>
-  </data>
-  <data name="GridPanelGetRowSpanDescr" xml:space="preserve">
+  </data><data name="GridPanelGetRowSpanDescr" xml:space="preserve">
     <value>The row span of the control.</value>
-  </data>
-  <data name="GridPanelRowDescr" xml:space="preserve">
+  </data><data name="GridPanelRowDescr" xml:space="preserve">
     <value>The row position of the absolutely positioned element.</value>
-  </data>
-  <data name="GridPanelRowsDescr" xml:space="preserve">
-    <value>The number of rows on the table.</value>
-  </data>
-  <data name="GridPanelRowStylesDescr" xml:space="preserve">
+  </data><data name="GridPanelRowStylesDescr" xml:space="preserve">
     <value>The row styles of the table.</value>
-  </data>
-  <data name="HandleAlreadyExists" xml:space="preserve">
+  </data><data name="GridPanelRowsDescr" xml:space="preserve">
+    <value>The number of rows on the table.</value>
+  </data><data name="HScrollBarDefaultAccessibleName" xml:space="preserve">
+    <value>Horizontal</value>
+  </data><data name="HandleAlreadyExists" xml:space="preserve">
     <value>Window handle already exists.</value>
-  </data>
-  <data name="HelpCaption" xml:space="preserve">
+  </data><data name="HelpCaption" xml:space="preserve">
     <value>Help</value>
-  </data>
-  <data name="HelpInvalidURL" xml:space="preserve">
+  </data><data name="HelpInvalidURL" xml:space="preserve">
     <value>Help URL '{0}' is not valid.</value>
-  </data>
-  <data name="HelpProviderHelpKeywordDescr" xml:space="preserve">
+  </data><data name="HelpProviderHelpKeywordDescr" xml:space="preserve">
     <value>Determines the Help keyword associated with this control.</value>
-  </data>
-  <data name="HelpProviderHelpNamespaceDescr" xml:space="preserve">
+  </data><data name="HelpProviderHelpNamespaceDescr" xml:space="preserve">
     <value>The Help namespace (for example HTML 1.0 Help file) that will be used. It is only used for controls that have the HelpKeyword set.</value>
-  </data>
-  <data name="HelpProviderHelpStringDescr" xml:space="preserve">
+  </data><data name="HelpProviderHelpStringDescr" xml:space="preserve">
     <value>Determines the Help string associated with this control.</value>
-  </data>
-  <data name="HelpProviderNavigatorDescr" xml:space="preserve">
+  </data><data name="HelpProviderNavigatorDescr" xml:space="preserve">
     <value>Determines the kind of Help associated with this control.</value>
-  </data>
-  <data name="HelpProviderShowHelpDescr" xml:space="preserve">
+  </data><data name="HelpProviderShowHelpDescr" xml:space="preserve">
     <value>Determines if Help should be displayed for this control.</value>
-  </data>
-  <data name="HtmlDocumentInvalidDomain" xml:space="preserve">
+  </data><data name="HtmlDocumentInvalidDomain" xml:space="preserve">
     <value>Argument for the Domain property must be a fully qualified domain name using Domain Name System (DNS) conventions.</value>
-  </data>
-  <data name="HtmlElementAttributeNotSupported" xml:space="preserve">
+  </data><data name="HtmlElementAttributeNotSupported" xml:space="preserve">
     <value>The attribute you specified is not supported on this element.</value>
-  </data>
-  <data name="HtmlElementMethodNotSupported" xml:space="preserve">
+  </data><data name="HtmlElementMethodNotSupported" xml:space="preserve">
     <value>Method is not supported on this type of HtmlElement.</value>
-  </data>
-  <data name="HtmlElementPropertyNotSupported" xml:space="preserve">
+  </data><data name="HtmlElementPropertyNotSupported" xml:space="preserve">
     <value>Property is not supported on this type of HtmlElement.</value>
-  </data>
-  <data name="ICurrencyManagerProviderDescr" xml:space="preserve">
+  </data><data name="ICurrencyManagerProviderDescr" xml:space="preserve">
     <value>Provides custom binding management for components.</value>
-  </data>
-  <data name="IllegalCrossThreadCall" xml:space="preserve">
+  </data><data name="ISupportInitializeDescr" xml:space="preserve">
+    <value>Specifies support for transacted initialization. </value>
+  </data><data name="ITypeDataObject_Not_Implemented" xml:space="preserve">
+    <value>Data object '{0}' doesn't implement the 'ITypedDataObject' interface and can't be read using 'TryGetData&lt;T&gt;(string, out T)' methods.</value>
+  </data><data name="IllegalCrossThreadCall" xml:space="preserve">
     <value>Cross-thread operation not valid: Control '{0}' accessed from a thread other than the thread it was created on.</value>
-  </data>
-  <data name="IllegalCrossThreadCallWithStack" xml:space="preserve">
+  </data><data name="IllegalCrossThreadCallWithStack" xml:space="preserve">
     <value>Cross-thread operation not valid: Control '{0}' accessed from a thread other than the thread it was created on.
 Stack trace where the illegal operation occurred was:
 {1}"</value>
-  </data>
-  <data name="IllegalState" xml:space="preserve">
+  </data><data name="IllegalState" xml:space="preserve">
     <value>Internal state of the {1} class is not valid.</value>
-  </data>
-  <data name="ImageListAddFailed" xml:space="preserve">
+  </data><data name="ImageListAddFailed" xml:space="preserve">
     <value>Image cannot be added to the ImageList.</value>
-  </data>
-  <data name="ImageListAllowMirroringDescr" xml:space="preserve">
+  </data><data name="ImageListAllowMirroringDescr" xml:space="preserve">
     <value>Indicates whether the images in the list should be mirrored.</value>
-  </data>
-  <data name="ImageListBadImage" xml:space="preserve">
+  </data><data name="ImageListBadImage" xml:space="preserve">
     <value>Parameter must be of type Image.</value>
-  </data>
-  <data name="ImageListBitmap" xml:space="preserve">
+  </data><data name="ImageListBitmap" xml:space="preserve">
     <value>Image must be a Bitmap.</value>
-  </data>
-  <data name="ImageListColorDepthDescr" xml:space="preserve">
+  </data><data name="ImageListColorDepthDescr" xml:space="preserve">
     <value>The number of colors to use to render images.</value>
-  </data>
-  <data name="ImageListCreateFailed" xml:space="preserve">
+  </data><data name="ImageListCreateFailed" xml:space="preserve">
     <value>Creation of the ImageList handle did not succeed.</value>
-  </data>
-  <data name="ImageListDuplicateFailed" xml:space="preserve">
+  </data><data name="ImageListDuplicateFailed" xml:space="preserve">
     <value>Duplication of the ImageList handle did not succeed.</value>
-  </data>
-  <data name="ImageListEntryType" xml:space="preserve">
+  </data><data name="ImageListEntryType" xml:space="preserve">
     <value>Image added to an ImageList must either derive from Image or be an Icon.</value>
-  </data>
-  <data name="ImageListGetFailed" xml:space="preserve">
+  </data><data name="ImageListGetFailed" xml:space="preserve">
     <value>Retrieval of the image from ImageList did not succeed.</value>
-  </data>
-  <data name="ImageListHandleCreatedDescr" xml:space="preserve">
+  </data><data name="ImageListHandleCreatedDescr" xml:space="preserve">
     <value>Indicates if the native handle has been created for this ImageList.</value>
-  </data>
-  <data name="ImageListHandleDescr" xml:space="preserve">
+  </data><data name="ImageListHandleDescr" xml:space="preserve">
     <value>The native handle of the ImageList.</value>
-  </data>
-  <data name="ImageListImagesDescr" xml:space="preserve">
-    <value>The images stored in this ImageList.</value>
-  </data>
-  <data name="ImageListImageStreamDescr" xml:space="preserve">
+  </data><data name="ImageListImageStreamDescr" xml:space="preserve">
     <value>Retrieves an ImageList streamer for persisting images.</value>
-  </data>
-  <data name="ImageListImageTooShort" xml:space="preserve">
+  </data><data name="ImageListImageTooShort" xml:space="preserve">
     <value>Image strip shorter than the ImageSize property cannot be added.</value>
-  </data>
-  <data name="ImageListOnRecreateHandleDescr" xml:space="preserve">
+  </data><data name="ImageListImagesDescr" xml:space="preserve">
+    <value>The images stored in this ImageList.</value>
+  </data><data name="ImageListOnRecreateHandleDescr" xml:space="preserve">
     <value>Occurs when the ImageList needs to recreate its handle.</value>
-  </data>
-  <data name="ImageListRemoveFailed" xml:space="preserve">
+  </data><data name="ImageListRemoveFailed" xml:space="preserve">
     <value>Removal of the image from ImageList did not succeed.</value>
-  </data>
-  <data name="ImageListReplaceFailed" xml:space="preserve">
+  </data><data name="ImageListReplaceFailed" xml:space="preserve">
     <value>Replacement of the image in ImageList did not succeed.</value>
-  </data>
-  <data name="ImageListRightToLeftInvalidArgument" xml:space="preserve">
+  </data><data name="ImageListRightToLeftInvalidArgument" xml:space="preserve">
     <value>'Inherit' is not a valid value for this property.  Must be set to 'Yes' or 'No'.</value>
-  </data>
-  <data name="ImageListSizeDescr" xml:space="preserve">
+  </data><data name="ImageListSizeDescr" xml:space="preserve">
     <value>The size of individual images in the ImageList.</value>
-  </data>
-  <data name="ImageListStreamerLoadFailed" xml:space="preserve">
+  </data><data name="ImageListStreamerLoadFailed" xml:space="preserve">
     <value>Loading of the ImageList did not succeed.</value>
-  </data>
-  <data name="ImageListStreamerSaveFailed" xml:space="preserve">
+  </data><data name="ImageListStreamerSaveFailed" xml:space="preserve">
     <value>Saving of the ImageList did not succeed.</value>
-  </data>
-  <data name="ImageListStripBadWidth" xml:space="preserve">
+  </data><data name="ImageListStripBadWidth" xml:space="preserve">
     <value>Width of the image strip must be a positive multiple of ImageSize.Width.</value>
-  </data>
-  <data name="ImageListTransparentColorDescr" xml:space="preserve">
+  </data><data name="ImageListTransparentColorDescr" xml:space="preserve">
     <value>The color that is treated as transparent.</value>
-  </data>
-  <data name="IndexOutOfRange" xml:space="preserve">
+  </data><data name="IndexOutOfRange" xml:space="preserve">
     <value>Index {0} is out of range.</value>
-  </data>
-  <data name="Invalid_boolean_attribute" xml:space="preserve">
-    <value>Attribute {0} must be set to true or false.</value>
-  </data>
-  <data name="InvalidArgument" xml:space="preserve">
+  </data><data name="InputLanguageCultureNotFound" xml:space="preserve">
+    <value>Could not find an InputLanguage for culture '{0}'.</value>
+  </data><data name="InvalidArgument" xml:space="preserve">
     <value>InvalidArgument=Value of '{1}' is not valid for '{0}'.</value>
-  </data>
-  <data name="InvalidBoundArgument" xml:space="preserve">
+  </data><data name="InvalidArgumentType" xml:space="preserve">
+    <value>Argument '{0}' must be of type '{1}'.</value>
+  </data><data name="InvalidBoundArgument" xml:space="preserve">
     <value>Value of '{1}' is not valid for '{0}'. '{0}' should be between {2} and {3}.</value>
-  </data>
-  <data name="InvalidCrossThreadControlCall" xml:space="preserve">
+  </data><data name="InvalidCrossThreadControlCall" xml:space="preserve">
     <value>Action being performed on this control is being called from the wrong thread. Marshal to the correct thread using Control.Invoke or Control.BeginInvoke to perform this action.</value>
-  </data>
-  <data name="InvalidFileFormat" xml:space="preserve">
+  </data><data name="InvalidFileFormat" xml:space="preserve">
     <value>File format is not valid.</value>
-  </data>
-  <data name="InvalidFileType" xml:space="preserve">
+  </data><data name="InvalidFileType" xml:space="preserve">
     <value>File type is not valid.</value>
-  </data>
-  <data name="InvalidGDIHandle" xml:space="preserve">
+  </data><data name="InvalidGDIHandle" xml:space="preserve">
     <value>Win32 handle passed to {0} is not valid or is the wrong type.</value>
-  </data>
-  <data name="InvalidNullArgument" xml:space="preserve">
+  </data><data name="InvalidHdcType" xml:space="preserve">
+    <value>Invalid HDC type: {0}</value>
+  </data><data name="InvalidNullArgument" xml:space="preserve">
     <value>Null is not a valid value for '{0}'.</value>
-  </data>
-  <data name="InvalidNullItemInCollection" xml:space="preserve">
+  </data><data name="InvalidNullItemInCollection" xml:space="preserve">
     <value>One or more items in the collection are null.</value>
-  </data>
-  <data name="InvalidPictureFormat" xml:space="preserve">
+  </data><data name="InvalidPictureFormat" xml:space="preserve">
     <value>Image format is not valid. The image file may be corrupted.</value>
-  </data>
-  <data name="InvalidPictureType" xml:space="preserve">
+  </data><data name="InvalidPictureType" xml:space="preserve">
     <value>Argument '{0}' must be a picture that can be used as a {1}.</value>
-  </data>
-  <data name="InvalidResXBasePathOperation" xml:space="preserve">
+  </data><data name="InvalidResXBasePathOperation" xml:space="preserve">
     <value>Property can be changed only before the enumeration.</value>
-  </data>
-  <data name="InvalidResXFile" xml:space="preserve">
+  </data><data name="InvalidResXFile" xml:space="preserve">
     <value>ResX file {0} cannot be parsed.</value>
-  </data>
-  <data name="InvalidResXFileReaderWriterTypes" xml:space="preserve">
+  </data><data name="InvalidResXFileReaderWriterTypes" xml:space="preserve">
     <value>ResX input is not valid. Cannot find valid "resheader" tags for the ResX reader and writer type names.</value>
-  </data>
-  <data name="InvalidResXNoType" xml:space="preserve">
+  </data><data name="InvalidResXNoType" xml:space="preserve">
     <value>Could not find a type for a name.  The type name was '{0}'.</value>
-  </data>
-  <data name="InvalidResXResourceNoName" xml:space="preserve">
+  </data><data name="InvalidResXResourceNoName" xml:space="preserve">
     <value>Cannot find a name for the resource with the value '{0}'.</value>
-  </data>
-  <data name="InvalidSendKeysKeyword" xml:space="preserve">
+  </data><data name="InvalidSendKeysKeyword" xml:space="preserve">
     <value>Keyword "{0}" is not valid.</value>
-  </data>
-  <data name="InvalidSendKeysRepeat" xml:space="preserve">
+  </data><data name="InvalidSendKeysRepeat" xml:space="preserve">
     <value>Specified repeat count is not valid.</value>
-  </data>
-  <data name="InvalidSendKeysString" xml:space="preserve">
+  </data><data name="InvalidSendKeysString" xml:space="preserve">
     <value>SendKeys string '{0}' is not valid.</value>
-  </data>
-  <data name="InvalidSingleMonthSize" xml:space="preserve">
+  </data><data name="InvalidSingleMonthSize" xml:space="preserve">
     <value>MonthCalendar size information cannot be retrieved.</value>
-  </data>
-  <data name="InvalidWndClsName" xml:space="preserve">
+  </data><data name="InvalidWndClsName" xml:space="preserve">
     <value>Window class name is not valid.</value>
-  </data>
-  <data name="InvocationException" xml:space="preserve">
+  </data><data name="Invalid_boolean_attribute" xml:space="preserve">
+    <value>Attribute {0} must be set to true or false.</value>
+  </data><data name="InvocationException" xml:space="preserve">
     <value>Type {0} in the data at line {1}, position {2}, cannot be loaded because it threw the following exception during construction: {3}</value>
-  </data>
-  <data name="IsMirroredDescr" xml:space="preserve">
+  </data><data name="IsMirroredDescr" xml:space="preserve">
     <value>Indicates whether the control is mirrored.</value>
-  </data>
-  <data name="ISupportInitializeDescr" xml:space="preserve">
-    <value>Specifies support for transacted initialization. </value>
-  </data>
-  <data name="KeysConverterInvalidKeyCombination" xml:space="preserve">
+  </data><data name="KeyboardToolTipDisplayBehaviorRequiresAccessibilityImprovementsLevel3" xml:space="preserve">
+    <value>ToolTips display on keyboard focus requires the following AppContextSwitchOverrides: 'Switch.UseLegacyAccessibilityFeatures.3' and 'Switch.System.Windows.Forms.UseLegacyToolTipDisplay'</value>
+  </data><data name="KeysConverterInvalidKeyCombination" xml:space="preserve">
     <value>Key combination is not valid.</value>
-  </data>
-  <data name="LabelAutoEllipsisDescr" xml:space="preserve">
+  </data><data name="KioskModeManagerContainerControlChangedDescr" xml:space="preserve">
+    <value>Occurs when the ContainerControl property value changes.</value>
+  </data><data name="KioskModeManagerContainerControlDescr" xml:space="preserve">
+    <value>The container whose containing form is controlled by the kiosk mode manager.</value>
+  </data><data name="KioskModeManagerEscapeExitsFullScreenDescr" xml:space="preserve">
+    <value>Indicates whether pressing Escape exits fullscreen mode.</value>
+  </data><data name="KioskModeManagerFullScreenChangedDescr" xml:space="preserve">
+    <value>Occurs when the fullscreen state changes.</value>
+  </data><data name="KioskModeManagerFullScreenDescr" xml:space="preserve">
+    <value>Gets or sets a value indicating whether the resolved form is currently fullscreen.</value>
+  </data><data name="KioskModeManagerHideTaskbarDescr" xml:space="preserve">
+    <value>Indicates whether fullscreen mode covers the Windows taskbar.</value>
+  </data><data name="KioskModeManagerMousePointerAutoHideDelayDescr" xml:space="preserve">
+    <value>The delay, in milliseconds, before the mouse pointer is hidden while fullscreen. A value of 0 disables automatic pointer hiding.</value>
+  </data><data name="KioskModeManagerSuppressPowerSavingDescr" xml:space="preserve">
+    <value>Indicates whether Windows should keep the display and system awake while this component is active.</value>
+  </data><data name="KioskModeManagerToggleFullScreenKeyDescr" xml:space="preserve">
+    <value>The key that toggles between fullscreen and restored mode.</value>
+  </data><data name="KioskModeManagerTopMostInFullScreenDescr" xml:space="preserve">
+    <value>Indicates whether the form is topmost while fullscreen.</value>
+  </data><data name="KioskModeManagerWakeUpCommandDescr" xml:space="preserve">
+    <value>The command that is executed whenever the kiosk experience is woken.</value>
+  </data><data name="KioskModeManagerWakeupDescr" xml:space="preserve">
+    <value>Occurs when keyboard, mouse, power resume, or session activity wakes the kiosk experience.</value>
+  </data><data name="LabelAutoEllipsisDescr" xml:space="preserve">
     <value>Enables the automatic handling of text that extends beyond the width of the label control.</value>
-  </data>
-  <data name="LabelAutoSizeDescr" xml:space="preserve">
+  </data><data name="LabelAutoSizeDescr" xml:space="preserve">
     <value>Enables automatic resizing based on font size. Note that this is only valid for label controls that do not wrap text.</value>
-  </data>
-  <data name="LabelBackgroundImageDescr" xml:space="preserve">
+  </data><data name="LabelBackgroundImageDescr" xml:space="preserve">
     <value>The background image of this control.</value>
-  </data>
-  <data name="LabelBorderDescr" xml:space="preserve">
+  </data><data name="LabelBorderDescr" xml:space="preserve">
     <value>Determines if the label has a visible border.</value>
-  </data>
-  <data name="LabelOnTextAlignChangedDescr" xml:space="preserve">
+  </data><data name="LabelOnTextAlignChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the TextAlign property is changed on Label.</value>
-  </data>
-  <data name="LabelPreferredHeightDescr" xml:space="preserve">
+  </data><data name="LabelPreferredHeightDescr" xml:space="preserve">
     <value>The preferred height of this control.</value>
-  </data>
-  <data name="LabelPreferredWidthDescr" xml:space="preserve">
+  </data><data name="LabelPreferredWidthDescr" xml:space="preserve">
     <value>The preferred width of this control.</value>
-  </data>
-  <data name="LabelTextAlignDescr" xml:space="preserve">
+  </data><data name="LabelTextAlignDescr" xml:space="preserve">
     <value>Determines the position of the text within the label.</value>
-  </data>
-  <data name="LabelUseMnemonicDescr" xml:space="preserve">
+  </data><data name="LabelUseMnemonicDescr" xml:space="preserve">
     <value>If true, the first character preceded by an ampersand (&amp;&amp;) will be used as the label's mnemonic key.</value>
-  </data>
-  <data name="LayoutEngineUnsupportedType" xml:space="preserve">
+  </data><data name="LayoutEngineUnsupportedType" xml:space="preserve">
     <value>LayoutEngine cannot arrange objects of type '{0}'.</value>
-  </data>
-  <data name="LinkLabelActiveLinkColorDescr" xml:space="preserve">
+  </data><data name="LinkLabelActiveLinkColorDescr" xml:space="preserve">
     <value>Determines the color of the hyperlink when the user clicks the link.</value>
-  </data>
-  <data name="LinkLabelAreaLength" xml:space="preserve">
+  </data><data name="LinkLabelAreaLength" xml:space="preserve">
     <value>LinkArea length cannot be negative.</value>
-  </data>
-  <data name="LinkLabelAreaStart" xml:space="preserve">
+  </data><data name="LinkLabelAreaStart" xml:space="preserve">
     <value>LinkArea start cannot be negative.</value>
-  </data>
-  <data name="LinkLabelBadLink" xml:space="preserve">
+  </data><data name="LinkLabelBadLink" xml:space="preserve">
     <value>Parameter must be of type Link.</value>
-  </data>
-  <data name="LinkLabelDisabledLinkColorDescr" xml:space="preserve">
+  </data><data name="LinkLabelDisabledLinkColorDescr" xml:space="preserve">
     <value>Determines the color of the hyperlink when disabled.</value>
-  </data>
-  <data name="LinkLabelLinkAreaDescr" xml:space="preserve">
+  </data><data name="LinkLabelLinkAreaDescr" xml:space="preserve">
     <value>Portion of the text in the label to render as a hyperlink.</value>
-  </data>
-  <data name="LinkLabelLinkBehaviorDescr" xml:space="preserve">
+  </data><data name="LinkLabelLinkBehaviorDescr" xml:space="preserve">
     <value>Determines the underline behavior of the hyperlink.</value>
-  </data>
-  <data name="LinkLabelLinkClickedDescr" xml:space="preserve">
+  </data><data name="LinkLabelLinkClickedDescr" xml:space="preserve">
     <value>Occurs when the link is clicked.</value>
-  </data>
-  <data name="LinkLabelLinkColorDescr" xml:space="preserve">
+  </data><data name="LinkLabelLinkColorDescr" xml:space="preserve">
     <value>Determines the color of the hyperlink in its default state.</value>
-  </data>
-  <data name="LinkLabelLinkVisitedDescr" xml:space="preserve">
+  </data><data name="LinkLabelLinkVisitedDescr" xml:space="preserve">
     <value>Determines if the hyperlink should be rendered as visited.</value>
-  </data>
-  <data name="LinkLabelOverlap" xml:space="preserve">
+  </data><data name="LinkLabelOverlap" xml:space="preserve">
     <value>Overlapping link regions.</value>
-  </data>
-  <data name="LinkLabelVisitedLinkColorDescr" xml:space="preserve">
+  </data><data name="LinkLabelVisitedLinkColorDescr" xml:space="preserve">
     <value>Determines the color of the hyperlink when the LinkVisited property is set to true.</value>
-  </data>
-  <data name="ListBindingBindField" xml:space="preserve">
+  </data><data name="ListBindingBindField" xml:space="preserve">
     <value>Cannot bind to the property or column {0} on the DataSource.</value>
-  </data>
-  <data name="ListBindingBindProperty" xml:space="preserve">
+  </data><data name="ListBindingBindProperty" xml:space="preserve">
     <value>Cannot bind to the property '{0}' on the target control.</value>
-  </data>
-  <data name="ListBindingBindPropertyReadOnly" xml:space="preserve">
+  </data><data name="ListBindingBindPropertyReadOnly" xml:space="preserve">
     <value>Cannot bind to property '{0}' because it is read-only.</value>
-  </data>
-  <data name="ListBindingFormatFailed" xml:space="preserve">
+  </data><data name="ListBindingFormatFailed" xml:space="preserve">
     <value>Cannot format the value to the desired type.</value>
-  </data>
-  <data name="ListBoxBorderDescr" xml:space="preserve">
+  </data><data name="ListBoxBorderDescr" xml:space="preserve">
     <value>Controls what type of border is drawn around the ListBox.</value>
-  </data>
-  <data name="ListBoxCantInsertIntoIntegerCollection" xml:space="preserve">
+  </data><data name="ListBoxCantInsertIntoIntegerCollection" xml:space="preserve">
     <value>ListBox.IntegerCollection is sorted, and items cannot be inserted into it.</value>
-  </data>
-  <data name="ListBoxColumnWidthDescr" xml:space="preserve">
+  </data><data name="ListBoxColumnWidthDescr" xml:space="preserve">
     <value>Indicates how wide each column should be in a multicolumn ListBox.</value>
-  </data>
-  <data name="ListBoxCustomTabOffsetsDescr" xml:space="preserve">
+  </data><data name="ListBoxCustomTabOffsetsDescr" xml:space="preserve">
     <value>The collection of pixel offsets each corresponding TAB character will be placed from the near edge of the client area.</value>
-  </data>
-  <data name="ListBoxDrawModeDescr" xml:space="preserve">
+  </data><data name="ListBoxDrawModeDescr" xml:space="preserve">
     <value>Controls list box painting. Either the system [NORMAL] or the user [OWNERDRAW] paints each item.</value>
-  </data>
-  <data name="ListBoxHorizontalExtentDescr" xml:space="preserve">
+  </data><data name="ListBoxHorizontalExtentDescr" xml:space="preserve">
     <value>The width, in pixels, by which a list box can be scrolled horizontally. Only valid if HorizontalScrollBars is true.</value>
-  </data>
-  <data name="ListBoxHorizontalScrollbarDescr" xml:space="preserve">
+  </data><data name="ListBoxHorizontalScrollbarDescr" xml:space="preserve">
     <value>Indicates whether the ListBox will display a horizontal scroll bar for items beyond the right edge of the ListBox.</value>
-  </data>
-  <data name="ListBoxIntegralHeightDescr" xml:space="preserve">
+  </data><data name="ListBoxIntegralHeightDescr" xml:space="preserve">
     <value>Indicates whether the list can contain only complete items.</value>
-  </data>
-  <data name="ListBoxInvalidSelectionMode" xml:space="preserve">
+  </data><data name="ListBoxInvalidSelectionMode" xml:space="preserve">
     <value>Cannot call this method when SelectionMode is SelectionMode.NONE.</value>
-  </data>
-  <data name="ListBoxItemHeightDescr" xml:space="preserve">
+  </data><data name="ListBoxItemHeightDescr" xml:space="preserve">
     <value>The height, in pixels, of items in a fixed-height owner-draw list box.</value>
-  </data>
-  <data name="ListBoxItemOverflow" xml:space="preserve">
+  </data><data name="ListBoxItemOverflow" xml:space="preserve">
     <value>List box contains too many items.</value>
-  </data>
-  <data name="ListBoxItemsDescr" xml:space="preserve">
+  </data><data name="ListBoxItemsDescr" xml:space="preserve">
     <value>The items in the list box.</value>
-  </data>
-  <data name="ListBoxMultiColumnDescr" xml:space="preserve">
+  </data><data name="ListBoxMultiColumnDescr" xml:space="preserve">
     <value>Indicates if values should be displayed in columns horizontally.</value>
-  </data>
-  <data name="ListBoxPreferredHeightDescr" xml:space="preserve">
+  </data><data name="ListBoxPreferredHeightDescr" xml:space="preserve">
     <value>The preferred height of this control.</value>
-  </data>
-  <data name="ListBoxScrollIsVisibleDescr" xml:space="preserve">
+  </data><data name="ListBoxScrollIsVisibleDescr" xml:space="preserve">
     <value>Indicates if the list box should always have a scroll bar present, regardless of how many items are in it.</value>
-  </data>
-  <data name="ListBoxSelectedIndexCollectionIsReadOnly" xml:space="preserve">
+  </data><data name="ListBoxSelectedIndexCollectionIsReadOnly" xml:space="preserve">
     <value>ListBox.SelectedIndexCollection is read only.</value>
-  </data>
-  <data name="ListBoxSelectedIndexDescr" xml:space="preserve">
+  </data><data name="ListBoxSelectedIndexDescr" xml:space="preserve">
     <value>Retrieves the index of the first selection in the list box, or -1 if there is no selection.</value>
-  </data>
-  <data name="ListBoxSelectedIndicesDescr" xml:space="preserve">
+  </data><data name="ListBoxSelectedIndicesDescr" xml:space="preserve">
     <value>A collection of indexes for the currently selected items in the list box.</value>
-  </data>
-  <data name="ListBoxSelectedItemDescr" xml:space="preserve">
+  </data><data name="ListBoxSelectedItemDescr" xml:space="preserve">
     <value>The currently selected item in the list box, or null.</value>
-  </data>
-  <data name="ListBoxSelectedItemsDescr" xml:space="preserve">
+  </data><data name="ListBoxSelectedItemsDescr" xml:space="preserve">
     <value>A collection of currently selected items.</value>
-  </data>
-  <data name="ListBoxSelectedObjectCollectionIsReadOnly" xml:space="preserve">
+  </data><data name="ListBoxSelectedObjectCollectionIsReadOnly" xml:space="preserve">
     <value>ListBox.SelectedObjectCollection is read only.</value>
-  </data>
-  <data name="ListBoxSelectionModeDescr" xml:space="preserve">
+  </data><data name="ListBoxSelectionModeDescr" xml:space="preserve">
     <value>Indicates if the list box is to be single-select, multi-select, or not selectable.</value>
-  </data>
-  <data name="ListBoxSortedDescr" xml:space="preserve">
+  </data><data name="ListBoxSortedDescr" xml:space="preserve">
     <value>Controls whether the list is sorted.</value>
-  </data>
-  <data name="ListBoxTopIndexDescr" xml:space="preserve">
+  </data><data name="ListBoxTopIndexDescr" xml:space="preserve">
     <value>The index of the first visible item in the list box.</value>
-  </data>
-  <data name="ListBoxUseTabStopsDescr" xml:space="preserve">
+  </data><data name="ListBoxUseTabStopsDescr" xml:space="preserve">
     <value>Indicates if TAB characters should be expanded into full spacing.</value>
-  </data>
-  <data name="ListBoxVarHeightMultiCol" xml:space="preserve">
+  </data><data name="ListBoxVarHeightMultiCol" xml:space="preserve">
     <value>ListBox cannot have variable height and be multicolumn. Either make the ListBox owner-draw fixed height, or make the ListBox single column.</value>
-  </data>
-  <data name="ListControlDataSourceDescr" xml:space="preserve">
+  </data><data name="ListControlDataSourceDescr" xml:space="preserve">
     <value>Indicates the list that this control will use to get its items.</value>
-  </data>
-  <data name="ListControlDisplayMemberDescr" xml:space="preserve">
+  </data><data name="ListControlDisplayMemberDescr" xml:space="preserve">
     <value>Indicates the property to display for the items in this control.</value>
-  </data>
-  <data name="ListControlEmptyValueMemberInSettingSelectedValue" xml:space="preserve">
+  </data><data name="ListControlEmptyValueMemberInSettingSelectedValue" xml:space="preserve">
     <value>Cannot set the SelectedValue in a ListControl with an empty ValueMember.</value>
-  </data>
-  <data name="ListControlFormatDescr" xml:space="preserve">
+  </data><data name="ListControlFormatDescr" xml:space="preserve">
     <value>Event raised to allow you to convert the value to a value suitable for display.</value>
-  </data>
-  <data name="ListControlFormatInfoChangedDescr" xml:space="preserve">
+  </data><data name="ListControlFormatInfoChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the FormatInfo property changed.</value>
-  </data>
-  <data name="ListControlFormatStringChangedDescr" xml:space="preserve">
+  </data><data name="ListControlFormatStringChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the FormatString property is changed.</value>
-  </data>
-  <data name="ListControlFormatStringDescr" xml:space="preserve">
+  </data><data name="ListControlFormatStringDescr" xml:space="preserve">
     <value>The format specifier characters that indicate how a value is to be displayed.</value>
-  </data>
-  <data name="ListControlFormattingEnabledChangedDescr" xml:space="preserve">
+  </data><data name="ListControlFormattingEnabledChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the FormattingEnabled property is changed.</value>
-  </data>
-  <data name="ListControlFormattingEnabledDescr" xml:space="preserve">
+  </data><data name="ListControlFormattingEnabledDescr" xml:space="preserve">
     <value>If this property is true, the value of FormatString is used to convert the value of DisplayMember into a value that can be displayed.</value>
-  </data>
-  <data name="ListControlOnDataSourceChangedDescr" xml:space="preserve">
+  </data><data name="ListControlOnDataSourceChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the DataSource property is changed on ListControl.</value>
-  </data>
-  <data name="ListControlOnDisplayMemberChangedDescr" xml:space="preserve">
+  </data><data name="ListControlOnDisplayMemberChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the DisplayMember property is changed on ListControl.</value>
-  </data>
-  <data name="ListControlOnSelectedValueChangedDescr" xml:space="preserve">
+  </data><data name="ListControlOnSelectedValueChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the SelectedValue property is changed on ListControl.</value>
-  </data>
-  <data name="ListControlOnValueMemberChangedDescr" xml:space="preserve">
+  </data><data name="ListControlOnValueMemberChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the ValueMember property is changed on ListControl.</value>
-  </data>
-  <data name="ListControlSelectedValueDescr" xml:space="preserve">
+  </data><data name="ListControlSelectedValueDescr" xml:space="preserve">
     <value>Indicates the actual value of the currently selected item. Setting it will cause the item whose actual value is equal to become selected.</value>
-  </data>
-  <data name="ListControlValueMemberDescr" xml:space="preserve">
+  </data><data name="ListControlValueMemberDescr" xml:space="preserve">
     <value>Indicates the property to use as the actual value for the items in the control.</value>
-  </data>
-  <data name="ListControlWrongDisplayMember" xml:space="preserve">
+  </data><data name="ListControlWrongDisplayMember" xml:space="preserve">
     <value>Cannot bind to the new display member.</value>
-  </data>
-  <data name="ListControlWrongValueMember" xml:space="preserve">
+  </data><data name="ListControlWrongValueMember" xml:space="preserve">
     <value>Cannot bind to the new value member.</value>
-  </data>
-  <data name="ListEnumCurrentOutOfRange" xml:space="preserve">
+  </data><data name="ListEnumCurrentOutOfRange" xml:space="preserve">
     <value>Enumerator's current position is out of the bounds of the list.</value>
-  </data>
-  <data name="ListEnumVersionMismatch" xml:space="preserve">
+  </data><data name="ListEnumVersionMismatch" xml:space="preserve">
     <value>List that this enumerator is bound to has been modified. An enumerator can only be used if the list does not change.</value>
-  </data>
-  <data name="ListManagerBadPosition" xml:space="preserve">
+  </data><data name="ListManagerBadPosition" xml:space="preserve">
     <value>Position is either less than 0 or greater than the number of items in the data source.</value>
-  </data>
-  <data name="ListManagerEmptyList" xml:space="preserve">
+  </data><data name="ListManagerEmptyList" xml:space="preserve">
     <value>Cannot operate with an empty list.</value>
-  </data>
-  <data name="ListManagerNoValue" xml:space="preserve">
+  </data><data name="ListManagerNoValue" xml:space="preserve">
     <value>Index {0} does not have a value.</value>
-  </data>
-  <data name="ListManagerSetDataSource" xml:space="preserve">
+  </data><data name="ListManagerSetDataSource" xml:space="preserve">
     <value>Data sources of type {0} are not supported.</value>
-  </data>
-  <data name="ListViewActivationDescr" xml:space="preserve">
+  </data><data name="ListViewActivationDescr" xml:space="preserve">
     <value>Indicates the type of action required by the user to activate an item, and the feedback given.</value>
-  </data>
-  <data name="ListViewActivationMustBeOnWhenHotTrackingIsOn" xml:space="preserve">
+  </data><data name="ListViewActivationMustBeOnWhenHotTrackingIsOn" xml:space="preserve">
     <value>When HotTracking is on, activation must be ItemActivation.OneClick.</value>
-  </data>
-  <data name="ListViewAddColumnFailed" xml:space="preserve">
+  </data><data name="ListViewAddColumnFailed" xml:space="preserve">
     <value>Column cannot be added to ListView.</value>
-  </data>
-  <data name="ListViewAddItemFailed" xml:space="preserve">
+  </data><data name="ListViewAddItemFailed" xml:space="preserve">
     <value>Item cannot be added to ListView.</value>
-  </data>
-  <data name="ListViewAfterLabelEditDescr" xml:space="preserve">
+  </data><data name="ListViewAfterLabelEditDescr" xml:space="preserve">
     <value>Occurs when the text of an item has been edited by the user.</value>
-  </data>
-  <data name="ListViewAlignmentDescr" xml:space="preserve">
+  </data><data name="ListViewAlignmentDescr" xml:space="preserve">
     <value>Indicates how items are aligned within the ListView.</value>
-  </data>
-  <data name="ListViewAllowColumnReorderDescr" xml:space="preserve">
+  </data><data name="ListViewAllowColumnReorderDescr" xml:space="preserve">
     <value>Indicates whether the user can reorder columns in Details view.</value>
-  </data>
-  <data name="ListViewAutoArrangeDescr" xml:space="preserve">
+  </data><data name="ListViewAutoArrangeDescr" xml:space="preserve">
     <value>Indicates whether items are kept arranged automatically when in LargeIcon or SmallIcon view.</value>
-  </data>
-  <data name="ListViewBackgroundImageTiledDescr" xml:space="preserve">
+  </data><data name="ListViewBackgroundImageTiledDescr" xml:space="preserve">
     <value>Indicates whether the background image will be tiled to fill the entire background of the control.</value>
-  </data>
-  <data name="ListViewBadListViewSubItem" xml:space="preserve">
+  </data><data name="ListViewBadListViewSubItem" xml:space="preserve">
     <value>Parameter must be of type ListViewSubItem.</value>
-  </data>
-  <data name="ListViewBeforeLabelEditDescr" xml:space="preserve">
+  </data><data name="ListViewBeforeLabelEditDescr" xml:space="preserve">
     <value>Occurs when the text of an item is about to be edited by the user.</value>
-  </data>
-  <data name="ListViewBeginEditFailed" xml:space="preserve">
+  </data><data name="ListViewBeginEditFailed" xml:space="preserve">
     <value>BeginEdit did not succeed because the LabelEdit property is false.</value>
-  </data>
-  <data name="ListViewCacheVirtualItemsEventDescr" xml:space="preserve">
+  </data><data name="ListViewCacheVirtualItemsEventDescr" xml:space="preserve">
     <value>Notifies users of virtual ListView controls that they should prepare their cache.</value>
-  </data>
-  <data name="ListViewCantAccessCheckedItemsCollectionWhenInVirtualMode" xml:space="preserve">
+  </data><data name="ListViewCannotAddGroupsToVirtualListView" xml:space="preserve">
+    <value>You cannot add groups to the ListView groups collection when the ListView is in virtual mode.</value>
+  </data><data name="ListViewCantAccessCheckedItemsCollectionWhenInVirtualMode" xml:space="preserve">
     <value>Cannot access the checked items collection when the ListView is in virtual mode.</value>
-  </data>
-  <data name="ListViewCantAccessSelectedItemsCollectionWhenInVirtualMode" xml:space="preserve">
+  </data><data name="ListViewCantAccessSelectedItemsCollectionWhenInVirtualMode" xml:space="preserve">
     <value>Cannot access the selected items collection when the ListView is in virtual mode.</value>
-  </data>
-  <data name="ListViewCantAddItemsToAVirtualListView" xml:space="preserve">
+  </data><data name="ListViewCantAddItemsToAVirtualListView" xml:space="preserve">
     <value>When the ListView is in virtual mode, you cannot add items to the ListView items collection. Use  the VirtualListSize property instead to change the size of the ListView items collection.</value>
-  </data>
-  <data name="ListViewCantGetEnumeratorInVirtualMode" xml:space="preserve">
+  </data><data name="ListViewCantGetEnumeratorInVirtualMode" xml:space="preserve">
     <value>When the ListView is in virtual mode, you cannot enumerate through the ListView items collection using an enumerator or call GetEnumerator. Use the ListView items indexer instead and access an item by index value.</value>
-  </data>
-  <data name="ListViewCantModifyTheItemCollInAVirtualListView" xml:space="preserve">
+  </data><data name="ListViewCantModifyTheItemCollInAVirtualListView" xml:space="preserve">
     <value>Cannot modify the items collection in a virtual ListView.</value>
-  </data>
-  <data name="ListViewCantRemoveItemsFromAVirtualListView" xml:space="preserve">
+  </data><data name="ListViewCantRemoveItemsFromAVirtualListView" xml:space="preserve">
     <value>When the ListView is in virtual mode, you cannot remove items from the ListView items collection. Use the VirtualListSize property instead to change the size of the ListView items collection.</value>
-  </data>
-  <data name="ListViewCantSetViewToTileViewInVirtualMode" xml:space="preserve">
+  </data><data name="ListViewCantSetViewToTileViewInVirtualMode" xml:space="preserve">
     <value>Tile view is not supported in VirtualMode.</value>
-  </data>
-  <data name="ListViewCantSetVirtualModeWhenInTileView" xml:space="preserve">
+  </data><data name="ListViewCantSetVirtualModeWhenInTileView" xml:space="preserve">
     <value>VirtualMode is not supported in Tile view.</value>
-  </data>
-  <data name="ListViewCheckBoxesDescr" xml:space="preserve">
+  </data><data name="ListViewCheckBoxesDescr" xml:space="preserve">
     <value>Indicates whether check boxes are displayed beside items.</value>
-  </data>
-  <data name="ListViewCheckBoxesNotSupportedInTileView" xml:space="preserve">
+  </data><data name="ListViewCheckBoxesNotSupportedInTileView" xml:space="preserve">
     <value>CheckBoxes are not supported in Tile view. Choose a different view or set CheckBoxes to false.</value>
-  </data>
-  <data name="ListViewColumnClickDescr" xml:space="preserve">
+  </data><data name="ListViewColumnClickDescr" xml:space="preserve">
     <value>Occurs when a column header is clicked.</value>
-  </data>
-  <data name="ListViewColumnInfoSet" xml:space="preserve">
+  </data><data name="ListViewColumnInfoSet" xml:space="preserve">
     <value>ColumnInfo cannot be set.</value>
-  </data>
-  <data name="ListViewColumnReorderedDscr" xml:space="preserve">
+  </data><data name="ListViewColumnReorderedDscr" xml:space="preserve">
     <value>Occurs when the ListView column header has been reordered.</value>
-  </data>
-  <data name="ListViewColumnsDescr" xml:space="preserve">
-    <value>The columns shown in Details view.</value>
-  </data>
-  <data name="ListViewColumnWidthChangedDscr" xml:space="preserve">
+  </data><data name="ListViewColumnWidthChangedDscr" xml:space="preserve">
     <value>Occurs when the user stops dragging the column header divider. Works only in Details mode.</value>
-  </data>
-  <data name="ListViewColumnWidthChangingDscr" xml:space="preserve">
+  </data><data name="ListViewColumnWidthChangingDscr" xml:space="preserve">
     <value>Occurs when the user drags the column header divider. Works only in Details mode.</value>
-  </data>
-  <data name="ListViewDrawColumnHeaderEventDescr" xml:space="preserve">
+  </data><data name="ListViewColumnsDescr" xml:space="preserve">
+    <value>The columns shown in Details view.</value>
+  </data><data name="ListViewDrawColumnHeaderEventDescr" xml:space="preserve">
     <value>Occurs in owner draw mode, when a column header needs to be drawn.</value>
-  </data>
-  <data name="ListViewDrawItemEventDescr" xml:space="preserve">
+  </data><data name="ListViewDrawItemEventDescr" xml:space="preserve">
     <value>Occurs in owner-draw mode, when an item needs to be drawn.</value>
-  </data>
-  <data name="ListViewDrawSubItemEventDescr" xml:space="preserve">
+  </data><data name="ListViewDrawSubItemEventDescr" xml:space="preserve">
     <value>Occurs in owner-draw mode, when a SubItem (Details view only) needs to be drawn.</value>
-  </data>
-  <data name="ListViewFindNearestItemWorksOnlyInIconView" xml:space="preserve">
+  </data><data name="ListViewFindNearestItemWorksOnlyInIconView" xml:space="preserve">
     <value>FindNearestItem is supported only when the ListView is in SMALLICON or LARGEICON view.</value>
-  </data>
-  <data name="ListViewFocusedItemDescr" xml:space="preserve">
+  </data><data name="ListViewFocusedItemDescr" xml:space="preserve">
     <value>The ListView item that currently has the user focus.</value>
-  </data>
-  <data name="ListViewFullRowSelectDescr" xml:space="preserve">
+  </data><data name="ListViewFullRowSelectDescr" xml:space="preserve">
     <value>Indicates whether all SubItems are highlighted along with the item when selected.</value>
-  </data>
-  <data name="ListViewGetTopItem" xml:space="preserve">
+  </data><data name="ListViewGetTopItem" xml:space="preserve">
     <value>Cannot get the top item in LargeIcon, SmallIcon, or Tile view.</value>
-  </data>
-  <data name="ListViewGridLinesDescr" xml:space="preserve">
+  </data><data name="ListViewGridLinesDescr" xml:space="preserve">
     <value>Displays grid lines around items and SubItems. Only shown when in Details view.</value>
-  </data>
-  <data name="ListViewGroupDefaultGroup" xml:space="preserve">
+  </data><data name="ListViewGroupCollapsedStateChangedDescr" xml:space="preserve">
+    <value>Event raised when the CollapsedState property of a ListViewGroup changes.</value>
+  </data><data name="ListViewGroupCollapsedStateName" xml:space="preserve">
+    <value>{0}, group, collapsed</value>
+  </data><data name="ListViewGroupCollectionBadListViewGroup" xml:space="preserve">
+    <value>Parameter must be of type ListViewGroup.</value>
+  </data><data name="ListViewGroupDefaultGroup" xml:space="preserve">
     <value>Default</value>
-  </data>
-  <data name="ListViewGroupDefaultHeader" xml:space="preserve">
+  </data><data name="ListViewGroupDefaultHeader" xml:space="preserve">
     <value>ListViewGroup</value>
-  </data>
-  <data name="ListViewGroupNameDescr" xml:space="preserve">
+  </data><data name="ListViewGroupExpandedStateName" xml:space="preserve">
+    <value>{0}, group, expanded</value>
+  </data><data name="ListViewGroupImageListDescr" xml:space="preserve">
+    <value>The ImageList control used by the ListView for ListViewGroup images in all views.</value>
+  </data><data name="ListViewGroupNameDescr" xml:space="preserve">
     <value>The name of this group.</value>
-  </data>
-  <data name="ListViewGroupsDescr" xml:space="preserve">
+  </data><data name="ListViewGroupTaskLinkClickDescr" xml:space="preserve">
+    <value>Event raised when the TaskLink property of a ListViewGroup is clicked.</value>
+  </data><data name="ListViewGroupsDescr" xml:space="preserve">
     <value>The groups in the ListView.</value>
-  </data>
-  <data name="ListViewGroupCollectionBadListViewGroup" xml:space="preserve">
-    <value>Parameter must be of type ListViewGroup.</value>
-  </data>
-  <data name="ListViewHeaderStyleDescr" xml:space="preserve">
+  </data><data name="ListViewHeaderStyleDescr" xml:space="preserve">
     <value>The style of the column headers in Details view.</value>
-  </data>
-  <data name="ListViewHideSelectionDescr" xml:space="preserve">
+  </data><data name="ListViewHideSelectionDescr" xml:space="preserve">
     <value>Removes highlighting from the selected item when the control does not have focus.</value>
-  </data>
-  <data name="ListViewHotTrackingDescr" xml:space="preserve">
+  </data><data name="ListViewHotTrackingDescr" xml:space="preserve">
     <value>Allows items to appear as hyperlinks when the mouse hovers over them.</value>
-  </data>
-  <data name="ListViewHoverMustBeOnWhenHotTrackingIsOn" xml:space="preserve">
+  </data><data name="ListViewHoverMustBeOnWhenHotTrackingIsOn" xml:space="preserve">
     <value>When HotTracking is on, HoverSelection must also be enabled.</value>
-  </data>
-  <data name="ListViewHoverSelectDescr" xml:space="preserve">
+  </data><data name="ListViewHoverSelectDescr" xml:space="preserve">
     <value>Allows items to be selected by hovering over them with the mouse.</value>
-  </data>
-  <data name="ListViewIndentCountCantBeNegative" xml:space="preserve">
+  </data><data name="ListViewIndentCountCantBeNegative" xml:space="preserve">
     <value>IndentCount property on the ListViewItem class does not accept negative values.</value>
-  </data>
-  <data name="ListViewInsertionMarkDescr" xml:space="preserve">
+  </data><data name="ListViewInsertionMarkDescr" xml:space="preserve">
     <value>Allows insertion mark attributes to be changed.</value>
-  </data>
-  <data name="ListViewItemCheckedDescr" xml:space="preserve">
+  </data><data name="ListViewItemAccessibilityObjectInvalidViewException" xml:space="preserve">
+    <value>The current accessibility object is only for the ListView in {0} view</value>
+  </data><data name="ListViewItemAccessibilityObjectRequiresListView" xml:space="preserve">
+    <value>Cannot get accessiblity object when ListViewItem is not attached to a ListView.</value>
+  </data><data name="ListViewItemCheckedDescr" xml:space="preserve">
     <value>Event raised when the checked property of a ListView item changes.</value>
-  </data>
-  <data name="ListViewItemClickDescr" xml:space="preserve">
+  </data><data name="ListViewItemClickDescr" xml:space="preserve">
     <value>Occurs when an item is activated.</value>
-  </data>
-  <data name="ListViewItemDragDescr" xml:space="preserve">
+  </data><data name="ListViewItemDragDescr" xml:space="preserve">
     <value>Occurs when the user begins dragging an item.</value>
-  </data>
-  <data name="ListViewItemImageIndexDescr" xml:space="preserve">
+  </data><data name="ListViewItemImageIndexDescr" xml:space="preserve">
     <value>The ImageList index value of the image displayed when the list view item is in the unselected state.</value>
-  </data>
-  <data name="ListViewItemImageKeyDescr" xml:space="preserve">
+  </data><data name="ListViewItemImageKeyDescr" xml:space="preserve">
     <value>The key in the image-list value that represents the image to display. when the list view item is in the unselected state.</value>
-  </data>
-  <data name="ListViewItemIndentCountDescr" xml:space="preserve">
+  </data><data name="ListViewItemIndentCountDescr" xml:space="preserve">
     <value>Number of indents for a list ListViewItem</value>
-  </data>
-  <data name="ListViewItemMouseHoverDescr" xml:space="preserve">
+  </data><data name="ListViewItemMouseHoverDescr" xml:space="preserve">
     <value>Occurs when the mouse hovers over an item.</value>
-  </data>
-  <data name="ListViewItemsDescr" xml:space="preserve">
-    <value>The items in the ListView.</value>
-  </data>
-  <data name="ListViewItemSelectionChangedDescr" xml:space="preserve">
+  </data><data name="ListViewItemSelectionChangedDescr" xml:space="preserve">
     <value>Event raised when the selection state of an item has changed.</value>
-  </data>
-  <data name="ListViewItemSorterDescr" xml:space="preserve">
+  </data><data name="ListViewItemSorterDescr" xml:space="preserve">
     <value>The sorting comparer for this view.</value>
-  </data>
-  <data name="ListViewItemStateImageIndexDescr" xml:space="preserve">
+  </data><data name="ListViewItemStateImageIndexDescr" xml:space="preserve">
     <value>The image-list index value of the state image displayed.</value>
-  </data>
-  <data name="ListViewItemStateImageKeyDescr" xml:space="preserve">
+  </data><data name="ListViewItemStateImageKeyDescr" xml:space="preserve">
     <value>The key in the image-list value that represents the image to display.</value>
-  </data>
-  <data name="ListViewItemSubItemsDescr" xml:space="preserve">
+  </data><data name="ListViewItemSubItemsDescr" xml:space="preserve">
     <value>The SubItems for this ListViewItem.</value>
-  </data>
-  <data name="ListViewLabelEditDescr" xml:space="preserve">
+  </data><data name="ListViewItemsDescr" xml:space="preserve">
+    <value>The items in the ListView.</value>
+  </data><data name="ListViewLabelEditDescr" xml:space="preserve">
     <value>Allows item labels to be edited in place by the user.</value>
-  </data>
-  <data name="ListViewLabelWrapDescr" xml:space="preserve">
+  </data><data name="ListViewLabelWrapDescr" xml:space="preserve">
     <value>Determines whether label text can wrap to a new line.</value>
-  </data>
-  <data name="ListViewLargeImageListDescr" xml:space="preserve">
+  </data><data name="ListViewLargeImageListDescr" xml:space="preserve">
     <value>The ImageList control used by the ListView for images in Large Icon View.</value>
-  </data>
-  <data name="ListViewMultiSelectDescr" xml:space="preserve">
+  </data><data name="ListViewMultiSelectDescr" xml:space="preserve">
     <value>Allows multiple items to be selected.</value>
-  </data>
-  <data name="ListViewOwnerDrawDescr" xml:space="preserve">
+  </data><data name="ListViewOwnerDrawDescr" xml:space="preserve">
     <value>Controls whether the system or the user paints items/SubItems.</value>
-  </data>
-  <data name="ListViewRetrieveVirtualItemEventDescr" xml:space="preserve">
+  </data><data name="ListViewRetrieveVirtualItemEventDescr" xml:space="preserve">
     <value>Retrieves the virtual item from the user.</value>
-  </data>
-  <data name="ListViewScrollableDescr" xml:space="preserve">
+  </data><data name="ListViewScrollableDescr" xml:space="preserve">
     <value>Indicates whether the control will display scroll bars if it contains more items than can fit in the client area.</value>
-  </data>
-  <data name="ListViewSearchForVirtualItemDescr" xml:space="preserve">
+  </data><data name="ListViewSearchForVirtualItemDescr" xml:space="preserve">
     <value>Notifies the user that a search is taking place on a virtual ListView.</value>
-  </data>
-  <data name="ListViewSelectedIndexChangedDescr" xml:space="preserve">
+  </data><data name="ListViewSelectedIndexChangedDescr" xml:space="preserve">
     <value>Occurs whenever the 'SelectedIndex' property for this ListView changes.</value>
-  </data>
-  <data name="ListViewSelectedItemsDescr" xml:space="preserve">
+  </data><data name="ListViewSelectedItemsDescr" xml:space="preserve">
     <value>A collection of items that are currently selected in the ListView.</value>
-  </data>
-  <data name="ListViewSetTopItem" xml:space="preserve">
+  </data><data name="ListViewSetTopItem" xml:space="preserve">
     <value>Cannot set the TopItem in LargeIcon, SmallIcon, or Tile View.</value>
-  </data>
-  <data name="ListViewShowGroupsDescr" xml:space="preserve">
+  </data><data name="ListViewShowGroupsDescr" xml:space="preserve">
     <value>Indicates whether the control will display the items in group form.</value>
-  </data>
-  <data name="ListViewShowItemToolTipsDescr" xml:space="preserve">
+  </data><data name="ListViewShowItemToolTipsDescr" xml:space="preserve">
     <value>Allows ListViewItems to display ToolTips.</value>
-  </data>
-  <data name="ListViewSmallImageListDescr" xml:space="preserve">
+  </data><data name="ListViewSmallImageListDescr" xml:space="preserve">
     <value>The ImageList control used by the ListView for images in all views except for the large icon view.</value>
-  </data>
-  <data name="ListViewSortingDescr" xml:space="preserve">
-    <value>Indicates the manner in which items are to be sorted.</value>
-  </data>
-  <data name="ListViewSortNotAllowedInVirtualListView" xml:space="preserve">
+  </data><data name="ListViewSortNotAllowedInVirtualListView" xml:space="preserve">
     <value>Sorting is not allowed in a virtual ListView.</value>
-  </data>
-  <data name="ListViewStartIndexCannotBeLargerThanEndIndex" xml:space="preserve">
+  </data><data name="ListViewSortingDescr" xml:space="preserve">
+    <value>Indicates the manner in which items are to be sorted.</value>
+  </data><data name="ListViewStartIndexCannotBeLargerThanEndIndex" xml:space="preserve">
     <value>The startIndex value cannot be larger than the endIndex value.</value>
-  </data>
-  <data name="ListViewStateImageListDescr" xml:space="preserve">
+  </data><data name="ListViewStateImageListDescr" xml:space="preserve">
     <value>The ImageList control used by the ListView for custom states.</value>
-  </data>
-  <data name="ListViewSubItemCollectionInvalidArgument" xml:space="preserve">
+  </data><data name="ListViewSubItemCollectionInvalidArgument" xml:space="preserve">
     <value>Argument must be of type ListViewSubItem.</value>
-  </data>
-  <data name="ListViewTileSizeDescr" xml:space="preserve">
+  </data><data name="ListViewTileSizeDescr" xml:space="preserve">
     <value>The size of the tile in Tile view.</value>
-  </data>
-  <data name="ListViewTileSizeMustBePositive" xml:space="preserve">
+  </data><data name="ListViewTileSizeMustBePositive" xml:space="preserve">
     <value>TileSize must be positive.</value>
-  </data>
-  <data name="ListViewTileViewDoesNotSupportCheckBoxes" xml:space="preserve">
+  </data><data name="ListViewTileViewDoesNotSupportCheckBoxes" xml:space="preserve">
     <value>Tile view does not support CheckBoxes. Choose a different view or set CheckBoxes to false.</value>
-  </data>
-  <data name="ListViewTopItemDescr" xml:space="preserve">
+  </data><data name="ListViewTopItemDescr" xml:space="preserve">
     <value>The first item that is visible to the user.</value>
-  </data>
-  <data name="ListViewViewDescr" xml:space="preserve">
+  </data><data name="ListViewViewDescr" xml:space="preserve">
     <value>Selects one of five different views that items can be shown in.</value>
-  </data>
-  <data name="ListViewVirtualItemRequired" xml:space="preserve">
+  </data><data name="ListViewVirtualItemRequired" xml:space="preserve">
     <value>ListView virtualization requires a valid ListViewItem to be provided by the RetrieveVirtualItem event or in the OnRetrieveVirtualItem method.</value>
-  </data>
-  <data name="ListViewVirtualItemsSelectionRangeChangedDescr" xml:space="preserve">
-    <value>Event raised when the selection state of a range of items has changed. This event in raised only in virtual mode.</value>
-  </data>
-  <data name="ListViewVirtualItemStateChangedDescr" xml:space="preserve">
+  </data><data name="ListViewVirtualItemStateChangedDescr" xml:space="preserve">
     <value>Occurs whenever the state of a virtual item is changed.</value>
-  </data>
-  <data name="ListViewVirtualListSizeDescr" xml:space="preserve">
+  </data><data name="ListViewVirtualItemsSelectionRangeChangedDescr" xml:space="preserve">
+    <value>Event raised when the selection state of a range of items has changed. This event in raised only in virtual mode.</value>
+  </data><data name="ListViewVirtualListSizeDescr" xml:space="preserve">
     <value>Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items.</value>
-  </data>
-  <data name="ListViewVirtualListSizeInvalidArgument" xml:space="preserve">
+  </data><data name="ListViewVirtualListSizeInvalidArgument" xml:space="preserve">
     <value>Value of '{1}' is not valid for '{0}'. {0} should be greater than or equal to 0.</value>
-  </data>
-  <data name="ListViewVirtualListViewRequiresNoCheckedItems" xml:space="preserve">
+  </data><data name="ListViewVirtualListViewRequiresNoCheckedItems" xml:space="preserve">
     <value>Cannot set VirtualMode=true on a list whose checked items collection is not empty.</value>
-  </data>
-  <data name="ListViewVirtualListViewRequiresNoItems" xml:space="preserve">
+  </data><data name="ListViewVirtualListViewRequiresNoItems" xml:space="preserve">
     <value>Cannot set VirtualMode=true on a ListView that has items.</value>
-  </data>
-  <data name="ListViewVirtualListViewRequiresNoSelectedItems" xml:space="preserve">
+  </data><data name="ListViewVirtualListViewRequiresNoSelectedItems" xml:space="preserve">
     <value>Cannot set VirtualMode=true on a ListView whose selected items collection is not empty.</value>
-  </data>
-  <data name="ListViewVirtualModeCantAccessSubItem" xml:space="preserve">
+  </data><data name="ListViewVirtualModeCantAccessSubItem" xml:space="preserve">
     <value>When in VirtualMode the ListView RetrieveVirtualListItem event needs a list view SubItem for each ListView column.</value>
-  </data>
-  <data name="ListViewVirtualModeDescr" xml:space="preserve">
+  </data><data name="ListViewVirtualModeDescr" xml:space="preserve">
     <value>Enables ListView virtual mode.</value>
-  </data>
-  <data name="LoadDLLError" xml:space="preserve">
+  </data><data name="LiveRegionAutomationLiveSettingDescr" xml:space="preserve">
+    <value>The politeness level that a client should use to notify the user of changes to this live region.</value>
+  </data><data name="LoadDLLError" xml:space="preserve">
     <value>Cannot load the "{0}" DLL into memory.</value>
-  </data>
-  <data name="LoadTextError" xml:space="preserve">
+  </data><data name="LoadTextError" xml:space="preserve">
     <value>Cannot load the text.</value>
-  </data>
-  <data name="MaskedTextBoxAllowPromptAsInputDescr" xml:space="preserve">
+  </data><data name="MDIChildAddToNonMDIParent" xml:space="preserve">
+    <value>MDI child forms can be added only to an MdiClient.</value>
+  </data><data name="MDIChildSystemMenuItemAccessibleName" xml:space="preserve">
+    <value>System</value>
+  </data><data name="MDIContainerMustBeTopLevel" xml:space="preserve">
+    <value>MDI container forms must be top-level.</value>
+  </data><data name="MDIMenuMoreWindows" xml:space="preserve">
+    <value>&amp;More Windows...</value>
+  </data><data name="MDIParentNotContainer" xml:space="preserve">
+    <value>Form that was specified to be the MdiParent for this form is not an MdiContainer.</value>
+  </data><data name="MaskedTextBoxAllowPromptAsInputDescr" xml:space="preserve">
     <value>Indicates whether the prompt character is valid as input.</value>
-  </data>
-  <data name="MaskedTextBoxAsciiOnlyDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxAsciiOnlyDescr" xml:space="preserve">
     <value>Indicates whether only ASCII characters are accepted as valid input.</value>
-  </data>
-  <data name="MaskedTextBoxBeepOnErrorDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxBeepOnErrorDescr" xml:space="preserve">
     <value>Indicates whether the control will beep when an invalid character is typed.</value>
-  </data>
-  <data name="MaskedTextBoxCultureDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxCultureDescr" xml:space="preserve">
     <value>The culture that determines the value of the localizable mask language separators and placeholders.</value>
-  </data>
-  <data name="MaskedTextBoxCutCopyMaskFormat" xml:space="preserve">
+  </data><data name="MaskedTextBoxCutCopyMaskFormat" xml:space="preserve">
     <value>Indicates whether the text to be copied to the clipboard includes literals and/or prompt characters.</value>
-  </data>
-  <data name="MaskedTextBoxHidePromptOnLeaveDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxHidePromptOnLeaveDescr" xml:space="preserve">
     <value>Indicates whether prompt characters are displayed when the control does not have focus.</value>
-  </data>
-  <data name="MaskedTextBoxIncompleteMsg" xml:space="preserve">
+  </data><data name="MaskedTextBoxIncompleteMsg" xml:space="preserve">
     <value>Mask input is not complete.</value>
-  </data>
-  <data name="MaskedTextBoxInsertKeyModeDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxInsertKeyModeDescr" xml:space="preserve">
     <value>Indicates the masked text box input character typing mode.</value>
-  </data>
-  <data name="MaskedTextBoxInvalidCharError" xml:space="preserve">
+  </data><data name="MaskedTextBoxInvalidCharError" xml:space="preserve">
     <value>Specified character value is not allowed for this property.</value>
-  </data>
-  <data name="MaskedTextBoxIsOverwriteModeChangedDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxIsOverwriteModeChangedDescr" xml:space="preserve">
     <value>Occurs when the value of IsOverwriteMode property changes.</value>
-  </data>
-  <data name="MaskedTextBoxMaskChangedDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxMaskChangedDescr" xml:space="preserve">
     <value>Occurs when the value of Mask property changes.</value>
-  </data>
-  <data name="MaskedTextBoxMaskDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxMaskDescr" xml:space="preserve">
     <value>Sets the string governing the input allowed for this control.</value>
-  </data>
-  <data name="MaskedTextBoxMaskInputRejectedDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxMaskInputRejectedDescr" xml:space="preserve">
     <value>Occurs when the input character or text does not comply with the mask specification.</value>
-  </data>
-  <data name="MaskedTextBoxMaskInvalidChar" xml:space="preserve">
+  </data><data name="MaskedTextBoxMaskInvalidChar" xml:space="preserve">
     <value>Specified mask contains characters that are not valid.</value>
-  </data>
-  <data name="MaskedTextBoxPasswordAndPromptCharError" xml:space="preserve">
+  </data><data name="MaskedTextBoxPasswordAndPromptCharError" xml:space="preserve">
     <value>PasswordChar and PromptChar values cannot be the same.</value>
-  </data>
-  <data name="MaskedTextBoxPasswordCharDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxPasswordCharDescr" xml:space="preserve">
     <value>Indicates the character to display for password input.</value>
-  </data>
-  <data name="MaskedTextBoxPromptCharDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxPromptCharDescr" xml:space="preserve">
     <value>Indicates the character used as the placeholder.</value>
-  </data>
-  <data name="MaskedTextBoxRejectInputOnFirstFailureDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxRejectInputOnFirstFailureDescr" xml:space="preserve">
     <value>If true, the input text is rejected whenever a character fails to comply with the mask; otherwise, characters in the text are processed one by one as individual inputs.</value>
-  </data>
-  <data name="MaskedTextBoxResetOnPrompt" xml:space="preserve">
+  </data><data name="MaskedTextBoxResetOnPrompt" xml:space="preserve">
     <value>Specifies whether to reset and skip the current position if editable, when the input character has the same value as the prompt.</value>
-  </data>
-  <data name="MaskedTextBoxResetOnSpace" xml:space="preserve">
+  </data><data name="MaskedTextBoxResetOnSpace" xml:space="preserve">
     <value>Specifies whether to reset and skip the current position if editable, when the input is the space character.</value>
-  </data>
-  <data name="MaskedTextBoxSkipLiterals" xml:space="preserve">
+  </data><data name="MaskedTextBoxSkipLiterals" xml:space="preserve">
     <value>Specifies whether to skip the current position if non-editable and the input character has the same value as the literal at that position.</value>
-  </data>
-  <data name="MaskedTextBoxTextMaskFormat" xml:space="preserve">
+  </data><data name="MaskedTextBoxTextMaskFormat" xml:space="preserve">
     <value>Indicates whether the string returned from the Text property includes literals and/or prompt characters.</value>
-  </data>
-  <data name="MaskedTextBoxTypeValidationCompletedDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxTypeValidationCompletedDescr" xml:space="preserve">
     <value>Occurs when the ValidatingType object has completed parsing the input text.</value>
-  </data>
-  <data name="MaskedTextBoxTypeValidationSucceeded" xml:space="preserve">
+  </data><data name="MaskedTextBoxTypeValidationSucceeded" xml:space="preserve">
     <value>Type validation succeeded.</value>
-  </data>
-  <data name="MaskedTextBoxUseSystemPasswordCharDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxUseSystemPasswordCharDescr" xml:space="preserve">
     <value>Indicates if the text in the edit control should appear as the default password character.</value>
-  </data>
-  <data name="MaskedTextBoxValidatedValueChangedDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxValidatedValueChangedDescr" xml:space="preserve">
     <value>Occurs when the ValidatedValue changes after type validation has been completed.</value>
-  </data>
-  <data name="MaskedTextBoxValidatingTypeDescr" xml:space="preserve">
+  </data><data name="MaskedTextBoxValidatingTypeDescr" xml:space="preserve">
     <value>Specifies the Type of the object to be used for parsing the input text when the control looses focus.</value>
-  </data>
-  <data name="MDIChildAddToNonMDIParent" xml:space="preserve">
-    <value>MDI child forms can be added only to an MdiClient.</value>
-  </data>
-  <data name="MDIContainerMustBeTopLevel" xml:space="preserve">
-    <value>MDI container forms must be top-level.</value>
-  </data>
-  <data name="MDIMenuMoreWindows" xml:space="preserve">
-    <value>&amp;More Windows...</value>
-  </data>
-  <data name="MDIParentNotContainer" xml:space="preserve">
-    <value>Form that was specified to be the MdiParent for this form is not an MdiContainer.</value>
-  </data>
-  <data name="measureItemEventDescr" xml:space="preserve">
-    <value>Occurs whenever a particular item's height needs to be calculated.</value>
-  </data>
-  <data name="MenuItemShortCutDescr" xml:space="preserve">
+  </data><data name="MenuItemShortCutDescr" xml:space="preserve">
     <value>The shortcut key associated with the menu item. </value>
-  </data>
-  <data name="MenuItemShowShortCutDescr" xml:space="preserve">
+  </data><data name="MenuItemShowShortCutDescr" xml:space="preserve">
     <value>Indicates whether the shorcut key for the menu item is displayed on the item. </value>
-  </data>
-  <data name="MenuStripMdiWindowListItem" xml:space="preserve">
+  </data><data name="MenuStripMdiWindowListItem" xml:space="preserve">
     <value>Specifies the item whose DropDown will show the list of MDI windows.</value>
-  </data>
-  <data name="MenuStripMenuActivateDescr" xml:space="preserve">
+  </data><data name="MenuStripMenuActivateDescr" xml:space="preserve">
     <value>Occurs when the user has started accessing the menu through the keyboard or mouse.</value>
-  </data>
-  <data name="MenuStripMenuDeactivateDescr" xml:space="preserve">
+  </data><data name="MenuStripMenuDeactivateDescr" xml:space="preserve">
     <value>Occurs when the user has finished accessing the menu through the keyboard or mouse.</value>
-  </data>
-  <data name="MonthCalendarAnnuallyBoldedDatesDescr" xml:space="preserve">
+  </data><data name="MonthCalendarAnnuallyBoldedDatesDescr" xml:space="preserve">
     <value>Indicates which annual dates should be boldface.</value>
-  </data>
-  <data name="MonthCalendarBodyAccessibleName" xml:space="preserve">
+  </data><data name="MonthCalendarBodyAccessibleName" xml:space="preserve">
     <value>Calendar body</value>
-  </data>
-  <data name="MonthCalendarDimensionsDescr" xml:space="preserve">
+  </data><data name="MonthCalendarDimensionsDescr" xml:space="preserve">
     <value>The number of rows and columns of months in a month calendar.</value>
-  </data>
-  <data name="MonthCalendarFirstDayOfWeekDescr" xml:space="preserve">
+  </data><data name="MonthCalendarFirstDayOfWeekDescr" xml:space="preserve">
     <value>The first day of the week.</value>
-  </data>
-  <data name="MonthCalendarForeColorDescr" xml:space="preserve">
+  </data><data name="MonthCalendarForeColorDescr" xml:space="preserve">
     <value>The color used to display text within a month.</value>
-  </data>
-  <data name="MonthCalendarInvalidDimensions" xml:space="preserve">
+  </data><data name="MonthCalendarInvalidDimensions" xml:space="preserve">
     <value>Calendar dimensions ({0}, {1}) are not valid.</value>
-  </data>
-  <data name="MonthCalendarMaxDateDescr" xml:space="preserve">
+  </data><data name="MonthCalendarMaxDateDescr" xml:space="preserve">
     <value>The maximum date that can be selected for a month calendar control.</value>
-  </data>
-  <data name="MonthCalendarMaxSelCount" xml:space="preserve">
+  </data><data name="MonthCalendarMaxSelCount" xml:space="preserve">
     <value>Unable to set the MonthCalendar maximum selection count to {0}.</value>
-  </data>
-  <data name="MonthCalendarMaxSelectionCountDescr" xml:space="preserve">
+  </data><data name="MonthCalendarMaxSelectionCountDescr" xml:space="preserve">
     <value>The total number of days that can be selected for the control.</value>
-  </data>
-  <data name="MonthCalendarMinDateDescr" xml:space="preserve">
+  </data><data name="MonthCalendarMinDateDescr" xml:space="preserve">
     <value>The minimum date that can be selected for a month calendar control.</value>
-  </data>
-  <data name="MonthCalendarMonthBackColorDescr" xml:space="preserve">
+  </data><data name="MonthCalendarMonthBackColorDescr" xml:space="preserve">
     <value>The background color displayed within the month.</value>
-  </data>
-  <data name="MonthCalendarMonthlyBoldedDatesDescr" xml:space="preserve">
+  </data><data name="MonthCalendarMonthlyBoldedDatesDescr" xml:space="preserve">
     <value>Indicates which monthly dates to bold.</value>
-  </data>
-  <data name="MonthCalendarNextButtonAccessibleName" xml:space="preserve">
+  </data><data name="MonthCalendarNextButtonAccessibleName" xml:space="preserve">
     <value>Next</value>
-  </data>
-  <data name="MonthCalendarOnDateChangedDescr" xml:space="preserve">
+  </data><data name="MonthCalendarOnDateChangedDescr" xml:space="preserve">
     <value>Occurs when the range of dates changes due to user selection, or through next/previous month navigation.</value>
-  </data>
-  <data name="MonthCalendarOnDateSelectedDescr" xml:space="preserve">
+  </data><data name="MonthCalendarOnDateSelectedDescr" xml:space="preserve">
     <value>Occurs when the user selects a date or a range of dates.</value>
-  </data>
-  <data name="MonthCalendarPreviousButtonAccessibleName" xml:space="preserve">
+  </data><data name="MonthCalendarPreviousButtonAccessibleName" xml:space="preserve">
     <value>Previous</value>
-  </data>
-  <data name="MonthCalendarRange" xml:space="preserve">
+  </data><data name="MonthCalendarRange" xml:space="preserve">
     <value>Unable to set the MonthCalendar range from {0} to {1}.</value>
-  </data>
-  <data name="MonthCalendarScrollChangeDescr" xml:space="preserve">
+  </data><data name="MonthCalendarRangeSelected" xml:space="preserve">
+    <value> {0} to {1} selected.</value>
+  </data><data name="MonthCalendarScrollChangeDescr" xml:space="preserve">
     <value>The number of months that a single click on a next/previous button moves the display by.</value>
-  </data>
-  <data name="MonthCalendarSelectionEndDescr" xml:space="preserve">
+  </data><data name="MonthCalendarSelectionEndDescr" xml:space="preserve">
     <value>The end date in a range of dates selected in a month calendar control.</value>
-  </data>
-  <data name="MonthCalendarSelectionRangeDescr" xml:space="preserve">
+  </data><data name="MonthCalendarSelectionRangeDescr" xml:space="preserve">
     <value>The range of dates selected in a month calendar control.</value>
-  </data>
-  <data name="MonthCalendarSelectionStartDescr" xml:space="preserve">
+  </data><data name="MonthCalendarSelectionStartDescr" xml:space="preserve">
     <value>The start date in a range of dates selected in a month calendar control.</value>
-  </data>
-  <data name="MonthCalendarShowTodayCircleDescr" xml:space="preserve">
+  </data><data name="MonthCalendarShowTodayCircleDescr" xml:space="preserve">
     <value>Indicates whether the month calendar control will circle the \"today\" date.</value>
-  </data>
-  <data name="MonthCalendarShowTodayDescr" xml:space="preserve">
+  </data><data name="MonthCalendarShowTodayDescr" xml:space="preserve">
     <value>Indicates whether the month calendar control will display the \"today\" date at the bottom of the control.</value>
-  </data>
-  <data name="MonthCalendarShowWeekNumbersDescr" xml:space="preserve">
+  </data><data name="MonthCalendarShowWeekNumbersDescr" xml:space="preserve">
     <value>Indicates whether the month calendar control will display week numbers (1 to 52) to the left of each row of days.</value>
-  </data>
-  <data name="MonthCalendarSingleMonthSizeDescr" xml:space="preserve">
+  </data><data name="MonthCalendarSingleDateSelected" xml:space="preserve">
+    <value> {0} selected.</value>
+  </data><data name="MonthCalendarSingleDecadeSelected" xml:space="preserve">
+    <value>Decade {0} selected.</value>
+  </data><data name="MonthCalendarSingleMonthSizeDescr" xml:space="preserve">
     <value>The minimum size required to display a full month.</value>
-  </data>
-  <data name="MonthCalendarTitleBackColorDescr" xml:space="preserve">
+  </data><data name="MonthCalendarSingleYearSelected" xml:space="preserve">
+    <value>Year {0} selected.</value>
+  </data><data name="MonthCalendarTitleBackColorDescr" xml:space="preserve">
     <value>The background color displayed in the calendar's title.</value>
-  </data>
-  <data name="MonthCalendarTitleForeColorDescr" xml:space="preserve">
+  </data><data name="MonthCalendarTitleForeColorDescr" xml:space="preserve">
     <value>The color used to display text within the calendar's title.</value>
-  </data>
-  <data name="MonthCalendarTodayButtonAccessibleName" xml:space="preserve">
+  </data><data name="MonthCalendarTodayButtonAccessibleName" xml:space="preserve">
     <value>Today: {0}</value>
-  </data>
-  <data name="MonthCalendarTodayDateDescr" xml:space="preserve">
+  </data><data name="MonthCalendarTodayDateDescr" xml:space="preserve">
     <value>The current day.</value>
-  </data>
-  <data name="MonthCalendarTodayDateSetDescr" xml:space="preserve">
+  </data><data name="MonthCalendarTodayDateSetDescr" xml:space="preserve">
     <value>Indicates if the current day has been set.</value>
-  </data>
-  <data name="MonthCalendarTrailingForeColorDescr" xml:space="preserve">
+  </data><data name="MonthCalendarTrailingForeColorDescr" xml:space="preserve">
     <value>The color used to display the previous and following months that appear on the month calendar.</value>
-  </data>
-  <data name="NoAllowNewOnReadOnlyList" xml:space="preserve">
+  </data><data name="MonthCalendarWeekNumberDescription" xml:space="preserve">
+    <value>Week {0}</value>
+  </data><data name="MonthCalendarYearRangeSelected" xml:space="preserve">
+    <value>Year {0} to {1} selected.</value>
+  </data><data name="NoAllowNewOnReadOnlyList" xml:space="preserve">
     <value>AllowNew can only be set to true on an IBindingList or on a read-write list with a default public constructor.</value>
-  </data>
-  <data name="NoAllowRemoveOnReadOnlyList" xml:space="preserve">
+  </data><data name="NoAllowRemoveOnReadOnlyList" xml:space="preserve">
     <value>AllowRemove can only be set to true on an IBindingList or on a read-write list.</value>
-  </data>
-  <data name="NoDefaultConstructor" xml:space="preserve">
+  </data><data name="NoDefaultConstructor" xml:space="preserve">
     <value>Type '{0}' must have a public constructor, without parameters, to be serialized.</value>
-  </data>
-  <data name="NoMoreColumns" xml:space="preserve">
+  </data><data name="NoMoreColumns" xml:space="preserve">
     <value>There are no more columns in the table. Use NextRow() to start printing on the next row.</value>
-  </data>
-  <data name="NonTopLevelCantHaveOwner" xml:space="preserve">
+  </data><data name="NonTopLevelCantHaveOwner" xml:space="preserve">
     <value>Only top-level controls can have an owner.</value>
-  </data>
-  <data name="NotAvailable" xml:space="preserve">
+  </data><data name="NotAvailable" xml:space="preserve">
     <value>n/a</value>
-  </data>
-  <data name="NotifyIconBalloonTipIconDescr" xml:space="preserve">
+  </data><data name="NotSerializableType" xml:space="preserve">
+    <value>Item named '{0}' of type '{1}' cannot be added to the resource file because it is not serializable.</value>
+  </data><data name="NotSortedAccessibleStatus" xml:space="preserve">
+    <value>Not sorted.</value>
+  </data><data name="NotSupported" xml:space="preserve">
+    <value>The type {0} on line {1}, position {2} threw the following exception while being converted: {3}</value>
+  </data><data name="NotSupportedExceptionOnClipboard" xml:space="preserve">
+    <value>Clipboard contains a 'NotSupportedException' that indicates that write operation failed. '{0}'.</value>
+  </data><data name="NotifyIconBalloonTipIconDescr" xml:space="preserve">
     <value>The icon to associate with the balloon ToolTip.</value>
-  </data>
-  <data name="NotifyIconBalloonTipTextDescr" xml:space="preserve">
+  </data><data name="NotifyIconBalloonTipTextDescr" xml:space="preserve">
     <value>The text to associate with the balloon ToolTip.</value>
-  </data>
-  <data name="NotifyIconBalloonTipTitleDescr" xml:space="preserve">
+  </data><data name="NotifyIconBalloonTipTitleDescr" xml:space="preserve">
     <value>The title of the balloon ToolTip.</value>
-  </data>
-  <data name="NotifyIconEmptyOrNullTipText" xml:space="preserve">
+  </data><data name="NotifyIconEmptyOrNullTipText" xml:space="preserve">
     <value>Balloon tip text must have a non-empty value.</value>
-  </data>
-  <data name="NotifyIconIconDescr" xml:space="preserve">
+  </data><data name="NotifyIconIconDescr" xml:space="preserve">
     <value>The icon to display in the system tray.</value>
-  </data>
-  <data name="NotifyIconMenuDescr" xml:space="preserve">
+  </data><data name="NotifyIconMenuDescr" xml:space="preserve">
     <value>The shortcut menu to show when the user right-clicks the icon.</value>
-  </data>
-  <data name="NotifyIconMouseClickDescr" xml:space="preserve">
+  </data><data name="NotifyIconMouseClickDescr" xml:space="preserve">
     <value>Occurs when the component is clicked with the mouse.</value>
-  </data>
-  <data name="NotifyIconMouseDoubleClickDescr" xml:space="preserve">
+  </data><data name="NotifyIconMouseDoubleClickDescr" xml:space="preserve">
     <value>Occurs when the component is double-clicked with the mouse. </value>
-  </data>
-  <data name="NotifyIconOnBalloonTipClickedDescr" xml:space="preserve">
+  </data><data name="NotifyIconOnBalloonTipClickedDescr" xml:space="preserve">
     <value>Occurs when a balloon ToolTip is clicked.</value>
-  </data>
-  <data name="NotifyIconOnBalloonTipClosedDescr" xml:space="preserve">
+  </data><data name="NotifyIconOnBalloonTipClosedDescr" xml:space="preserve">
     <value>Occurs when a balloon ToolTip is closed.</value>
-  </data>
-  <data name="NotifyIconOnBalloonTipShownDescr" xml:space="preserve">
+  </data><data name="NotifyIconOnBalloonTipShownDescr" xml:space="preserve">
     <value>Occurs when a balloon tip is shown.</value>
-  </data>
-  <data name="NotifyIconTextDescr" xml:space="preserve">
+  </data><data name="NotifyIconTextDescr" xml:space="preserve">
     <value>The text that will be displayed when the mouse hovers over the icon.</value>
-  </data>
-  <data name="NotifyIconVisDescr" xml:space="preserve">
+  </data><data name="NotifyIconVisDescr" xml:space="preserve">
     <value>Determines whether the control is visible or hidden.</value>
-  </data>
-  <data name="NotSerializableType" xml:space="preserve">
-    <value>Item named '{0}' of type '{1}' cannot be added to the resource file because it is not serializable.</value>
-  </data>
-  <data name="NotSupported" xml:space="preserve">
-    <value>The type {0} on line {1}, position {2} threw the following exception while being converted: {3}</value>
-  </data>
-  <data name="NumericUpDownAccelerationCollectionAtLeastOneEntryIsNull" xml:space="preserve">
+  </data><data name="NumericUpDownAccelerationCollectionAtLeastOneEntryIsNull" xml:space="preserve">
     <value>At least one of the NumericUpDownAcceleration elements is null.</value>
-  </data>
-  <data name="NumericUpDownAccelerationCompareException" xml:space="preserve">
+  </data><data name="NumericUpDownAccelerationCompareException" xml:space="preserve">
     <value>Argument is null or is not a NumericUpDownAcceleration object.</value>
-  </data>
-  <data name="NumericUpDownDecimalPlacesDescr" xml:space="preserve">
+  </data><data name="NumericUpDownDecimalPlacesDescr" xml:space="preserve">
     <value>Indicates the number of decimal places to display.</value>
-  </data>
-  <data name="NumericUpDownHexadecimalDescr" xml:space="preserve">
+  </data><data name="NumericUpDownHexadecimalDescr" xml:space="preserve">
     <value>Indicates whether the numeric up-down should display its value in hexadecimal.</value>
-  </data>
-  <data name="NumericUpDownIncrementDescr" xml:space="preserve">
+  </data><data name="NumericUpDownIncrementDescr" xml:space="preserve">
     <value>Indicates the amount to increment or decrement on each button click.</value>
-  </data>
-  <data name="NumericUpDownMaximumDescr" xml:space="preserve">
+  </data><data name="NumericUpDownMaximumDescr" xml:space="preserve">
     <value>Indicates the maximum value for the numeric up-down control.</value>
-  </data>
-  <data name="NumericUpDownMinimumDescr" xml:space="preserve">
+  </data><data name="NumericUpDownMinimumDescr" xml:space="preserve">
     <value>Indicates the minimum value for the numeric up-down control.</value>
-  </data>
-  <data name="NumericUpDownOnValueChangedDescr" xml:space="preserve">
+  </data><data name="NumericUpDownOnValueChangedDescr" xml:space="preserve">
     <value>Occurs when the value in the up-down control changes.</value>
-  </data>
-  <data name="NumericUpDownThousandsSeparatorDescr" xml:space="preserve">
+  </data><data name="NumericUpDownThousandsSeparatorDescr" xml:space="preserve">
     <value>Indicates whether the thousands separator will be inserted between every three decimal digits.</value>
-  </data>
-  <data name="NumericUpDownValueDescr" xml:space="preserve">
+  </data><data name="NumericUpDownValueDescr" xml:space="preserve">
     <value>The current value of the numeric up-down control.</value>
-  </data>
-  <data name="ObjectHasParent" xml:space="preserve">
-    <value>Object already has a parent.</value>
-  </data>
-  <data name="OFDcheckFileExistsDescr" xml:space="preserve">
+  </data><data name="OFDcheckFileExistsDescr" xml:space="preserve">
     <value>Indicates whether a warning appears when the user specifies a file that does not exist.</value>
-  </data>
-  <data name="OFDmultiSelectDescr" xml:space="preserve">
+  </data><data name="OFDmultiSelectDescr" xml:space="preserve">
     <value>Controls whether multiple files can be selected in the dialog.</value>
-  </data>
-  <data name="OFDreadOnlyCheckedDescr" xml:space="preserve">
+  </data><data name="OFDreadOnlyCheckedDescr" xml:space="preserve">
     <value>The state of the read-only check box in the dialog.</value>
-  </data>
-  <data name="OFDshowReadOnlyDescr" xml:space="preserve">
+  </data><data name="OFDshowReadOnlyDescr" xml:space="preserve">
     <value>Controls whether to show the read-only check box in the dialog.</value>
-  </data>
-  <data name="OKCaption" xml:space="preserve">
+  </data><data name="OKCaption" xml:space="preserve">
     <value>OK</value>
-  </data>
-  <data name="OnlyOneControl" xml:space="preserve">
+  </data><data name="ObjectHasParent" xml:space="preserve">
+    <value>Object already has a parent.</value>
+  </data><data name="OnlyOneControl" xml:space="preserve">
     <value>Cannot add or insert the item '{0}' in more than one place. You must first remove it from its current location or clone it.</value>
-  </data>
-  <data name="OperationRequiresIBindingList" xml:space="preserve">
+  </data><data name="OpenFileDialogSelectReadOnlyDescr" xml:space="preserve">
+    <value>Controls whether the dialog box allows to select read-only files.</value>
+  </data><data name="OpenFileDialogShowPreviewDescr" xml:space="preserve">
+    <value>Controls whether the dialog box shows a preview for selected files.</value>
+  </data><data name="OperationRequiresIBindingList" xml:space="preserve">
     <value>This operation requires an IBindingList.</value>
-  </data>
-  <data name="OperationRequiresIBindingListView" xml:space="preserve">
+  </data><data name="OperationRequiresIBindingListView" xml:space="preserve">
     <value>This operation requires an IBindingListView.</value>
-  </data>
-  <data name="OutOfMemory" xml:space="preserve">
+  </data><data name="OutOfMemory" xml:space="preserve">
     <value>Cannot allocate needed memory.</value>
-  </data>
-  <data name="OwnsSelfOrOwner" xml:space="preserve">
+  </data><data name="OwnerControlIsNotALiveRegion" xml:space="preserve">
+    <value>Owner control of the accessible object must implement IAutomationLiveRegion interface.</value>
+  </data><data name="OwnsSelfOrOwner" xml:space="preserve">
     <value>Form {0} tried to set an ineligible form as its owner. Forms cannot own themselves or their owners.</value>
-  </data>
-  <data name="PaddingAllDescr" xml:space="preserve">
-    <value>Number of pixels along all borders to pad docked controls.</value>
-  </data>
-  <data name="PaddingBottomDescr" xml:space="preserve">
-    <value>Number of pixels along the bottom border to pad docked controls.</value>
-  </data>
-  <data name="PaddingLeftDescr" xml:space="preserve">
-    <value>Number of pixels along the left border to pad docked controls.</value>
-  </data>
-  <data name="PaddingRightDescr" xml:space="preserve">
-    <value>Number of pixels along the right border to pad docked controls.</value>
-  </data>
-  <data name="PaddingTopDescr" xml:space="preserve">
-    <value>Number of pixels along the top border to pad docked controls.</value>
-  </data>
-  <data name="PanelBorderStyleDescr" xml:space="preserve">
-    <value>Indicates whether the panel should have a border.</value>
-  </data>
-  <data name="PropertyGridHelpPaneTitle" xml:space="preserve">
-    <value>Description</value>
-  </data>
-  <data name="PBRSErrorInvalidPropertyValue" xml:space="preserve">
+  </data><data name="PBRSErrorInvalidPropertyValue" xml:space="preserve">
     <value>Property value is not valid.</value>
-  </data>
-  <data name="PBRSErrorTitle" xml:space="preserve">
+  </data><data name="PBRSErrorTitle" xml:space="preserve">
     <value>Properties Window</value>
-  </data>
-  <data name="PBRSFormatExceptionMessage" xml:space="preserve">
+  </data><data name="PBRSFormatExceptionMessage" xml:space="preserve">
     <value>Drop-down list option is not valid.</value>
-  </data>
-  <data name="PBRSToolTipAlphabetic" xml:space="preserve">
+  </data><data name="PBRSToolTipAlphabetic" xml:space="preserve">
     <value>Alphabetical</value>
-  </data>
-  <data name="PBRSToolTipCategorized" xml:space="preserve">
+  </data><data name="PBRSToolTipCategorized" xml:space="preserve">
     <value>Categorized</value>
-  </data>
-  <data name="PBRSToolTipEvents" xml:space="preserve">
+  </data><data name="PBRSToolTipEvents" xml:space="preserve">
     <value>Events</value>
-  </data>
-  <data name="PBRSToolTipProperties" xml:space="preserve">
+  </data><data name="PBRSToolTipProperties" xml:space="preserve">
     <value>Properties</value>
-  </data>
-  <data name="PBRSToolTipPropertyPages" xml:space="preserve">
+  </data><data name="PBRSToolTipPropertyPages" xml:space="preserve">
     <value>Property Pages</value>
-  </data>
-  <data name="PDallowCurrentPageDescr" xml:space="preserve">
+  </data><data name="PDallowCurrentPageDescr" xml:space="preserve">
     <value>Enables and disables the Current Page option button.</value>
-  </data>
-  <data name="PDallowPagesDescr" xml:space="preserve">
+  </data><data name="PDallowPagesDescr" xml:space="preserve">
     <value>Enables and disables the Pages option button.</value>
-  </data>
-  <data name="PDallowPrintToFileDescr" xml:space="preserve">
+  </data><data name="PDallowPrintToFileDescr" xml:space="preserve">
     <value>Enables and disables the Print To File check box.</value>
-  </data>
-  <data name="PDallowSelectionDescr" xml:space="preserve">
+  </data><data name="PDallowSelectionDescr" xml:space="preserve">
     <value>Enables and disables the Selection option button.</value>
-  </data>
-  <data name="PDcantShowWithoutPrinter" xml:space="preserve">
+  </data><data name="PDcantShowWithoutPrinter" xml:space="preserve">
     <value>PrintDialog needs a PrinterSettings object to display. Set PrintDialog.Document (preferred) or PrintDialog.PrinterSettings.</value>
-  </data>
-  <data name="PDdocumentDescr" xml:space="preserve">
+  </data><data name="PDdocumentDescr" xml:space="preserve">
     <value>The PrintDocument to get printer settings from.</value>
-  </data>
-  <data name="PDpageOutOfRange" xml:space="preserve">
+  </data><data name="PDpageOutOfRange" xml:space="preserve">
     <value>Value {0} is out of range.</value>
-  </data>
-  <data name="PDprinterSettingsDescr" xml:space="preserve">
-    <value>The PrinterSettings to use.</value>
-  </data>
-  <data name="PDprintToFileDescr" xml:space="preserve">
+  </data><data name="PDprintToFileDescr" xml:space="preserve">
     <value>Determines whether the Print To File check box is selected.</value>
-  </data>
-  <data name="PDshowHelpDescr" xml:space="preserve">
+  </data><data name="PDprinterSettingsDescr" xml:space="preserve">
+    <value>The PrinterSettings to use.</value>
+  </data><data name="PDshowHelpDescr" xml:space="preserve">
     <value>Controls whether the Help button is displayed.</value>
-  </data>
-  <data name="PDshowNetworkDescr" xml:space="preserve">
+  </data><data name="PDshowNetworkDescr" xml:space="preserve">
     <value>Controls whether the Network button is displayed.</value>
-  </data>
-  <data name="PDuseEXDialog" xml:space="preserve">
+  </data><data name="PDuseEXDialog" xml:space="preserve">
     <value>Gets or sets a value indicating whether the print dialog box in the Windows XP style should be shown for systems running Windows XP and later.</value>
-  </data>
-  <data name="PictureBoxBorderStyleDescr" xml:space="preserve">
+  </data><data name="PSDallowMarginsDescr" xml:space="preserve">
+    <value>Enables and disables editing of margins.</value>
+  </data><data name="PSDallowOrientationDescr" xml:space="preserve">
+    <value>Enables and disables the Orientation radio buttons.</value>
+  </data><data name="PSDallowPaperDescr" xml:space="preserve">
+    <value>Enables and disables editing of paper size.</value>
+  </data><data name="PSDallowPrinterDescr" xml:space="preserve">
+    <value>Enables and disables Printer button.</value>
+  </data><data name="PSDcantShowWithoutPage" xml:space="preserve">
+    <value>PageSetupDialog needs a PageSettings object to display. Set PageSetupDialog.Document (preferred), PageSetupDialog.PrinterSettings, or PageSetupDialog.PageSettings.</value>
+  </data><data name="PSDenableMetricDescr" xml:space="preserve">
+    <value>Gets or sets a value indicating whether the margin settings, when displayed in millimeters, should be automatically converted to and from hundredths of an inch.</value>
+  </data><data name="PSDminMarginsDescr" xml:space="preserve">
+    <value>The smallest margins the user is allowed to select.</value>
+  </data><data name="PSDpageSettingsDescr" xml:space="preserve">
+    <value>The PageSettings the dialog box will modify.</value>
+  </data><data name="PSDprinterSettingsDescr" xml:space="preserve">
+    <value>The PrinterSettings the dialog box will modify when the user clicks the Printer button.</value>
+  </data><data name="PSDshowHelpDescr" xml:space="preserve">
+    <value>Controls whether the Help button is displayed.</value>
+  </data><data name="PSDshowNetworkDescr" xml:space="preserve">
+    <value>Controls whether the Network button is displayed.</value>
+  </data><data name="PaddingAllDescr" xml:space="preserve">
+    <value>Number of pixels along all borders to pad docked controls.</value>
+  </data><data name="PaddingBottomDescr" xml:space="preserve">
+    <value>Number of pixels along the bottom border to pad docked controls.</value>
+  </data><data name="PaddingLeftDescr" xml:space="preserve">
+    <value>Number of pixels along the left border to pad docked controls.</value>
+  </data><data name="PaddingRightDescr" xml:space="preserve">
+    <value>Number of pixels along the right border to pad docked controls.</value>
+  </data><data name="PaddingTopDescr" xml:space="preserve">
+    <value>Number of pixels along the top border to pad docked controls.</value>
+  </data><data name="PanelBorderStyleDescr" xml:space="preserve">
+    <value>Indicates whether the panel should have a border.</value>
+  </data><data name="ParentPropertyNotSetInGetNextControl" xml:space="preserve">
+    <value>{0} property should be set for {1}.</value>
+  </data><data name="PictureBoxBorderStyleDescr" xml:space="preserve">
     <value>Controls what type of border the PictureBox should have.</value>
-  </data>
-  <data name="PictureBoxCancelAsyncDescr" xml:space="preserve">
+  </data><data name="PictureBoxCancelAsyncDescr" xml:space="preserve">
     <value>Attempts to cancel any current image-loading operation.</value>
-  </data>
-  <data name="PictureBoxErrorImageDescr" xml:space="preserve">
+  </data><data name="PictureBoxErrorImageDescr" xml:space="preserve">
     <value>Image to display when the load of another image fails.</value>
-  </data>
-  <data name="PictureBoxImageDescr" xml:space="preserve">
+  </data><data name="PictureBoxImageDescr" xml:space="preserve">
     <value>The image displayed in the PictureBox.</value>
-  </data>
-  <data name="PictureBoxImageLocationDescr" xml:space="preserve">
+  </data><data name="PictureBoxImageLocationDescr" xml:space="preserve">
     <value>Disk or Web location to load image from.</value>
-  </data>
-  <data name="PictureBoxInitialImageDescr" xml:space="preserve">
+  </data><data name="PictureBoxInitialImageDescr" xml:space="preserve">
     <value>Image to display while another image is loading.</value>
-  </data>
-  <data name="PictureBoxLoad0Descr" xml:space="preserve">
+  </data><data name="PictureBoxLoad0Descr" xml:space="preserve">
     <value>Loads the image from the location specified in ImageLocation.</value>
-  </data>
-  <data name="PictureBoxLoad1Descr" xml:space="preserve">
+  </data><data name="PictureBoxLoad1Descr" xml:space="preserve">
     <value>Loads the image from the provided location.</value>
-  </data>
-  <data name="PictureBoxLoadAsync0Descr" xml:space="preserve">
+  </data><data name="PictureBoxLoadAsync0Descr" xml:space="preserve">
     <value>Initiates asynchronous loading of the image from the location specified in ImageLocation.</value>
-  </data>
-  <data name="PictureBoxLoadAsync1Descr" xml:space="preserve">
+  </data><data name="PictureBoxLoadAsync1Descr" xml:space="preserve">
     <value>Initiates asynchronous loading of the image from the provided location.</value>
-  </data>
-  <data name="PictureBoxLoadCompletedDescr" xml:space="preserve">
+  </data><data name="PictureBoxLoadCompletedDescr" xml:space="preserve">
     <value>Event raised when loading into a PictureBox finishes.</value>
-  </data>
-  <data name="PictureBoxLoadProgressChangedDescr" xml:space="preserve">
+  </data><data name="PictureBoxLoadProgressChangedDescr" xml:space="preserve">
     <value>Event raised when progress is reported during loading into a PictureBox.</value>
-  </data>
-  <data name="PictureBoxLoadProgressDescr" xml:space="preserve">
+  </data><data name="PictureBoxLoadProgressDescr" xml:space="preserve">
     <value>Indicates the progress of the background download task.</value>
-  </data>
-  <data name="PictureBoxNoImageLocation" xml:space="preserve">
+  </data><data name="PictureBoxNoImageLocation" xml:space="preserve">
     <value>ImageLocation must be set.</value>
-  </data>
-  <data name="PictureBoxOnSizeModeChangedDescr" xml:space="preserve">
+  </data><data name="PictureBoxOnSizeModeChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the SizeMode property is changed on the PictureBox.</value>
-  </data>
-  <data name="PictureBoxSizeModeDescr" xml:space="preserve">
+  </data><data name="PictureBoxRemoteLocationNotSupported" xml:space="preserve">
+    <value>Loading from remote location not supported.</value>
+  </data><data name="PictureBoxSizeModeDescr" xml:space="preserve">
     <value>Controls how the PictureBox will handle image placement and control sizing.</value>
-  </data>
-  <data name="PictureBoxWaitOnLoadDescr" xml:space="preserve">
+  </data><data name="PictureBoxWaitOnLoadDescr" xml:space="preserve">
     <value>Controls whether processing will stop until the image is loaded.</value>
-  </data>
-  <data name="PictureBoxRemoteLocationNotSupported" xml:space="preserve">
-    <value>Loading from remote location not supported.</value>
-  </data>
-  <data name="PopupControlBadParentArgument" xml:space="preserve">
+  </data><data name="PopupControlBadParentArgument" xml:space="preserve">
     <value>Cannot set the ParentPopup to be yourself.</value>
-  </data>
-  <data name="PreviewKeyDownDescr" xml:space="preserve">
+  </data><data name="PreviewKeyDownDescr" xml:space="preserve">
     <value>Occurs before the KeyDown event when a key is pressed while focus is on this control.</value>
-  </data>
-  <data name="PrintControllerWithStatusDialog_Cancel" xml:space="preserve">
+  </data><data name="PrintControllerWithStatusDialog_Cancel" xml:space="preserve">
     <value>Cancel</value>
-  </data>
-  <data name="PrintControllerWithStatusDialog_Canceling" xml:space="preserve">
+  </data><data name="PrintControllerWithStatusDialog_Canceling" xml:space="preserve">
     <value>Canceling Print...</value>
-  </data>
-  <data name="PrintControllerWithStatusDialog_DialogTitlePreview" xml:space="preserve">
+  </data><data name="PrintControllerWithStatusDialog_DialogTitlePreview" xml:space="preserve">
     <value>Generating Previews</value>
-  </data>
-  <data name="PrintControllerWithStatusDialog_DialogTitlePrint" xml:space="preserve">
+  </data><data name="PrintControllerWithStatusDialog_DialogTitlePrint" xml:space="preserve">
     <value>Printing</value>
-  </data>
-  <data name="PrintControllerWithStatusDialog_NowPrinting" xml:space="preserve">
+  </data><data name="PrintControllerWithStatusDialog_NowPrinting" xml:space="preserve">
     <value>Page {0} of {1}</value>
-  </data>
-  <data name="PrintPreviewAntiAliasDescr" xml:space="preserve">
+  </data><data name="PrintPreviewAntiAliasDescr" xml:space="preserve">
     <value>Controls if the print preview will be rendered with anti-aliasing. Using AntiAlias provides a more accurate display of the document, but it is slower.</value>
-  </data>
-  <data name="PrintPreviewAutoZoomDescr" xml:space="preserve">
+  </data><data name="PrintPreviewAutoZoomDescr" xml:space="preserve">
     <value>Determines whether to automatically adjust zoom to fill available space.</value>
-  </data>
-  <data name="PrintPreviewColumnsDescr" xml:space="preserve">
+  </data><data name="PrintPreviewColumnsDescr" xml:space="preserve">
     <value>Number of pages across.</value>
-  </data>
-  <data name="PrintPreviewControlZoomNegative" xml:space="preserve">
+  </data><data name="PrintPreviewControlZoomNegative" xml:space="preserve">
     <value>Zoom must be 0 or greater. Negative values are not permitted.</value>
-  </data>
-  <data name="PrintPreviewDialog_PrintPreview" xml:space="preserve">
+  </data><data name="PrintPreviewDialog_PrintPreview" xml:space="preserve">
     <value>Print preview</value>
-  </data>
-  <data name="PrintPreviewDocumentDescr" xml:space="preserve">
+  </data><data name="PrintPreviewDocumentDescr" xml:space="preserve">
     <value>PrintDocument to be previewed.</value>
-  </data>
-  <data name="PrintPreviewExceptionPrinting" xml:space="preserve">
+  </data><data name="PrintPreviewExceptionPrinting" xml:space="preserve">
     <value>Document cannot be displayed.</value>
-  </data>
-  <data name="PrintPreviewNoPages" xml:space="preserve">
+  </data><data name="PrintPreviewNoPages" xml:space="preserve">
     <value>Document does not contain any pages.</value>
-  </data>
-  <data name="PrintPreviewPrintPreviewControlDescr" xml:space="preserve">
+  </data><data name="PrintPreviewPrintPreviewControlDescr" xml:space="preserve">
     <value>PrintPreviewControl to use as the dialog's core.</value>
-  </data>
-  <data name="PrintPreviewRowsDescr" xml:space="preserve">
+  </data><data name="PrintPreviewRowsDescr" xml:space="preserve">
     <value>The number of pages displayed vertically down the screen.</value>
-  </data>
-  <data name="PrintPreviewStartPageDescr" xml:space="preserve">
+  </data><data name="PrintPreviewStartPageDescr" xml:space="preserve">
     <value>Indicates the page number to start previewing.</value>
-  </data>
-  <data name="PrintPreviewZoomDescr" xml:space="preserve">
+  </data><data name="PrintPreviewZoomDescr" xml:space="preserve">
     <value>Indicates how large the pages will appear.</value>
-  </data>
-  <data name="ProfessionalColorsButtonCheckedGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonCheckedGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used when the button is checked.</value>
-  </data>
-  <data name="ProfessionalColorsButtonCheckedGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonCheckedGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used when the button is checked.</value>
-  </data>
-  <data name="ProfessionalColorsButtonCheckedGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonCheckedGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used when the button is checked.</value>
-  </data>
-  <data name="ProfessionalColorsButtonCheckedHighlightBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonCheckedHighlightBorderDescr" xml:space="preserve">
     <value>Border color to use with ButtonCheckedHighlight.</value>
-  </data>
-  <data name="ProfessionalColorsButtonCheckedHighlightDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonCheckedHighlightDescr" xml:space="preserve">
     <value>Solid color used when the button is checked.</value>
-  </data>
-  <data name="ProfessionalColorsButtonPressedBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonPressedBorderDescr" xml:space="preserve">
     <value>Border color to use with the pressed button gradient colors (ButtonPressedGradient*).</value>
-  </data>
-  <data name="ProfessionalColorsButtonPressedGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonPressedGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used when the button is pressed.</value>
-  </data>
-  <data name="ProfessionalColorsButtonPressedGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonPressedGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used when the button is pressed.</value>
-  </data>
-  <data name="ProfessionalColorsButtonPressedGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonPressedGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used when the button is pressed.</value>
-  </data>
-  <data name="ProfessionalColorsButtonPressedHighlightBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonPressedHighlightBorderDescr" xml:space="preserve">
     <value>Border color to use with ButtonPressedHighlight.</value>
-  </data>
-  <data name="ProfessionalColorsButtonPressedHighlightDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonPressedHighlightDescr" xml:space="preserve">
     <value>Solid color used when the button is pressed.</value>
-  </data>
-  <data name="ProfessionalColorsButtonSelectedBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonSelectedBorderDescr" xml:space="preserve">
     <value>Border color to use with the selected button gradient colors (ButtonCheckedGradient*).</value>
-  </data>
-  <data name="ProfessionalColorsButtonSelectedGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonSelectedGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used when the button is selected.</value>
-  </data>
-  <data name="ProfessionalColorsButtonSelectedGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonSelectedGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used when the button is selected.</value>
-  </data>
-  <data name="ProfessionalColorsButtonSelectedGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonSelectedGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used when the button is selected.</value>
-  </data>
-  <data name="ProfessionalColorsButtonSelectedHighlightBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonSelectedHighlightBorderDescr" xml:space="preserve">
     <value>Border color to use with ButtonSelectedHighlight.</value>
-  </data>
-  <data name="ProfessionalColorsButtonSelectedHighlightDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsButtonSelectedHighlightDescr" xml:space="preserve">
     <value>Solid color used when the button is selected.</value>
-  </data>
-  <data name="ProfessionalColorsCheckBackgroundDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsCheckBackgroundDescr" xml:space="preserve">
     <value>Solid color to use when the button is checked and gradients are being used.</value>
-  </data>
-  <data name="ProfessionalColorsCheckPressedBackgroundDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsCheckPressedBackgroundDescr" xml:space="preserve">
     <value>Solid color to use when the button is checked and selected and gradients are being used.</value>
-  </data>
-  <data name="ProfessionalColorsCheckSelectedBackgroundDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsCheckSelectedBackgroundDescr" xml:space="preserve">
     <value>Solid color to use when the button is checked and selected and gradients are being used.</value>
-  </data>
-  <data name="ProfessionalColorsGripDarkDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsGripDarkDescr" xml:space="preserve">
     <value>Color to use to for shadow effects on the grip.</value>
-  </data>
-  <data name="ProfessionalColorsGripLightDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsGripLightDescr" xml:space="preserve">
     <value>Color to use to for highlight effects on the grip.</value>
-  </data>
-  <data name="ProfessionalColorsImageMarginGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsImageMarginGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the image margin.</value>
-  </data>
-  <data name="ProfessionalColorsImageMarginGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsImageMarginGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the image margin.</value>
-  </data>
-  <data name="ProfessionalColorsImageMarginGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsImageMarginGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used in the image margin.</value>
-  </data>
-  <data name="ProfessionalColorsImageMarginRevealedGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsImageMarginRevealedGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the image margin when an item is revealed.</value>
-  </data>
-  <data name="ProfessionalColorsImageMarginRevealedGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsImageMarginRevealedGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the image margin when an item is revealed.</value>
-  </data>
-  <data name="ProfessionalColorsImageMarginRevealedGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsImageMarginRevealedGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used in the image margin when an item is revealed.</value>
-  </data>
-  <data name="ProfessionalColorsMenuBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuBorderDescr" xml:space="preserve">
     <value>The border color to use around the edge of a drop-down menu.</value>
-  </data>
-  <data name="ProfessionalColorsMenuItemBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuItemBorderDescr" xml:space="preserve">
     <value>The border color to use with MenuItem.</value>
-  </data>
-  <data name="ProfessionalColorsMenuItemPressedGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuItemPressedGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used when a top level menu item is pressed.</value>
-  </data>
-  <data name="ProfessionalColorsMenuItemPressedGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuItemPressedGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used when a top level menu item is pressed.</value>
-  </data>
-  <data name="ProfessionalColorsMenuItemPressedGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuItemPressedGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used when a top level menu item is pressed.</value>
-  </data>
-  <data name="ProfessionalColorsMenuItemSelectedDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuItemSelectedDescr" xml:space="preserve">
     <value>Solid color to use when a non-top level menu item is selected</value>
-  </data>
-  <data name="ProfessionalColorsMenuItemSelectedGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuItemSelectedGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used when the menu item is selected.</value>
-  </data>
-  <data name="ProfessionalColorsMenuItemSelectedGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuItemSelectedGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used when the menu item is selected.</value>
-  </data>
-  <data name="ProfessionalColorsMenuStripGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuStripGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the MenuStrip.</value>
-  </data>
-  <data name="ProfessionalColorsMenuStripGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsMenuStripGradientEndDescr" xml:space="preserve">
     <value>Middle color of the gradient used in the MenuStrip.</value>
-  </data>
-  <data name="ProfessionalColorsOverflowButtonGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsOverflowButtonGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the overflow button.</value>
-  </data>
-  <data name="ProfessionalColorsOverflowButtonGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsOverflowButtonGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the overflow button.</value>
-  </data>
-  <data name="ProfessionalColorsOverflowButtonGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsOverflowButtonGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used in the overflow button.</value>
-  </data>
-  <data name="ProfessionalColorsRaftingContainerGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsRaftingContainerGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the RaftingContainer.</value>
-  </data>
-  <data name="ProfessionalColorsRaftingContainerGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsRaftingContainerGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the RaftingContainer.</value>
-  </data>
-  <data name="ProfessionalColorsSeparatorDarkDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsSeparatorDarkDescr" xml:space="preserve">
     <value>Color to use to for shadow effects on the separator.</value>
-  </data>
-  <data name="ProfessionalColorsSeparatorLightDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsSeparatorLightDescr" xml:space="preserve">
     <value>Color to use to for highlight effects on the separator.</value>
-  </data>
-  <data name="ProfessionalColorsStatusStripGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsStatusStripBorderDescr" xml:space="preserve">
+    <value>Border color to use on the top edge of the StatusStrip.</value>
+  </data><data name="ProfessionalColorsStatusStripGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the StatusStrip.</value>
-  </data>
-  <data name="ProfessionalColorsStatusStripGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsStatusStripGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the StatusStrip.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripBorderDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripBorderDescr" xml:space="preserve">
     <value>Border color to use on the bottom edge of the ToolStrip.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripContentPanelGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripContentPanelGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the ToolStripContentPanel.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripContentPanelGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripContentPanelGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the ToolStripContentPanel.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripDropDownBackgroundDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripDropDownBackgroundDescr" xml:space="preserve">
     <value>Solid background color of the ToolStripDropDown.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the ToolStrip background.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the ToolStrip background.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripGradientMiddleDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripGradientMiddleDescr" xml:space="preserve">
     <value>Middle color of the gradient used in the ToolStrip background.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripPanelGradientBeginDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripPanelGradientBeginDescr" xml:space="preserve">
     <value>Starting color of the gradient used in the ToolStripPanel.</value>
-  </data>
-  <data name="ProfessionalColorsToolStripPanelGradientEndDescr" xml:space="preserve">
+  </data><data name="ProfessionalColorsToolStripPanelGradientEndDescr" xml:space="preserve">
     <value>End color of the gradient used in the ToolStripPanel.</value>
-  </data>
-  <data name="ProgressBarDefaultAccessibleName" xml:space="preserve">
+  </data><data name="ProgressBarDefaultAccessibleName" xml:space="preserve">
     <value>ProgressBar</value>
-  </data>
-  <data name="ProgressBarIncrementMarqueeException" xml:space="preserve">
+  </data><data name="ProgressBarIncrementMarqueeException" xml:space="preserve">
     <value>Increment should not be called if the style is Marquee.</value>
-  </data>
-  <data name="ProgressBarMarqueeAnimationSpeed" xml:space="preserve">
+  </data><data name="ProgressBarMarqueeAnimationSpeed" xml:space="preserve">
     <value>The speed of the marquee animation in milliseconds.</value>
-  </data>
-  <data name="ProgressBarMaximumDescr" xml:space="preserve">
+  </data><data name="ProgressBarMaximumDescr" xml:space="preserve">
     <value>The upper bound of the range this ProgressBar is working with.</value>
-  </data>
-  <data name="ProgressBarMinimumDescr" xml:space="preserve">
+  </data><data name="ProgressBarMinimumDescr" xml:space="preserve">
     <value>The lower bound of the range this ProgressBar is working with.</value>
-  </data>
-  <data name="ProgressBarPerformStepMarqueeException" xml:space="preserve">
+  </data><data name="ProgressBarPerformStepMarqueeException" xml:space="preserve">
     <value>PerformStep should not be called if the style is Marquee.</value>
-  </data>
-  <data name="ProgressBarStepDescr" xml:space="preserve">
+  </data><data name="ProgressBarStepDescr" xml:space="preserve">
     <value>The amount to increment the current value of the control by when the PerformStep() method is called.</value>
-  </data>
-  <data name="ProgressBarStyleDescr" xml:space="preserve">
+  </data><data name="ProgressBarStyleDescr" xml:space="preserve">
     <value>This property allows the user to set the style of the ProgressBar.</value>
-  </data>
-  <data name="ProgressBarValueDescr" xml:space="preserve">
+  </data><data name="ProgressBarValueDescr" xml:space="preserve">
     <value>The current value for the ProgressBar, in the range specified by the minimum and maximum properties.</value>
-  </data>
-  <data name="ProgressBarValueMarqueeException" xml:space="preserve">
+  </data><data name="ProgressBarValueMarqueeException" xml:space="preserve">
     <value>Value must not be set if the style is Marquee.</value>
-  </data>
-  <data name="PropertyCategoryAppearance" xml:space="preserve">
+  </data><data name="PropertyCategoryAppearance" xml:space="preserve">
     <value>Appearance</value>
-  </data>
-  <data name="PropertyCategoryBehavior" xml:space="preserve">
+  </data><data name="PropertyCategoryBehavior" xml:space="preserve">
     <value>Behavior</value>
-  </data>
-  <data name="PropertyCategoryData" xml:space="preserve">
-    <value>Data</value>
-  </data>
-  <data name="PropertyCategoryDDE" xml:space="preserve">
+  </data><data name="PropertyCategoryDDE" xml:space="preserve">
     <value>DDE</value>
-  </data>
-  <data name="PropertyCategoryFont" xml:space="preserve">
+  </data><data name="PropertyCategoryData" xml:space="preserve">
+    <value>Data</value>
+  </data><data name="PropertyCategoryFont" xml:space="preserve">
     <value>Font</value>
-  </data>
-  <data name="PropertyCategoryList" xml:space="preserve">
+  </data><data name="PropertyCategoryList" xml:space="preserve">
     <value>List</value>
-  </data>
-  <data name="PropertyCategoryMisc" xml:space="preserve">
+  </data><data name="PropertyCategoryMisc" xml:space="preserve">
     <value>Misc</value>
-  </data>
-  <data name="PropertyCategoryPosition" xml:space="preserve">
+  </data><data name="PropertyCategoryPosition" xml:space="preserve">
     <value>Position</value>
-  </data>
-  <data name="PropertyCategoryScale" xml:space="preserve">
+  </data><data name="PropertyCategoryScale" xml:space="preserve">
     <value>Scale</value>
-  </data>
-  <data name="PropertyCategoryText" xml:space="preserve">
+  </data><data name="PropertyCategoryText" xml:space="preserve">
     <value>Text</value>
-  </data>
-  <data name="PropertyGridCanShowCommandsDesc" xml:space="preserve">
+  </data><data name="PropertyGridCanShowCommandsDesc" xml:space="preserve">
     <value>Sets whether the commands window will be displayed for components with commands.</value>
-  </data>
-  <data name="PropertyGridCanShowVisualStyleGlyphsDesc" xml:space="preserve">
+  </data><data name="PropertyGridCanShowVisualStyleGlyphsDesc" xml:space="preserve">
     <value>Sets whether OS-enabled visual style glyphs can be used for the expansion nodes in the grid area.</value>
-  </data>
-  <data name="PropertyGridCategoryForeColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCategoryForeColorDesc" xml:space="preserve">
     <value>The text color used for category headings. The background color is determined by the LineColor property.</value>
-  </data>
-  <data name="PropertyGridCategorySplitterColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCategorySplitterColorDesc" xml:space="preserve">
     <value>The color of the line that separates categories.</value>
-  </data>
-  <data name="PropertyGridCommandsActiveLinkColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCommandsActiveLinkColorDesc" xml:space="preserve">
     <value>The color of active links in the hot commands region.</value>
-  </data>
-  <data name="PropertyGridCommandsBackColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCommandsBackColorDesc" xml:space="preserve">
     <value>The background color of the hot commands region.</value>
-  </data>
-  <data name="PropertyGridCommandsBorderColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCommandsBorderColorDesc" xml:space="preserve">
     <value>The color of the border surrounding the hot commands region.</value>
-  </data>
-  <data name="PropertyGridCommandsDisabledLinkColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCommandsDisabledLinkColorDesc" xml:space="preserve">
     <value>The color of disabled links in the hot commands region.</value>
-  </data>
-  <data name="PropertyGridCommandsForeColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCommandsForeColorDesc" xml:space="preserve">
     <value>The foreground color of the hot commands region.</value>
-  </data>
-  <data name="PropertyGridCommandsLinkColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridCommandsLinkColorDesc" xml:space="preserve">
     <value>The color of enabled links in the hot commands region.</value>
-  </data>
-  <data name="PropertyGridCommandsVisibleIfAvailable" xml:space="preserve">
+  </data><data name="PropertyGridCommandsVisibleIfAvailable" xml:space="preserve">
     <value>Show the commands pane if the selected object exposes verbs.</value>
-  </data>
-  <data name="PropertyGridDefaultAccessibleName" xml:space="preserve">
+  </data><data name="PropertyGridDefaultAccessibleName" xml:space="preserve">
     <value>Properties Window</value>
-  </data>
-  <data name="PropertyGridDefaultAccessibleNameTemplate" xml:space="preserve">
+  </data><data name="PropertyGridDefaultAccessibleNameTemplate" xml:space="preserve">
     <value>{0} Properties Window</value>
-  </data>
-  <data name="PropertyGridHelpPaneAccessibleNameTemplate" xml:space="preserve">
-    <value>{0} Description</value>
-  </data>
-  <data name="PropertyGridDisabledItemForeColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridDisabledItemForeColorDesc" xml:space="preserve">
     <value>The foreground color of disabled text in the grid area.</value>
-  </data>
-  <data name="PropertyGridDropDownButtonAccessibleName" xml:space="preserve">
+  </data><data name="PropertyGridDropDownButtonAccessibleName" xml:space="preserve">
     <value>Browse...</value>
-  </data>
-  <data name="PropertyGridExceptionInfo" xml:space="preserve">
+  </data><data name="PropertyGridDropDownButtonComboBoxAccessibleName" xml:space="preserve">
+    <value>Open</value>
+  </data><data name="PropertyGridEntryValuesListDefaultAccessibleName" xml:space="preserve">
+    <value>Available values</value>
+  </data><data name="PropertyGridExceptionInfo" xml:space="preserve">
     <value>Error Information</value>
-  </data>
-  <data name="PropertyGridExceptionWhilePaintingLabel" xml:space="preserve">
+  </data><data name="PropertyGridExceptionWhilePaintingLabel" xml:space="preserve">
     <value>Exception has occurred while painting the label for property '{0}'. See below for details."</value>
-  </data>
-  <data name="PropertyGridHelpBackColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridHelpBackColorDesc" xml:space="preserve">
     <value>The background color of the description pane.</value>
-  </data>
-  <data name="PropertyGridHelpBorderColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridHelpBorderColorDesc" xml:space="preserve">
     <value>The color of the border surrounding the description pane.</value>
-  </data>
-  <data name="PropertyGridHelpForeColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridHelpForeColorDesc" xml:space="preserve">
     <value>The foreground color of the description pane.</value>
-  </data>
-  <data name="PropertyGridHelpVisibleDesc" xml:space="preserve">
+  </data><data name="PropertyGridHelpPaneAccessibleNameTemplate" xml:space="preserve">
+    <value>{0} Description</value>
+  </data><data name="PropertyGridHelpPaneTitle" xml:space="preserve">
+    <value>Description</value>
+  </data><data name="PropertyGridHelpVisibleDesc" xml:space="preserve">
     <value>Sets whether to show the description pane.</value>
-  </data>
-  <data name="PropertyGridSelectedItemWithFocusBackColorDesc" xml:space="preserve">
-    <value>The background color of selected items that have focus.</value>
-  </data>
-  <data name="PropertyGridSelectedItemWithFocusForeColorDesc" xml:space="preserve">
-    <value>The foreground color of selected items that have focus.</value>
-  </data>
-  <data name="PropertyGridInternalNoProp" xml:space="preserve">
+  </data><data name="PropertyGridInternalNoProp" xml:space="preserve">
     <value>Get of properties did not succeed.  Log at {0}</value>
-  </data>
-  <data name="PropertyGridInvalidGridEntry" xml:space="preserve">
+  </data><data name="PropertyGridInvalidGridEntry" xml:space="preserve">
     <value>GridItem specified to PropertyGrid.SelectedGridItem must be a valid GridItem.</value>
-  </data>
-  <data name="PropertyGridLargeButtonsDesc" xml:space="preserve">
+  </data><data name="PropertyGridLargeButtonsDesc" xml:space="preserve">
     <value>Sets buttons to large (32x32) on the PropertyGrid tool bar.</value>
-  </data>
-  <data name="PropertyGridLineColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridLineColorDesc" xml:space="preserve">
     <value>Sets the color of the borders and grid lines within the grid area.</value>
-  </data>
-  <data name="PropertyGridNoBitmap" xml:space="preserve">
+  </data><data name="PropertyGridNoBitmap" xml:space="preserve">
     <value>Tab '{0}' does not have a bitmap.</value>
-  </data>
-  <data name="PropertyGridPropertySortChangedDescr" xml:space="preserve">
+  </data><data name="PropertyGridPropertySortChangedDescr" xml:space="preserve">
     <value>Occurs when the PropertySort property on the PropertyGrid has changed.</value>
-  </data>
-  <data name="PropertyGridPropertySortDesc" xml:space="preserve">
+  </data><data name="PropertyGridPropertySortDesc" xml:space="preserve">
     <value>Sets the type of sorting that the PropertyGrid will use to display properties.</value>
-  </data>
-  <data name="PropertyGridPropertyTabchangedDescr" xml:space="preserve">
-    <value>Occurs when a property tab changes.</value>
-  </data>
-  <data name="PropertyGridPropertyTabCollectionReadOnly" xml:space="preserve">
+  </data><data name="PropertyGridPropertyTabCollectionReadOnly" xml:space="preserve">
     <value>PropertyTabCollection is read-only.</value>
-  </data>
-  <data name="PropertyGridPropertyValueChangedDescr" xml:space="preserve">
+  </data><data name="PropertyGridPropertyTabchangedDescr" xml:space="preserve">
+    <value>Occurs when a property tab changes.</value>
+  </data><data name="PropertyGridPropertyValueChangedDescr" xml:space="preserve">
     <value>Occurs when a property value changes.</value>
-  </data>
-  <data name="PropertyGridRemoveStaticTabs" xml:space="preserve">
+  </data><data name="PropertyGridPropertyValueSelectedFormat" xml:space="preserve">
+    <value>{0} selected.</value>
+  </data><data name="PropertyGridRemoveStaticTabs" xml:space="preserve">
     <value>Static tabs cannot be removed from the PropertyGrid.</value>
-  </data>
-  <data name="PropertyGridResetValue" xml:space="preserve">
+  </data><data name="PropertyGridResetValue" xml:space="preserve">
     <value>Reset property '{0}'</value>
-  </data>
-  <data name="PropertyGridSelectedGridItemChangedDescr" xml:space="preserve">
+  </data><data name="PropertyGridSelectedGridItemChangedDescr" xml:space="preserve">
     <value>Occurs when the selected grid item has changed.</value>
-  </data>
-  <data name="PropertyGridSelectedObjectDesc" xml:space="preserve">
+  </data><data name="PropertyGridSelectedItemWithFocusBackColorDesc" xml:space="preserve">
+    <value>The background color of selected items that have focus.</value>
+  </data><data name="PropertyGridSelectedItemWithFocusForeColorDesc" xml:space="preserve">
+    <value>The foreground color of selected items that have focus.</value>
+  </data><data name="PropertyGridSelectedObjectDesc" xml:space="preserve">
     <value>Sets the currently selected object that the grid will browse.</value>
-  </data>
-  <data name="PropertyGridSelectedObjectsChangedDescr" xml:space="preserve">
+  </data><data name="PropertyGridSelectedObjectsChangedDescr" xml:space="preserve">
     <value>Occurs when the SelectedObjects property has changed.</value>
-  </data>
-  <data name="PropertyGridSet" xml:space="preserve">
+  </data><data name="PropertyGridSet" xml:space="preserve">
     <value>'objs' array must have at least {0} members.</value>
-  </data>
-  <data name="PropertyGridSetNull" xml:space="preserve">
+  </data><data name="PropertyGridSetNull" xml:space="preserve">
     <value>Item {0} in the 'objs' array is null.  The array must begin with at least {1} members.</value>
-  </data>
-  <data name="PropertyGridSetValue" xml:space="preserve">
+  </data><data name="PropertyGridSetValue" xml:space="preserve">
     <value>Set Property '{0}'</value>
-  </data>
-  <data name="PropertyGridTabName" xml:space="preserve">
+  </data><data name="PropertyGridTabName" xml:space="preserve">
     <value>Tab '{0}' must have a valid name.</value>
-  </data>
-  <data name="PropertyGridTabScope" xml:space="preserve">
+  </data><data name="PropertyGridTabScope" xml:space="preserve">
     <value>TabScope must be TabScopeEnum.Component or TabScopeEnum.Document</value>
-  </data>
-  <data name="PropertyGridTitle" xml:space="preserve">
+  </data><data name="PropertyGridTitle" xml:space="preserve">
     <value>PropertyGrid</value>
-  </data>
-  <data name="PropertyGridToolbarAccessibleName" xml:space="preserve">
+  </data><data name="PropertyGridToolbarAccessibleName" xml:space="preserve">
     <value>PropertyGrid</value>
-  </data>
-  <data name="PropertyGridToolbarVisibleDesc" xml:space="preserve">
+  </data><data name="PropertyGridToolbarVisibleDesc" xml:space="preserve">
     <value>Sets whether to display the ToolBar at the top of the PropertyGrid.</value>
-  </data>
-  <data name="PropertyGridViewBackColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridViewBackColorDesc" xml:space="preserve">
     <value>Sets the background color of the grid area.</value>
-  </data>
-  <data name="PropertyGridViewBorderColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridViewBorderColorDesc" xml:space="preserve">
     <value>The color of the border surrounding the grid area.</value>
-  </data>
-  <data name="PropertyGridViewEditorCreatedInvalidObject" xml:space="preserve">
+  </data><data name="PropertyGridViewDropDownControlHolderAccessibleName" xml:space="preserve">
+    <value>Drop down control holder</value>
+  </data><data name="PropertyGridViewEditorCreatedInvalidObject" xml:space="preserve">
     <value>Editor created an object that is not valid.  The created object must be of type '{0}'.</value>
-  </data>
-  <data name="PropertyGridViewForeColorDesc" xml:space="preserve">
+  </data><data name="PropertyGridViewForeColorDesc" xml:space="preserve">
     <value>Sets the foreground color of the grid area.</value>
-  </data>
-  <data name="PropertyManagerPropDoesNotExist" xml:space="preserve">
+  </data><data name="PropertyManagerPropDoesNotExist" xml:space="preserve">
     <value>Property {0} does not exist in {1}.</value>
-  </data>
-  <data name="PropertyValueInvalidEntry" xml:space="preserve">
+  </data><data name="PropertyValueInvalidEntry" xml:space="preserve">
     <value>One or more entries are not valid in the IDictionary parameter. Verify that all values match up to the object's properties.</value>
-  </data>
-  <data name="PSDallowMarginsDescr" xml:space="preserve">
-    <value>Enables and disables editing of margins.</value>
-  </data>
-  <data name="PSDallowOrientationDescr" xml:space="preserve">
-    <value>Enables and disables the Orientation radio buttons.</value>
-  </data>
-  <data name="PSDallowPaperDescr" xml:space="preserve">
-    <value>Enables and disables editing of paper size.</value>
-  </data>
-  <data name="PSDallowPrinterDescr" xml:space="preserve">
-    <value>Enables and disables Printer button.</value>
-  </data>
-  <data name="PSDcantShowWithoutPage" xml:space="preserve">
-    <value>PageSetupDialog needs a PageSettings object to display. Set PageSetupDialog.Document (preferred), PageSetupDialog.PrinterSettings, or PageSetupDialog.PageSettings.</value>
-  </data>
-  <data name="PSDenableMetricDescr" xml:space="preserve">
-    <value>Gets or sets a value indicating whether the margin settings, when displayed in millimeters, should be automatically converted to and from hundredths of an inch.</value>
-  </data>
-  <data name="PSDminMarginsDescr" xml:space="preserve">
-    <value>The smallest margins the user is allowed to select.</value>
-  </data>
-  <data name="PSDpageSettingsDescr" xml:space="preserve">
-    <value>The PageSettings the dialog box will modify.</value>
-  </data>
-  <data name="PSDprinterSettingsDescr" xml:space="preserve">
-    <value>The PrinterSettings the dialog box will modify when the user clicks the Printer button.</value>
-  </data>
-  <data name="PSDshowHelpDescr" xml:space="preserve">
-    <value>Controls whether the Help button is displayed.</value>
-  </data>
-  <data name="PSDshowNetworkDescr" xml:space="preserve">
-    <value>Controls whether the Network button is displayed.</value>
-  </data>
-  <data name="RadioButtonAppearanceDescr" xml:space="preserve">
+  </data><data name="RTL" xml:space="preserve">
+    <value>RTL_False</value>
+  </data><data name="RadioButtonAppearanceDescr" xml:space="preserve">
     <value>Controls whether the RadioButton appears as normal or as a Windows PushButton.</value>
-  </data>
-  <data name="RadioButtonAutoCheckDescr" xml:space="preserve">
+  </data><data name="RadioButtonAutoCheckDescr" xml:space="preserve">
     <value>Causes the radio button to automatically change state when clicked.</value>
-  </data>
-  <data name="RadioButtonCheckAlignDescr" xml:space="preserve">
+  </data><data name="RadioButtonCheckAlignDescr" xml:space="preserve">
     <value>Determines the location of the check box inside the control.</value>
-  </data>
-  <data name="RadioButtonCheckedDescr" xml:space="preserve">
+  </data><data name="RadioButtonCheckedDescr" xml:space="preserve">
     <value>Indicates whether the radio button is checked or not.</value>
-  </data>
-  <data name="RadioButtonOnAppearanceChangedDescr" xml:space="preserve">
+  </data><data name="RadioButtonOnAppearanceChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the Appearance property is changed on RadioButton.</value>
-  </data>
-  <data name="RadioButtonOnCheckedChangedDescr" xml:space="preserve">
+  </data><data name="RadioButtonOnCheckedChangedDescr" xml:space="preserve">
     <value>Occurs whenever the 'checked' property changes value.</value>
-  </data>
-  <data name="RadioButtonOnStartPageChangedDescr" xml:space="preserve">
+  </data><data name="RadioButtonOnStartPageChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the StartPage property is changed on RadioButton.</value>
-  </data>
-  <data name="RadioButtonOnTextAlignChangedDescr" xml:space="preserve">
+  </data><data name="RadioButtonOnTextAlignChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the TextAlign property changes</value>
-  </data>
-  <data name="ReadonlyControlsCollection" xml:space="preserve">
+  </data><data name="ReadonlyControlsCollection" xml:space="preserve">
     <value>Collection is read only.</value>
-  </data>
-  <data name="RelatedListManagerChild" xml:space="preserve">
+  </data><data name="RelatedListManagerChild" xml:space="preserve">
     <value>Child list for field {0} cannot be created.</value>
-  </data>
-  <data name="RestartNotSupported" xml:space="preserve">
-    <value>Restart method is not supported for this application type.</value>
-  </data>
-  <data name="ResXResourceWriterSaved" xml:space="preserve">
+  </data><data name="ResXResourceWriterSaved" xml:space="preserve">
     <value>Resource writer has been saved.  You may not edit it.</value>
-  </data>
-  <data name="RichControlLresult" xml:space="preserve">
+  </data><data name="ResourceValueNotFound" xml:space="preserve">
+    <value>The resource value '{0}' was not found.</value>
+  </data><data name="RestartNotSupported" xml:space="preserve">
+    <value>Restart method is not supported for this application type.</value>
+  </data><data name="RichControlLresult" xml:space="preserve">
     <value>Lresult for the accessibility object cannot be obtained.</value>
-  </data>
-  <data name="RichTextBox_IDCut" xml:space="preserve">
-    <value>Cut</value>
-  </data>
-  <data name="RichTextBox_IDDelete" xml:space="preserve">
-    <value>Delete</value>
-  </data>
-  <data name="RichTextBox_IDDragDrop" xml:space="preserve">
-    <value>Drag and Drop</value>
-  </data>
-  <data name="RichTextBox_IDPaste" xml:space="preserve">
-    <value>Paste</value>
-  </data>
-  <data name="RichTextBox_IDTyping" xml:space="preserve">
-    <value>Typing</value>
-  </data>
-  <data name="RichTextBox_IDUnknown" xml:space="preserve">
-    <value>Unknown</value>
-  </data>
-  <data name="RichTextBoxAutoWordSelection" xml:space="preserve">
+  </data><data name="RichTextBoxAutoWordSelection" xml:space="preserve">
     <value>Turns on/off automatic word selection.</value>
-  </data>
-  <data name="RichTextBoxBulletIndent" xml:space="preserve">
+  </data><data name="RichTextBoxBulletIndent" xml:space="preserve">
     <value>Defines the indent for the bullets in the control.</value>
-  </data>
-  <data name="RichTextBoxCanRedoDescr" xml:space="preserve">
+  </data><data name="RichTextBoxCanRedoDescr" xml:space="preserve">
     <value>Indicates if the rich edit control can redo the previous action.</value>
-  </data>
-  <data name="RichTextBoxContentsResized" xml:space="preserve">
+  </data><data name="RichTextBoxContentsResized" xml:space="preserve">
     <value>Occurs when the control's contents are either smaller or larger than the control's window size.</value>
-  </data>
-  <data name="RichTextBoxDetectURLs" xml:space="preserve">
+  </data><data name="RichTextBoxDetectURLs" xml:space="preserve">
     <value>Indicates whether URLs are automatically formatted as links.</value>
-  </data>
-  <data name="RichTextBoxEnableAutoDragDrop" xml:space="preserve">
+  </data><data name="RichTextBoxEnableAutoDragDrop" xml:space="preserve">
     <value>Enable drag/drop of text, pictures, and other data</value>
-  </data>
-  <data name="RichTextBoxHScroll" xml:space="preserve">
+  </data><data name="RichTextBoxHScroll" xml:space="preserve">
     <value>Occurs when the control's horizontal scroll bar is clicked.</value>
-  </data>
-  <data name="RichTextBoxIMEChange" xml:space="preserve">
+  </data><data name="RichTextBoxIMEChange" xml:space="preserve">
     <value>Occurs when the control's IME conversion status changes. (East Asian versions of OS only.)</value>
-  </data>
-  <data name="RichTextBoxLinkClick" xml:space="preserve">
+  </data><data name="RichTextBoxLinkClick" xml:space="preserve">
     <value>Occurs when a hyperlink in the text is clicked.</value>
-  </data>
-  <data name="RichTextBoxProtected" xml:space="preserve">
+  </data><data name="RichTextBoxProtected" xml:space="preserve">
     <value>Occurs when the user takes an action that would change a protected range of text.</value>
-  </data>
-  <data name="RichTextBoxRedoActionNameDescr" xml:space="preserve">
+  </data><data name="RichTextBoxRTF" xml:space="preserve">
+    <value>Defines the rich text-formatted contents of the control.</value>
+  </data><data name="RichTextBoxRedoActionNameDescr" xml:space="preserve">
     <value>The name of the action that will be performed if the user redoes a previous action.</value>
-  </data>
-  <data name="RichTextBoxRightMargin" xml:space="preserve">
+  </data><data name="RichTextBoxRightMargin" xml:space="preserve">
     <value>Defines the right margin dimensions.</value>
-  </data>
-  <data name="RichTextBoxRTF" xml:space="preserve">
-    <value>Defines the rich text-formatted contents of the control.</value>
-  </data>
-  <data name="RichTextBoxScrollBars" xml:space="preserve">
+  </data><data name="RichTextBoxScrollBars" xml:space="preserve">
     <value>Defines the behavior of the scroll bars of the control.</value>
-  </data>
-  <data name="RichTextBoxSelAlignment" xml:space="preserve">
+  </data><data name="RichTextBoxSelAlignment" xml:space="preserve">
     <value>Defines the alignment of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelBackColor" xml:space="preserve">
+  </data><data name="RichTextBoxSelBackColor" xml:space="preserve">
     <value>Sets the text color for the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelBullet" xml:space="preserve">
+  </data><data name="RichTextBoxSelBullet" xml:space="preserve">
     <value>Turns on/off the bullets in front of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelChange" xml:space="preserve">
+  </data><data name="RichTextBoxSelChange" xml:space="preserve">
     <value>Occurs when the current selection has changed.</value>
-  </data>
-  <data name="RichTextBoxSelCharOffset" xml:space="preserve">
+  </data><data name="RichTextBoxSelCharOffset" xml:space="preserve">
     <value>Defines the superscript/subscript mode for the characters.</value>
-  </data>
-  <data name="RichTextBoxSelColor" xml:space="preserve">
+  </data><data name="RichTextBoxSelColor" xml:space="preserve">
     <value>Sets the text color for the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelFont" xml:space="preserve">
+  </data><data name="RichTextBoxSelFont" xml:space="preserve">
     <value>Defines the font of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelHangingIndent" xml:space="preserve">
+  </data><data name="RichTextBoxSelHangingIndent" xml:space="preserve">
     <value>Defines the hanging indent of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelIndent" xml:space="preserve">
+  </data><data name="RichTextBoxSelIndent" xml:space="preserve">
     <value>Defines the indent of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelMargin" xml:space="preserve">
+  </data><data name="RichTextBoxSelMargin" xml:space="preserve">
     <value>Turns on/off the selection margin.</value>
-  </data>
-  <data name="RichTextBoxSelProtected" xml:space="preserve">
+  </data><data name="RichTextBoxSelProtected" xml:space="preserve">
     <value>Turns on/off protection around the contents of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelRightIndent" xml:space="preserve">
-    <value>Defines the right-indent of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelRTF" xml:space="preserve">
+  </data><data name="RichTextBoxSelRTF" xml:space="preserve">
     <value>Defines the rich text formatted contents of the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelTabs" xml:space="preserve">
+  </data><data name="RichTextBoxSelRightIndent" xml:space="preserve">
+    <value>Defines the right-indent of the currently selected text.</value>
+  </data><data name="RichTextBoxSelTabs" xml:space="preserve">
     <value>Defines the locations of tab stops in the currently selected text.</value>
-  </data>
-  <data name="RichTextBoxSelText" xml:space="preserve">
+  </data><data name="RichTextBoxSelText" xml:space="preserve">
     <value>Displays the currently selected text in the control.</value>
-  </data>
-  <data name="RichTextBoxSelTypeDescr" xml:space="preserve">
+  </data><data name="RichTextBoxSelTypeDescr" xml:space="preserve">
     <value>The type of selection.</value>
-  </data>
-  <data name="RichTextBoxUndoActionNameDescr" xml:space="preserve">
+  </data><data name="RichTextBoxUndoActionNameDescr" xml:space="preserve">
     <value>The name of the action that will be performed if the user undoes a previous edit.</value>
-  </data>
-  <data name="RichTextBoxVScroll" xml:space="preserve">
+  </data><data name="RichTextBoxVScroll" xml:space="preserve">
     <value>Occurs when the control's vertical scroll bar is clicked.</value>
-  </data>
-  <data name="RichTextBoxZoomFactor" xml:space="preserve">
+  </data><data name="RichTextBoxZoomFactor" xml:space="preserve">
     <value>Defines the current scaling factor of the RichTextBox display; 1.0 is normal viewing.</value>
-  </data>
-  <data name="RichTextFindEndInvalid" xml:space="preserve">
+  </data><data name="RichTextBox_IDCut" xml:space="preserve">
+    <value>Cut</value>
+  </data><data name="RichTextBox_IDDelete" xml:space="preserve">
+    <value>Delete</value>
+  </data><data name="RichTextBox_IDDragDrop" xml:space="preserve">
+    <value>Drag and Drop</value>
+  </data><data name="RichTextBox_IDPaste" xml:space="preserve">
+    <value>Paste</value>
+  </data><data name="RichTextBox_IDTyping" xml:space="preserve">
+    <value>Typing</value>
+  </data><data name="RichTextBox_IDUnknown" xml:space="preserve">
+    <value>Unknown</value>
+  </data><data name="RichTextFindEndInvalid" xml:space="preserve">
     <value>Value '{0}' is not a valid value for 'end'.  'end' must be greater than or equal to 'start', or -1.</value>
-  </data>
-  <data name="RTL" xml:space="preserve">
-    <value>RTL_False</value>
-  </data>
-  <data name="SafeTopLevelCaptionFormat" xml:space="preserve">
+  </data><data name="SafeTopLevelCaptionFormat" xml:space="preserve">
     <value>{1} - {0} - {2}</value>
-  </data>
-  <data name="SaveFileDialogCreatePrompt" xml:space="preserve">
+  </data><data name="SaveFileDialogCheckWriteAccess" xml:space="preserve">
+    <value>Controls whether the dialog box verifies if the creation of the specified file will be successful.</value>
+  </data><data name="SaveFileDialogCreatePrompt" xml:space="preserve">
     <value>Controls whether to prompt the user when a new file is about to be created. It is only applicable if 'ValidateNames' is set to true.</value>
-  </data>
-  <data name="SaveFileDialogOverWritePrompt" xml:space="preserve">
+  </data><data name="SaveFileDialogExpandedMode" xml:space="preserve">
+    <value>Controls whether the dialog box is always opened in the expanded mode.</value>
+  </data><data name="SaveFileDialogOverWritePrompt" xml:space="preserve">
     <value>Controls whether to prompt the user when an existing file is about to be overwritten. It is only applicable if 'ValidateNames' is set to true.</value>
-  </data>
-  <data name="SaveTextError" xml:space="preserve">
+  </data><data name="SaveTextError" xml:space="preserve">
     <value>Text is not saved.</value>
-  </data>
-  <data name="ScrollableControlHorizontalScrollDescr" xml:space="preserve">
-    <value>Gets the horizontal scroll bar for this ScrollableControl.</value>
-  </data>
-  <data name="ScrollableControlActiveControlParentNull" xml:space="preserve">
-    <value>Parent property of the active control cannot be null.</value>
-  </data>
-  <data name="ScrollableControlRaiseMouseEnterLeaveEventsForScrollBarsDescr" xml:space="preserve">
-    <value>Property being set to false will not raise MouseEnter and MouseLeave events until the mouse leaves the client area and the scrollbars.</value>
-  </data>
-  <data name="ScrollableControlVerticalScrollDescr" xml:space="preserve">
-    <value>Gets the vertical scroll bar for this ScrollableControl.</value>
-  </data>
-  <data name="ScrollBarEnableDescr" xml:space="preserve">
+  </data><data name="ScrollBarEnableDescr" xml:space="preserve">
     <value>Gets or sets a Boolean value controlling whether the scrollbar is enabled.</value>
-  </data>
-  <data name="ScrollBarLargeChangeDescr" xml:space="preserve">
+  </data><data name="ScrollBarLargeChangeDescr" xml:space="preserve">
     <value>The amount by which the scroll box position changes when the user clicks in the scroll bar or presses the PAGE UP or PAGE DOWN keys.</value>
-  </data>
-  <data name="ScrollBarMaximumDescr" xml:space="preserve">
+  </data><data name="ScrollBarMaximumDescr" xml:space="preserve">
     <value>The upper limit value of the scrollable range. </value>
-  </data>
-  <data name="ScrollBarMinimumDescr" xml:space="preserve">
+  </data><data name="ScrollBarMinimumDescr" xml:space="preserve">
     <value>The lower limit value of the scrollable range. </value>
-  </data>
-  <data name="ScrollBarOnScrollDescr" xml:space="preserve">
+  </data><data name="ScrollBarOnScrollDescr" xml:space="preserve">
     <value>Occurs when the user moves the scroll box.</value>
-  </data>
-  <data name="ScrollBarSmallChangeDescr" xml:space="preserve">
+  </data><data name="ScrollBarSmallChangeDescr" xml:space="preserve">
     <value>The amount by which the scroll box position changes when the user clicks a scroll arrow or presses an arrow key.</value>
-  </data>
-  <data name="ScrollBarValueDescr" xml:space="preserve">
+  </data><data name="ScrollBarValueDescr" xml:space="preserve">
     <value>The value that the scroll box position represents. </value>
-  </data>
-  <data name="ScrollBarVisibleDescr" xml:space="preserve">
+  </data><data name="ScrollBarVisibleDescr" xml:space="preserve">
     <value>Gets or sets a Boolean value controlling whether the scrollbar is showing.</value>
-  </data>
-  <data name="selectedIndexChangedEventDescr" xml:space="preserve">
-    <value>Occurs when the value of the SelectedIndex property changes.</value>
-  </data>
-  <data name="selectedIndexDescr" xml:space="preserve">
-    <value>The index of the currently selected item.</value>
-  </data>
-  <data name="SelectedNotEqualActual" xml:space="preserve">
-    <value>Number of selected items does not match actual selected items.</value>
-  </data>
-  <data name="selectionChangeCommittedEventDescr" xml:space="preserve">
-    <value>Occurs when an item is chosen from the drop-down list and the drop-down list is closed.</value>
-  </data>
-  <data name="SelTabCountRange" xml:space="preserve">
+  </data><data name="ScrollableControlActiveControlParentNull" xml:space="preserve">
+    <value>Parent property of the active control cannot be null.</value>
+  </data><data name="ScrollableControlHorizontalScrollDescr" xml:space="preserve">
+    <value>Gets the horizontal scroll bar for this ScrollableControl.</value>
+  </data><data name="ScrollableControlRaiseMouseEnterLeaveEventsForScrollBarsDescr" xml:space="preserve">
+    <value>Property being set to false will not raise MouseEnter and MouseLeave events until the mouse leaves the client area and the scrollbars.</value>
+  </data><data name="ScrollableControlVerticalScrollDescr" xml:space="preserve">
+    <value>Gets the vertical scroll bar for this ScrollableControl.</value>
+  </data><data name="SelTabCountRange" xml:space="preserve">
     <value>SelTabCount out of range.</value>
-  </data>
-  <data name="SendKeysGroupDelimError" xml:space="preserve">
+  </data><data name="SelectedNotEqualActual" xml:space="preserve">
+    <value>Number of selected items does not match actual selected items.</value>
+  </data><data name="SendKeysGroupDelimError" xml:space="preserve">
     <value>Group delimiters are not balanced.</value>
-  </data>
-  <data name="SendKeysHookFailed" xml:space="preserve">
+  </data><data name="SendKeysHookFailed" xml:space="preserve">
     <value>Hook cannot be created.</value>
-  </data>
-  <data name="SendKeysKeywordDelimError" xml:space="preserve">
+  </data><data name="SendKeysKeywordDelimError" xml:space="preserve">
     <value>Keyword delimiter is missing.</value>
-  </data>
-  <data name="SendKeysNestingError" xml:space="preserve">
+  </data><data name="SendKeysNestingError" xml:space="preserve">
     <value>Only three levels of nesting are supported.</value>
-  </data>
-  <data name="SendKeysNoMessageLoop" xml:space="preserve">
+  </data><data name="SendKeysNoMessageLoop" xml:space="preserve">
     <value>SendKeys cannot run inside this application because the application is not handling Windows messages.  Either change the application to handle messages, or use the SendKeys.SendWait method.</value>
-  </data>
-  <data name="SerializationException" xml:space="preserve">
+  </data><data name="SerializationException" xml:space="preserve">
     <value>Type {0} could not be read from the data in line {1}, position {2}.  The type's internal structure may have changed.  Either implement ISerializable on the type or provide a type converter that can provide a more reliable conversion format, such as text or an array of bytes.  The conversion exception was: {3}</value>
-  </data>
-  <data name="ShowDialogOnDisabled" xml:space="preserve">
+  </data><data name="ShowDialogOnDisabled" xml:space="preserve">
     <value>Forms that are not enabled cannot be displayed as a modal dialog box. Set the form's enabled property to true before calling {0}.</value>
-  </data>
-  <data name="ShowDialogOnModal" xml:space="preserve">
+  </data><data name="ShowDialogOnModal" xml:space="preserve">
     <value>Form that is already displayed modally cannot be displayed as a modal dialog box. Close the form before calling {0}.</value>
-  </data>
-  <data name="ShowDialogOnNonTopLevel" xml:space="preserve">
+  </data><data name="ShowDialogOnNonTopLevel" xml:space="preserve">
     <value>Form that is not a top-level form cannot be displayed as a modal dialog box. Remove the form from any parent form before calling {0}.</value>
-  </data>
-  <data name="ShowDialogOnVisible" xml:space="preserve">
+  </data><data name="ShowDialogOnVisible" xml:space="preserve">
     <value>Form that is already visible cannot be displayed as a modal dialog box. Set the form's visible property to false before calling {0}.</value>
-  </data>
-  <data name="SortRequiresIBindingList" xml:space="preserve">
+  </data><data name="SortRequiresIBindingList" xml:space="preserve">
     <value>Sorting requires an IBindingList that supports sorting or an IBindingListView that supports advanced sorting.</value>
-  </data>
-  <data name="SplitContainerFixedPanelDescr" xml:space="preserve">
+  </data><data name="SortedAscendingAccessibleStatus" xml:space="preserve">
+    <value>Sorted ascending.</value>
+  </data><data name="SortedDescendingAccessibleStatus" xml:space="preserve">
+    <value>Sorted descending.</value>
+  </data><data name="SplitContainerFixedPanelDescr" xml:space="preserve">
     <value>Indicates that a particular SplitContainer's Panel should remain fixed in size during resize events.</value>
-  </data>
-  <data name="SplitContainerIsSplitterFixedDescr" xml:space="preserve">
+  </data><data name="SplitContainerIsSplitterFixedDescr" xml:space="preserve">
     <value>Determines if the splitter can move.</value>
-  </data>
-  <data name="SplitContainerOrientationDescr" xml:space="preserve">
+  </data><data name="SplitContainerOrientationDescr" xml:space="preserve">
     <value>Determines if the splitter is vertical or horizontal.</value>
-  </data>
-  <data name="SplitContainerPanel1CollapsedDescr" xml:space="preserve">
+  </data><data name="SplitContainerPanel1CollapsedDescr" xml:space="preserve">
     <value>This determines if Panel1 is collapsed.</value>
-  </data>
-  <data name="SplitContainerPanel1Descr" xml:space="preserve">
+  </data><data name="SplitContainerPanel1Descr" xml:space="preserve">
     <value>The Left or Top panel in the SplitContainer.</value>
-  </data>
-  <data name="SplitContainerPanel1MinSizeDescr" xml:space="preserve">
+  </data><data name="SplitContainerPanel1MinSizeDescr" xml:space="preserve">
     <value>Determines the minimum distance of pixels of the splitter from the left or the top edge of Panel1.</value>
-  </data>
-  <data name="SplitContainerPanel2CollapsedDescr" xml:space="preserve">
+  </data><data name="SplitContainerPanel2CollapsedDescr" xml:space="preserve">
     <value>This determines if Panel2 is collapsed.</value>
-  </data>
-  <data name="SplitContainerPanel2Descr" xml:space="preserve">
+  </data><data name="SplitContainerPanel2Descr" xml:space="preserve">
     <value>The Right or Bottom panel in the SplitContainer.</value>
-  </data>
-  <data name="SplitContainerPanel2MinSizeDescr" xml:space="preserve">
+  </data><data name="SplitContainerPanel2MinSizeDescr" xml:space="preserve">
     <value>Determines the minimum distance of pixels of the splitter from the right or the bottom edge of Panel2.</value>
-  </data>
-  <data name="SplitContainerPanelHeight" xml:space="preserve">
+  </data><data name="SplitContainerPanelHeight" xml:space="preserve">
     <value>The SplitterPanel's height cannot be set explicitly. Set the SplitterDistance on the SplitContainer instead.</value>
-  </data>
-  <data name="SplitContainerPanelWidth" xml:space="preserve">
+  </data><data name="SplitContainerPanelWidth" xml:space="preserve">
     <value>The SplitterPanel's width cannot be set explicitly. Set the SplitterDistance on the SplitContainer instead.</value>
-  </data>
-  <data name="SplitContainerSplitterDistanceDescr" xml:space="preserve">
+  </data><data name="SplitContainerSplitterDistanceDescr" xml:space="preserve">
     <value>Determines pixel distance of the splitter from the left or top edge.</value>
-  </data>
-  <data name="SplitContainerSplitterIncrementDescr" xml:space="preserve">
+  </data><data name="SplitContainerSplitterIncrementDescr" xml:space="preserve">
     <value>Determines the number of pixels the splitter moves in increments. Default is 1.</value>
-  </data>
-  <data name="SplitContainerSplitterRectangleDescr" xml:space="preserve">
+  </data><data name="SplitContainerSplitterRectangleDescr" xml:space="preserve">
     <value>Determines the rectangle bounds of the splitter.</value>
-  </data>
-  <data name="SplitContainerSplitterWidthDescr" xml:space="preserve">
+  </data><data name="SplitContainerSplitterWidthDescr" xml:space="preserve">
     <value>Determines the thickness of the splitter.</value>
-  </data>
-  <data name="SplitterBorderStyleDescr" xml:space="preserve">
+  </data><data name="SplitterBorderStyleDescr" xml:space="preserve">
     <value>The border type of the control.</value>
-  </data>
-  <data name="SplitterDistanceNotAllowed" xml:space="preserve">
+  </data><data name="SplitterDistanceNotAllowed" xml:space="preserve">
     <value>SplitterDistance must be between Panel1MinSize and Width - Panel2MinSize.</value>
-  </data>
-  <data name="SplitterInvalidDockEnum" xml:space="preserve">
+  </data><data name="SplitterInvalidDockEnum" xml:space="preserve">
     <value>Splitter control must be docked left, right, top, or bottom.</value>
-  </data>
-  <data name="SplitterMinExtraDescr" xml:space="preserve">
+  </data><data name="SplitterMinExtraDescr" xml:space="preserve">
     <value>Specifies the minimum size of the undocked area.</value>
-  </data>
-  <data name="SplitterMinSizeDescr" xml:space="preserve">
+  </data><data name="SplitterMinSizeDescr" xml:space="preserve">
     <value>Specifies the minimum size of the control being resized.</value>
-  </data>
-  <data name="SplitterSplitPositionDescr" xml:space="preserve">
+  </data><data name="SplitterSplitPositionDescr" xml:space="preserve">
     <value>The current position of the splitter, or -1 if it is not bound to a control.</value>
-  </data>
-  <data name="SplitterSplitterMovedDescr" xml:space="preserve">
+  </data><data name="SplitterSplitterMovedDescr" xml:space="preserve">
     <value>Occurs when the splitter is done being moved.</value>
-  </data>
-  <data name="SplitterSplitterMovingDescr" xml:space="preserve">
+  </data><data name="SplitterSplitterMovingDescr" xml:space="preserve">
     <value>Occurs when the splitter is being moved.</value>
-  </data>
-  <data name="StatusStripPanelBorderSidesDescr" xml:space="preserve">
+  </data><data name="StandardOleMarshalObjectGetMarshalerFailed" xml:space="preserve">
+    <value>Failed to get marshaler for IID {0}.</value>
+  </data><data name="StatusStripPanelBorderSidesDescr" xml:space="preserve">
     <value>Specifies the sides of the panel that should display borders.</value>
-  </data>
-  <data name="StatusStripPanelBorderStyleDescr" xml:space="preserve">
+  </data><data name="StatusStripPanelBorderStyleDescr" xml:space="preserve">
     <value>Specifies the border style for the panel.</value>
-  </data>
-  <data name="StatusStripSizingGripDescr" xml:space="preserve">
+  </data><data name="StatusStripSizingGripDescr" xml:space="preserve">
     <value>Determines whether a StatusStrip has a sizing grip.</value>
-  </data>
-  <data name="SystemInformationFeatureNotSupported" xml:space="preserve">
+  </data><data name="SystemInformationFeatureNotSupported" xml:space="preserve">
     <value>Feature not supported with this operating system.</value>
-  </data>
-  <data name="TabBaseAlignmentDescr" xml:space="preserve">
+  </data><data name="TYPEINFOPROCESSORGetDocumentationFailed" xml:space="preserve">
+    <value>ITypeInfo::GetDocumentation for DISPID 0x{0:X} returned hr=0x{1:X}, which will cause this property to be ignored. S_OK must be returned. Component={2}</value>
+  </data><data name="TYPEINFOPROCESSORGetRefTypeInfoFailed" xml:space="preserve">
+    <value>ITypeInfo::GetRefTypeInfo returned hr={0:X}, so the data type cannot be retrieved.</value>
+  </data><data name="TYPEINFOPROCESSORGetTypeAttrFailed" xml:space="preserve">
+    <value>ITypeInfo::GetTypeAttr returned hr={0:X}, so the data type cannot be retrieved.</value>
+  </data><data name="TabBaseAlignmentDescr" xml:space="preserve">
     <value>Determines whether the tabs appear on the top, bottom, left, or right side of the Control (left or right are implicitly multilined).</value>
-  </data>
-  <data name="TabBaseAppearanceDescr" xml:space="preserve">
+  </data><data name="TabBaseAppearanceDescr" xml:space="preserve">
     <value>Indicates whether the tabs are painted as buttons or regular tabs.</value>
-  </data>
-  <data name="TabBaseDrawModeDescr" xml:space="preserve">
+  </data><data name="TabBaseDrawModeDescr" xml:space="preserve">
     <value>Indicates whether the user or the system paints the captions.</value>
-  </data>
-  <data name="TabBaseHotTrackDescr" xml:space="preserve">
+  </data><data name="TabBaseHotTrackDescr" xml:space="preserve">
     <value>Indicates whether the tabs visually change when the mouse passes over them.</value>
-  </data>
-  <data name="TabBaseImageListDescr" xml:space="preserve">
+  </data><data name="TabBaseImageListDescr" xml:space="preserve">
     <value>The ImageList object from which this tab takes its images.</value>
-  </data>
-  <data name="TabBaseItemSizeDescr" xml:space="preserve">
+  </data><data name="TabBaseItemSizeDescr" xml:space="preserve">
     <value>Determines the width of fixed-width or owner-draw tabs and the height of all tabs.</value>
-  </data>
-  <data name="TabBaseMultilineDescr" xml:space="preserve">
+  </data><data name="TabBaseMultilineDescr" xml:space="preserve">
     <value>Indicates if more than one row of tabs is allowed.</value>
-  </data>
-  <data name="TabBasePaddingDescr" xml:space="preserve">
+  </data><data name="TabBasePaddingDescr" xml:space="preserve">
     <value>Indicates how much extra space should be added around the text/image in the tab.</value>
-  </data>
-  <data name="TabBaseRowCountDescr" xml:space="preserve">
+  </data><data name="TabBaseRowCountDescr" xml:space="preserve">
     <value>The number of rows currently being displayed in the tab strip.</value>
-  </data>
-  <data name="TabBaseShowToolTipsDescr" xml:space="preserve">
+  </data><data name="TabBaseShowToolTipsDescr" xml:space="preserve">
     <value>Indicates whether ToolTips should be shown for tabs that have their ToolTips set.</value>
-  </data>
-  <data name="TabBaseSizeModeDescr" xml:space="preserve">
+  </data><data name="TabBaseSizeModeDescr" xml:space="preserve">
     <value>Indicates how tabs are sized.</value>
-  </data>
-  <data name="TabBaseTabCountDescr" xml:space="preserve">
+  </data><data name="TabBaseTabCountDescr" xml:space="preserve">
     <value>The number of tabs in the tab strip.</value>
-  </data>
-  <data name="TabControlBadControl" xml:space="preserve">
+  </data><data name="TabControlBadControl" xml:space="preserve">
     <value>Parameter must be of type TabPage.</value>
-  </data>
-  <data name="TabControlDeselectedEventDescr" xml:space="preserve">
+  </data><data name="TabControlDeselectedEventDescr" xml:space="preserve">
     <value>Occurs after a tab page is deselected as the topmost tab page.</value>
-  </data>
-  <data name="TabControlDeselectingEventDescr" xml:space="preserve">
+  </data><data name="TabControlDeselectingEventDescr" xml:space="preserve">
     <value>Occurs when a tab page is being deselected.</value>
-  </data>
-  <data name="TabControlInvalidTabPageType" xml:space="preserve">
+  </data><data name="TabControlInvalidTabPageType" xml:space="preserve">
     <value>Cannot add '{0}' to TabControl.  Only TabPages can be directly added to TabControls.</value>
-  </data>
-  <data name="TabControlSelectedEventDescr" xml:space="preserve">
+  </data><data name="TabControlSelectedEventDescr" xml:space="preserve">
     <value>Occurs after a tab page is selected as the topmost tab page.</value>
-  </data>
-  <data name="TabControlSelectedTabDescr" xml:space="preserve">
+  </data><data name="TabControlSelectedTabDescr" xml:space="preserve">
     <value>The currently selected tab page.</value>
-  </data>
-  <data name="TabControlSelectingEventDescr" xml:space="preserve">
+  </data><data name="TabControlSelectingEventDescr" xml:space="preserve">
     <value>Occurs when a tab page is being selected. </value>
-  </data>
-  <data name="TabControlTabPageNotOnTabControl" xml:space="preserve">
+  </data><data name="TabControlTabPageNotOnTabControl" xml:space="preserve">
     <value>TabPage cannot be added to a '{0}'.  TabPages can only be added to TabControls.</value>
-  </data>
-  <data name="TabControlTabPageOnTabPage" xml:space="preserve">
+  </data><data name="TabControlTabPageOnTabPage" xml:space="preserve">
     <value>TabPage cannot be added to another TabPage.  TabPages can only be added to TabControls.</value>
-  </data>
-  <data name="TabControlTabsDescr" xml:space="preserve">
+  </data><data name="TabControlTabsDescr" xml:space="preserve">
     <value>The TabPages in the TabControl.</value>
-  </data>
-  <data name="TabItemImageIndexDescr" xml:space="preserve">
+  </data><data name="TabItemImageIndexDescr" xml:space="preserve">
     <value>Identifies the image displayed on the tab.</value>
-  </data>
-  <data name="TabItemToolTipTextDescr" xml:space="preserve">
+  </data><data name="TabItemToolTipTextDescr" xml:space="preserve">
     <value>The text that is shown when the mouse hovers over this tab.</value>
-  </data>
-  <data name="TabItemUseVisualStyleBackColorDescr" xml:space="preserve">
+  </data><data name="TabItemUseVisualStyleBackColorDescr" xml:space="preserve">
     <value>Determines if the background is drawn using visual styles, if supported.</value>
-  </data>
-  <data name="TableBeginMustBeCalledPrior" xml:space="preserve">
+  </data><data name="TableBeginMustBeCalledPrior" xml:space="preserve">
     <value>TableBegin() must be called before using this method.</value>
-  </data>
-  <data name="TableBeginNotCalled" xml:space="preserve">
+  </data><data name="TableBeginNotCalled" xml:space="preserve">
     <value>No table is currently being printing.  TableBegin() has not been called.</value>
-  </data>
-  <data name="TableLayoutPanelCellBorderStyleDescr" xml:space="preserve">
+  </data><data name="TableLayoutPanelCellBorderStyleDescr" xml:space="preserve">
     <value>Indicates the appearance of cell borders in a table.</value>
-  </data>
-  <data name="TableLayoutPanelFullDesc" xml:space="preserve">
+  </data><data name="TableLayoutPanelFullDesc" xml:space="preserve">
     <value>Additional Rows or Columns cannot be created.  TableLayoutPanel is full and GrowStyle is 'FixedSize'.</value>
-  </data>
-  <data name="TableLayoutPanelGrowStyleDescr" xml:space="preserve">
+  </data><data name="TableLayoutPanelGrowStyleDescr" xml:space="preserve">
     <value>Indicates whether a TableLayoutPanel will expand to include new cells when all existing cells are occupied.</value>
-  </data>
-  <data name="TableLayoutPanelOnPaintCellDescr" xml:space="preserve">
+  </data><data name="TableLayoutPanelOnPaintCellDescr" xml:space="preserve">
     <value>Occurs when a cell needs repainting.</value>
-  </data>
-  <data name="TableLayoutPanelSpanDesc" xml:space="preserve">
+  </data><data name="TableLayoutPanelSpanDesc" xml:space="preserve">
     <value>TableLayoutPanel cannot expand to contain the control, because the panel's GrowStyle property is set to 'FixedSize'.</value>
-  </data>
-  <data name="TableLayoutSettingsConverterNoName" xml:space="preserve">
-    <value>Cannot convert TableLayoutSettings to string: could not find a 'Name' string property on a control.</value>
-  </data>
-  <data name="TableLayoutSettingSettingsIsNotSupported" xml:space="preserve">
+  </data><data name="TableLayoutSettingSettingsIsNotSupported" xml:space="preserve">
     <value>Directly setting TableLayoutSettings is not supported.  Use individual properties instead.</value>
-  </data>
-  <data name="TableLayoutSettingsGetCellPositionDescr" xml:space="preserve">
+  </data><data name="TableLayoutSettingsConverterNoName" xml:space="preserve">
+    <value>Cannot convert TableLayoutSettings to string: could not find a 'Name' string property on a control.</value>
+  </data><data name="TableLayoutSettingsGetCellPositionDescr" xml:space="preserve">
     <value>Indicates the row and column of the cell.</value>
-  </data>
-  <data name="TableLayoutSettingsSetCellPositionDescr" xml:space="preserve">
+  </data><data name="TableLayoutSettingsSetCellPositionDescr" xml:space="preserve">
     <value>Sets the row and column of the cell.</value>
-  </data>
-  <data name="TablePrintLayoutFromDifferentDocument" xml:space="preserve">
+  </data><data name="TablePrintLayoutFromDifferentDocument" xml:space="preserve">
     <value>TablePrintLayout instance specified was constructed for a different document.</value>
-  </data>
-  <data name="TextBoxAcceptsReturnDescr" xml:space="preserve">
+  </data><data name="TaskDialogButtonTextMustNotBeNull" xml:space="preserve">
+    <value>The text of a custom button must not be null or an empty string.</value>
+  </data><data name="TaskDialogCanUpdateStateOnlyWhenShown" xml:space="preserve">
+    <value>Can only update the state of a task dialog while it is shown.</value>
+  </data><data name="TaskDialogCannotNavigateClosedDialog" xml:space="preserve">
+    <value>Cannot navigate the dialog when it has already closed.</value>
+  </data><data name="TaskDialogCannotNavigateWithinNavigationEventHandler" xml:space="preserve">
+    <value>Cannot navigate the dialog from an event handler that is called from within navigation.</value>
+  </data><data name="TaskDialogCannotNavigateWithinRadioButtonCheckedChanged" xml:space="preserve">
+    <value>Cannot navigate the dialog from within the {0} event of one of the radio buttons of the current task dialog.</value>
+  </data><data name="TaskDialogCannotNavigateWithoutDialog" xml:space="preserve">
+    <value>Cannot navigate from a page not bound to a dialog.</value>
+  </data><data name="TaskDialogCannotRemoveProgressBarWhileDialogIsShown" xml:space="preserve">
+    <value>Cannot remove the progress bar while the task dialog is shown.</value>
+  </data><data name="TaskDialogCannotSetPropertyOfBoundPage" xml:space="preserve">
+    <value>Cannot set this property or call this method while the page is bound to a task dialog.</value>
+  </data><data name="TaskDialogCannotSetPropertyOfShownDialog" xml:space="preserve">
+    <value>Cannot set this property while the task dialog is shown.</value>
+  </data><data name="TaskDialogCannotSetRadioButtonCheckedWithinCheckedChangedEvent" xml:space="preserve">
+    <value>Cannot set the {0} property from within the {1} event of one of the radio buttons of the current task dialog.</value>
+  </data><data name="TaskDialogCannotSetTextForStandardButton" xml:space="preserve">
+    <value>Cannot set the text for a standard button.</value>
+  </data><data name="TaskDialogCannotShowCustomButtonsAndCommandLinks" xml:space="preserve">
+    <value>Cannot show both custom buttons and command links at the same time.</value>
+  </data><data name="TaskDialogCannotUncheckRadioButtonWhileBound" xml:space="preserve">
+    <value>Cannot uncheck a radio button while it is bound to a task dialog.</value>
+  </data><data name="TaskDialogCannotUpdateAfterNavigation" xml:space="preserve">
+    <value>Cannot manipulate the task dialog immediately after navigating it. Please wait for the {0} event of the next page to occur.</value>
+  </data><data name="TaskDialogCannotUpdateIconType" xml:space="preserve">
+    <value>Cannot update the icon from a handle icon type to a non-handle icon type, and vice versa.</value>
+  </data><data name="TaskDialogCollectionAlreadyBound" xml:space="preserve">
+    <value>One of the collections of this {0} is already bound to a {1} instance.</value>
+  </data><data name="TaskDialogControlAlreadyAddedToCollection" xml:space="preserve">
+    <value>This control has already been added to the collection.</value>
+  </data><data name="TaskDialogControlAlreadyBound" xml:space="preserve">
+    <value>One of the controls of this {0} is already bound to a {1} instance.</value>
+  </data><data name="TaskDialogControlIsPartOfOtherCollection" xml:space="preserve">
+    <value>This control is already part of a different collection.</value>
+  </data><data name="TaskDialogControlNotBound" xml:space="preserve">
+    <value>This control is not currently bound to a task dialog.</value>
+  </data><data name="TaskDialogControlNotCreated" xml:space="preserve">
+    <value>The control has not been created.</value>
+  </data><data name="TaskDialogDefaultButtonMustExistInCollection" xml:space="preserve">
+    <value>The default button must exist in the buttons collection.</value>
+  </data><data name="TaskDialogInstanceAlreadyShown" xml:space="preserve">
+    <value>This {0} instance is already being shown.</value>
+  </data><data name="TaskDialogNavigationNotCompleted" xml:space="preserve">
+    <value>Navigation of the task dialog did not complete yet. Please wait for the {0} event to occur.</value>
+  </data><data name="TaskDialogOnlySingleRadioButtonCanBeChecked" xml:space="preserve">
+    <value>Only a single radio button can be set as checked.</value>
+  </data><data name="TaskDialogPageIsAlreadyBound" xml:space="preserve">
+    <value>This {0} instance is already bound to a {1} instance.</value>
+  </data><data name="TaskDialogRadioButtonTextMustNotBeNull" xml:space="preserve">
+    <value>The text of a radio button must not be null or an empty string.</value>
+  </data><data name="TaskDialogTooManyButtonsAdded" xml:space="preserve">
+    <value>Too many custom buttons or radio buttons have been added.</value>
+  </data><data name="TaskDialogVisualStylesNotEnabled" xml:space="preserve">
+    <value>Visual styles are not enabled. Please call {0} before showing the task dialog.</value>
+  </data><data name="TextBoxAcceptsReturnDescr" xml:space="preserve">
     <value>Indicates if return characters are accepted as input for multiline edit controls.</value>
-  </data>
-  <data name="TextBoxAcceptsTabDescr" xml:space="preserve">
+  </data><data name="TextBoxAcceptsTabDescr" xml:space="preserve">
     <value>Indicates if tab characters are accepted as input for multiline edit controls.</value>
-  </data>
-  <data name="TextBoxAutoCompleteCustomSourceDescr" xml:space="preserve">
+  </data><data name="TextBoxAutoCompleteCustomSourceDescr" xml:space="preserve">
     <value>The StringCollection to use when the AutoCompleteSource property is set to CustomSource.</value>
-  </data>
-  <data name="TextBoxAutoCompleteModeDescr" xml:space="preserve">
+  </data><data name="TextBoxAutoCompleteModeDescr" xml:space="preserve">
     <value>Indicates the text completion behavior of the text box.</value>
-  </data>
-  <data name="TextBoxAutoCompleteSourceDescr" xml:space="preserve">
+  </data><data name="TextBoxAutoCompleteSourceDescr" xml:space="preserve">
     <value>The autocomplete source, which can be one of the values from AutoCompleteSource enumeration.</value>
-  </data>
-  <data name="TextBoxAutoCompleteSourceNoItems" xml:space="preserve">
+  </data><data name="TextBoxAutoCompleteSourceNoItems" xml:space="preserve">
     <value>The value AutoCompleteSource.ListItems is not applicable to the TextBox control.</value>
-  </data>
-  <data name="TextBoxAutoSizeDescr" xml:space="preserve">
+  </data><data name="TextBoxAutoSizeDescr" xml:space="preserve">
     <value>Enables automatic resizing based on font size for single-line edit controls.</value>
-  </data>
-  <data name="TextBoxBaseOnAcceptsTabChangedDescr" xml:space="preserve">
+  </data><data name="TextBoxBaseOnAcceptsTabChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the AcceptsTab property changes.</value>
-  </data>
-  <data name="TextBoxBaseOnAutoSizeChangedDescr" xml:space="preserve">
+  </data><data name="TextBoxBaseOnAutoSizeChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the AutoSize property is changed on TextBoxBase.</value>
-  </data>
-  <data name="TextBoxBaseOnBorderStyleChangedDescr" xml:space="preserve">
+  </data><data name="TextBoxBaseOnBorderStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the BorderStyle property changes.</value>
-  </data>
-  <data name="TextBoxBaseOnHideSelectionChangedDescr" xml:space="preserve">
+  </data><data name="TextBoxBaseOnHideSelectionChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the HideSelection property changes.</value>
-  </data>
-  <data name="TextBoxBaseOnModifiedChangedDescr" xml:space="preserve">
+  </data><data name="TextBoxBaseOnModifiedChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the Modified property changes.</value>
-  </data>
-  <data name="TextBoxBaseOnMultilineChangedDescr" xml:space="preserve">
+  </data><data name="TextBoxBaseOnMultilineChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the Multiline property changes.</value>
-  </data>
-  <data name="TextBoxBaseOnReadOnlyChangedDescr" xml:space="preserve">
+  </data><data name="TextBoxBaseOnReadOnlyChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the ReadOnly property changes.</value>
-  </data>
-  <data name="TextBoxBorderDescr" xml:space="preserve">
+  </data><data name="TextBoxBorderDescr" xml:space="preserve">
     <value>Indicates whether the edit control should have a border.</value>
-  </data>
-  <data name="TextBoxCanUndoDescr" xml:space="preserve">
+  </data><data name="TextBoxCanUndoDescr" xml:space="preserve">
     <value>Indicates if the edit control can undo the previous action.</value>
-  </data>
-  <data name="TextBoxCharacterCasingDescr" xml:space="preserve">
+  </data><data name="TextBoxCharacterCasingDescr" xml:space="preserve">
     <value>Indicates if all characters should be left alone or converted to uppercase or lowercase.</value>
-  </data>
-  <data name="TextBoxHideSelectionDescr" xml:space="preserve">
+  </data><data name="TextBoxHideSelectionDescr" xml:space="preserve">
     <value>Indicates that the selection should be hidden when the edit control loses focus.</value>
-  </data>
-  <data name="TextBoxLinesDescr" xml:space="preserve">
+  </data><data name="TextBoxLinesDescr" xml:space="preserve">
     <value>The lines of text in a multiline edit, as an array of String values.</value>
-  </data>
-  <data name="TextBoxMaxLengthDescr" xml:space="preserve">
+  </data><data name="TextBoxMaxLengthDescr" xml:space="preserve">
     <value>Specifies the maximum number of characters that can be entered into the edit control.</value>
-  </data>
-  <data name="TextBoxModifiedDescr" xml:space="preserve">
+  </data><data name="TextBoxModifiedDescr" xml:space="preserve">
     <value>Indicates if the text in the edit control has been modified by the user.</value>
-  </data>
-  <data name="TextBoxMultilineDescr" xml:space="preserve">
+  </data><data name="TextBoxMultilineDescr" xml:space="preserve">
     <value>Controls whether the text of the edit control can span more than one line.</value>
-  </data>
-  <data name="TextBoxPasswordCharDescr" xml:space="preserve">
+  </data><data name="TextBoxPasswordCharDescr" xml:space="preserve">
     <value>Indicates the character to display for password input for single-line edit controls.</value>
-  </data>
-  <data name="TextBoxPreferredHeightDescr" xml:space="preserve">
+  </data><data name="TextBoxPlaceholderTextDescr" xml:space="preserve">
+    <value>Specifies the PlaceholderText of the TextBox control. The PlaceholderText is displayed in the control when the Text property is null or empty and can be used to guide the user what input is expected by the control. </value>
+  </data><data name="TextBoxPreferredHeightDescr" xml:space="preserve">
     <value>The preferred height of this control.</value>
-  </data>
-  <data name="TextBoxReadOnlyDescr" xml:space="preserve">
+  </data><data name="TextBoxReadOnlyDescr" xml:space="preserve">
     <value>Controls whether the text in the edit control can be changed or not.</value>
-  </data>
-  <data name="TextBoxScrollBarsDescr" xml:space="preserve">
+  </data><data name="TextBoxScrollBarsDescr" xml:space="preserve">
     <value>Indicates, for multiline edit controls, which scroll bars will be shown for this control.</value>
-  </data>
-  <data name="TextBoxSelectedTextDescr" xml:space="preserve">
+  </data><data name="TextBoxSelectedTextDescr" xml:space="preserve">
     <value>The currently selected text.</value>
-  </data>
-  <data name="TextBoxSelectionLengthDescr" xml:space="preserve">
+  </data><data name="TextBoxSelectionLengthDescr" xml:space="preserve">
     <value>The length of the currently selected text.</value>
-  </data>
-  <data name="TextBoxSelectionStartDescr" xml:space="preserve">
+  </data><data name="TextBoxSelectionStartDescr" xml:space="preserve">
     <value>The beginning of the currently selected text.</value>
-  </data>
-  <data name="TextBoxShortcutsEnabledDescr" xml:space="preserve">
+  </data><data name="TextBoxShortcutsEnabledDescr" xml:space="preserve">
     <value>Indicates whether shortcuts defined for the control are enabled.</value>
-  </data>
-  <data name="TextBoxTextAlignDescr" xml:space="preserve">
+  </data><data name="TextBoxTextAlignDescr" xml:space="preserve">
     <value>Indicates how the text should be aligned for edit controls.</value>
-  </data>
-  <data name="TextBoxUseSystemPasswordCharDescr" xml:space="preserve">
+  </data><data name="TextBoxUseSystemPasswordCharDescr" xml:space="preserve">
     <value>Indicates if the text in the edit control should appear as the default password character.</value>
-  </data>
-  <data name="TextBoxWordWrapDescr" xml:space="preserve">
+  </data><data name="TextBoxWordWrapDescr" xml:space="preserve">
     <value>Indicates if lines are automatically word-wrapped for multiline edit controls.</value>
-  </data>
-  <data name="TextParseFailedFormat" xml:space="preserve">
+  </data><data name="TextFormatFlagsModifyStringNotAllowed" xml:space="preserve">
+    <value>TextFormatFlags.ModifyString is not allowed.</value>
+  </data><data name="TextParseFailedFormat" xml:space="preserve">
     <value>Parse of Text("{0}") expected text in the format "{1}" did not succeed.</value>
-  </data>
-  <data name="ThreadMustBeSTA" xml:space="preserve">
+  </data><data name="ThreadMustBeSTA" xml:space="preserve">
     <value>Current thread must be set to single thread apartment (STA) mode before OLE calls can be made. Ensure that your Main function has STAThreadAttribute marked on it.</value>
-  </data>
-  <data name="ThreadNoLongerValid" xml:space="preserve">
+  </data><data name="ThreadNoLongerValid" xml:space="preserve">
     <value>An error occurred invoking the method.  The destination thread no longer exists.</value>
-  </data>
-  <data name="ThreadNotPumpingMessages" xml:space="preserve">
+  </data><data name="ThreadNotPumpingMessages" xml:space="preserve">
     <value>An error occurred invoking the method.  A message loop is required to marshal the thread call.</value>
-  </data>
-  <data name="TimerEnabledDescr" xml:space="preserve">
+  </data><data name="TimerEnabledDescr" xml:space="preserve">
     <value>Enables generation of Elapsed events.</value>
-  </data>
-  <data name="TimerIntervalDescr" xml:space="preserve">
+  </data><data name="TimerIntervalDescr" xml:space="preserve">
     <value>The frequency of Elapsed events in milliseconds.</value>
-  </data>
-  <data name="TimerInvalidInterval" xml:space="preserve">
+  </data><data name="TimerInvalidInterval" xml:space="preserve">
     <value>Value '{0}' is not a valid value for Interval. Interval must be greater than {1}.</value>
-  </data>
-  <data name="TimerTimerDescr" xml:space="preserve">
+  </data><data name="TimerTimerDescr" xml:space="preserve">
     <value>Occurs whenever the specified interval time elapses.</value>
-  </data>
-  <data name="ToolStripAllowClickThrough" xml:space="preserve">
+  </data><data name="TooManyResumeUpdateMenuHandles" xml:space="preserve">
+    <value>Too many calls to ResumeUpdateMenuHandles.</value>
+  </data><data name="ToolStripAllowClickThrough" xml:space="preserve">
     <value>Allows the control to be interacted when window does not have focus.</value>
-  </data>
-  <data name="ToolStripAllowItemReorderAndAllowDropCannotBeSetToTrue" xml:space="preserve">
+  </data><data name="ToolStripAllowItemReorderAndAllowDropCannotBeSetToTrue" xml:space="preserve">
     <value>AllowItemReorder and AllowDrop cannot both be true.</value>
-  </data>
-  <data name="ToolStripAllowItemReorderDescr" xml:space="preserve">
+  </data><data name="ToolStripAllowItemReorderDescr" xml:space="preserve">
     <value>Allows the items to be reordered when the ALT key is pressed.</value>
-  </data>
-  <data name="ToolStripAllowMergeDescr" xml:space="preserve">
+  </data><data name="ToolStripAllowMergeDescr" xml:space="preserve">
     <value>Allow the items to be merged.</value>
-  </data>
-  <data name="ToolStripBackColorDescr" xml:space="preserve">
+  </data><data name="ToolStripBackColorDescr" xml:space="preserve">
     <value>Specifies the background color of the ToolStrip.</value>
-  </data>
-  <data name="ToolStripButtonCheckedDescr" xml:space="preserve">
-    <value>Indicates whether the ToolStripButton is pressed in or not pressed in.</value>
-  </data>
-  <data name="ToolStripButtonCheckOnClickDescr" xml:space="preserve">
+  </data><data name="ToolStripButtonCheckOnClickDescr" xml:space="preserve">
     <value>Indicates whether the item should toggle its selected state when clicked.</value>
-  </data>
-  <data name="ToolStripCanOnlyPositionItsOwnItems" xml:space="preserve">
+  </data><data name="ToolStripButtonCheckedDescr" xml:space="preserve">
+    <value>Indicates whether the ToolStripButton is pressed in or not pressed in.</value>
+  </data><data name="ToolStripCanOnlyPositionItsOwnItems" xml:space="preserve">
     <value>ToolStrip cannot position another ToolStrip's items.</value>
-  </data>
-  <data name="ToolStripCanOverflowDescr" xml:space="preserve">
+  </data><data name="ToolStripCanOverflowDescr" xml:space="preserve">
     <value>Indicates whether items can be sent to an overflow menu.</value>
-  </data>
-  <data name="ToolStripCollectionMustInsertAndRemove" xml:space="preserve">
+  </data><data name="ToolStripCollectionMustInsertAndRemove" xml:space="preserve">
     <value>You must explicitly insert one item and remove the other.</value>
-  </data>
-  <data name="ToolStripContainerBottomToolStripPanelDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerBottomToolStripPanelDescr" xml:space="preserve">
     <value>The bottom panel of the ToolStripContainer.  This area is used for moving ToolStrips, MenuStrips and StatusStrips.</value>
-  </data>
-  <data name="ToolStripContainerBottomToolStripPanelVisibleDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerBottomToolStripPanelVisibleDescr" xml:space="preserve">
     <value>Specifies the visibility of the bottom panel of the ToolStripContainer.</value>
-  </data>
-  <data name="ToolStripContainerContentPanelDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerContentPanelDescr" xml:space="preserve">
     <value>The center panel of the ToolStripContainer.</value>
-  </data>
-  <data name="ToolStripContainerDesc" xml:space="preserve">
+  </data><data name="ToolStripContainerDesc" xml:space="preserve">
     <value>Provides panels on each side of the form that can contain one or more ToolStrip, MenuStrip, or StatusStrip controls.</value>
-  </data>
-  <data name="ToolStripContainerLeftToolStripPanelDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerLeftToolStripPanelDescr" xml:space="preserve">
     <value>The left panel of the ToolStripContainer.  This area is used for moving ToolStrips, MenuStrips and StatusStrips.</value>
-  </data>
-  <data name="ToolStripContainerLeftToolStripPanelVisibleDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerLeftToolStripPanelVisibleDescr" xml:space="preserve">
     <value>Specifies the visibility of the left panel of the ToolStripContainer.</value>
-  </data>
-  <data name="ToolStripContainerRightToolStripPanelDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerRightToolStripPanelDescr" xml:space="preserve">
     <value>The right panel of the ToolStripContainer.  This area is used for moving ToolStrips, MenuStrips and StatusStrips.</value>
-  </data>
-  <data name="ToolStripContainerRightToolStripPanelVisibleDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerRightToolStripPanelVisibleDescr" xml:space="preserve">
     <value>Specifies the visibility of the right panel of the ToolStripContainer.</value>
-  </data>
-  <data name="ToolStripContainerTopToolStripPanelDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerTopToolStripPanelDescr" xml:space="preserve">
     <value>The top panel of the ToolStripContainer.  This area is used for moving ToolStrips, MenuStrips and StatusStrips.</value>
-  </data>
-  <data name="ToolStripContainerTopToolStripPanelVisibleDescr" xml:space="preserve">
+  </data><data name="ToolStripContainerTopToolStripPanelVisibleDescr" xml:space="preserve">
     <value>Specifies the visibility of the top panel of the ToolStripContainer.</value>
-  </data>
-  <data name="ToolStripContainerUseContentPanel" xml:space="preserve">
+  </data><data name="ToolStripContainerUseContentPanel" xml:space="preserve">
     <value>Adding controls directly to the ToolStripContainer is not supported.  Use the 'ContentPanel.Controls' property instead.</value>
-  </data>
-  <data name="ToolStripContentPanelOnLoadDescr" xml:space="preserve">
+  </data><data name="ToolStripContentPanelOnLoadDescr" xml:space="preserve">
     <value>Occurs whenever the content panel loads.</value>
-  </data>
-  <data name="ToolStripDefaultDropDownDirectionDescr" xml:space="preserve">
+  </data><data name="ToolStripDefaultDropDownDirectionDescr" xml:space="preserve">
     <value>Specifies the default direction for DropDowns to open.</value>
-  </data>
-  <data name="ToolStripDoesntSupportAutoScroll" xml:space="preserve">
+  </data><data name="ToolStripDoesntSupportAutoScroll" xml:space="preserve">
     <value>ToolStrip doesn't support the AutoScroll property.</value>
-  </data>
-  <data name="ToolStripDropDownAutoCloseDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownAutoCloseDescr" xml:space="preserve">
     <value>Specifies whether the DropDown automatically closes through user action.</value>
-  </data>
-  <data name="ToolStripDropDownButtonShowDropDownArrowDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownButtonShowDropDownArrowDescr" xml:space="preserve">
     <value>Specifies whether or not an arrow should be shown on the drop down button.</value>
-  </data>
-  <data name="ToolStripDropDownClosedDecr" xml:space="preserve">
+  </data><data name="ToolStripDropDownClosedDecr" xml:space="preserve">
     <value>Occurs when the DropDown has closed.</value>
-  </data>
-  <data name="ToolStripDropDownClosingDecr" xml:space="preserve">
+  </data><data name="ToolStripDropDownClosingDecr" xml:space="preserve">
     <value>Occurs when the DropDown is about to close.</value>
-  </data>
-  <data name="ToolStripDropDownDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownDescr" xml:space="preserve">
     <value>Specifies a ToolStripDropDown to show when the item is clicked.</value>
-  </data>
-  <data name="ToolStripDropDownItemDropDownDirectionDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownItemDropDownDirectionDescr" xml:space="preserve">
     <value>Specifies the direction in which to drop the drop down.</value>
-  </data>
-  <data name="ToolStripDropDownItemsDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownItemsDescr" xml:space="preserve">
     <value>Specifies a ToolStripItem to display when the item is clicked.</value>
-  </data>
-  <data name="ToolStripDropDownMenuShowCheckMarginDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownMenuShowCheckMarginDescr" xml:space="preserve">
     <value>Specifies whether the check margin will be shown.</value>
-  </data>
-  <data name="ToolStripDropDownMenuShowImageMarginDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownMenuShowImageMarginDescr" xml:space="preserve">
     <value>Specifies whether the image margin will be shown.</value>
-  </data>
-  <data name="ToolStripDropDownOpenedDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownOpenedDescr" xml:space="preserve">
     <value>Occurs when the DropDown has opened.</value>
-  </data>
-  <data name="ToolStripDropDownOpeningDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownOpeningDescr" xml:space="preserve">
     <value>Occurs when the DropDown is opening.</value>
-  </data>
-  <data name="ToolStripDropDownPreferredWidthDescr" xml:space="preserve">
+  </data><data name="ToolStripDropDownPreferredWidthDescr" xml:space="preserve">
     <value>Specifies the PreferredWidth of the ToolStripDropDown when it is shown.</value>
-  </data>
-  <data name="ToolStripGripAccessibleName" xml:space="preserve">
-    <value>Grip</value>
-  </data>
-  <data name="ToolStripDropDownsCantBeRafted" xml:space="preserve">
+  </data><data name="ToolStripDropDownsCantBeRafted" xml:space="preserve">
     <value>ToolStripDropDown does not support rafting.</value>
-  </data>
-  <data name="ToolStripGripDisplayStyleDescr" xml:space="preserve">
+  </data><data name="ToolStripGripAccessibleName" xml:space="preserve">
+    <value>Grip</value>
+  </data><data name="ToolStripGripDisplayStyleDescr" xml:space="preserve">
     <value>Specifies the orientation of the grip on the ToolStrip.</value>
-  </data>
-  <data name="ToolStripGripMargin" xml:space="preserve">
+  </data><data name="ToolStripGripMargin" xml:space="preserve">
     <value>Specifies the external spacing between the grip and the padding of the ToolStrip and the displayed item.</value>
-  </data>
-  <data name="ToolStripGripStyleDescr" xml:space="preserve">
+  </data><data name="ToolStripGripStyleDescr" xml:space="preserve">
     <value>Specifies visibility of the grip on the ToolStrip.</value>
-  </data>
-  <data name="ToolStripImageListDescr" xml:space="preserve">
+  </data><data name="ToolStripImageListDescr" xml:space="preserve">
     <value>Specifies the ImageList on the ToolStrip.</value>
-  </data>
-  <data name="ToolStripImageScalingSizeDescr" xml:space="preserve">
+  </data><data name="ToolStripImageScalingSizeDescr" xml:space="preserve">
     <value>Specifies the size of images on items.  To control the scaling of items, use the 'ToolStripItem.ImageScaling' property.</value>
-  </data>
-  <data name="ToolStripItemAccessibilityObjectDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAccessibilityObjectDescr" xml:space="preserve">
     <value>The AccessibleObject assigned to the control.</value>
-  </data>
-  <data name="ToolStripItemAccessibleDefaultActionDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAccessibleDefaultActionDescr" xml:space="preserve">
     <value>The default action description of the item.</value>
-  </data>
-  <data name="ToolStripItemAccessibleDescriptionDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAccessibleDescriptionDescr" xml:space="preserve">
     <value>The description that will be reported to accessibility clients.</value>
-  </data>
-  <data name="ToolStripItemAccessibleNameDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAccessibleNameDescr" xml:space="preserve">
     <value>The name that will be reported to accessibility clients.</value>
-  </data>
-  <data name="ToolStripItemAccessibleRoleDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAccessibleRoleDescr" xml:space="preserve">
     <value>The role that will be reported to accessibility clients.</value>
-  </data>
-  <data name="ToolStripItemAddedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAddedDescr" xml:space="preserve">
     <value>Occurs when a ToolStripItem has been added to the ToolStrip's item collection.</value>
-  </data>
-  <data name="ToolStripItemAlignment" xml:space="preserve">
+  </data><data name="ToolStripItemAlignment" xml:space="preserve">
     <value>The alignment of the item with respect to it's owner ToolStrip.</value>
-  </data>
-  <data name="ToolStripItemAlignmentDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAlignmentDescr" xml:space="preserve">
     <value>Indicates whether the item aligns toward the beginning or end of the ToolStrip.</value>
-  </data>
-  <data name="ToolStripItemAllowDropDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAllowDropDescr" xml:space="preserve">
     <value>Determines if the item will receive drag-drop notifications.</value>
-  </data>
-  <data name="ToolStripItemAutoSizeDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAutoSizeDescr" xml:space="preserve">
     <value>Determines whether the item should automatically size based on its image and text.</value>
-  </data>
-  <data name="ToolStripItemAutoToolTipDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAutoToolTipDescr" xml:space="preserve">
     <value>Specifies whether to use the Text or ToolTipText property to display on the ToolTip.</value>
-  </data>
-  <data name="ToolStripItemAvailableDescr" xml:space="preserve">
+  </data><data name="ToolStripItemAvailableDescr" xml:space="preserve">
     <value>Specifies whether or not an item should be placed on a ToolStrip.  </value>
-  </data>
-  <data name="ToolStripItemBackColorDescr" xml:space="preserve">
+  </data><data name="ToolStripItemBackColorDescr" xml:space="preserve">
     <value>The background color used to display text and graphics in the control.</value>
-  </data>
-  <data name="ToolStripItemCircularReference" xml:space="preserve">
+  </data><data name="ToolStripItemBindingContextDescr" xml:space="preserve">
+    <value>Gets or sets the BindingContext for this toolstrip item.</value>
+  </data><data name="ToolStripItemCircularReference" xml:space="preserve">
     <value>Cannot add owner item to the drop-down items collection.</value>
-  </data>
-  <data name="ToolStripItemCollectionIsReadOnly" xml:space="preserve">
+  </data><data name="ToolStripItemCollectionIsReadOnly" xml:space="preserve">
     <value>Collection of ToolStripItems is read-only.</value>
-  </data>
-  <data name="ToolStripItemDisplayStyleDescr" xml:space="preserve">
+  </data><data name="ToolStripItemDisplayStyleDescr" xml:space="preserve">
     <value>Specifies whether the image and text are rendered.</value>
-  </data>
-  <data name="ToolStripItemDoubleClickedEnabledDescr" xml:space="preserve">
+  </data><data name="ToolStripItemDoubleClickedEnabledDescr" xml:space="preserve">
     <value>Specifies whether the DoubleClick event will occur.</value>
-  </data>
-  <data name="ToolStripItemDrawModeDescr" xml:space="preserve">
+  </data><data name="ToolStripItemDrawModeDescr" xml:space="preserve">
     <value>Specifies the drawing mode of the ToolStrip item.</value>
-  </data>
-  <data name="ToolStripItemEnabledChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemEnabledChangedDescr" xml:space="preserve">
     <value>Occurs when the enabled state of the item has changed.</value>
-  </data>
-  <data name="ToolStripItemEnabledDescr" xml:space="preserve">
+  </data><data name="ToolStripItemEnabledDescr" xml:space="preserve">
     <value>Indicates whether the control is enabled.</value>
-  </data>
-  <data name="ToolStripItemFontDescr" xml:space="preserve">
+  </data><data name="ToolStripItemFontDescr" xml:space="preserve">
     <value>The font used to display text in the item.</value>
-  </data>
-  <data name="ToolStripItemForeColorDescr" xml:space="preserve">
+  </data><data name="ToolStripItemForeColorDescr" xml:space="preserve">
     <value>The foreground color used to display text and graphics in the item.</value>
-  </data>
-  <data name="ToolStripItemImageAlignDescr" xml:space="preserve">
+  </data><data name="ToolStripItemImageAlignDescr" xml:space="preserve">
     <value>The alignment of the image that will be displayed on the item.</value>
-  </data>
-  <data name="ToolStripItemImageDescr" xml:space="preserve">
+  </data><data name="ToolStripItemImageDescr" xml:space="preserve">
     <value>The image that will be displayed on the item.</value>
-  </data>
-  <data name="ToolStripItemImageIndexDescr" xml:space="preserve">
+  </data><data name="ToolStripItemImageIndexDescr" xml:space="preserve">
     <value>The index of the image in the ImageList to display on the item.</value>
-  </data>
-  <data name="ToolStripItemImageKeyDescr" xml:space="preserve">
+  </data><data name="ToolStripItemImageKeyDescr" xml:space="preserve">
     <value>The key representing the image in the ImageList to display on the item.</value>
-  </data>
-  <data name="ToolStripItemImageList" xml:space="preserve">
+  </data><data name="ToolStripItemImageList" xml:space="preserve">
     <value>The ImageList to get the image to display on the item.</value>
-  </data>
-  <data name="ToolStripItemImageScalingDescr" xml:space="preserve">
+  </data><data name="ToolStripItemImageScalingDescr" xml:space="preserve">
     <value>Specifies whether the image on the item will size to fit on the ToolStrip.  To control the image size, use the 'ToolStrip.ImageScalingSize' property.</value>
-  </data>
-  <data name="ToolStripItemImageTransparentColorDescr" xml:space="preserve">
+  </data><data name="ToolStripItemImageTransparentColorDescr" xml:space="preserve">
     <value>Specifies the transparent color on the item's image for images that support transparency.</value>
-  </data>
-  <data name="ToolStripItemMarginDescr" xml:space="preserve">
+  </data><data name="ToolStripItemMarginDescr" xml:space="preserve">
     <value>Specifies the spacing between this item and an adjacent item.</value>
-  </data>
-  <data name="ToolStripItemOnAvailableChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnAvailableChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the Available property changes.</value>
-  </data>
-  <data name="ToolStripItemOnBackColorChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnBackColorChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the BackColor property is changed on the item.</value>
-  </data>
-  <data name="ToolStripItemOnClickDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnBindingContextChangedDescr" xml:space="preserve">
+    <value>Occurs whenever the binding context changes.</value>
+  </data><data name="ToolStripItemOnClickDescr" xml:space="preserve">
     <value>Occurs when the item is clicked.</value>
-  </data>
-  <data name="ToolStripItemOnDragDropDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnCommandChangedDescr" xml:space="preserve">
+    <value>Occurs whenever the bindable command changes.</value>
+  </data><data name="ToolStripItemOnDragDropDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item and the user releases the mouse indicating that the item should be 'dropped' into this item.</value>
-  </data>
-  <data name="ToolStripItemOnDragEnterDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnDragEnterDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item into the client area for this item.</value>
-  </data>
-  <data name="ToolStripItemOnDragLeaveDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnDragLeaveDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item and is no longer over the client area for this item.</value>
-  </data>
-  <data name="ToolStripItemOnDragOverDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnDragOverDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item over the client area for this item.</value>
-  </data>
-  <data name="ToolStripItemOnForeColorChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnForeColorChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the BackColor property is changed on the item.</value>
-  </data>
-  <data name="ToolStripItemOnGiveFeedbackDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnGiveFeedbackDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item. The system requests that the Item provide feedback to that effect.</value>
-  </data>
-  <data name="ToolStripItemOnGotFocusDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnGotFocusDescr" xml:space="preserve">
     <value>Occurs when the control gets focus.</value>
-  </data>
-  <data name="ToolStripItemOnLocationChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnLocationChangedDescr" xml:space="preserve">
     <value>Occurs when the location of a ToolStripItem is updated.</value>
-  </data>
-  <data name="ToolStripItemOnLostFocusDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnLostFocusDescr" xml:space="preserve">
     <value>Occurs when the control loses focus.</value>
-  </data>
-  <data name="ToolStripItemOnMouseDownDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnMouseDownDescr" xml:space="preserve">
     <value>Occurs when a mouse button is pressed.</value>
-  </data>
-  <data name="ToolStripItemOnMouseEnterDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnMouseEnterDescr" xml:space="preserve">
     <value>Occurs when the mouse enters the visible part of the item.</value>
-  </data>
-  <data name="ToolStripItemOnMouseHoverDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnMouseHoverDescr" xml:space="preserve">
     <value>Occurs when the mouse remains stationary inside of the item for an amount of time.</value>
-  </data>
-  <data name="ToolStripItemOnMouseLeaveDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnMouseLeaveDescr" xml:space="preserve">
     <value>Occurs when the mouse leaves the visible part of the item.</value>
-  </data>
-  <data name="ToolStripItemOnMouseMoveDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnMouseMoveDescr" xml:space="preserve">
     <value>Occurs when the mouse is moved.</value>
-  </data>
-  <data name="ToolStripItemOnMouseUpDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnMouseUpDescr" xml:space="preserve">
     <value>Occurs when a mouse button is released.</value>
-  </data>
-  <data name="ToolStripItemOnPaintDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnPaintDescr" xml:space="preserve">
     <value>Occurs when an item needs repainting.</value>
-  </data>
-  <data name="ToolStripItemOnQueryAccessibilityHelpDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnQueryAccessibilityHelpDescr" xml:space="preserve">
     <value>Occurs when an Accessibility client invokes help for the item.</value>
-  </data>
-  <data name="ToolStripItemOnQueryContinueDragDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnQueryContinueDragDescr" xml:space="preserve">
     <value>Occurs when the mouse drags an item. The system requests whether the drag-and-drop operation should be allowed to continue.</value>
-  </data>
-  <data name="ToolStripItemOnRightToLeftChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnRightToLeftChangedDescr" xml:space="preserve">
     <value>Event raised when the value of the RightToLeft property is changed on this item.</value>
-  </data>
-  <data name="ToolStripItemOnTextChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnTextChangedDescr" xml:space="preserve">
     <value>Occurs when the Text property is changed on the item.</value>
-  </data>
-  <data name="ToolStripItemOnVisibleChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOnVisibleChangedDescr" xml:space="preserve">
     <value>Occurs when the visibility of an item has changed.</value>
-  </data>
-  <data name="ToolStripItemOverflow" xml:space="preserve">
+  </data><data name="ToolStripItemOverflow" xml:space="preserve">
     <value>Specifies whether an item will always be sent to the overflow, never be sent to the overflow, or sent to the overflow as needed.</value>
-  </data>
-  <data name="ToolStripItemOverflowDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOverflowDescr" xml:space="preserve">
     <value>Specifies whether the item will always move to the overflow, move to the overflow as needed, or never move to the overflow.</value>
-  </data>
-  <data name="ToolStripItemOwnerChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemOwnerChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the Owner property changes.</value>
-  </data>
-  <data name="ToolStripItemPaddingDescr" xml:space="preserve">
+  </data><data name="ToolStripItemPaddingDescr" xml:space="preserve">
     <value>Specifies the internal spacing within this item.</value>
-  </data>
-  <data name="ToolStripItemRemovedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemRemovedDescr" xml:space="preserve">
     <value>Occurs when a ToolStripItem has been removed from the ToolStrip's item collection.</value>
-  </data>
-  <data name="ToolStripItemRightToLeftAutoMirrorImageDescr" xml:space="preserve">
+  </data><data name="ToolStripItemRightToLeftAutoMirrorImageDescr" xml:space="preserve">
     <value>Specifies whether the image should mirror when the RightToLeft property equals RightToLeft.Yes.</value>
-  </data>
-  <data name="ToolStripItemRightToLeftDescr" xml:space="preserve">
+  </data><data name="ToolStripItemRightToLeftDescr" xml:space="preserve">
     <value>Indicates whether the item should draw right-to-left for RTL languages.</value>
-  </data>
-  <data name="ToolStripItemsDescr" xml:space="preserve">
-    <value>Collection of items to display on the ToolStrip.</value>
-  </data>
-  <data name="ToolStripItemSelectedChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripItemSelectedChangedDescr" xml:space="preserve">
     <value>Occurs when the Selected property value changes.</value>
-  </data>
-  <data name="ToolStripItemSize" xml:space="preserve">
+  </data><data name="ToolStripItemSize" xml:space="preserve">
     <value>The size of the item.</value>
-  </data>
-  <data name="ToolStripItemSizeDescr" xml:space="preserve">
+  </data><data name="ToolStripItemSizeDescr" xml:space="preserve">
     <value>The size of the item in pixels.</value>
-  </data>
-  <data name="ToolStripItemTagDescr" xml:space="preserve">
+  </data><data name="ToolStripItemTagDescr" xml:space="preserve">
     <value>User-defined data associated with the item.</value>
-  </data>
-  <data name="ToolStripItemTextAlignDescr" xml:space="preserve">
+  </data><data name="ToolStripItemTextAlignDescr" xml:space="preserve">
     <value>The alignment of the text that will be displayed on the item.</value>
-  </data>
-  <data name="ToolStripItemTextDescr" xml:space="preserve">
+  </data><data name="ToolStripItemTextDescr" xml:space="preserve">
     <value>The text to display on the item.</value>
-  </data>
-  <data name="ToolStripItemTextImageRelationDescr" xml:space="preserve">
+  </data><data name="ToolStripItemTextImageRelationDescr" xml:space="preserve">
     <value>Specifies the relative location of the image to the text on the item.</value>
-  </data>
-  <data name="ToolStripItemToolTipTextDescr" xml:space="preserve">
+  </data><data name="ToolStripItemToolTipTextDescr" xml:space="preserve">
     <value>Specifies the text to show on the ToolTip.</value>
-  </data>
-  <data name="ToolStripItemVisibleDescr" xml:space="preserve">
+  </data><data name="ToolStripItemVisibleDescr" xml:space="preserve">
     <value>Determines whether the item is visible or hidden.</value>
-  </data>
-  <data name="ToolStripLabelActiveLinkColorDescr" xml:space="preserve">
+  </data><data name="ToolStripItemsDescr" xml:space="preserve">
+    <value>Collection of items to display on the ToolStrip.</value>
+  </data><data name="ToolStripLabelActiveLinkColorDescr" xml:space="preserve">
     <value>Specifies the color of the link when the link is active.</value>
-  </data>
-  <data name="ToolStripLabelIsLinkDescr" xml:space="preserve">
+  </data><data name="ToolStripLabelIsLinkDescr" xml:space="preserve">
     <value>Specifies whether the label acts as a link.</value>
-  </data>
-  <data name="DataGridViewCheckBoxCellCheckedStateDescription" xml:space="preserve">
-    <value>{0} check box checked</value>
-  </data>
-  <data name="DataGridViewCheckBoxCellUncheckedStateDescription" xml:space="preserve">
-    <value>{0} check box unchecked</value>
-  </data>
-  <data name="DataGridViewCheckBoxCellIndeterminateStateDescription" xml:space="preserve">
-    <value>{0} check box indeterminate</value>
-  </data>
-  <data name="ToolStripLabelLinkBehaviorDescr" xml:space="preserve">
+  </data><data name="ToolStripLabelLinkBehaviorDescr" xml:space="preserve">
     <value>The underlining behavior of the link.</value>
-  </data>
-  <data name="ToolStripLabelLinkColorDescr" xml:space="preserve">
+  </data><data name="ToolStripLabelLinkColorDescr" xml:space="preserve">
     <value>Specifies the color of the link.</value>
-  </data>
-  <data name="ToolStripLabelLinkVisitedDescr" xml:space="preserve">
+  </data><data name="ToolStripLabelLinkVisitedDescr" xml:space="preserve">
     <value>Determines if the hyperlink should be rendered as visited.</value>
-  </data>
-  <data name="ToolStripLabelVisitedLinkColorDescr" xml:space="preserve">
+  </data><data name="ToolStripLabelVisitedLinkColorDescr" xml:space="preserve">
     <value>Specifies the color of the link when the link has been visited.</value>
-  </data>
-  <data name="ToolStripLayoutCompleteDescr" xml:space="preserve">
+  </data><data name="ToolStripLayoutCompleteDescr" xml:space="preserve">
     <value>Occurs after layout and placement of items on the ToolStrip.</value>
-  </data>
-  <data name="ToolStripLayoutStyle" xml:space="preserve">
+  </data><data name="ToolStripLayoutStyle" xml:space="preserve">
     <value>Specifies the layout orientation of the ToolStrip.</value>
-  </data>
-  <data name="ToolStripLayoutStyleChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripLayoutStyleChangedDescr" xml:space="preserve">
     <value>Occurs when the layout style of the ToolStrip has changed.</value>
-  </data>
-  <data name="ToolStripMenuItemShortcutKeyDisplayStringDescr" xml:space="preserve">
+  </data><data name="ToolStripMenuItemShortcutKeyDisplayStringDescr" xml:space="preserve">
     <value>The string to be displayed as the shortcut key.</value>
-  </data>
-  <data name="ToolStripMergeActionDescr" xml:space="preserve">
+  </data><data name="ToolStripMergeActionDescr" xml:space="preserve">
     <value>Specifies what action to take if match is successful.</value>
-  </data>
-  <data name="ToolStripMergeImpossibleIdentical" xml:space="preserve">
+  </data><data name="ToolStripMergeImpossibleIdentical" xml:space="preserve">
     <value>Operation impossible. Source and target are identical.</value>
-  </data>
-  <data name="ToolStripMergeIndexDescr" xml:space="preserve">
+  </data><data name="ToolStripMergeIndexDescr" xml:space="preserve">
     <value>Used for matching and positioning within target ToolStrip.</value>
-  </data>
-  <data name="ToolStripMustSupplyItsOwnComboBox" xml:space="preserve">
+  </data><data name="ToolStripMustSupplyItsOwnComboBox" xml:space="preserve">
     <value>Call the empty ToolStripComboBox constructor, which will provide a ComboBox.</value>
-  </data>
-  <data name="ToolStripMustSupplyItsOwnTextBox" xml:space="preserve">
+  </data><data name="ToolStripMustSupplyItsOwnTextBox" xml:space="preserve">
     <value>Call the empty ToolStripTextBox constructor, which will provide a TextBox.</value>
-  </data>
-  <data name="ToolStripOnBeginDrag" xml:space="preserve">
+  </data><data name="ToolStripOnBeginDrag" xml:space="preserve">
     <value>Occurs when the ToolStrip has started to move within a ToolStripPanel.</value>
-  </data>
-  <data name="ToolStripOnEndDrag" xml:space="preserve">
+  </data><data name="ToolStripOnEndDrag" xml:space="preserve">
     <value>Occurs when the ToolStrip has stopped moving within a ToolStripPanel.</value>
-  </data>
-  <data name="ToolStripOptions" xml:space="preserve">
+  </data><data name="ToolStripOptions" xml:space="preserve">
     <value>ToolBar Options</value>
-  </data>
-  <data name="ToolStripPaintGripDescr" xml:space="preserve">
+  </data><data name="ToolStripPaintGripDescr" xml:space="preserve">
     <value>Occurs when the move handle needs repainting.</value>
-  </data>
-  <data name="ToolStripPanelRowsDescr" xml:space="preserve">
-    <value>A collection of rows in the panel. </value>
-  </data>
-  <data name="ToolStripPanelRowControlCollectionIncorrectIndexLength" xml:space="preserve">
+  </data><data name="ToolStripPanelRowControlCollectionIncorrectIndexLength" xml:space="preserve">
     <value>Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.</value>
-  </data>
-  <data name="ToolStripRendererChanged" xml:space="preserve">
-    <value>Occurs when the value of the Renderer property changes.</value>
-  </data>
-  <data name="ToolStripRenderModeDescr" xml:space="preserve">
+  </data><data name="ToolStripPanelRowsDescr" xml:space="preserve">
+    <value>A collection of rows in the panel. </value>
+  </data><data name="ToolStripRenderModeDescr" xml:space="preserve">
     <value>The painting styles applied to the control.</value>
-  </data>
-  <data name="ToolStripRenderModeUseRendererPropertyInstead" xml:space="preserve">
+  </data><data name="ToolStripRenderModeUseRendererPropertyInstead" xml:space="preserve">
     <value>The RenderMode property cannot directly be set to 'Custom', to use a custom ToolStripRenderer, set the Renderer property instead.</value>
-  </data>
-  <data name="ToolStripSaveSettingsDescr" xml:space="preserve">
+  </data><data name="ToolStripRendererChanged" xml:space="preserve">
+    <value>Occurs when the value of the Renderer property changes.</value>
+  </data><data name="ToolStripSaveSettingsDescr" xml:space="preserve">
     <value>Specifies whether the ToolStrip should persist user settings via IPersistComponentSettings.</value>
-  </data>
-  <data name="ToolStripScrollButtonDownAccessibleName" xml:space="preserve">
+  </data><data name="ToolStripScrollButtonDownAccessibleName" xml:space="preserve">
     <value>Line down</value>
-  </data>
-  <data name="ToolStripScrollButtonUpAccessibleName" xml:space="preserve">
+  </data><data name="ToolStripScrollButtonUpAccessibleName" xml:space="preserve">
     <value>Line up</value>
-  </data>
-  <data name="ToolStripSettingsKeyDescr" xml:space="preserve">
+  </data><data name="ToolStripSettingsKeyDescr" xml:space="preserve">
     <value>Specifies the settings key to use to save settings.</value>
-  </data>
-  <data name="ToolStripShowDropDownInvalidOperation" xml:space="preserve">
+  </data><data name="ToolStripShowDropDownInvalidOperation" xml:space="preserve">
     <value>DropDown is the same as the Parent ToolStrip. Cannot Drop Down.</value>
-  </data>
-  <data name="ToolStripShowItemToolTipsDescr" xml:space="preserve">
+  </data><data name="ToolStripShowItemToolTipsDescr" xml:space="preserve">
     <value>Specifies whether to display ToolTips on items.</value>
-  </data>
-  <data name="ToolStripSplitButtonDropDownButtonWidthDescr" xml:space="preserve">
+  </data><data name="ToolStripSplitButtonDropDownButtonWidthDescr" xml:space="preserve">
     <value>Specifies how much space to give to the DropDownButton portion of the ToolStripSplitButton.</value>
-  </data>
-  <data name="ToolStripSplitButtonOnButtonClickDescr" xml:space="preserve">
+  </data><data name="ToolStripSplitButtonOnButtonClickDescr" xml:space="preserve">
     <value>Occurs when the button portion of the split button has been clicked.</value>
-  </data>
-  <data name="ToolStripSplitButtonOnButtonDoubleClickDescr" xml:space="preserve">
+  </data><data name="ToolStripSplitButtonOnButtonDoubleClickDescr" xml:space="preserve">
     <value>Occurs when the button portion of the split button has been double clicked.</value>
-  </data>
-  <data name="ToolStripSplitButtonOnDefaultItemChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripSplitButtonOnDefaultItemChangedDescr" xml:space="preserve">
     <value>Occurs when the DefaultItem property has changed.</value>
-  </data>
-  <data name="ToolStripSplitButtonSplitterWidthDescr" xml:space="preserve">
+  </data><data name="ToolStripSplitButtonSplitterWidthDescr" xml:space="preserve">
     <value>Specifies the width of the split section between the default and drop-down button.</value>
-  </data>
-  <data name="ToolStripSplitStackLayoutContainerMustBeAToolStrip" xml:space="preserve">
+  </data><data name="ToolStripSplitStackLayoutContainerMustBeAToolStrip" xml:space="preserve">
     <value>Container must be a ToolStrip.</value>
-  </data>
-  <data name="ToolStripStatusLabelBorderSidesDescr" xml:space="preserve">
+  </data><data name="ToolStripStatusLabelBorderSidesDescr" xml:space="preserve">
     <value>Specifies the sides of the panel that should display borders.</value>
-  </data>
-  <data name="ToolStripStatusLabelBorderStyleDescr" xml:space="preserve">
+  </data><data name="ToolStripStatusLabelBorderStyleDescr" xml:space="preserve">
     <value>Specifies the border style for the panel.</value>
-  </data>
-  <data name="ToolStripStatusLabelSpringDescr" xml:space="preserve">
+  </data><data name="ToolStripStatusLabelSpringDescr" xml:space="preserve">
     <value>Specifies whether the item fills up the remaining space.</value>
-  </data>
-  <data name="ToolStripStretchDescr" xml:space="preserve">
+  </data><data name="ToolStripStretchDescr" xml:space="preserve">
     <value>Specifies whether the ToolStrip stretches from end to end in the rafting container.</value>
-  </data>
-  <data name="ToolStripTextBoxTextBoxTextAlignChangedDescr" xml:space="preserve">
+  </data><data name="ToolStripTextBoxTextBoxTextAlignChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the TextBoxTextAlign property changes.</value>
-  </data>
-  <data name="ToolStripTextDirectionDescr" xml:space="preserve">
+  </data><data name="ToolStripTextDirectionDescr" xml:space="preserve">
     <value>Specifies the direction to draw the text on the item.</value>
-  </data>
-  <data name="ToolTipActiveDescr" xml:space="preserve">
+  </data><data name="ToolTipActiveDescr" xml:space="preserve">
     <value>Determines if the ToolTip is active. A tip will only appear if the ToolTip has been activated.</value>
-  </data>
-  <data name="ToolTipAddFailed" xml:space="preserve">
+  </data><data name="ToolTipAddFailed" xml:space="preserve">
     <value>Adding the tip to the native ToolTip control did not succeed.</value>
-  </data>
-  <data name="ToolTipAutomaticDelayDescr" xml:space="preserve">
-    <value>Sets the values of AutoPopDelay, InitialDelay, and ReshowDelay to the appropriate values.</value>
-  </data>
-  <data name="ToolTipAutoPopDelayDescr" xml:space="preserve">
+  </data><data name="ToolTipAutoPopDelayDescr" xml:space="preserve">
     <value>Determines the length of time the ToolTip window remains visible if the pointer is stationary inside a ToolTip region.</value>
-  </data>
-  <data name="ToolTipBackColorDescr" xml:space="preserve">
+  </data><data name="ToolTipAutomaticDelayDescr" xml:space="preserve">
+    <value>Sets the values of AutoPopDelay, InitialDelay, and ReshowDelay to the appropriate values.</value>
+  </data><data name="ToolTipBackColorDescr" xml:space="preserve">
     <value>The background color of the ToolTip control.</value>
-  </data>
-  <data name="ToolTipDrawEventDescr" xml:space="preserve">
+  </data><data name="ToolTipDrawEventDescr" xml:space="preserve">
     <value>Occurs in OwnerDraw mode when the ToolTip needs to be drawn.</value>
-  </data>
-  <data name="ToolTipEmptyColor" xml:space="preserve">
+  </data><data name="ToolTipEmptyColor" xml:space="preserve">
     <value>Value '{0}' cannot be set to an empty value.</value>
-  </data>
-  <data name="ToolTipForeColorDescr" xml:space="preserve">
+  </data><data name="ToolTipForeColorDescr" xml:space="preserve">
     <value>The foreground color of the ToolTip control.</value>
-  </data>
-  <data name="ToolTipInitialDelayDescr" xml:space="preserve">
+  </data><data name="ToolTipInitialDelayDescr" xml:space="preserve">
     <value>Determines the length of time the pointer must remain stationary within a ToolTip region before the ToolTip window appears.</value>
-  </data>
-  <data name="ToolTipIsBalloonDescr" xml:space="preserve">
+  </data><data name="ToolTipIsBalloonDescr" xml:space="preserve">
     <value>Indicates whether the ToolTip will take on a balloon form.</value>
-  </data>
-  <data name="ToolTipOwnerDrawDescr" xml:space="preserve">
+  </data><data name="ToolTipOwnerDrawDescr" xml:space="preserve">
     <value>Controls whether the system or the user paints items/sub items.</value>
-  </data>
-  <data name="ToolTipPopupEventDescr" xml:space="preserve">
+  </data><data name="ToolTipPopupEventDescr" xml:space="preserve">
     <value>Occurs whenever a ToolTip is about to be shown.</value>
-  </data>
-  <data name="ToolTipReshowDelayDescr" xml:space="preserve">
+  </data><data name="ToolTipReshowDelayDescr" xml:space="preserve">
     <value>Determines the length of time it takes for subsequent ToolTip windows to appear as the pointer moves from one ToolTip region to another.</value>
-  </data>
-  <data name="ToolTipShowAlwaysDescr" xml:space="preserve">
+  </data><data name="ToolTipShowAlwaysDescr" xml:space="preserve">
     <value>Determines if the tool tip will be displayed always, even if the parent window is not active.</value>
-  </data>
-  <data name="ToolTipStripAmpersandsDescr" xml:space="preserve">
+  </data><data name="ToolTipStripAmpersandsDescr" xml:space="preserve">
     <value>When set to true, any ampersands (&amp;) in the Text property are not displayed.</value>
-  </data>
-  <data name="ToolTipTitleDescr" xml:space="preserve">
+  </data><data name="ToolTipTitleDescr" xml:space="preserve">
     <value>Determines the title of the ToolTip.</value>
-  </data>
-  <data name="ToolTipToolTipDescr" xml:space="preserve">
+  </data><data name="ToolTipToolTipDescr" xml:space="preserve">
     <value>Determines the ToolTip shown when the mouse hovers over the control.</value>
-  </data>
-  <data name="ToolTipToolTipIconDescr" xml:space="preserve">
+  </data><data name="ToolTipToolTipIconDescr" xml:space="preserve">
     <value>Determines the icon that is shown on the ToolTip.</value>
-  </data>
-  <data name="ToolTipUseAnimationDescr" xml:space="preserve">
+  </data><data name="ToolTipUseAnimationDescr" xml:space="preserve">
     <value>When set to true, animations are used when the ToolTip is shown or hidden.</value>
-  </data>
-  <data name="ToolTipUseFadingDescr" xml:space="preserve">
+  </data><data name="ToolTipUseFadingDescr" xml:space="preserve">
     <value>When set to true, a fade effect is used when ToolTips are shown or hidden.</value>
-  </data>
-  <data name="TooManyResumeUpdateMenuHandles" xml:space="preserve">
-    <value>Too many calls to ResumeUpdateMenuHandles.</value>
-  </data>
-  <data name="TopLevelControlAdd" xml:space="preserve">
+  </data><data name="TopLevelControlAdd" xml:space="preserve">
     <value>Top-level control cannot be added to a control.</value>
-  </data>
-  <data name="TopLevelNotAllowedIfActiveX" xml:space="preserve">
+  </data><data name="TopLevelNotAllowedIfActiveX" xml:space="preserve">
     <value>TopLevel property cannot be set to true for ActiveX controls.</value>
-  </data>
-  <data name="TopLevelParentedControl" xml:space="preserve">
+  </data><data name="TopLevelParentedControl" xml:space="preserve">
     <value>Top-level style of a parented control cannot be changed.</value>
-  </data>
-  <data name="toStringAlt" xml:space="preserve">
-    <value>Alt</value>
-    <comment>{Locked="Alt"}</comment>
-  </data>
-  <data name="toStringBack" xml:space="preserve">
-    <value>Back</value>
-  </data>
-  <data name="toStringControl" xml:space="preserve">
-    <value>Ctrl</value>
-    <comment>{Locked=!de; "Ctrl"}</comment>
-  </data>
-  <data name="toStringDefault" xml:space="preserve">
-    <value>(default)</value>
-  </data>
-  <data name="toStringDelete" xml:space="preserve">
-    <value>Del</value>
-    <comment>{Locked=!fr,de,it,es; "Del"}</comment>
-  </data>
-  <data name="toStringEnd" xml:space="preserve">
-    <value>End</value>
-    <comment>{Locked=!fr,de,it,es; "End"}</comment>
-  </data>
-  <data name="toStringEnter" xml:space="preserve">
-    <value>Enter</value>
-    <comment>{Locked=!fr,de,it,es; "Enter"}</comment>
-  </data>
-  <data name="toStringHome" xml:space="preserve">
-    <value>Home</value>
-    <comment>{Locked=!fr,de,es; "Home"}</comment>
-  </data>
-  <data name="toStringInsert" xml:space="preserve">
-    <value>Insert</value>
-    <comment>{Locked=!fr,de,it,es,zh-Hant; "Insert"}</comment>
-  </data>
-  <data name="toStringNone" xml:space="preserve">
-    <value>(none)</value>
-  </data>
-  <data name="toStringPageDown" xml:space="preserve">
-    <value>PgDn</value>
-    <comment>{Locked=!fr,de,it,es; "PgDn"}</comment>
-  </data>
-  <data name="toStringPageUp" xml:space="preserve">
-    <value>PgUp</value>
-    <comment>{Locked=!fr,de,it,es; "PgUp"}</comment>
-  </data>
-  <data name="toStringShift" xml:space="preserve">
-    <value>Shift</value>
-    <comment>{Locked=!fr,de,it,es; "Shift"}</comment>
-  </data>
-  <data name="TrackBarAutoSizeDescr" xml:space="preserve">
+  </data><data name="TrackBarAutoSizeDescr" xml:space="preserve">
     <value>Indicates whether the control will resize itself automatically based on a computation of the default scroll bar dimensions.</value>
-  </data>
-  <data name="TrackBarLargeChangeDescr" xml:space="preserve">
+  </data><data name="TrackBarLargeChangeDescr" xml:space="preserve">
     <value>The number of positions the slider moves in response to mouse clicks or the PAGE UP and PAGE DOWN keys.</value>
-  </data>
-  <data name="TrackBarLargeChangeError" xml:space="preserve">
+  </data><data name="TrackBarLargeChangeError" xml:space="preserve">
     <value>LargeChange: Value '{0}' must be greater than or equal to 0.</value>
-  </data>
-  <data name="TrackBarMaximumDescr" xml:space="preserve">
+  </data><data name="TrackBarLargeDecreaseButtonName" xml:space="preserve">
+    <value>Large decrease</value>
+  </data><data name="TrackBarLargeIncreaseButtonName" xml:space="preserve">
+    <value>Large increase</value>
+  </data><data name="TrackBarMaximumDescr" xml:space="preserve">
     <value>The maximum value for the position of the slider on the TrackBar.</value>
-  </data>
-  <data name="TrackBarMinimumDescr" xml:space="preserve">
+  </data><data name="TrackBarMinimumDescr" xml:space="preserve">
     <value>The minimum value for the position of the slider on the TrackBar.</value>
-  </data>
-  <data name="TrackBarOnScrollDescr" xml:space="preserve">
+  </data><data name="TrackBarOnScrollDescr" xml:space="preserve">
     <value>Occurs when the TrackBar slider moves.</value>
-  </data>
-  <data name="TrackBarOrientationDescr" xml:space="preserve">
+  </data><data name="TrackBarOrientationDescr" xml:space="preserve">
     <value>The orientation of the control.</value>
-  </data>
-  <data name="TrackBarSmallChangeDescr" xml:space="preserve">
+  </data><data name="TrackBarPositionButtonName" xml:space="preserve">
+    <value>Position</value>
+  </data><data name="TrackBarSmallChangeDescr" xml:space="preserve">
     <value>The number of positions the slider moves in response to keyboard input (arrow keys).</value>
-  </data>
-  <data name="TrackBarSmallChangeError" xml:space="preserve">
+  </data><data name="TrackBarSmallChangeError" xml:space="preserve">
     <value>SmallChange: Value '{0}' must be greater than or equal to 0.</value>
-  </data>
-  <data name="TrackBarTickFrequencyDescr" xml:space="preserve">
+  </data><data name="TrackBarTickFrequencyDescr" xml:space="preserve">
     <value>The number of positions between tick marks.</value>
-  </data>
-  <data name="TrackBarTickStyleDescr" xml:space="preserve">
+  </data><data name="TrackBarTickStyleDescr" xml:space="preserve">
     <value>Indicates where the ticks appear on the TrackBar.</value>
-  </data>
-  <data name="TrackBarValueDescr" xml:space="preserve">
+  </data><data name="TrackBarValueDescr" xml:space="preserve">
     <value>The position of the slider.</value>
-  </data>
-  <data name="TransparentBackColorNotAllowed" xml:space="preserve">
+  </data><data name="TransparentBackColorNotAllowed" xml:space="preserve">
     <value>Control does not support transparent background colors.</value>
-  </data>
-  <data name="TrayIcon_TextTooLong" xml:space="preserve">
+  </data><data name="TrayIcon_TextTooLong" xml:space="preserve">
     <value>Text length must be less than 128 characters long.</value>
-  </data>
-  <data name="TreeNodeBackColorDescr" xml:space="preserve">
+  </data><data name="TreeNodeBackColorDescr" xml:space="preserve">
     <value>The background color of tree node.</value>
-  </data>
-  <data name="TreeNodeBeginEditFailed" xml:space="preserve">
+  </data><data name="TreeNodeBeginEditFailed" xml:space="preserve">
     <value>BeginEdit did not succeed because LabelEdit property is false.</value>
-  </data>
-  <data name="TreeNodeCheckedDescr" xml:space="preserve">
+  </data><data name="TreeNodeBoundToAnotherTreeView" xml:space="preserve">
+    <value>The TreeNode is already bound to another TreeView. You must first remove it from its current location or clone it.</value>
+  </data><data name="TreeNodeCheckedDescr" xml:space="preserve">
     <value>Indicates whether the tree node is in a checked state.</value>
-  </data>
-  <data name="TreeNodeCollectionBadTreeNode" xml:space="preserve">
+  </data><data name="TreeNodeCircularReference" xml:space="preserve">
+    <value>A circular reference has been made. A TreeNode cannot be added as a descendant of itself.</value>
+  </data><data name="TreeNodeCollectionBadTreeNode" xml:space="preserve">
     <value>Parameter must be of type TreeNode.</value>
-  </data>
-  <data name="TreeNodeForeColorDescr" xml:space="preserve">
+  </data><data name="TreeNodeForeColorDescr" xml:space="preserve">
     <value>The foreground color of tree node.</value>
-  </data>
-  <data name="TreeNodeImageIndexDescr" xml:space="preserve">
+  </data><data name="TreeNodeImageIndexDescr" xml:space="preserve">
     <value>The ImageList index value of the image displayed when the tree node is in the unselected state.</value>
-  </data>
-  <data name="TreeNodeImageKeyDescr" xml:space="preserve">
+  </data><data name="TreeNodeImageKeyDescr" xml:space="preserve">
     <value>Identifies the image to display on the node when it is not selected.</value>
-  </data>
-  <data name="TreeNodeIndexDescr" xml:space="preserve">
+  </data><data name="TreeNodeIndexDescr" xml:space="preserve">
     <value>The position of the tree node in the tree node collection.</value>
-  </data>
-  <data name="TreeNodeNodeFontDescr" xml:space="preserve">
+  </data><data name="TreeNodeNoParent" xml:space="preserve">
+    <value>Full path can only be retrieved when a TreeNode has been added to a TreeView. This TreeNode has not been added to a TreeView.</value>
+  </data><data name="TreeNodeNodeFontDescr" xml:space="preserve">
     <value>The font used to display the text on the tree node's label.</value>
-  </data>
-  <data name="TreeNodeNodeNameDescr" xml:space="preserve">
+  </data><data name="TreeNodeNodeNameDescr" xml:space="preserve">
     <value>The name of the object. </value>
-  </data>
-  <data name="TreeNodeNoParent" xml:space="preserve">
-    <value>Full path can only be retrieved when a TreeNode has been added to a TreeView. This TreeNode has not been added to a TreeView.</value>
-  </data>
-  <data name="TreeNodeSelectedImageIndexDescr" xml:space="preserve">
+  </data><data name="TreeNodeSelectedImageIndexDescr" xml:space="preserve">
     <value>The key in the image-list value that represents the image to display when the tree node is in the selected state.</value>
-  </data>
-  <data name="TreeNodeSelectedImageKeyDescr" xml:space="preserve">
+  </data><data name="TreeNodeSelectedImageKeyDescr" xml:space="preserve">
     <value>The key in the ImageList value that represents the image to display when the tree node is in the selected state.</value>
-  </data>
-  <data name="TreeNodeStateImageIndexDescr" xml:space="preserve">
+  </data><data name="TreeNodeStateImageIndexDescr" xml:space="preserve">
     <value>The index in the StateImageList displayed when CheckBoxes is set to false on the TreeView.</value>
-  </data>
-  <data name="TreeNodeStateImageKeyDescr" xml:space="preserve">
+  </data><data name="TreeNodeStateImageKeyDescr" xml:space="preserve">
     <value>Identifies the image to display on the node to indicate its current state.</value>
-  </data>
-  <data name="TreeNodeTextDescr" xml:space="preserve">
+  </data><data name="TreeNodeTextDescr" xml:space="preserve">
     <value>The text displayed in the label of the tree node.</value>
-  </data>
-  <data name="TreeNodeToolTipTextDescr" xml:space="preserve">
+  </data><data name="TreeNodeToolTipTextDescr" xml:space="preserve">
     <value>The ToolTip text that will be displayed when the mouse hovers over the node.</value>
-  </data>
-  <data name="TreeViewAfterCheckDescr" xml:space="preserve">
+  </data><data name="TreeViewAfterCheckDescr" xml:space="preserve">
     <value>Occurs when a check box on a tree node has been checked or unchecked.</value>
-  </data>
-  <data name="TreeViewAfterCollapseDescr" xml:space="preserve">
+  </data><data name="TreeViewAfterCollapseDescr" xml:space="preserve">
     <value>Occurs when a node has been collapsed.</value>
-  </data>
-  <data name="TreeViewAfterEditDescr" xml:space="preserve">
+  </data><data name="TreeViewAfterEditDescr" xml:space="preserve">
     <value>Occurs when the text of a node has been edited by the user.</value>
-  </data>
-  <data name="TreeViewAfterExpandDescr" xml:space="preserve">
+  </data><data name="TreeViewAfterExpandDescr" xml:space="preserve">
     <value>Occurs when a node has been expanded.</value>
-  </data>
-  <data name="TreeViewAfterSelectDescr" xml:space="preserve">
+  </data><data name="TreeViewAfterSelectDescr" xml:space="preserve">
     <value>Occurs when the selection has been changed.</value>
-  </data>
-  <data name="TreeViewBeforeCheckDescr" xml:space="preserve">
+  </data><data name="TreeViewBeforeCheckDescr" xml:space="preserve">
     <value>Occurs when a check box on a tree node is about to be checked or unchecked.</value>
-  </data>
-  <data name="TreeViewBeforeCollapseDescr" xml:space="preserve">
+  </data><data name="TreeViewBeforeCollapseDescr" xml:space="preserve">
     <value>Occurs when a node is about to be collapsed.</value>
-  </data>
-  <data name="TreeViewBeforeEditDescr" xml:space="preserve">
+  </data><data name="TreeViewBeforeEditDescr" xml:space="preserve">
     <value>Occurs when the text of a node is about to be edited by the user.</value>
-  </data>
-  <data name="TreeViewBeforeExpandDescr" xml:space="preserve">
+  </data><data name="TreeViewBeforeExpandDescr" xml:space="preserve">
     <value>Occurs when a node is about to be expanded.</value>
-  </data>
-  <data name="TreeViewBeforeSelectDescr" xml:space="preserve">
+  </data><data name="TreeViewBeforeSelectDescr" xml:space="preserve">
     <value>Occurs when the selection is about to change.</value>
-  </data>
-  <data name="TreeViewCheckBoxesDescr" xml:space="preserve">
+  </data><data name="TreeViewCheckBoxesDescr" xml:space="preserve">
     <value>Indicates whether check boxes are displayed beside nodes.</value>
-  </data>
-  <data name="TreeViewDrawModeDescr" xml:space="preserve">
+  </data><data name="TreeViewDrawModeDescr" xml:space="preserve">
     <value>Controls whether the system or the user paints the nodes.</value>
-  </data>
-  <data name="TreeViewDrawNodeEventDescr" xml:space="preserve">
+  </data><data name="TreeViewDrawNodeEventDescr" xml:space="preserve">
     <value>Occurs in owner-draw mode, when a node needs to be drawn.</value>
-  </data>
-  <data name="TreeViewFullRowSelectDescr" xml:space="preserve">
+  </data><data name="TreeViewFullRowSelectDescr" xml:space="preserve">
     <value>Indicates whether the highlight spans the width of the TreeView.</value>
-  </data>
-  <data name="TreeViewHideSelectionDescr" xml:space="preserve">
+  </data><data name="TreeViewHideSelectionDescr" xml:space="preserve">
     <value>Removes highlight from the selected node when control does not have focus.</value>
-  </data>
-  <data name="TreeViewHotTrackingDescr" xml:space="preserve">
+  </data><data name="TreeViewHotTrackingDescr" xml:space="preserve">
     <value>Indicates whether nodes give feedback when the mouse is moved over them.</value>
-  </data>
-  <data name="TreeViewImageIndexDescr" xml:space="preserve">
+  </data><data name="TreeViewImageIndexDescr" xml:space="preserve">
     <value>The default image index for nodes.</value>
-  </data>
-  <data name="TreeViewImageKeyDescr" xml:space="preserve">
+  </data><data name="TreeViewImageKeyDescr" xml:space="preserve">
     <value>The default image key for nodes.</value>
-  </data>
-  <data name="TreeViewImageListDescr" xml:space="preserve">
+  </data><data name="TreeViewImageListDescr" xml:space="preserve">
     <value>The ImageList control from which node images are taken.</value>
-  </data>
-  <data name="TreeViewIndentDescr" xml:space="preserve">
+  </data><data name="TreeViewIndentDescr" xml:space="preserve">
     <value>The indentation width of child nodes in pixels.</value>
-  </data>
-  <data name="TreeViewItemHeightDescr" xml:space="preserve">
+  </data><data name="TreeViewItemHeightDescr" xml:space="preserve">
     <value>The height of every node in the TreeView.</value>
-  </data>
-  <data name="TreeViewLabelEditDescr" xml:space="preserve">
+  </data><data name="TreeViewLabelEditDescr" xml:space="preserve">
     <value>Indicates whether the user can edit the label text of nodes.</value>
-  </data>
-  <data name="TreeViewLineColorDescr" xml:space="preserve">
+  </data><data name="TreeViewLineColorDescr" xml:space="preserve">
     <value>The color of the lines that connect the nodes of the TreeView.</value>
-  </data>
-  <data name="TreeViewNodeLeadingDescr" xml:space="preserve">
+  </data><data name="TreeViewNodeLeadingDescr" xml:space="preserve">
     <value>The uniform row-height leading factor applied to all nodes.</value>
-  </data>
-  <data name="TreeViewNodeMouseClickDescr" xml:space="preserve">
+  </data><data name="TreeViewNodeMouseClickDescr" xml:space="preserve">
     <value>Occurs when a node is clicked with the mouse.</value>
-  </data>
-  <data name="TreeViewNodeMouseDoubleClickDescr" xml:space="preserve">
+  </data><data name="TreeViewNodeMouseDoubleClickDescr" xml:space="preserve">
     <value>Occurs when a node is double-clicked with the mouse.</value>
-  </data>
-  <data name="TreeViewNodeMouseHoverDescr" xml:space="preserve">
+  </data><data name="TreeViewNodeMouseHoverDescr" xml:space="preserve">
     <value>Occurs when the mouse hovers over a TreeNode.</value>
-  </data>
-  <data name="TreeViewNodesDescr" xml:space="preserve">
-    <value>The root nodes in the TreeView control.</value>
-  </data>
-  <data name="TreeViewNodeSorterDescr" xml:space="preserve">
+  </data><data name="TreeViewNodeSorterDescr" xml:space="preserve">
     <value>The sorting comparer for the TreeView.</value>
-  </data>
-  <data name="TreeViewOnNodeLeadingChangedDescr" xml:space="preserve">
+  </data><data name="TreeViewNodesDescr" xml:space="preserve">
+    <value>The root nodes in the TreeView control.</value>
+  </data><data name="TreeViewOnNodeLeadingChangedDescr" xml:space="preserve">
     <value>Occurs when the value of the NodeLeading property changes.</value>
-  </data>
-  <data name="TreeViewPathSeparatorDescr" xml:space="preserve">
+  </data><data name="TreeViewPathSeparatorDescr" xml:space="preserve">
     <value>The string delimiter used for the path returned by a node's FullPath property.</value>
-  </data>
-  <data name="TreeViewScrollableDescr" xml:space="preserve">
+  </data><data name="TreeViewScrollableDescr" xml:space="preserve">
     <value>Indicates whether the control will display scroll bars if it contains more nodes than can fit in the visible area.</value>
-  </data>
-  <data name="TreeViewSelectedImageIndexDescr" xml:space="preserve">
+  </data><data name="TreeViewSelectedImageIndexDescr" xml:space="preserve">
     <value>The default image index for selected nodes.</value>
-  </data>
-  <data name="TreeViewSelectedImageKeyDescr" xml:space="preserve">
+  </data><data name="TreeViewSelectedImageKeyDescr" xml:space="preserve">
     <value>The default image for selected nodes.</value>
-  </data>
-  <data name="TreeViewSelectedNodeDescr" xml:space="preserve">
+  </data><data name="TreeViewSelectedNodeDescr" xml:space="preserve">
     <value>The currently selected node, or null if no node is selected.</value>
-  </data>
-  <data name="TreeViewShowLinesDescr" xml:space="preserve">
+  </data><data name="TreeViewShowLinesDescr" xml:space="preserve">
     <value>Indicates whether lines are displayed between sibling nodes and between parent and child nodes.</value>
-  </data>
-  <data name="TreeViewShowPlusMinusDescr" xml:space="preserve">
+  </data><data name="TreeViewShowPlusMinusDescr" xml:space="preserve">
     <value>Indicates if plus/minus buttons are shown next to parent nodes.</value>
-  </data>
-  <data name="TreeViewShowRootLinesDescr" xml:space="preserve">
+  </data><data name="TreeViewShowRootLinesDescr" xml:space="preserve">
     <value>Indicates whether lines are displayed between root nodes.</value>
-  </data>
-  <data name="TreeViewShowShowNodeToolTipsDescr" xml:space="preserve">
+  </data><data name="TreeViewShowShowNodeToolTipsDescr" xml:space="preserve">
     <value>Indicates whether ToolTips will be displayed on the nodes.</value>
-  </data>
-  <data name="TreeViewSortedDescr" xml:space="preserve">
+  </data><data name="TreeViewSortedDescr" xml:space="preserve">
     <value>Indicates whether nodes are sorted.</value>
-  </data>
-  <data name="TreeViewStateImageListDescr" xml:space="preserve">
+  </data><data name="TreeViewStateImageListDescr" xml:space="preserve">
     <value>The ImageList control used by the TreeView for custom states.</value>
-  </data>
-  <data name="TreeViewTopNodeDescr" xml:space="preserve">
+  </data><data name="TreeViewTopNodeDescr" xml:space="preserve">
     <value>The first visible node in the TreeView.</value>
-  </data>
-  <data name="TreeViewVisibleCountDescr" xml:space="preserve">
+  </data><data name="TreeViewVisibleCountDescr" xml:space="preserve">
     <value>The number of visible nodes in the TreeView.</value>
-  </data>
-  <data name="TypedControlCollectionShouldBeOfType" xml:space="preserve">
-    <value>Controls added to this collection must be of type '{0}'.</value>
-  </data>
-  <data name="TypedControlCollectionShouldBeOfTypes" xml:space="preserve">
-    <value>Controls added to this collection must be of type '{0}' or '{1}'.</value>
-  </data>
-  <data name="TYPEINFOPROCESSORGetDocumentationFailed" xml:space="preserve">
-    <value>ITypeInfo::GetDocumentation for DISPID 0x{0:X} returned hr=0x{1:X}, which will cause this property to be ignored. S_OK must be returned. Component={2}</value>
-  </data>
-  <data name="TYPEINFOPROCESSORGetRefTypeInfoFailed" xml:space="preserve">
-    <value>ITypeInfo::GetRefTypeInfo returned hr={0:X}, so the data type cannot be retrieved.</value>
-  </data>
-  <data name="TYPEINFOPROCESSORGetTypeAttrFailed" xml:space="preserve">
-    <value>ITypeInfo::GetTypeAttr returned hr={0:X}, so the data type cannot be retrieved.</value>
-  </data>
-  <data name="TypeLoadException" xml:space="preserve">
+  </data><data name="TypeLoadException" xml:space="preserve">
     <value>Type {0} in the data at line {1}, position {2} cannot be located.</value>
-  </data>
-  <data name="TypeLoadExceptionShort" xml:space="preserve">
+  </data><data name="TypeLoadExceptionShort" xml:space="preserve">
     <value>Type {0} cannot be located.</value>
-  </data>
-  <data name="UnableToInitComponent" xml:space="preserve">
+  </data><data name="TypedControlCollectionShouldBeOfType" xml:space="preserve">
+    <value>Controls added to this collection must be of type '{0}'.</value>
+  </data><data name="TypedControlCollectionShouldBeOfTypes" xml:space="preserve">
+    <value>Controls added to this collection must be of type '{0}' or '{1}'.</value>
+  </data><data name="UnableToInitComponent" xml:space="preserve">
     <value>Unable to initialize component.</value>
-  </data>
-  <data name="UnableToSetPanelText" xml:space="preserve">
+  </data><data name="UnableToSetPanelText" xml:space="preserve">
     <value>Unable to set the panel text.</value>
-  </data>
-  <data name="UnknownAttr" xml:space="preserve">
+  </data><data name="UnexpectedClipboardType" xml:space="preserve">
+    <value>Clipboard contains an unexpected type.</value>
+  </data><data name="UnexpectedTypeForClipboardFormat" xml:space="preserve">
+    <value>The specified Clipboard format is not compatible with '{0}' type.</value>
+  </data><data name="UnknownAttr" xml:space="preserve">
     <value>Unknown ATTRIBUTE type.</value>
-  </data>
-  <data name="UnknownInputLanguageLayout" xml:space="preserve">
+  </data><data name="UnknownInputLanguageLayout" xml:space="preserve">
     <value>Unknown layout</value>
-  </data>
-  <data name="UnsafeNativeMethodsNotImplemented" xml:space="preserve">
+  </data><data name="UnsafeNativeMethodsNotImplemented" xml:space="preserve">
     <value>Not implemented.</value>
-  </data>
-  <data name="UpDownBaseAlignmentDescr" xml:space="preserve">
+  </data><data name="UpDownBaseAlignmentDescr" xml:space="preserve">
     <value>Indicates how the up-down control will position the up and down buttons relative to its edit box.</value>
-  </data>
-  <data name="UpDownBaseBorderStyleDescr" xml:space="preserve">
+  </data><data name="UpDownBaseBorderStyleDescr" xml:space="preserve">
     <value>Indicates the border style of the up-down control.</value>
-  </data>
-  <data name="UpDownBaseDownButtonAccName" xml:space="preserve">
+  </data><data name="UpDownBaseDownButtonAccName" xml:space="preserve">
     <value>Down</value>
-  </data>
-  <data name="UpDownBaseInterceptArrowKeysDescr" xml:space="preserve">
+  </data><data name="UpDownBaseInterceptArrowKeysDescr" xml:space="preserve">
     <value>Indicates whether the up-down control will increment and decrement the value when the UP ARROW and DOWN ARROW keys are pressed.</value>
-  </data>
-  <data name="UpDownBasePreferredHeightDescr" xml:space="preserve">
+  </data><data name="UpDownBasePreferredHeightDescr" xml:space="preserve">
     <value>The preferred height of this control.</value>
-  </data>
-  <data name="UpDownBaseReadOnlyDescr" xml:space="preserve">
+  </data><data name="UpDownBaseReadOnlyDescr" xml:space="preserve">
     <value>Indicates whether the edit box is read-only.</value>
-  </data>
-  <data name="UpDownBaseTextAlignDescr" xml:space="preserve">
+  </data><data name="UpDownBaseTextAlignDescr" xml:space="preserve">
     <value>Indicates how the text should be aligned in the edit box.</value>
-  </data>
-  <data name="UpDownBaseUpButtonAccName" xml:space="preserve">
+  </data><data name="UpDownBaseUpButtonAccName" xml:space="preserve">
     <value>Up</value>
-  </data>
-  <data name="UseCompatibleTextRenderingDescr" xml:space="preserve">
+  </data><data name="UpDownEditLocalizedControlTypeName" xml:space="preserve">
+    <value>Edit</value>
+  </data><data name="UseCompatibleTextRenderingDescr" xml:space="preserve">
     <value>Specifies whether text rendering should be compatible with previous releases of Windows Forms.</value>
-  </data>
-  <data name="UserControlBorderStyleDescr" xml:space="preserve">
+  </data><data name="UserControlBorderStyleDescr" xml:space="preserve">
     <value>Indicates whether the panel should have a border.</value>
-  </data>
-  <data name="UserControlOnLoadDescr" xml:space="preserve">
+  </data><data name="UserControlOnLoadDescr" xml:space="preserve">
     <value>Occurs whenever the user control loads.</value>
-  </data>
-  <data name="valueChangedEventDescr" xml:space="preserve">
-    <value>Occurs when the value of the control changes.</value>
-  </data>
-  <data name="VisualStyleHandleCreationFailed" xml:space="preserve">
+  </data><data name="VScrollBarDefaultAccessibleName" xml:space="preserve">
+    <value>Vertical</value>
+  </data><data name="VisualStyleHandleCreationFailed" xml:space="preserve">
     <value>Visual Style handle creation operation did not succeed.</value>
-  </data>
-  <data name="VisualStyleNotActive" xml:space="preserve">
+  </data><data name="VisualStyleNotActive" xml:space="preserve">
     <value>Visual Styles-related operation resulted in an error because no visual style is currently active.</value>
-  </data>
-  <data name="VisualStylesDisabledInClientArea" xml:space="preserve">
+  </data><data name="VisualStylesDisabledInClientArea" xml:space="preserve">
     <value>Visual Styles-related operation resulted in an error because visual styles are currently disabled in the client area.</value>
-  </data>
-  <data name="VisualStylesInvalidCombination" xml:space="preserve">
+  </data><data name="VisualStylesInvalidCombination" xml:space="preserve">
     <value>Given combination of Class, Part, and State is not defined by the current visual style.</value>
-  </data>
-  <data name="WebBrowserAllowDropNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserAllowDropNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support AllowDrop.  Use AllowWebBrowserDrop to allow the WebBrowser to process drag/drop.</value>
-  </data>
-  <data name="WebBrowserAllowNavigationDescr" xml:space="preserve">
+  </data><data name="WebBrowserAllowNavigationDescr" xml:space="preserve">
     <value>Specifies whether the WebBrowser control can browse to another page after initially loading.</value>
-  </data>
-  <data name="WebBrowserAllowWebBrowserDropDescr" xml:space="preserve">
+  </data><data name="WebBrowserAllowWebBrowserDropDescr" xml:space="preserve">
     <value>Specifies whether the WebBrowser control will receive drop notifications.</value>
-  </data>
-  <data name="WebBrowserBackgroundImageLayoutNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserBackgroundImageLayoutNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support the BackgroundImageLayout property.</value>
-  </data>
-  <data name="WebBrowserBackgroundImageNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserBackgroundImageNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support the BackgroundImage property.</value>
-  </data>
-  <data name="WebBrowserCanGoBackChangedDescr" xml:space="preserve">
+  </data><data name="WebBrowserCanGoBackChangedDescr" xml:space="preserve">
     <value>Occurs when the availability of a previous page in the Web browser navigation history changes.  </value>
-  </data>
-  <data name="WebBrowserCanGoForwardChangedDescr" xml:space="preserve">
+  </data><data name="WebBrowserCanGoForwardChangedDescr" xml:space="preserve">
     <value>Occurs when the availability of a next page in the Web browser navigation history changes.  </value>
-  </data>
-  <data name="WebBrowserCursorNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserCursorNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support the Cursor property.</value>
-  </data>
-  <data name="WebBrowserDocumentCompletedDescr" xml:space="preserve">
+  </data><data name="WebBrowserDocumentCompletedDescr" xml:space="preserve">
     <value>Occurs when the document hosted in the Web browser control is fully loaded.</value>
-  </data>
-  <data name="WebBrowserDocumentTitleChangedDescr" xml:space="preserve">
+  </data><data name="WebBrowserDocumentTitleChangedDescr" xml:space="preserve">
     <value>Occurs whenever the title text changes.</value>
-  </data>
-  <data name="WebBrowserEnabledNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserEnabledNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support the Enabled property.</value>
-  </data>
-  <data name="WebBrowserEncryptionLevelChangedDescr" xml:space="preserve">
+  </data><data name="WebBrowserEncryptionLevelChangedDescr" xml:space="preserve">
     <value>Occurs whenever encryption level changes.</value>
-  </data>
-  <data name="WebBrowserFileDownloadDescr" xml:space="preserve">
+  </data><data name="WebBrowserFileDownloadDescr" xml:space="preserve">
     <value>Occurs when a file download occurs.</value>
-  </data>
-  <data name="WebBrowserIsOfflineDescr" xml:space="preserve">
+  </data><data name="WebBrowserIsOfflineDescr" xml:space="preserve">
     <value>Determines whether the Web browser control operates in offline mode.</value>
-  </data>
-  <data name="WebBrowserIsWebBrowserContextMenuEnabledDescr" xml:space="preserve">
+  </data><data name="WebBrowserIsWebBrowserContextMenuEnabledDescr" xml:space="preserve">
     <value>Indicates whether to use the context menu of the native web browser.</value>
-  </data>
-  <data name="WebBrowserNavigateAbsoluteUri" xml:space="preserve">
+  </data><data name="WebBrowserNavigateAbsoluteUri" xml:space="preserve">
     <value>Navigation to a relative URL unsuccessful.</value>
-  </data>
-  <data name="WebBrowserNavigatedDescr" xml:space="preserve">
+  </data><data name="WebBrowserNavigatedDescr" xml:space="preserve">
     <value>Occurs after WebBrowser navigation occurs.</value>
-  </data>
-  <data name="WebBrowserNavigatingDescr" xml:space="preserve">
+  </data><data name="WebBrowserNavigatingDescr" xml:space="preserve">
     <value>Occurs before WebBrowser navigation occurs.</value>
-  </data>
-  <data name="WebBrowserNewWindowDescr" xml:space="preserve">
+  </data><data name="WebBrowserNewWindowDescr" xml:space="preserve">
     <value>Occurs when a new window is created for the WebBrowser.</value>
-  </data>
-  <data name="WebBrowserNoCastToIWebBrowser2" xml:space="preserve">
+  </data><data name="WebBrowserNoCastToIWebBrowser2" xml:space="preserve">
     <value>IWebBrowser2 get from the native ActiveX control did not succeed.</value>
-  </data>
-  <data name="WebBrowserObjectForScriptingComVisibleOnly" xml:space="preserve">
+  </data><data name="WebBrowserObjectForScriptingComVisibleOnly" xml:space="preserve">
     <value>ObjectForScripting's class must be visible to COM.  Verify that the object is public, or consider adding the ComVisible attribute to your class.</value>
-  </data>
-  <data name="WebBrowserProgressChangedDescr" xml:space="preserve">
+  </data><data name="WebBrowserProgressChangedDescr" xml:space="preserve">
     <value>Occurs when an update to the progress of a download occurs.</value>
-  </data>
-  <data name="WebBrowserRightToLeftNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserRightToLeftNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support the RightToLeft property.</value>
-  </data>
-  <data name="WebBrowserScriptErrorsSuppressedDescr" xml:space="preserve">
+  </data><data name="WebBrowserScriptErrorsSuppressedDescr" xml:space="preserve">
     <value>Specifies whether the WebBrowser control shows script errors in dialogs boxes.</value>
-  </data>
-  <data name="WebBrowserScrollBarsEnabledDescr" xml:space="preserve">
+  </data><data name="WebBrowserScrollBarsEnabledDescr" xml:space="preserve">
     <value>Specifies whether the WebBrowser control should have scrollbars or not.</value>
-  </data>
-  <data name="WebBrowserSecurityLevelDescr" xml:space="preserve">
+  </data><data name="WebBrowserSecurityLevelDescr" xml:space="preserve">
     <value>The level of security permissions the hosted documents are granted.</value>
-  </data>
-  <data name="WebBrowserStatusTextChangedDescr" xml:space="preserve">
+  </data><data name="WebBrowserStatusTextChangedDescr" xml:space="preserve">
     <value>Occurs whenever the status text changes.</value>
-  </data>
-  <data name="WebBrowserTextNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserTextNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support the Text property.</value>
-  </data>
-  <data name="WebBrowserUrlDescr" xml:space="preserve">
+  </data><data name="WebBrowserUrlDescr" xml:space="preserve">
     <value>Specifies the URL that the Web browser control has navigated to.</value>
-  </data>
-  <data name="WebBrowserUseWaitCursorNotSupported" xml:space="preserve">
+  </data><data name="WebBrowserUseWaitCursorNotSupported" xml:space="preserve">
     <value>The WebBrowser control does not support the UseWaitCursor property.</value>
-  </data>
-  <data name="WebBrowserWebBrowserShortcutsEnabledDescr" xml:space="preserve">
+  </data><data name="WebBrowserWebBrowserShortcutsEnabledDescr" xml:space="preserve">
     <value>Specifies whether some accelerator keys are enabled in the WebBrowser control.</value>
-  </data>
-  <data name="WidthGreaterThanMinWidth" xml:space="preserve">
+  </data><data name="WidthGreaterThanMinWidth" xml:space="preserve">
     <value>Width must be greater than MinWidth.</value>
-  </data>
-  <data name="Win32WindowAlreadyCreated" xml:space="preserve">
-    <value>{0} must be called before the first IWin32Window object is created in the application.</value>
-  </data>
-  <data name="WindowsFormsSetEvent" xml:space="preserve">
-    <value>Setting event '{0}'</value>
-  </data>
-  <data name="ControlOnDpiChangedBeforeParentDescr" xml:space="preserve">
-    <value>Occurs when the top level parent of this control is moved to a monitor with a different resolution and scaling level, or when parent's monitor scaling level is changed in Windows settings. Child windows receive this message before parent window receives DpiChanged event.</value>
-  </data>
-  <data name="ControlOnDpiChangedAfterParentDescr" xml:space="preserve">
-    <value>Occurs when the top level parent of this control is moved to a monitor with a different resolution and scaling level, or when parent's monitor scaling level is changed in Windows settings. Child windows receive this message after parent window receives DpiChanged event.</value>
-  </data>
-  <data name="FormOnDpiChangedDescr" xml:space="preserve">
-    <value>Occurs when form is moved to a monitor with a different resolution and scaling level, or when form's monitor scaling level is changed in the Windows settings.</value>
-  </data>
-  <data name="FormOnSystemTextSizeChangedDescr" xml:space="preserve">
-    <value>Occurs when the Windows Accessibility text size setting changes for this top-level form.</value>
-  </data>
-  <data name="MDIChildSystemMenuItemAccessibleName" xml:space="preserve">
-    <value>System</value>
-  </data>
-  <data name="MonthCalendarSingleDateSelected" xml:space="preserve">
-    <value> {0} selected.</value>
-  </data>
-  <data name="MonthCalendarSingleYearSelected" xml:space="preserve">
-    <value>Year {0} selected.</value>
-  </data>
-  <data name="MonthCalendarYearRangeSelected" xml:space="preserve">
-    <value>Year {0} to {1} selected.</value>
-  </data>
-  <data name="MonthCalendarSingleDecadeSelected" xml:space="preserve">
-    <value>Decade {0} selected.</value>
-  </data>
-  <data name="MonthCalendarRangeSelected" xml:space="preserve">
-    <value> {0} to {1} selected.</value>
-  </data>
-  <data name="PropertyGridDropDownButtonComboBoxAccessibleName" xml:space="preserve">
-    <value>Open</value>
-  </data>
-  <data name="CombinationOfAccessibilitySwitchesNotSupported" xml:space="preserve">
-    <value>Desktop applications are required to opt in to all earlier accessibility improvements to get the later improvements. To do this, ensure that if the AppContext switch 'Switch.UseLegacyAccessibilityFeatures.N' is set to 'false', then 'Switch.UseLegacyAccessibilityFeatures' and all 'Switch.UseLegacyAccessibilityFeatures.M' switches, when M &lt; N, evaluate to false as well. Note that, if a switch for a particular set of accessibility improvements is not present, its value is determined by the target framework version. You can remedy this by adding these switches and setting their value to false.</value>
-  </data>
-  <data name="DateTimePickerLocalizedControlType" xml:space="preserve">
-    <value>date and time picker</value>
-  </data>
-  <data name="LiveRegionAutomationLiveSettingDescr" xml:space="preserve">
-    <value>The politeness level that a client should use to notify the user of changes to this live region.</value>
-  </data>
-  <data name="AccessibleObjectLiveRegionNotSupported" xml:space="preserve">
-    <value>The corresponding UI element is not a live region.</value>
-  </data>
-  <data name="OwnerControlIsNotALiveRegion" xml:space="preserve">
-    <value>Owner control of the accessible object must implement IAutomationLiveRegion interface.</value>
-  </data>
-  <data name="StandardOleMarshalObjectGetMarshalerFailed" xml:space="preserve">
-    <value>Failed to get marshaler for IID {0}.</value>
-  </data>
-  <data name="NotSortedAccessibleStatus" xml:space="preserve">
-    <value>Not sorted.</value>
-  </data>
-  <data name="SortedAscendingAccessibleStatus" xml:space="preserve">
-    <value>Sorted ascending.</value>
-  </data>
-  <data name="SortedDescendingAccessibleStatus" xml:space="preserve">
-    <value>Sorted descending.</value>
-  </data>
-  <data name="DataGridViewSortedAscendingAccessibleStatusFormat" xml:space="preserve">
-    <value>Sorted ascending by {0}.</value>
-  </data>
-  <data name="DataGridViewSortedDescendingAccessibleStatusFormat" xml:space="preserve">
-    <value>Sorted descending by {0}.</value>
-  </data>
-  <data name="PropertyGridPropertyValueSelectedFormat" xml:space="preserve">
-    <value>{0} selected.</value>
-  </data>
-  <data name="KeyboardToolTipDisplayBehaviorRequiresAccessibilityImprovementsLevel3" xml:space="preserve">
-    <value>ToolTips display on keyboard focus requires the following AppContextSwitchOverrides: 'Switch.UseLegacyAccessibilityFeatures.3' and 'Switch.System.Windows.Forms.UseLegacyToolTipDisplay'</value>
-  </data>
-  <data name="ControlDpiChangeScale" xml:space="preserve">
-    <value>Enable or disable automatic scaling of this control when dpi changes.</value>
-  </data>
-  <data name="DataGridViewEditingPanelUiaProviderDescription" xml:space="preserve">
-    <value>DataGridView EditingPanel UI Automation provider</value>
-  </data>
-  <data name="ComboBoxValueSelectedFormat" xml:space="preserve">
-    <value>{0} selected</value>
-  </data>
-  <data name="UnexpectedClipboardType" xml:space="preserve">
-    <value>Clipboard contains an unexpected type.</value>
-  </data>
-  <data name="UnexpectedTypeForClipboardFormat" xml:space="preserve">
-    <value>The specified Clipboard format is not compatible with '{0}' type.</value>
-  </data>
-  <data name="FolderBrowserDialogUseDescriptionForTitle" xml:space="preserve">
-    <value>A value that indicates whether to use the value of the Description property as the dialog title for Vista style dialogs. This property has no effect on old style dialogs.</value>
-  </data>
-  <data name="TextBoxPlaceholderTextDescr" xml:space="preserve">
-    <value>Specifies the PlaceholderText of the TextBox control. The PlaceholderText is displayed in the control when the Text property is null or empty and can be used to guide the user what input is expected by the control. </value>
-  </data>
-  <data name="TreeNodeCircularReference" xml:space="preserve">
-    <value>A circular reference has been made. A TreeNode cannot be added as a descendant of itself.</value>
-  </data>
-  <data name="DefaultNumericUpDownAccessibleName" xml:space="preserve">
-    <value>NumericUpDown</value>
-  </data>
-  <data name="DefaultUpDownButtonsAccessibleName" xml:space="preserve">
-    <value>UpDown</value>
-  </data>
-  <data name="Win32SetParentFailed" xml:space="preserve">
+  </data><data name="Win32SetParentFailed" xml:space="preserve">
     <value>Failed to set Win32 parent window of the Control.</value>
-  </data>
-  <data name="ErrorProviderDefaultAccessibleName" xml:space="preserve">
-    <value>Error provider</value>
-  </data>
-  <data name="PropertyGridEntryValuesListDefaultAccessibleName" xml:space="preserve">
-    <value>Available values</value>
-  </data>
-  <data name="TaskDialogButtonTextMustNotBeNull" xml:space="preserve">
-    <value>The text of a custom button must not be null or an empty string.</value>
-  </data>
-  <data name="TaskDialogCannotNavigateClosedDialog" xml:space="preserve">
-    <value>Cannot navigate the dialog when it has already closed.</value>
-  </data>
-  <data name="TaskDialogCannotNavigateWithinNavigationEventHandler" xml:space="preserve">
-    <value>Cannot navigate the dialog from an event handler that is called from within navigation.</value>
-  </data>
-  <data name="TaskDialogCannotNavigateWithinRadioButtonCheckedChanged" xml:space="preserve">
-    <value>Cannot navigate the dialog from within the {0} event of one of the radio buttons of the current task dialog.</value>
-  </data>
-  <data name="TaskDialogCannotNavigateWithoutDialog" xml:space="preserve">
-    <value>Cannot navigate from a page not bound to a dialog.</value>
-  </data>
-  <data name="TaskDialogCannotRemoveProgressBarWhileDialogIsShown" xml:space="preserve">
-    <value>Cannot remove the progress bar while the task dialog is shown.</value>
-  </data>
-  <data name="TaskDialogCannotSetPropertyOfBoundPage" xml:space="preserve">
-    <value>Cannot set this property or call this method while the page is bound to a task dialog.</value>
-  </data>
-  <data name="TaskDialogCannotSetPropertyOfShownDialog" xml:space="preserve">
-    <value>Cannot set this property while the task dialog is shown.</value>
-  </data>
-  <data name="TaskDialogCannotSetRadioButtonCheckedWithinCheckedChangedEvent" xml:space="preserve">
-    <value>Cannot set the {0} property from within the {1} event of one of the radio buttons of the current task dialog.</value>
-  </data>
-  <data name="TaskDialogCannotUncheckRadioButtonWhileBound" xml:space="preserve">
-    <value>Cannot uncheck a radio button while it is bound to a task dialog.</value>
-  </data>
-  <data name="TaskDialogCannotUpdateAfterNavigation" xml:space="preserve">
-    <value>Cannot manipulate the task dialog immediately after navigating it. Please wait for the {0} event of the next page to occur.</value>
-  </data>
-  <data name="TaskDialogCannotUpdateIconType" xml:space="preserve">
-    <value>Cannot update the icon from a handle icon type to a non-handle icon type, and vice versa.</value>
-  </data>
-  <data name="TaskDialogCanUpdateStateOnlyWhenShown" xml:space="preserve">
-    <value>Can only update the state of a task dialog while it is shown.</value>
-  </data>
-  <data name="HScrollBarDefaultAccessibleName" xml:space="preserve">
-    <value>Horizontal</value>
-  </data>
-  <data name="VScrollBarDefaultAccessibleName" xml:space="preserve">
-    <value>Vertical</value>
-  </data>
-  <data name="TaskDialogCollectionAlreadyBound" xml:space="preserve">
-    <value>One of the collections of this {0} is already bound to a {1} instance.</value>
-  </data>
-  <data name="TaskDialogControlAlreadyAddedToCollection" xml:space="preserve">
-    <value>This control has already been added to the collection.</value>
-  </data>
-  <data name="TaskDialogControlAlreadyBound" xml:space="preserve">
-    <value>One of the controls of this {0} is already bound to a {1} instance.</value>
-  </data>
-  <data name="TaskDialogControlIsPartOfOtherCollection" xml:space="preserve">
-    <value>This control is already part of a different collection.</value>
-  </data>
-  <data name="TaskDialogControlNotBound" xml:space="preserve">
-    <value>This control is not currently bound to a task dialog.</value>
-  </data>
-  <data name="TaskDialogControlNotCreated" xml:space="preserve">
-    <value>The control has not been created.</value>
-  </data>
-  <data name="TaskDialogInstanceAlreadyShown" xml:space="preserve">
-    <value>This {0} instance is already being shown.</value>
-  </data>
-  <data name="TaskDialogNavigationNotCompleted" xml:space="preserve">
-    <value>Navigation of the task dialog did not complete yet. Please wait for the {0} event to occur.</value>
-  </data>
-  <data name="TaskDialogVisualStylesNotEnabled" xml:space="preserve">
-    <value>Visual styles are not enabled. Please call {0} before showing the task dialog.</value>
-  </data>
-  <data name="TaskDialogDefaultButtonMustExistInCollection" xml:space="preserve">
-    <value>The default button must exist in the buttons collection.</value>
-  </data>
-  <data name="TaskDialogOnlySingleRadioButtonCanBeChecked" xml:space="preserve">
-    <value>Only a single radio button can be set as checked.</value>
-  </data>
-  <data name="TaskDialogPageIsAlreadyBound" xml:space="preserve">
-    <value>This {0} instance is already bound to a {1} instance.</value>
-  </data>
-  <data name="TaskDialogRadioButtonTextMustNotBeNull" xml:space="preserve">
-    <value>The text of a radio button must not be null or an empty string.</value>
-  </data>
-  <data name="TaskDialogTooManyButtonsAdded" xml:space="preserve">
-    <value>Too many custom buttons or radio buttons have been added.</value>
-  </data>
-  <data name="TaskDialogCannotSetTextForStandardButton" xml:space="preserve">
-    <value>Cannot set the text for a standard button.</value>
-  </data>
-  <data name="TaskDialogCannotShowCustomButtonsAndCommandLinks" xml:space="preserve">
-    <value>Cannot show both custom buttons and command links at the same time.</value>
-  </data>
-  <data name="WindowSubclassHandlerWndProcIsNotExceptedOne" xml:space="preserve">
+  </data><data name="Win32WindowAlreadyCreated" xml:space="preserve">
+    <value>{0} must be called before the first IWin32Window object is created in the application.</value>
+  </data><data name="WindowSubclassHandlerWndProcIsNotExceptedOne" xml:space="preserve">
     <value>The current window procedure is not the expected one.</value>
-  </data>
-  <data name="ListViewGroupCollapsedStateChangedDescr" xml:space="preserve">
-    <value>Event raised when the CollapsedState property of a ListViewGroup changes.</value>
-  </data>
-  <data name="ListViewGroupTaskLinkClickDescr" xml:space="preserve">
-    <value>Event raised when the TaskLink property of a ListViewGroup is clicked.</value>
-  </data>
-  <data name="InputLanguageCultureNotFound" xml:space="preserve">
-    <value>Could not find an InputLanguage for culture '{0}'.</value>
-  </data>
-  <data name="ListViewGroupImageListDescr" xml:space="preserve">
-    <value>The ImageList control used by the ListView for ListViewGroup images in all views.</value>
-  </data>
-  <data name="ConstructorArgumentInvalidValueType" xml:space="preserve">
-    <value>Argument '{0}' cannot be converted to type '{1}'.</value>
-  </data>
-  <data name="TextFormatFlagsModifyStringNotAllowed" xml:space="preserve">
-    <value>TextFormatFlags.ModifyString is not allowed.</value>
-  </data>
-  <data name="AccessibleActionDoubleClick" xml:space="preserve">
-    <value>Double Click</value>
-  </data>
-  <data name="InvalidHdcType" xml:space="preserve">
-    <value>Invalid HDC type: {0}</value>
-  </data>
-  <data name="PropertyGridViewDropDownControlHolderAccessibleName" xml:space="preserve">
-    <value>Drop down control holder</value>
-  </data>
-  <data name="UpDownEditLocalizedControlTypeName" xml:space="preserve">
-    <value>Edit</value>
-  </data>
-  <data name="DataGridView_RowAddedNotification" xml:space="preserve">
-    <value>Row {0} is added</value>
-  </data>
-  <data name="TreeNodeBoundToAnotherTreeView" xml:space="preserve">
-    <value>The TreeNode is already bound to another TreeView. You must first remove it from its current location or clone it.</value>
-  </data>
-  <data name="ComboboxDropDownButtonCloseName" xml:space="preserve">
-    <value>Close</value>
-  </data>
-  <data name="ComboboxDropDownButtonOpenName" xml:space="preserve">
-    <value>Open</value>
-  </data>
-  <data name="CalendarPreviousButtonAccessibleObjectDescription" xml:space="preserve">
-    <value>Go to previous time frame</value>
-  </data>
-  <data name="CalendarNextButtonAccessibleObjectDescription" xml:space="preserve">
-    <value>Go to next time frame</value>
-  </data>
-  <data name="CalendarTodayLinkAccessibleObjectDescription" xml:space="preserve">
-    <value>Go to and select today's date</value>
-  </data>
-  <data name="MonthCalendarWeekNumberDescription" xml:space="preserve">
-    <value>Week {0}</value>
-  </data>
-  <data name="ListViewItemAccessibilityObjectInvalidViewException" xml:space="preserve">
-    <value>The current accessibility object is only for the ListView in {0} view</value>
-  </data>
-  <data name="TrackBarLargeDecreaseButtonName" xml:space="preserve">
-    <value>Large decrease</value>
-  </data>
-  <data name="TrackBarLargeIncreaseButtonName" xml:space="preserve">
-    <value>Large increase</value>
-  </data>
-  <data name="TrackBarPositionButtonName" xml:space="preserve">
-    <value>Position</value>
-  </data>
-  <data name="ProfessionalColorsStatusStripBorderDescr" xml:space="preserve">
-    <value>Border color to use on the top edge of the StatusStrip.</value>
-  </data>
-  <data name="ListViewCannotAddGroupsToVirtualListView" xml:space="preserve">
-    <value>You cannot add groups to the ListView groups collection when the ListView is in virtual mode.</value>
-  </data>
-  <data name="ParentPropertyNotSetInGetNextControl" xml:space="preserve">
-    <value>{0} property should be set for {1}.</value>
-  </data>
-  <data name="ControlsPropertyNotSetInGetNextControl" xml:space="preserve">
-    <value>{0} property should be set for {1}.</value>
-  </data>
-  <data name="ControlsCollectionShouldNotBeEmptyInGetNextControl" xml:space="preserve">
-    <value>{0} collection shouldn't be empty for {1}.</value>
-  </data>
-  <data name="AccessibleObjectRuntimeIdNotSupported" xml:space="preserve">
-    <value>{0} doesn't support {1} property. It must be overriden in the derived class.</value>
-  </data>
-  <data name="ListViewGroupCollapsedStateName" xml:space="preserve">
-    <value>{0}, group, collapsed</value>
-  </data>
-  <data name="ListViewGroupExpandedStateName" xml:space="preserve">
-    <value>{0}, group, expanded</value>
-  </data>
-  <data name="CategoryPropertyGridLocalizedControlType" xml:space="preserve">
-    <value>PropertyGrid category</value>
-  </data>
-  <data name="FileDialogAddToRecentDescr" xml:space="preserve">
-    <value>Controls whether to add the file being opened or saved to the recent list.</value>
-  </data>
-  <data name="FileDialogShowHiddenFilesDescr" xml:space="preserve">
-    <value>Controls whether the dialog box displays hidden and system files.</value>
-  </data>
-  <data name="SaveFileDialogCheckWriteAccess" xml:space="preserve">
-    <value>Controls whether the dialog box verifies if the creation of the specified file will be successful.</value>
-  </data>
-  <data name="SaveFileDialogExpandedMode" xml:space="preserve">
-    <value>Controls whether the dialog box is always opened in the expanded mode.</value>
-  </data>
-  <data name="FileDialogOkRequiresInteractionDescr" xml:space="preserve">
-    <value>Controls whether the OK button of the dialog box is disabled until the user navigates the view or edits the filename (if applicable). Note: Disabling of the OK button does not prevent the dialog from being submitted by the Enter key.</value>
-  </data>
-  <data name="OpenFileDialogSelectReadOnlyDescr" xml:space="preserve">
-    <value>Controls whether the dialog box allows to select read-only files.</value>
-  </data>
-  <data name="FileDialogShowPinnedPlacesDescr" xml:space="preserve">
-    <value>Controls whether the items shown by default in the view's navigation pane are shown.</value>
-  </data>
-  <data name="OpenFileDialogShowPreviewDescr" xml:space="preserve">
-    <value>Controls whether the dialog box shows a preview for selected files.</value>
-  </data>
-  <data name="FolderBrowserDialogAddToRecent" xml:space="preserve">
-    <value>Controls whether the dialog box adds the folder being selected to the recent list.</value>
-  </data>
-  <data name="FolderBrowserDialogOkRequiresInteraction" xml:space="preserve">
-    <value>Controls whether the OK button of the dialog box is disabled until the user navigates the view or edits the filename (if applicable). Note: Disabling of the OK button does not prevent the dialog from being submitted by the Enter key.</value>
-  </data>
-  <data name="FolderBrowserDialogShowHiddenFiles" xml:space="preserve">
-    <value>Controls whether the dialog box displays hidden and system files.</value>
-  </data>
-  <data name="FolderBrowserDialogShowPinnedPlaces" xml:space="preserve">
-    <value>Controls whether the items shown by default in the view's navigation pane are shown.</value>
-  </data>
-  <data name="EditDefaultAccessibleName" xml:space="preserve">
-    <value>Spinner</value>
-  </data>
-  <data name="ExpandedStateName" xml:space="preserve">
-    <value>Expanded</value>
-  </data>
-  <data name="ToolStripItemOnCommandChangedDescr" xml:space="preserve">
-    <value>Occurs whenever the bindable command changes.</value>
-  </data>
-  <data name="ToolStripItemOnBindingContextChangedDescr" xml:space="preserve">
-    <value>Occurs whenever the binding context changes.</value>
-  </data>
-  <data name="CommandComponentCommandDescr" xml:space="preserve">
-    <value>Gets or sets the ICommand object whose Execute delegate gets executed whenever the Click event of this component gets invoked.</value>
-  </data>
-  <data name="ToolStripItemBindingContextDescr" xml:space="preserve">
-    <value>Gets or sets the BindingContext for this toolstrip item.</value>
-  </data>
-  <data name="ListViewItemAccessibilityObjectRequiresListView" xml:space="preserve">
-    <value>Cannot get accessiblity object when ListViewItem is not attached to a ListView.</value>
-  </data>
-  <data name="BindableComponentBindingContextChangedDescr" xml:space="preserve">
-    <value>Occurs when the binding context has changed.</value>
-  </data>
-  <data name="BindingComponentBindingContextDescr" xml:space="preserve">
-    <value>Gets or sets the BindingContext for this bindable Component.</value>
-  </data>
-  <data name="CommandCanExecuteChangedEventDescr" xml:space="preserve">
-    <value>Occurs when the ICommand.CanExecute(object?) status of the command which is assigned to the Command property has changed.</value>
-  </data>
-  <data name="CommandChangedEventDescr" xml:space="preserve">
-    <value>Occurs when the assigned ICommand object of the Command property has changed.</value>
-  </data>
-  <data name="CommandParameterChangedEventDescr" xml:space="preserve">
-    <value>Occurs when the value of the CommandParameter property has changed.</value>
-  </data>
-  <data name="ControlDataContextChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the DataContext property changes.</value>
-  </data>
-  <data name="ControlVisualStylesModeDescr" xml:space="preserve">
-    <value>Determines how the control renders itself when visual styles are applied.</value>
-  </data>
-  <data name="ControlVisualStylesModeChangedDescr" xml:space="preserve">
-    <value>Occurs when the value of the VisualStylesMode property changes.</value>
-  </data>
-  <data name="CommandComponentCommandParameterDescr" xml:space="preserve">
-    <value>Gets or sets the parameter that is passed to the Command property's object on execution or on execution context request.</value>
-  </data>
-  <data name="AccessDenied" xml:space="preserve">
-    <value>Access denied</value>
-  </data>
-  <data name="Argument_IncompatibleArrayType" xml:space="preserve">
-    <value>Target array type is not compatible with the type of items in the collection.</value>
-  </data>
-  <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
-    <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
-  </data>
-  <data name="Arg_NonZeroLowerBound" xml:space="preserve">
-    <value>The lower bound of target array must be zero.</value>
-  </data>
-  <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
-    <value>Only single dimensional arrays are supported for the requested action.</value>
-  </data>
-  <data name="InvalidArgumentType" xml:space="preserve">
-    <value>Argument '{0}' must be of type '{1}'.</value>
-  </data>
-  <data name="FailedToLoadCursor" xml:space="preserve">
-    <value>Failed to load cursor. Error '{1}'.</value>
-  </data>
-  <data name="ResourceValueNotFound" xml:space="preserve">
-    <value>The resource value '{0}' was not found.</value>
-  </data>
-  <data name="FolderBrowserDialogSelectedPathsDescr" xml:space="preserve">
-    <value>Retrieves the paths of all selected folders in the dialog box.</value>
-  </data>
-  <data name="FolderBrowserDialogMultiSelectDescr" xml:space="preserve">
-    <value>Controls whether multiple folders can be selected in the dialog.</value>
-  </data>
-  <data name="BindingNotSupported" xml:space="preserve">
-    <value>Binding operations are not supported when application trimming is enabled.</value>
-  </data>
-  <data name="BinaryFormatterNotSupported" xml:space="preserve">
-    <value>BinaryFormatter serialization and deserialization are disabled within this application. See https://aka.ms/binaryformatter for more information.</value>
-  </data>
-  <data name="ControlNotSupportedInTrimming" xml:space="preserve">
-    <value>'{0}' is not supported in trimmed applications.</value>
-  </data>
-  <data name="DesignTimeFeaturesNotSupported" xml:space="preserve">
-    <value>Design time features are not supported.</value>
-  </data>
-  <data name="ControlDarkModeDescr" xml:space="preserve">
-    <value>Determines the dark mode setting for the control. This ambient property inherits its value from its parent control or from the Application class.</value>
-  </data>
-  <data name="DarkModeNotSupported" xml:space="preserve">
-    <value>Dark mode cannot be activated, either because of an activated High-Contrast mode or because the underlying OS does not support it.</value>
-  </data>
-  <data name="FormBorderColorChangedDescr" xml:space="preserve">
-    <value>Occurs whenever the FormBorderColor property is changed.</value>
-  </data>
-  <data name="FormCaptionBackColorChangedDescr" xml:space="preserve">
-    <value>Occurs whenever the FormCaptionBackColor property is changed.</value>
-  </data>
-  <data name="FormCaptionTextColorChangedDescr" xml:space="preserve">
-    <value>Occurs whenever the FormCaptionTextColor property is changed.</value>
-  </data>
-  <data name="FormCornerPreferenceChangedDescr" xml:space="preserve">
-    <value>Occurs whenever the FormCornerPreference property is changed.</value>
-  </data>
-  <data name="FormCornerPreferenceDescr" xml:space="preserve">
-    <value>The rounding style of the Form's border.</value>
-  </data>
-  <data name="FormBorderColorDescr" xml:space="preserve">
-    <value>The color of the Form's border.</value>
-  </data>
-  <data name="FormCaptionBackColorDescr" xml:space="preserve">
-    <value>The back color of the Form's caption (title bar).</value>
-  </data>
-  <data name="FormCaptionTextColorDescr" xml:space="preserve">
-    <value>The color of the Form's text caption (title bar text).</value>
-  </data>
-  <data name="Form_HasAlreadyBeenShownAsync" xml:space="preserve">
-    <value>The form has already been shown asynchronously.</value>
-  </data>
-  <data name="FormOrTaskDialog_NoSyncContextForShowAsync" xml:space="preserve">
-    <value>Failed to retrieve the Synchronization Context for showing the Form asynchronously.</value>
-  </data>
-  <data name="ITypeDataObject_Not_Implemented" xml:space="preserve">
-    <value>Data object '{0}' doesn't implement the 'ITypedDataObject' interface and can't be read using 'TryGetData&lt;T&gt;(string, out T)' methods.</value>
-  </data>
-  <data name="BinaryFormatter_NotSupported_InClipboardOrDragDrop" xml:space="preserve">
-    <value>BinaryFormatter is not supported in clipboard or drag-and-drop operations.</value>
-  </data>
-  <data name="BinaryFormatter_NotSupported_InClipboardOrDragDrop_UseTypedAPI" xml:space="preserve">
-    <value>BinaryFormatter is not supported in clipboard or drag-and-drop operations. Please enable it and use 'TryGetData&lt;T&gt;' APIs with a 'resolver' function that defines a set of allowed types to deserialize '{0}'.</value>
-  </data>
-  <data name="ClipboardOrDragDrop_UseTypedAPI" xml:space="preserve">
-    <value>Please use 'TryGetData&lt;T&gt;' APIs with a 'resolver' function that defines a set of allowed types to deserialize '{0}'.</value>
-  </data>
-  <data name="ClipboardOrDragDrop_TypedAPI_InvalidResolver" xml:space="preserve">
-    <value>Type {0} is not found. If this type is allowed, please ensure that the 'resolver' function provided in 'TryGetData&lt;T&gt;' APIs supports it.</value>
-  </data>
-  <data name="ClipboardOrDragDrop_InvalidType" xml:space="preserve">
-    <value>'{0}' is not a concrete type, and could result in an unbounded deserialization attempt. Please use a concrete type or alternatively define a 'resolver' function that supports types that you are expecting to retrieve from the clipboard or use in drag-and-drop operations.</value>
-  </data>
-  <data name="ClipboardOrDragDrop_InvalidFormatTypeCombination" xml:space="preserve">
-    <value>The specified type '{0}' is not compatible with the specified format '{1}'.</value>
-  </data>
-  <data name="ClipboardOrDragDrop_CannotJsonSerializeDataObject" xml:space="preserve">
-    <value>An object of type 'DataObject' will serialize as empty. Use 'DataObject.SetDataAsJson' APIs on your object to JSON-serialize the data within your object, then use the '{0}' API with your object.</value>
-  </data>
-  <data name="NotSupportedExceptionOnClipboard" xml:space="preserve">
-    <value>Clipboard contains a 'NotSupportedException' that indicates that write operation failed. '{0}'.</value>
-  </data>
-  <data name="FormScreenCaptureModeDescr" xml:space="preserve">
-    <value>Gets or sets the behavior for preventing screen capture/video recording of the form's content via screen capture applications based on the Windows APIs.</value>
-  </data>
-  <data name="FormScreenCaptureModeRequiresTopLevel" xml:space="preserve">
-    <value>The FormScreenCaptureMode property can only be changed on top-level Forms with their TopLevel property set to true.</value>
-  </data>
-</root>
+  </data><data name="WindowsFormsSetEvent" xml:space="preserve">
+    <value>Setting event '{0}'</value>
+  </data><data name="borderStyleDescr" xml:space="preserve">
+    <value>The border style of the control.</value>
+  </data><data name="collectionChangedEventDescr" xml:space="preserve">
+    <value>Occurs whenever this collection's membership changes.</value>
+  </data><data name="collectionChangingEventDescr" xml:space="preserve">
+    <value>Occurs whenever this collection's membership is about to change.</value>
+  </data><data name="drawItemEventDescr" xml:space="preserve">
+    <value>Occurs whenever a particular item/area needs to be painted.</value>
+  </data><data name="measureItemEventDescr" xml:space="preserve">
+    <value>Occurs whenever a particular item's height needs to be calculated.</value>
+  </data><data name="selectedIndexChangedEventDescr" xml:space="preserve">
+    <value>Occurs when the value of the SelectedIndex property changes.</value>
+  </data><data name="selectedIndexDescr" xml:space="preserve">
+    <value>The index of the currently selected item.</value>
+  </data><data name="selectionChangeCommittedEventDescr" xml:space="preserve">
+    <value>Occurs when an item is chosen from the drop-down list and the drop-down list is closed.</value>
+  </data><data name="toStringAlt" xml:space="preserve">
+    <value>Alt</value>
+    <comment>{Locked="Alt"}</comment>
+  </data><data name="toStringBack" xml:space="preserve">
+    <value>Back</value>
+  </data><data name="toStringControl" xml:space="preserve">
+    <value>Ctrl</value>
+    <comment>{Locked=!de; "Ctrl"}</comment>
+  </data><data name="toStringDefault" xml:space="preserve">
+    <value>(default)</value>
+  </data><data name="toStringDelete" xml:space="preserve">
+    <value>Del</value>
+    <comment>{Locked=!fr,de,it,es; "Del"}</comment>
+  </data><data name="toStringEnd" xml:space="preserve">
+    <value>End</value>
+    <comment>{Locked=!fr,de,it,es; "End"}</comment>
+  </data><data name="toStringEnter" xml:space="preserve">
+    <value>Enter</value>
+    <comment>{Locked=!fr,de,it,es; "Enter"}</comment>
+  </data><data name="toStringHome" xml:space="preserve">
+    <value>Home</value>
+    <comment>{Locked=!fr,de,es; "Home"}</comment>
+  </data><data name="toStringInsert" xml:space="preserve">
+    <value>Insert</value>
+    <comment>{Locked=!fr,de,it,es,zh-Hant; "Insert"}</comment>
+  </data><data name="toStringNone" xml:space="preserve">
+    <value>(none)</value>
+  </data><data name="toStringPageDown" xml:space="preserve">
+    <value>PgDn</value>
+    <comment>{Locked=!fr,de,it,es; "PgDn"}</comment>
+  </data><data name="toStringPageUp" xml:space="preserve">
+    <value>PgUp</value>
+    <comment>{Locked=!fr,de,it,es; "PgUp"}</comment>
+  </data><data name="toStringShift" xml:space="preserve">
+    <value>Shift</value>
+    <comment>{Locked=!fr,de,it,es; "Shift"}</comment>
+  </data><data name="valueChangedEventDescr" xml:space="preserve">
+    <value>Occurs when the value of the control changes.</value>
+  </data></root>