From a8d0ef7e5972a7c521cfb676e95539b6f0aed6bf Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Tue, 9 Feb 2021 15:46:32 -0800 Subject: [PATCH 1/3] Fix wpf overview styles xaml (#209) --- .../framework/wpf/introduction-to-wpf.md | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dotnet-desktop-guide/framework/wpf/introduction-to-wpf.md b/dotnet-desktop-guide/framework/wpf/introduction-to-wpf.md index 11d055a..8813c80 100644 --- a/dotnet-desktop-guide/framework/wpf/introduction-to-wpf.md +++ b/dotnet-desktop-guide/framework/wpf/introduction-to-wpf.md @@ -513,22 +513,29 @@ Styles enable developers and designers to standardize on a particular appearance xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="SDKSample.StyleWindow" Title="Styles"> - - - - + + + + + + - - + + - - + + + + + + + ``` From a11eb130d1929aec7caac527b2c1507bd958ded6 Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Tue, 9 Feb 2021 15:46:56 -0800 Subject: [PATCH 2/3] Update threading-model.md (#208) --- dotnet-desktop-guide/framework/wpf/advanced/threading-model.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet-desktop-guide/framework/wpf/advanced/threading-model.md b/dotnet-desktop-guide/framework/wpf/advanced/threading-model.md index d8dc980..6b2b655 100644 --- a/dotnet-desktop-guide/framework/wpf/advanced/threading-model.md +++ b/dotnet-desktop-guide/framework/wpf/advanced/threading-model.md @@ -27,7 +27,7 @@ ms.assetid: 02d8fd00-8d7c-4604-874c-58e40786770b No matter how well architected, however, no [!INCLUDE[TLA2#tla_ui](../../../includes/tla2sharptla-ui-md.md)] framework will ever be able to provide a single-threaded solution for every sort of problem. [!INCLUDE[TLA2#tla_winclient](../../../includes/tla2sharptla-winclient-md.md)] comes close, but there are still situations where multiple threads improve [!INCLUDE[TLA#tla_ui](../../../includes/tlasharptla-ui-md.md)] responsiveness or application performance. After discussing some background material, this paper explores some of these situations and then concludes with a discussion of some lower-level details. > [!NOTE] -> This topic discusses threading by using the method for asynchronous calls. You can also make asynchronous calls by calling the method, which take an or as a parameter. The method returns a or , which has a property. You can use the `await` keyword with either the or the associated . If you need to wait synchronously for the that is returned by a or , call the extension method. Calling will result in a deadlock. For more information about using a to perform asynchronous operations, see Task Parallelism. The method also has overloads that take an or as a parameter. You can use the method to make synchronous calls by passing in a delegate, or . +> This topic discusses threading by using the method for asynchronous calls. You can also make asynchronous calls by calling the method, which take an or as a parameter. The method returns a or , which has a property. You can use the `await` keyword with either the or the associated . If you need to wait synchronously for the that is returned by a or , call the extension method. Calling will result in a deadlock. For more information about using a to perform asynchronous operations, see [Task-based asynchronous programming](/dotnet/standard/parallel-programming/task-based-asynchronous-programming). The method also has overloads that take an or as a parameter. You can use the method to make synchronous calls by passing in a delegate, or . ## Overview and the Dispatcher From c6e13afda1724815110fc1d6c589122feb4b05fc Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Tue, 9 Feb 2021 15:47:08 -0800 Subject: [PATCH 3/3] Fix update vs include (#207) * Fix update vs include * Minor wording change --- dotnet-desktop-guide/net/winforms/migration/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet-desktop-guide/net/winforms/migration/index.md b/dotnet-desktop-guide/net/winforms/migration/index.md index 7f241d0..f7f342e 100644 --- a/dotnet-desktop-guide/net/winforms/migration/index.md +++ b/dotnet-desktop-guide/net/winforms/migration/index.md @@ -181,11 +181,11 @@ Copy those entries from the old project file into an `` element in th > [!IMPORTANT] > **Visual Basic** projects typically use the folder _My Project_ while C# projects typically use the folder _Properties_ for the default project settings file. -- Import the configuration for any _resx_ file, such as the _properties/Resources.resx_ file. Notice that the `Include` attribute was changed to `Update` on the `` element, and `` was removed from ``: +- Import the configuration for any _resx_ file, such as the _properties/Resources.resx_ file. Notice that the `Include` attribute was set to `Update` on the `` and `` element, and `` was removed from ``: ```xml - + ResXFileCodeGenerator Resources.Designer.cs