Skip to content

Commit e1bdaf3

Browse files
authored
Merge pull request #7459 from MicrosoftDocs/main637757930345449153
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 8213a46 + 3c1b979 commit e1bdaf3

26 files changed

+83
-73
lines changed

docs/deployment/deploying-applications-services-and-components-resources.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ You determine how much computing power an App Service has by choosing a [pricing
9393
> If you want to use Azure App Service in your own datacenter or other on-premises computers, you can do so using the [Azure Stack](https://azure.microsoft.com/overview/azure-stack/).
9494
9595
For more information on publishing to App Service, see:
96-
- [Quickstart - Publish to Azure App Service](quickstart-deploy-to-azure.md)
97-
- [Quickstart - Publish ASP.NET Core to Linux](quickstart-deploy-to-linux.md).
96+
- [Quickstart - Publish to Azure App Service](quickstart-deploy-aspnet-web-app.md)
97+
- [Quickstart - Publish ASP.NET Core to Linux](quickstart-deploy-aspnet-web-app.md).
9898
- [Publish an ASP.NET Core app to Azure App Service](/aspnet/core/tutorials/publish-to-azure-webapp-using-vs)
9999
- [Troubleshoot ASP.NET Core on Azure App Service and IIS](/aspnet/core/test/troubleshoot-azure-iis).
100100

@@ -162,7 +162,7 @@ If for any reason (such as machine access) you are not able to use cloud service
162162
- You need only a local test deployment.
163163
- You want to examine and potentially modify the application files independently before sending them onto another deployment target.
164164

165-
For more information, see [Quickstart - Deploy to a local folder](quickstart-deploy-to-local-folder.md).
165+
For more information, see [Quickstart - Deploy to a local folder](quickstart-deploy-aspnet-web-app.md).
166166
::: moniker range=">=vs-2019"
167167
For more information on deploying a .NET Windows Application using ClickOnce, see [Deploy a .NET Windows application using ClickOnce](quickstart-deploy-using-clickonce-folder.md).
168168
::: moniker-end
@@ -211,7 +211,7 @@ You can create any number of IIS web server deployment profiles in Visual Studio
211211
- You want to deploy using credentials other than the ones that you use within Visual Studio, or those tied directly to your Azure accounts.
212212
- You want to delete files from the target each time you deploy.
213213

214-
For more information, see [Quickstart - Deploy to a web site](quickstart-deploy-to-a-web-site.md).
214+
For more information, see [Quickstart - Deploy to a web site](quickstart-deploy-aspnet-web-app.md).
215215

216216
For help with troubleshooting ASP.NET Core on IIS, see [Troubleshoot ASP.NET Core on Azure App Service and IIS](/aspnet/core/test/troubleshoot-azure-iis).
217217

docs/extensibility/ux-guidelines/menus-and-commands-for-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,6 @@ ms.workload:
282282

283283
There is not a simple way to check shortcut availability. If you want to add a shortcut, follow these steps:
284284

285-
1. Check the list of [Visual Studio 2013 shortcuts](/visualstudio/ide/default-keyboard-shortcuts-in-visual-studio) to determine if there are similar commands to group yours with.
285+
1. Check the list of [Visual Studio 2013 shortcuts](../../ide/default-keyboard-shortcuts-in-visual-studio.md) to determine if there are similar commands to group yours with.
286286

287287
2. Go to **Tools > Options > Environment > Keyboard** and test your shortcut. Check each keyboard mapping scheme listed under "Apply the following additional keyboard mapping scheme." Check General, C#, VB, and C++ profiles, as those share unique shortcuts. Your shortcut is available if it's not mapped in any of those places.

docs/get-started/csharp/tutorial-aspnet-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,4 +520,4 @@ Or, learn how to containerize your web app with Docker:
520520

521521
## See also
522522

523-
[Publish your web app to Azure App Service by using Visual Studio](../../deployment/quickstart-deploy-to-azure.md)
523+
[Publish your web app to Azure App Service by using Visual Studio](../../deployment/quickstart-deploy-aspnet-web-app.md)

docs/get-started/csharp/tutorial-uwp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ It's time to build, deploy, and launch the "Hello World" UWP app to see what it
351351
Congratulations on completing this tutorial! We hope you learned some basics about UWP and the Visual Studio IDE. To learn more, continue with the following tutorial:
352352

353353
> [!div class="nextstepaction"]
354-
> [Create a user interface](/visualstudio/xaml-tools/creating-a-ui-by-using-xaml-designer-in-visual-studio)
354+
> [Create a user interface](../../xaml-tools/creating-a-ui-by-using-xaml-designer-in-visual-studio.md)
355355
356356
## See also
357357

docs/get-started/tutorial-open-project-from-repo.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Here's how to browse to and clone an Azure DevOps repo by using Visual Studio.
128128

129129
## Open a project from a GitHub repo with Visual Studio 2019
130130

131-
How you open a project from a GitHub repo by using Visual Studio depends on which version you have. Specifically, if you've installed version Visual Studio 2019 [**version 16.8**](/visualstudio/releases/2019/release-notes-history) or later, there's a new, more fully integrated [Git experience in Visual Studio](../ide/git-with-visual-studio.md) available to you.
131+
How you open a project from a GitHub repo by using Visual Studio depends on which version you have. Specifically, if you've installed version Visual Studio 2019 [**version 16.8**](/visualstudio/releases/2019/release-notes-history) or later, there's a new, more fully integrated [Git experience in Visual Studio](../version-control/git-with-visual-studio.md) available to you.
132132

133133
But no matter which version you've installed, you can always open a project from a GitHub repo with Visual Studio.
134134

@@ -223,7 +223,7 @@ Here's how to use Git in Visual Studio 2019 [**version 16.7**](/visualstudio/rel
223223

224224
## Browse to an Azure DevOps repo with Visual Studio 2019
225225

226-
What you see when you browse to and clone an Azure DevOps repository by using Visual Studio 2019 depends on which version you have. Specifically, if you've installed version [**version 16.8**](/visualstudio/releases/2019/release-notes-history) or later, we've changed the UI to accommodate a new, more fully integrated [Git experience in Visual Studio](../ide/git-with-visual-studio.md) in Visual Studio.
226+
What you see when you browse to and clone an Azure DevOps repository by using Visual Studio 2019 depends on which version you have. Specifically, if you've installed version [**version 16.8**](/visualstudio/releases/2019/release-notes-history) or later, we've changed the UI to accommodate a new, more fully integrated [Git experience in Visual Studio](../version-control/git-with-visual-studio.md) in Visual Studio.
227227

228228
But no matter which version you have installed, you can always browse to and clone an Azure DevOps repo with Visual Studio.
229229

@@ -378,8 +378,8 @@ Feel free to dive into any of the following language-specific tutorials:
378378

379379
::: moniker range="<=vs-2019"
380380

381-
- [The Git experience in Visual Studio](../ide/git-with-visual-studio.md)
382-
- [Compare Git and Team Explorer side-by-side](../ide/git-team-explorer-feature-comparison.md)
381+
- [The Git experience in Visual Studio](../version-control/git-with-visual-studio.md)
382+
- [Compare Git and Team Explorer side-by-side](../version-control/git-team-explorer-feature-comparison.md)
383383
- [Microsoft Learn: Get started with Git and GitHub in Visual Studio](/learn/modules/visual-studio-github-push/)
384384
- [Microsoft Learn: Get started with Azure DevOps](/learn/modules/get-started-with-devops/)
385385
- [Azure DevOps Services: Get started with Azure Repos and Visual Studio](/azure/devops/repos/git/gitquickstart/)

docs/ide/advanced-feature-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ For full details, see the [Git experience in Visual Studio](../version-control/g
164164

165165
::: moniker range="vs-2019"
166166

167-
How you open a project from a GitHub repo by using Visual Studio 2019 depends on which version you have. Specifically, if you've installed version [**version 16.8**](/visualstudio/releases/2019/release-notes/) or later, there's a new, more fully integrated [Git experience in Visual Studio](../ide/git-with-visual-studio.md) available to you. For more information, see the [Visual Studio version control documentation](../version-control/index.yml) page.
167+
How you open a project from a GitHub repo by using Visual Studio 2019 depends on which version you have. Specifically, if you've installed version [**version 16.8**](/visualstudio/releases/2019/release-notes/) or later, there's a new, more fully integrated [Git experience in Visual Studio](../version-control/git-with-visual-studio.md) available to you. For more information, see the [Visual Studio version control documentation](../version-control/index.yml) page.
168168

169169
And, for a step-by-step tutorial on how to connect to a Git or Azure DevOps repository by using Visual Studio, see the [Open a project from a repo](../get-started/tutorial-open-project-from-repo.md?view=vs-2019&preserve-view=true) page.
170170

docs/ide/connect-team-project.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ To connect to a project:
118118
![Connect to a project in Team Explorer](media/team-explorer/connect-project.png "The Team Explorer - Connect to a Project option in Visual Studio.")
119119

120120
> [!TIP]
121-
> If you want to open a project from a repo, see [Open a project from a repo](../get-started/tutorial-open-project-from-repo-visual-studio-2017.md). If you want to create a new project or add users to a project, see [Create a project (Azure DevOps)](/azure/devops/organizations/projects/create-project) and [Add users to a project or team (Azure DevOps)](/azure/devops/organizations/security/add-users-team-project).
121+
> If you want to open a project from a repo, see [Open a project from a repo](/visualstudio/get-started/tutorial-open-project-from-repo?view=vs-2017&preserve-view=true). If you want to create a new project or add users to a project, see [Create a project (Azure DevOps)](/azure/devops/organizations/projects/create-project) and [Add users to a project or team (Azure DevOps)](/azure/devops/organizations/security/add-users-team-project).
122122
123123
::: moniker-end
124124

125125
## See also
126126

127-
- [Compare Git and Team Explorer side-by-side](git-team-explorer-feature-comparison.md)
127+
- [Compare Git and Team Explorer side-by-side](../version-control/git-team-explorer-feature-comparison.md)
128128
- [Visual Studio version control documentation](../version-control/index.yml)
129129
- [Team Explorer reference](reference/team-explorer-reference.md)
130130
- [Connect to a project (Azure DevOps)](/azure/devops/organizations/projects/connect-to-projects)

docs/ide/csharp-developer-productivity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Popular quick fixes and refactorings include:
134134

135135
For more information, see [code generation features](code-generation-in-visual-studio.md).
136136

137-
You can [install FxCop analyzers](../code-quality/install-fxcop-analyzers.md) to flag code issues. Or, write your own refactoring or code fix with [Roslyn analyzers](https://github.com/dotnet/roslyn/blob/master/docs/wiki/Getting-Started-Writing-a-Custom-Analyzer-&-Code-Fix.md).
137+
You can [install FxCop analyzers](../code-quality/install-net-analyzers.md) to flag code issues. Or, write your own refactoring or code fix with [Roslyn analyzers](https://github.com/dotnet/roslyn/blob/master/docs/wiki/Getting-Started-Writing-a-Custom-Analyzer-&-Code-Fix.md).
138138

139139
Several community members have written free extensions that add additional code inspections:
140140

docs/ide/productivity-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ At any one time, you may be working in multiple code files and moving among seve
176176
## See also
177177

178178
- [Visual Studio tips and tricks blog post](https://devblogs.microsoft.com/visualstudio/visual-studio-tips-and-tricks/)
179-
- [Default keyboard shortcuts for frequently used commands](../ide/default-keyboard-shortcuts-for-frequently-used-commands-in-visual-studio.md)
179+
- [Default keyboard shortcuts for frequently used commands](default-keyboard-shortcuts-in-visual-studio.md)
180180
- [How to: Customize menus and toolbars](../ide/how-to-customize-menus-and-toolbars-in-visual-studio.md)
181181
- [Walkthrough: Create a simple application](../get-started/csharp/tutorial-wpf.md)
182182
- [Accessibility tips and tricks](../ide/reference/accessibility-tips-and-tricks.md)

docs/ide/quickstart-aspnet-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,4 +295,4 @@ Or, learn how to containerize your web app with Docker:
295295
296296
## See also
297297

298-
[Publish your web app to Azure App Service by using Visual Studio](../deployment/quickstart-deploy-to-azure.md)
298+
[Publish your web app to Azure App Service by using Visual Studio](../deployment/quickstart-deploy-aspnet-web-app.md)

docs/ide/quickstart-fsharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,6 @@ Visual Studio launches a browser window that displays JSON matching the "Hello W
142142
Congratulations on completing this Quickstart! We hope you learned something about F#, ASP.NET Core, and the Visual Studio IDE. To see the app running on a public server, select the following button.
143143

144144
> [!div class="nextstepaction"]
145-
> [Deploy the app to Azure App Service](../deployment/quickstart-deploy-to-azure.md)
145+
> [Deploy the app to Azure App Service](../deployment/quickstart-deploy-aspnet-web-app.md)
146146
147147
To learn more about F#, check out the official [F# Guide](/dotnet/fsharp/index).

docs/ide/reference/connected-experiences.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Visual Studio consists of client software applications and connected experiences
2020

2121
## Choose whether these connected experiences are available to use ##
2222

23-
You can choose which connected experiences to use. Use of certain connected experiences require agreement to different and additional terms to the Visual Studio EULA. These experiences may be Microsoft-owned online services and/or services owned by third-parties. For example, when you use GitHub connected experiences, the [GitHub Privacy Statement](https://docs.github.com/github/site-policy/github-privacy-statement) and [GitHub Terms of Service](https://docs.github.com/github/site-policy/github-terms-of-service), [GitHub Corporate Terms of Service](https://docs.github.com/github/site-policy/github-corporate-terms-of-service), and/or [Additional Product Terms](https://docs.github.com/github/site-policy/github-additional-product-terms) will apply. If you [Report A Problem](/visualstudio/ide/how-to-report-a-problem-with-visual-studio), you agree to the [Microsoft Terms of Use](https://www.microsoft.com/legal/terms-of-use) and the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement). If you use the NuGet service, you agree to the [NuGet Terms of Use](https://www.nuget.org/policies/Terms) and the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement).
23+
You can choose which connected experiences to use. Use of certain connected experiences require agreement to different and additional terms to the Visual Studio EULA. These experiences may be Microsoft-owned online services and/or services owned by third-parties. For example, when you use GitHub connected experiences, the [GitHub Privacy Statement](https://docs.github.com/github/site-policy/github-privacy-statement) and [GitHub Terms of Service](https://docs.github.com/github/site-policy/github-terms-of-service), [GitHub Corporate Terms of Service](https://docs.github.com/github/site-policy/github-corporate-terms-of-service), and/or [Additional Product Terms](https://docs.github.com/github/site-policy/github-additional-product-terms) will apply. If you [Report A Problem](../how-to-report-a-problem-with-visual-studio.md), you agree to the [Microsoft Terms of Use](https://www.microsoft.com/legal/terms-of-use) and the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement). If you use the NuGet service, you agree to the [NuGet Terms of Use](https://www.nuget.org/policies/Terms) and the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement).
2424

25-
When you install Visual Studio, [you may optionally select workloads and components to install](/visualstudio/install/install-visual-studio). Workloads and components may leverage third-party software, and they may enable connected experiences, depending on their functionality. For example, [downloading the Azure development workload allows you to publish your cloud apps to Azure](https://visualstudio.microsoft.com/vs/features/azure/). Based on your installation selections, you may also use the Tools and Options menu to connect to, to configure, and to use connected experiences. For example, you can connect to a server, add Azure Services authentication, or change IntelliCode or LiveShare settings.
25+
When you install Visual Studio, [you may optionally select workloads and components to install](../../install/install-visual-studio.md). Workloads and components may leverage third-party software, and they may enable connected experiences, depending on their functionality. For example, [downloading the Azure development workload allows you to publish your cloud apps to Azure](https://visualstudio.microsoft.com/vs/features/azure/). Based on your installation selections, you may also use the Tools and Options menu to connect to, to configure, and to use connected experiences. For example, you can connect to a server, add Azure Services authentication, or change IntelliCode or LiveShare settings.
2626

27-
You can also use your organization’s [firewall settings](/visualstudio/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server) to enable or disable connection to services. Please note that disabling connection to an endpoint may negatively affect or disable performance of related Visual Studio features.
27+
You can also use your organization’s [firewall settings](../../install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md) to enable or disable connection to services. Please note that disabling connection to an endpoint may negatively affect or disable performance of related Visual Studio features.
2828

2929
Finally, the Visual Studio Marketplace offers extensions that may enable first- or third-party connected experiences. Visual Studio Marketplace is subject to the [Visual Studio Marketplace Terms of Use](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf) and the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement). Each extension requires agreement to particular terms of use and privacy statement associated with that offering.
3030

@@ -33,10 +33,10 @@ Finally, the Visual Studio Marketplace offers extensions that may enable first-
3333

3434
Required service data can include information related to the operation of the connected experience that is needed to keep the underlying service secure, up to date, and performing as expected. If you choose to use a connected experience that analyzes your content, for example IntelliCode, the code you selected for your model is also sent and processed to provide you the connected experience. Required service data can also include information needed by a connected experience to perform its task, such updating a NuGet package. You can manage required service data by choosing whether or not to use a particular service. If you do not use a service, then no required service data is collected.
3535

36-
Required service data is different from diagnostic data because diagnostic data relates to the software running on your device. Your choice whether to participate in the [Visual Studio Customer Experience Improvement Program (VSCEIP) controls privacy settings for diagnostic data](/visualstudio/ide/visual-studio-experience-improvement-program), but this setting does not affect whether required service data is sent.
36+
Required service data is different from diagnostic data because diagnostic data relates to the software running on your device. Your choice whether to participate in the [Visual Studio Customer Experience Improvement Program (VSCEIP) controls privacy settings for diagnostic data](../visual-studio-experience-improvement-program.md), but this setting does not affect whether required service data is sent.
3737

3838
## Diagnostic data collection ##
3939

4040
Diagnostic data is used to keep Visual Studio secure and up-to-date, detect, diagnose and fix problems, and also make product improvements. Diagnostic data is collected and sent to Microsoft about Visual Studio client software running on the user's device.
4141

42-
When you opt out, you are opting out of optional diagnostic data collection. Some diagnostic data collection is required to make sure Visual Studio is secure, up to date, and performing as expected. Required diagnostic data collection will not be affected by your choice to opt out of [VSCEIP](/visualstudio/ide/visual-studio-experience-improvement-program).
42+
When you opt out, you are opting out of optional diagnostic data collection. Some diagnostic data collection is required to make sure Visual Studio is secure, up to date, and performing as expected. Required diagnostic data collection will not be affected by your choice to opt out of [VSCEIP](../visual-studio-experience-improvement-program.md).

0 commit comments

Comments
 (0)