From 413ac79ce5c45e54dfcaaefbe9c8c21ee06e07a0 Mon Sep 17 00:00:00 2001 From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:57:24 -0700 Subject: [PATCH] Update some tables to prevent loc (#1810) * Update some tables to prevent loc * Revert one table --- .../wpf/controls/styles-templates-overview.md | 12 ++++++------ .../net/wpf/controls/styles-templates-overview.md | 12 ++++++------ .../wpf/migration/differences-from-net-framework.md | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dotnet-desktop-guide/framework/wpf/controls/styles-templates-overview.md b/dotnet-desktop-guide/framework/wpf/controls/styles-templates-overview.md index e62fb09971..f400956e4e 100644 --- a/dotnet-desktop-guide/framework/wpf/controls/styles-templates-overview.md +++ b/dotnet-desktop-guide/framework/wpf/controls/styles-templates-overview.md @@ -170,12 +170,12 @@ Controls are always in a specific **state**. For example, when the mouse moves o | VisualState Name | VisualStateGroup Name | Description | | ---------------- | --------------------- | ----------- | -| Normal | CommonStates | The default state. | -| MouseOver | CommonStates | The mouse pointer is positioned over the control. | -| Pressed | CommonStates | The control is pressed. | -| Disabled | CommonStates | The control is disabled. | -| Focused | FocusStates | The control has focus. | -| Unfocused | FocusStates | The control does not have focus. | +| `Normal` | `CommonStates` | The default state. | +| `MouseOver` | `CommonStates` | The mouse pointer is positioned over the control. | +| `Pressed` | `CommonStates` | The control is pressed. | +| `Disabled` | `CommonStates` | The control is disabled. | +| `Focused` | `FocusStates` | The control has focus. | +| `Unfocused` | `FocusStates` | The control does not have focus. | By defining a on the root element of a control template, you can trigger animations when a control enters a specific state. The `VisualStateManager` declares which combinations of and to watch. When the control enters a watched state, the animation defined by the `VisualStateManager` is started. diff --git a/dotnet-desktop-guide/net/wpf/controls/styles-templates-overview.md b/dotnet-desktop-guide/net/wpf/controls/styles-templates-overview.md index 18c453b78d..9bbffc3c4e 100644 --- a/dotnet-desktop-guide/net/wpf/controls/styles-templates-overview.md +++ b/dotnet-desktop-guide/net/wpf/controls/styles-templates-overview.md @@ -172,12 +172,12 @@ Controls are always in a specific **state**. For example, when the mouse moves o | VisualState Name | VisualStateGroup Name | Description | | ---------------- | --------------------- | ----------- | -| Normal | CommonStates | The default state. | -| MouseOver | CommonStates | The mouse pointer is positioned over the control. | -| Pressed | CommonStates | The control is pressed. | -| Disabled | CommonStates | The control is disabled. | -| Focused | FocusStates | The control has focus. | -| Unfocused | FocusStates | The control does not have focus. | +| `Normal` | `CommonStates` | The default state. | +| `MouseOver` | `CommonStates` | The mouse pointer is positioned over the control. | +| `Pressed` | `CommonStates` | The control is pressed. | +| `Disabled` | `CommonStates` | The control is disabled. | +| `Focused` | `FocusStates` | The control has focus. | +| `Unfocused` | `FocusStates` | The control does not have focus. | By defining a on the root element of a control template, you can trigger animations when a control enters a specific state. The `VisualStateManager` declares which combinations of and to watch. When the control enters a watched state, the animation defined by the `VisualStateManager` is started. diff --git a/dotnet-desktop-guide/net/wpf/migration/differences-from-net-framework.md b/dotnet-desktop-guide/net/wpf/migration/differences-from-net-framework.md index 24e8144c5e..31eebc0faa 100644 --- a/dotnet-desktop-guide/net/wpf/migration/differences-from-net-framework.md +++ b/dotnet-desktop-guide/net/wpf/migration/differences-from-net-framework.md @@ -1,6 +1,6 @@ --- title: Differences between .NET Framework and .NET -description: Describes the differences between the .NET Framework implementation of Windows Presentation Foundation (WPF) and .NET WPF. When migrating your app, you should consider these incompatibilities. +description: Describes the differences between the .NET Framework implementation of Windows Presentation Foundation (WPF) and .NET WPF. author: adegeo ms.date: 02/15/2023 ms.author: adegeo @@ -24,7 +24,7 @@ If your .NET Framework app lists its NuGet dependencies in a *packages.config* f 01. In Visual Studio, open the **Solution Explorer** pane. 01. In your WPF project, right-click **packages.config** > **Migrate packages.config to PackageReference**. -:::image type="content" source="media/differences-from-net-framework/package-reference-migration.png" alt-text="Upgrading to PackageReference."::: +:::image type="content" source="media/differences-from-net-framework/package-reference-migration.png" alt-text="The Solution Explorer's context menu in Visual Studio, displaying the 'Migrate packages.config' item."::: A dialog will appear showing calculated top-level NuGet dependencies and asking which other NuGet packages should be promoted to top level. Select **OK** and the *packages.config* file will be removed from the project and `` elements will be added to the project file. @@ -38,9 +38,9 @@ Publicly defined CAS-related types were moved out of the WPF assemblies and into | Source assembly | Target assembly | Type | | --------------- | --------------- | ------------------- | -| *WindowsBase.dll* | *System.Security.Permissions.dll* |






| -| *System.Xaml.dll* | *System.Security.Permissions.dll* | | -| *System.Xaml.dll* | *System.Windows.Extension.dll* |
| +| WindowsBase.dll | System.Security.Permissions.dll |






| +| System.Xaml.dll | System.Security.Permissions.dll | | +| System.Xaml.dll | System.Windows.Extension.dll |
| > [!NOTE] > In order to minimize porting friction, the functionality for storing and retrieving information related to the following properties was retained in the `XamlAccessLevel` type.