Skip to content

Commit e7d471f

Browse files
Merge pull request #10378 from MicrosoftDocs/main638606379678668245sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 2d2cdfb + 6755d56 commit e7d471f

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

docs/msbuild/how-to-use-project-sdk.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ During evaluation of the project, MSBuild adds implicit imports at the top and b
3838
</Project>
3939
```
4040

41-
There are many SDKs distributed by Microsoft, referenced in the previous example by its moniker `Microsoft.NET.Sdk`. The ones associated with .NET Core and .NET 5 and later are listed at [.NET Project SDK overview](/dotnet/core/project-sdk/overview).
41+
There are many SDKs distributed by Microsoft. The project SDK referenced in the previous example has the moniker `Microsoft.NET.Sdk`. The project SDKs associated with .NET Core and .NET 5 and later are listed at [.NET Project SDK overview](/dotnet/core/project-sdk/overview).
4242

4343
## Reference a project SDK
4444

@@ -88,16 +88,16 @@ The `Version` attribute isn't required.
8888
</Project>
8989
```
9090

91-
Explicitly including the imports in your project allows you full control over the order.
91+
When you explicitly include the imports in your project, you have full control over the order.
9292

9393
When using the `<Import/>` element, you can specify an optional `Version` attribute as well. For example, you can specify `<Import Project="Sdk.props" Sdk="My.Custom.Sdk" Version="1.2.3" />`.
9494

9595
> [!WARNING]
96-
> If you are changing project to use `<Import/>` elements, make sure you add both `.props` and `.targets` imports and that you remove the SDK from the `<Project/>` element and `<Sdk/>` elements. Failure to do so will result in doubled imports and an [`MSB4011`](./errors/msb4011.md) warning.
96+
> If you change your project to use `<Import/>` elements, make sure you add both `.props` and `.targets` imports, and that you remove the SDK from the `<Project/>` element and `<Sdk/>` elements. Failure to do so will result in doubled imports and an [`MSB4011`](./errors/msb4011.md) warning.
9797
9898
## How project SDKs are resolved
9999

100-
When evaluating the import, MSBuild dynamically resolves the path to the project SDK based on the name and version you specified. MSBuild also has a list of registered SDK resolvers, which are plug-ins that locate project SDKs on your machine. These plug-ins include:
100+
When evaluating the import, MSBuild dynamically resolves the path to the project SDK based on the name and version you specified. MSBuild also has a list of registered SDK resolvers, which are plug-ins that locate project SDKs on your machine. These plug-ins include:
101101

102102
- A NuGet-based resolver that queries your configured package feeds for NuGet packages that match the ID and version of the SDK you specified.
103103

@@ -127,4 +127,4 @@ Only one version of each project SDK can be used during a build. If you referenc
127127
- [MSBuild concepts](../msbuild/msbuild-concepts.md)
128128
- [Customize your build](../msbuild/customize-your-build.md)
129129
- [Packages, metadata, and frameworks](/dotnet/core/packages)
130-
- [Additions to the csproj format for .NET Core](/dotnet/core/tools/csproj)
130+
- [MSBuild reference for .NET SDK projects](/dotnet/core/project-sdk/msbuild-props)

docs/xaml-tools/creating-a-ui-by-using-blend-for-visual-studio.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Blend for Visual Studio feature tour
33
titleSuffix: ''
44
description: Explore the features and workspace UI in Blend for Visual Studio, a component for designing XAML-based Windows and Web applications.
5-
ms.date: 07/31/2019
5+
ms.date: 07/31/2024
66
ms.topic: overview
77
f1_keywords:
88
- Blend.Start.Dev12
@@ -11,6 +11,7 @@ ms.author: maleger
1111
manager: mijacobs
1212
ms.subservice: xaml-tools
1313
---
14+
1415
# Blend for Visual Studio overview
1516

1617
Blend for Visual Studio helps you design XAML-based Windows and Web applications. It provides the same basic XAML design experience as Visual Studio and adds visual designers for advanced tasks such as animations and behaviors. For a comparison between Blend and Visual Studio, see [Design XAML in Visual Studio and Blend for Visual Studio](../xaml-tools/designing-xaml-in-visual-studio.md).

docs/xaml-tools/creating-a-ui-by-using-xaml-designer-in-visual-studio.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create UIs with Visual Studio XAML Designer
33
description: Explore XAML Designer workspace UI and features in Blend for Visual Studio that provides a visual interface to help you design XAML-based apps.
4-
ms.date: 07/04/2023
4+
ms.date: 08/30/2024
55
ms.topic: conceptual
66
f1_keywords:
77
- VS.XamlDesigner
@@ -21,10 +21,12 @@ The XAML Designer in Visual Studio and Blend for Visual Studio provides a visual
2121
For advanced users, you can even [customize the XAML Designer](https://github.com/microsoft/xaml-designer-extensibility/blob/master/documents/xaml-designer-extensibility-migration.md).
2222

2323
> [!NOTE]
24-
> Xamarin.Forms does not support a XAML designer. To view your Xamarin.Forms XAML UIs and edit them while the app is running, use XAML Hot Reload for Xamarin.Forms. For more information, see the [XAML Hot Reload for Xamarin.Forms (Preview)](/xamarin/xamarin-forms/xaml/hot-reload/) page.
24+
> WinUI 3 / .NET MAUI XAML designer is not supported in Visual Studio 2022. To view your WinUI 3 / .NET MAUI XAML UIs and edit them while the app is running, use XAML Hot Reload for WinUI 3 / .NET MAUI. For more information, see the [XAML Hot Reload](../xaml-tools/xaml-hot-reload.md) page.
2525
26+
::: moniker range="vs-2019"
2627
> [!NOTE]
27-
> WinUI 3 / .NET MAUI XAML designer is not supported in Visual Studio 2022. To view your WinUI 3 / .NET MAUI XAML UIs and edit them while the app is running, use XAML Hot Reload for WinUI 3 / .NET MAUI. For more information, see the [XAML Hot Reload](../xaml-tools/xaml-hot-reload.md) page.
28+
> Xamarin.Forms does not support a XAML designer. To view your Xamarin.Forms XAML UIs and edit them while the app is running, use XAML Hot Reload for Xamarin.Forms. For more information, see the [XAML Hot Reload for Xamarin.Forms (Preview)](/xamarin/xamarin-forms/xaml/hot-reload/) page.
29+
::: moniker-end
2830

2931
## XAML Designer workspace
3032

docs/xaml-tools/xaml-hot-reload.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "XAML Hot Reload for WPF and UWP apps"
33
description: Modify XAML code in running .NET MAUI, WinUI 3, Windows Presentation Foundation (WPF), or Universal Windows Platform (UWP) apps with edit and continue features in XAML Hot Reload.
4-
ms.date: 02/25/2022
4+
ms.date: 08/27/2024
55
ms.topic: conceptual
66
helpviewer_keywords:
77
- "xaml edit and continue"
@@ -39,10 +39,10 @@ XAML Hot Reload is especially helpful in these scenarios:
3939

4040
|Supported Application Types|Operating System and Tools|
4141
|---|---|
42-
|.NET MAUI|.NET6+|
42+
|.NET MAUI|.NET 6+|
4343
|Windows Presentation Foundation (WPF) |.NET Framework 4.6+, .NET Core, and .NET 5+</br>Windows 7 and later |
4444
|Universal Windows apps (UWP)|Windows 10 and later, with the [Windows 10 SDK](https://developer.microsoft.com/windows/downloads/windows-sdk/) 14393+ and later|
45-
|WinUI 3)|Windows 10, version 1809 and later, with the Windows App SDK|
45+
|WinUI 3|Windows 10, version 1809 and later, with the Windows App SDK|
4646

4747
If you're using **.NET MAUI**, see [XAML Hot Reload for .NET MAUI](/dotnet/maui/xaml/hot-reload) for more details.
4848

0 commit comments

Comments
 (0)