Skip to content

Commit a065e46

Browse files
Merge pull request #10918 from MicrosoftDocs/main638871015406998415sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 177d2d8 + dc1196e commit a065e46

9 files changed

+32
-29
lines changed

docs/azure/overview.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ghogen
55
manager: mijacobs
66
ms.subservice: azure-development
77
ms.topic: overview
8-
ms.date: 01/31/2024
8+
ms.date: 7/1/2025
99
ms.author: ghogen
1010
monikerRange: ">=vs-2019"
1111
---
@@ -30,8 +30,6 @@ With Visual Studio, you can both develop apps that run in the Azure cloud, and c
3030

3131
C++ developers can access Azure services such as Azure Storage using a C++ client library, and IoT device developers using C and C++ can connect devices and services to Azure. See [Cloud and web programming in Visual C++](/cpp/cloud/cloud-and-web-programming-in-visual-cpp).
3232

33-
Users of Azure Cloud Services, supported in Visual Studio for many previous releases, can continue to work with these services in Visual Studio using [Azure Cloud Services (extended support)](../azure/cloud-services-extended-support.md).
34-
3533
## Connect to Azure services
3634

3735
When you want to use an Azure service in your application, it usually requires multiple changes to your project, such as package references, code changes, and configuration changes, as well as many changes in Azure to specify the services to connect to, or create them if they don't already exist. Visual Studio helps make this process easier by making those changes in your project and in Azure, based on the information you provide. Visual Studio also gives a list of all the changes, so you can examine them and fully understand what changed.
@@ -50,7 +48,7 @@ What are you deploying?
5048
| - | - |
5149
| Azure App Service (.NET Core) | [Deploy an ASP.NET Core web app](/azure/app-service/quickstart-dotnetcore?tabs=net70&pivots=development-environment-vs&toc=%2Fvisualstudio%2Fazure%2Ftoc.json&bc=%2Fvisualstudio%2Fazure%2Fbreadcrumb%2Ftoc.json#publish-your-web-app) |
5250
| Azure App Service (.NET Framework) | [Deploy an ASP.NET web app (.NET Framework)](/azure/app-service/quickstart-dotnetcore?toc=%2Fvisualstudio%2Fazure%2Ftoc.json&bc=%2Fvisualstudio%2Fazure%2Fbreadcrumb%2Ftoc.json&tabs=netframework48&pivots=development-environment-vs) |
53-
| Azure Container Apps | [Deploy to Azure Container Apps using Visual Studio](/azure/container-apps/deploy-visual-studio) |
51+
| Azure Container Apps | [Deploy to Azure Container Apps using Visual Studio](/azure/container-apps/deploy-visual-studio)<br/><br/>[Deploy a multicontainer app to Azure Container Apps](../containers/deploy-multicontainer-azure-container-apps.md) |
5452
| Azure Functions | [Create your first C# function in Azure using Visual Studio](/azure/azure-functions/functions-create-your-first-function-visual-studio#publish-the-project-to-azure) |
5553
| Azure Container Registry | [Deploy an ASP.NET container to a container registry using Visual Studio](../containers/hosting-web-apps-in-docker.md) |
5654

docs/data-tools/create-a-simple-data-application-with-wpf-and-entity-framework-6.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: ghogen
66
manager: mijacobs
77
ms.subservice: data-tools
88
ms.topic: tutorial
9-
ms.date: 03/27/2025
9+
ms.date: 7/2/2025
1010
dev_langs:
1111
- CSharp
1212

@@ -17,7 +17,7 @@ dev_langs:
1717
# Create a basic data application with WPF and Entity Framework 6
1818

1919
::: moniker range="vs-2022"
20-
> [!WARNING]
20+
> [!NOTE]
2121
> If you're running Visual Studio 2022, ensure you use version 17.3 or later for this tutorial.
2222
::: moniker-end
2323

@@ -41,7 +41,7 @@ In this tutorial, you:
4141
4242
## Prerequisites
4343

44-
* [Visual Studio](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta) with the **Windows Communication Foundation** component installed. To install it:
44+
* [Visual Studio](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta) with **.NET Desktop Development** workload installed, and the **Windows Communication Foundation** component installed. To install it:
4545

4646
1. Open the **Visual Studio Installer** app, or select **Tools** > **Get Tools and Features** from the Visual Studio menu.
4747
1. In **Visual Studio Installer**, choose **Modify** next to the version of Visual Studio you want to modify.
@@ -52,6 +52,8 @@ In this tutorial, you:
5252

5353
* SQL Server Object Explorer. To install it, install the **Data storage and processing** workload in the **Visual Studio Installer** app.
5454

55+
* Entity Framework 6 tools. This is usually installed when you install the **.NET Dektop Development** workload.
56+
5557
## Install and connect to Northwind
5658

5759
The following example uses SQL Server Express LocalDB and the Northwind sample database. If the ADO.NET data provider for that product supports Entity Framework, it should work with other SQL database products as well.

docs/ide/finding-and-using-visual-studio-extensions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ helpviewer_keywords:
99
- install extensions
1010
- install packages
1111
- managing extensions visual studio
12-
author: anandmeg
13-
ms.author: meghaanand
12+
author: ghogen
13+
ms.author: ghogen
1414
manager: mijacobs
1515
ms.subservice: general-ide
1616

docs/ide/intellicode-visual-studio.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: IntelliCode for Visual Studio
33
titleSuffix: ""
44
description: Read an overview of IntelliCode for Visual Studio. Understand preview features, supported languages, prerequisites, troubleshooting issues, and telemetry.
5-
ms.date: 4/1/2025
5+
ms.date: 7/2/2025
66
ms.service: visual-studio-family
77
ms.subservice: intellicode
88
ms.topic: conceptual
@@ -88,7 +88,7 @@ If disabling extensions that override IntelliSense UI doesn't solve the problem
8888

8989
IntelliCode captures some anonymized usage and error-reporting data to help improve the product. No user-defined code is sent to Microsoft, but we do collect information about your use of the IntelliCode results. For base model suggestions, which are open source or .NET types and members, we capture whether you selected an IntelliCode suggestion and log the name of the suggestion. Microsoft uses the data to monitor the quality of the base model. For custom models, we capture whether you selected an IntelliCode suggestion but *don't* log the names of your user-defined types or methods.
9090

91-
To turn off data collection for IntelliCode, opt out of the [Visual Studio Experience Improvement Program](visual-studio-experience-improvement-program.md). From the menu bar, select **Help** > **Send Feedback** > **Settings**. In the **Visual Studio Experience Improvement Program** dialog, select **No, I would not like to participate** and then select **OK**.
91+
To turn off data collection for IntelliCode, opt out of the [Visual Studio Experience Improvement Program](visual-studio-experience-improvement-program.md). From the menu bar, select **Help** > **Privacy** > **Privacy Settings**. In the **Visual Studio Experience Improvement Program** dialog, select **No, I would not like to participate** and then select **OK**.
9292

9393
## See also
9494

docs/ide/reference/command-devenv-exe.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: -Command (devenv.exe)
33
description: Learn how to use the Command devenv command-line switch to execute a specified command after launching the Visual Studio IDE.
4-
ms.date: 12/10/2018
4+
ms.date: 7/2/2025
55
ms.topic: reference
66
helpviewer_keywords:
77
- Devenv, /Command switch
@@ -45,8 +45,6 @@ The third example creates a new file called `some_file.cs` and opens it in a cod
4545
```shell
4646
devenv /command "Macros.MyMacros.Module1.OpenFavoriteFiles"
4747

48-
devenv /command "navigate https://learn.microsoft.com/"
49-
5048
devenv /command "nf some_file.cs"
5149
```
5250

docs/ide/visual-studio-whole-line-completions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ This feature supports C# in Visual Studio 2022.
1818

1919
![Screenshot of Whole Line Completion by IntelliCode in Visual Studio.](media/intellicode/intellicode-visual-studio-whole-line-completions-small.png)
2020

21+
To turn text predictions off, disable the IntelliCode extension. Select **Extensions** > **Manage Extensions** from the menu, find and select the IntelliCode extension, and then click **Disable**.
22+
2123
## How it works
2224

2325
IntelliCode uses a large scale transformer model, trained on around half a million public, open-source repos from GitHub. This model makes predictions on what you type next based on a rich knowledge of what you have coded so far, including:

docs/msbuild/errors/msb3277.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: MSB3277 diagnostic code
3-
description: Learn about the possible causes of the MSB3277 build error and get troubleshooting tips.
4-
ms.date: 05/16/2025
3+
description: Learn about the possible causes of the MSB3277 build warning and get troubleshooting tips.
4+
ms.date: 7/2/2025
55
ms.topic: "error-reference"
66
f1_keywords:
77
- MSB3277
@@ -20,25 +20,25 @@ ms.subservice: msbuild
2020

2121
<!-- :::ErrorDefinitionDescription::: -->
2222
<!-- :::editable-content name="introDescription"::: -->
23-
This article describes the MSB3277 error code.
23+
This article describes the MSB3277 warning.
2424
<!-- :::editable-content-end::: -->
2525

2626
## Message text
2727

2828
<!-- :::editable-content name="messageText"::: -->
29-
`MSB3277: Found conflicts between different versions of 'value' that could not be resolved.`
29+
`MSB3277: Found conflicts between different versions of 'assembly-name' that could not be resolved.`
3030
<!-- :::editable-content-end::: -->
3131
<!-- MSB3277: Found conflicts between different versions of "{0}" that could not be resolved.
3232
{1} -->
3333

3434
<!-- :::editable-content name="postOutputDescription"::: -->
3535
## Description
3636

37-
This error occurs during a build when more than one version of the same dependent assembly is referenced in a build of the same project. In a .NET build, all assemblies that are referenced, directly or indirectly through other referenced assemblies, have to resolve to the same version. You can't reference two different and conflicting versions of the same assembly when building the same binary. The [ResolveAssemblyReference task](../resolveassemblyreference-task.md) emits this error. The task inspects all the referenced assemblies, and all assemblies referenced indirectly by those assemblies, and so on. The task works through the process until all assembly references are resolved.
37+
This warning occurs during a build when more than one version of the same dependent assembly is referenced in a build of the same project. In a .NET build, all assemblies that are referenced, directly or indirectly through other referenced assemblies, have to resolve to the same version. You shouldn't reference two different and conflicting versions of the same assembly when building the same binary. The [ResolveAssemblyReference task](../resolveassemblyreference-task.md) emits this warning. The task inspects all the referenced assemblies, and all assemblies referenced indirectly by those assemblies, and so on. The task works through the process until all assembly references are resolved.
3838

39-
## Diagnose the error
39+
## Diagnose the warning
4040

41-
To diagnose the error, first enable diagnostic log output by using the `-verbosity:diag` command-line switch, and then check the MSBuild log file with the full diagnostics output. For longer output logs on large projects, consider using the binary log `-bl` command-line switch and the [MSBuild Structured Log Viewer](https://msbuildlog.com/) to view the output more easily.
41+
To diagnose the issue, first enable diagnostic log output by using the `-verbosity:diag` command-line switch, and then check the MSBuild log file with the full diagnostics output. For longer output logs on large projects, consider using the binary log `-bl` command-line switch and the [MSBuild Structured Log Viewer](https://msbuildlog.com/) to view the output more easily.
4242

4343
In MSBuild 16.x or later, the specific assembly versions in conflict are written to the log file. In earlier versions of MSBuild, the content isn't added to the log file. Instead, follow the assembly dependency chain to locate the conflicting reference. Look at each assembly that your project references, and then the assemblies that the initial assemblies reference, and so on. Follow this process until you identify the conflicting assembly versions.
4444

@@ -108,10 +108,10 @@ Visual Studio or settings in project files can enable or disable automatic bindi
108108

109109
In advanced scenarios, your project might intentionally require more than one version of the same assembly. You can use special techniques to override the normal assembly loading process to accomplish the goal. For more information, see [Resolve assembly loads](/dotnet/standard/assembly/resolve-loads). Be sure to understand and follow the guidance in [Best practices for assembly loading](/dotnet/framework/deployment/best-practices-for-assembly-loading).
110110

111-
For a guide on resolving errors with assembly references, see [Troubleshoot assembly references](../troubleshoot-assembly-references.md) and [How the runtime locates assemblies](/dotnet/framework/deployment/how-the-runtime-locates-assemblies).
111+
For a guide on resolving issues with assembly references, see [Troubleshoot assembly references](../troubleshoot-assembly-references.md) and [How the runtime locates assemblies](/dotnet/framework/deployment/how-the-runtime-locates-assemblies).
112112
<!-- :::editable-content-end::: -->
113113
<!-- :::ErrorDefinitionDescription-end::: -->
114114

115115
## Applies to
116116

117-
All versions of MSBuild
117+
All versions of MSBuild

docs/msbuild/item-functions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Call item functions from MSBuild code
33
description: Explore how MSBuild code in tasks and targets can call item functions to get information about the items in the project.
4-
ms.date: 2/7/2025
4+
ms.date: 7/2/2025
55
ms.topic: how-to
66
helpviewer_keywords:
77
- msbuild, Item functions
@@ -57,11 +57,11 @@ The table below lists the intrinsic functions available for items.
5757
|`Exists`|`@(MyItems->Exists())`|Filters a set of items to those that actually exist on disk.|
5858
|`GetPathsOfAllDirectoriesAbove`| `@(MyItems->GetPathsOfAllFilesAbove())`|Given a set of items, returns items representing all the ancestor directories. No order is guaranteed.|
5959
|`Reverse`|`@(MyItems->Reverse())`|Returns the items in reverse order.|
60-
|`AnyHaveMetadataValue`|`@(MyItems->AnyHaveMetadataValue("MetadataName", "MetadataValue"))` | Returns a `boolean` to indicate whether any item has the given metadata name and value. The comparison is case insensitive. |
60+
|`AnyHaveMetadataValue`|`@(MyItems->AnyHaveMetadataValue('MetadataName', 'MetadataValue'))` | Returns a `boolean` to indicate whether any item has the given metadata name and value. The comparison is case insensitive. |
6161
|`ClearMetadata`|`@(MyItems->ClearMetadata())` |Returns items with their metadata cleared. Only the `itemspec` is retained.|
62-
|`HasMetadata`|`@(MyItems->HasMetadata("MetadataName"))`|Returns items that have the given metadata name. The comparison is case insensitive.|
63-
|`Metadata`|`@(MyItems->Metadata("MetadataName"))`|Returns the values of the metadata that have the metadata name. The items returned have the same metadata as the source values.|
64-
|`WithMetadataValue`|`@(MyItems->WithMetadataValue("MetadataName", "MetadataValue"))`|Returns items that have the given metadata name and value. The comparison is case insensitive.|
62+
|`HasMetadata`|`@(MyItems->HasMetadata('MetadataName'))`|Returns items that have the given metadata name. The comparison is case insensitive.|
63+
|`Metadata`|`@(MyItems->Metadata('MetadataName'))`|Returns the values of the metadata that have the metadata name. The items returned have the same metadata as the source values.|
64+
|`WithMetadataValue`|`@(MyItems->WithMetadataValue('MetadataName', 'MetadataValue'))`|Returns items that have the given metadata name and value. The comparison is case insensitive.|
6565

6666
> [!NOTE]
6767
> `Exists` can also be used in other contexts; in [MSBuild conditions](msbuild-conditions.md), for example `Condition="Exists('path')"`; or in [Static property functions](property-functions.md), for example `$([System.IO.File]::Exists("path"))`.

subscriptions/delete-license.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ author: joseb-rdc
44
ms.author: amast
55
manager: shve
66
ms.assetid: e49242bc-e9f2-49e8-8caa-f574d508aba6
7-
ms.date: 01/28/2025
7+
ms.date: 07/02/2025
88
ms.topic: how-to
99
description: Learn how admins can delete subscription assignments in the Visual Studio Subscriptions Admin Portal.
1010
---
@@ -42,6 +42,9 @@ If you need to delete a large number of subscription assignments, you can use th
4242
>
4343
> Don't use this approach to manage cloud subscriptions. Although you can download and complete the bulk edit template, you can't upload the template with your changes.
4444
45+
> [!NOTE]
46+
> For best practices, it's recommended to process a maximum of 500 users at a time when editing a large number of subscriptions.
47+
4548
1. [Sign in](https://manage.visualstudio.com) by using an email address with admin rights for the agreement that was used to purchase the subscriptions.
4649
0. Select the **Bulk edit** option.
4750
> [!div class="mx-imgBorder"]

0 commit comments

Comments
 (0)