Skip to content

Commit 1ba6c1c

Browse files
Merge pull request #10497 from MicrosoftDocs/main638674886862511566sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 3350987 + a078018 commit 1ba6c1c

File tree

5 files changed

+7
-26
lines changed

5 files changed

+7
-26
lines changed

.github/policies/scheduled-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: GitOps.PullRequestIssueManagement - Scheduled PRs
22
description: Creates pull requests on a schedule
33
resource: repository
4-
4+
disabled: true
55
where:
66
configuration:
77
resourceManagementConfiguration:

docs/ide/class-designer/designing-and-viewing-classes-and-types.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,26 +101,13 @@ If you haven't installed the **Class Designer** component, follow these steps to
101101
> [!NOTE]
102102
> If you don't see the **Class Diagram** template, [follow the steps](#install-the-class-designer-component) to install the **Class Designer** component for Visual Studio. As stated earlier in this article, Class Designer is not available for .NET Core and .NET 5 and later.
103103
104-
The class diagram opens in Class Designer and appears as a file that has a *.cd* extension in **Solution Explorer**. You can drag shapes and lines to the diagram from **Toolbox**.
104+
The class diagram opens in Class Designer and appears as a file that has a *.cd* extension in **Solution Explorer**. You can drag shapes and lines to the diagram from **Toolbox**, or drag a project node from Solution Explorer to add the classes in that project.
105105

106106
To add multiple class diagrams, repeat the steps in this procedure.
107107

108-
## Add a class diagram based on existing types
109-
110-
In **Solution Explorer**, open a file's context menu (right-click) and then choose **View Class Diagram**.
111-
112-
-or-
113-
114-
In **Class View**, open the namespace or type context menu and then choose **View Class Diagram**.
115-
116-
> [!TIP]
117-
> If **Class View** is not open, open **Class View** from the **View** menu. Or, press **Ctrl**+**Shift**+**C**.
118-
119108
### To display the contents of a complete project in a class diagram
120109

121-
In **Solution Explorer** or Class View, right-click the project and choose **View**, then choose **View Class Diagram**.
122-
123-
An auto-populated class diagram is created.
110+
Open a blank class diagram, then drag the project node from Solution Explorer to the class diagram surface. An auto-populated class diagram is created.
124111

125112
> [!IMPORTANT]
126113
> Class Designer is not available in .NET Core projects.

docs/msbuild/msbuild-command-line-reference.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,12 @@ Square brackets `[]` indicate optional parts, and curly braces `{}`indicate user
8888
|`-noConsoleLogger`<br/><br/>`-noconlog`|Disable the default console logger, and don't log events to the console.|
8989
|`-terminalLogger[:auto`,`on`,`off]`<br/><br/>`-tl[:auto`,`on`,`off]`|Enable or disable the [terminal logger](https://devblogs.microsoft.com/dotnet/announcing-dotnet-8-preview-4/#msbuild-new-modern-terminal-build-output). Terminal logger provides enhanced build output on the console in real time, organized logically by project, and designed to highlight actionable information. Specify `auto` (or use the option without arguments) to use the terminal logger only if the standard output is not redirected. Don't parse the output or otherwise rely on it remaining unchanged in future versions. This option is available in MSBuild 17.8 and later.|
9090

91-
## Example 1
91+
## Example
9292

9393
The following example builds the `rebuild` target of the *MyProject.proj* project.
9494

9595
`MSBuild.exe MyProject.proj -t:rebuild`
9696

97-
## Example 2
98-
99-
You can use *MSBuild.exe* to perform more complex builds. For example, you can use it to build specific targets of specific projects in a solution. The following example rebuilds the project `NotInSolutionFolder` and cleans the project `InSolutionFolder`, which is in the *NewFolder* solution folder.
100-
101-
`msbuild SlnFolders.sln -t:NotInSolutionfolder:Rebuild;NewFolder\InSolutionFolder:Clean`
102-
10397
## See also
10498

10599
- [MSBuild reference](../msbuild/msbuild-reference.md)

docs/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
- name: Create web templates
237237
href: ide/how-to-manually-create-web-templates.md
238238
- name: Troubleshoot templates
239-
href: /troubleshoot/developer/visualstudio/project-build/how-to-troubleshoot-templates?toc=%2Fvisualstudio%2Fmsbuild%2Ftoc.json
239+
href: /troubleshoot/developer/visualstudio/project-build/how-to-troubleshoot-templates?toc=%2Fvisualstudio%2Ftoc.json
240240
- name: Locate project and item templates
241241
href: ide/how-to-locate-and-organize-project-and-item-templates.md
242242
- name: Customize templates

subscriptions/sign-in-work.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This article provides the steps for signing in with an email address provided by
3030

3131
You can now see the type of subscription you're using displayed in the blue bar across the top of the portal.
3232

33-
You can also see your currently selected subscription in the upper right corner, under your username. It says "Showing: ", followed by the subscription. If you have more than one subscription, you can select on the drop-down arrow and select the subscription you would like to use.
33+
You can also see your currently selected subscription in the upper right corner, under your username. It says "Showing:" followed by the subscription. If you have more than one subscription, you can select on the drop-down arrow and select the subscription you would like to use.
3434

3535
> [!NOTE]
3636
> Visual Studio [subscriptions portal](https://my.visualstudio.com?wt.mc_id=o~msft~docs) and [admin portal](https://manage.visualstudio.com) do not support [GCC High tenants](https://learn.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/office-365-us-government/gcc-high-and-dod), also known as private or government domains. This also applies to subscribers attempting to sign into the Visual Studio IDE. To access Visual Studio subscriptions, your organization will need to have a public tenant. For further assistance creating a public tenant, contact [Azure support](https://azure.microsoft.com/support/create-ticket/).
@@ -46,7 +46,7 @@ You can also see your currently selected subscription in the upper right corner,
4646
3. Select **Continue**.
4747
4. You're redirected to a decision page.
4848
+ Select **Work or school account** if the subscription is associated with a "Work or School" account associated with a Microsoft Entra tenant.
49-
+ Select **Personal** if the subscription is associated with a "Corporate" email address, but was also converted to a "Personal" Microsoft Account (MSA).
49+
+ Select **Personal** if the subscription is associated with a "Corporate" email address but was also converted to a "Personal" Microsoft Account (MSA).
5050

5151
> [!NOTE]
5252
> This will be the case for many subscribers who have used Visual Studio subscriptions (formerly MSDN) in the past.

0 commit comments

Comments
 (0)