Skip to content

Commit 93af55c

Browse files
authored
Merge pull request #7364 from MicrosoftDocs/master637738059295500830
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 76b69ff + b54e91b commit 93af55c

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

docs/containers/deploy-app-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The following steps guide you through creating a basic ASP.NET Core app that wil
4343
4. Give your new application a name (or take the default) and select **OK**.
4444
5. Select **Web Application**.
4545
6. Check the **Enable Docker Support** checkbox.
46-
7. Select the **Linux** container type and click **OK**. Windows containers are not supported to deploy to Azure App Service as a container.
46+
7. Select the **Linux** container type and click **OK**.
4747
::: moniker-end
4848
::: moniker range=">= vs-2019"
4949
1. From the Visual Studio start window, choose **Create a new project**.
@@ -188,4 +188,4 @@ Learn more about [Azure App Service](/azure/app-service/overview).
188188

189189
## See also
190190

191-
[Deploy to Azure Container Registry](hosting-web-apps-in-docker.md)
191+
[Deploy to Azure Container Registry](hosting-web-apps-in-docker.md)

docs/test/using-shims-to-isolate-your-application-from-other-assemblies-for-unit-testing.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,4 +525,3 @@ Shims cannot be used on all types from the .NET base class library **mscorlib**
525525

526526
- [Isolate code under test with Microsoft Fakes](../test/isolating-code-under-test-with-microsoft-fakes.md)
527527
- [Peter Provost's blog: Visual Studio 2012 shims](http://www.peterprovost.org/blog/2012/04/25/visual-studio-11-fakes-part-2)
528-
- [Video (1h16): Testing untestable code with fakes in Visual Studio 2012](https://channel9.msdn.com/Events/TechEd/Europe/2012/DEV411)

subscriptions/access-github.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ A: The process for setting up a GitHub Enterprise account can take a while. If
7676
A: Along with GitHub Enterprise, you receive all of the benefits of a standard Visual Studio subscription including software downloads, cloud services, technical support, and partner benefits just as if the subscription was purchased separately.
7777

7878
## Support resources
79-
- Learn more about GitHub assignment at [GitHub Docs](https://docs.github.com/github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle)
79+
- Learn more about GitHub assignment at [GitHub Docs](https://docs.github.com/en/enterprise-cloud@latest/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)
8080
- Find answers to questions on a wide array of GitHub topics at [GitHub Help](https://help.github.com).
8181
- Need more help? Contact [GitHub Support](https://support.github.com/)
8282
- Get help from other GitHub users in the [GitHub Community Forum](https://i.8713187.xyzmunity/).

subscriptions/assign-github.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Since this process is more complex, it may take several days after subscriptions
6565
GitHub is available as either the cloud-based GitHub.com, or on-premise GitHub Enterprise Server. The processes for managing the two versions differ. GitHub provides various help topics and admin guides to help you manage GitHub Enterprise subscriptions. We've provided links to selected topics below.
6666

6767
## Support resources
68-
- Learn more about GitHub assignment at [GitHub Docs](https://docs.github.com/en/github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle)
68+
- Learn more about GitHub assignment at [GitHub Docs](https://docs.github.com/en/enterprise-cloud@latest/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)
6969
- Find answers to questions on a wide array of GitHub topics at [GitHub Help](https://help.github.com/en).
7070
- Get help from other GitHub users in the [GitHub Community Forum](https://i.8713187.xyzmunity/).
7171
- For assistance with administration of Visual Studio Subscriptions, contact [Visual Studio subscriptions support](https://aka.ms/vsadminhelp).
@@ -86,4 +86,4 @@ Learn more about managing Visual Studio subscriptions.
8686
- [Delete subscriptions](delete-license.md)
8787
- [Determine maximum usage](maximum-usage.md)
8888

89-
For more information about managing Visual Studio subscriptions with GitHub Enterprise, check out the Visual Studio [subscriptions admin portal](https://visualstudio.microsoft.com/subscriptions-administration/).
89+
For more information about managing Visual Studio subscriptions with GitHub Enterprise, check out the Visual Studio [subscriptions admin portal](https://visualstudio.microsoft.com/subscriptions-administration/).

subscriptions/vs-m365.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ A: The Visual Studio subscriptions that include the Microsoft 365 benefit also i
134134
- Need help with Microsoft 365 developer subscription? Check out the online [Microsoft 365 documentation](/office/developer-program/office-365-developer-program-faq).
135135
- For assistance with sales, subscriptions, accounts and billing for Visual Studio Subscriptions, contact [Visual Studio subscriptions support](https://my.visualstudio.com/gethelp).
136136
- Have a question about Visual Studio IDE, Azure DevOps Services or other Visual Studio products or services? Visit [Visual Studio Support](https://visualstudio.microsoft.com/support/).
137-
- Have feedback on the new offer? Please [share your feedback on UserVoice](https://officespdev.uservoice.com/forums/224641-feature-requests-and-feedback?category_id=171306). The Microsoft 365 team will personally review each comment.
137+
- Have feedback on the new offer? Please [share your feedback on UserVoice](https://feedback.uservoice.com/). The Microsoft 365 team will personally review each comment.
138138

139139
## See also
140140
- [Visual Studio documentation](/visualstudio/)

0 commit comments

Comments
 (0)