Skip to content

Commit 3b18bf6

Browse files
authored
Merge pull request #4951 from MicrosoftDocs/master637200830187868014
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents fe86fd8 + 4b8e7a2 commit 3b18bf6

File tree

8 files changed

+50
-16
lines changed

8 files changed

+50
-16
lines changed

docs/code-quality/install-fxcop-analyzers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ In Visual Studio 2019 version 16.3 and later, you can install the [Microsoft.Cod
2828

2929
2. Select **Install**.
3030

31-
Visual Studio installs the latest version of the Microsoft.CodeAnalyzers.FxCopAnalyzers package. The assemblies appear in **Solution Explorer** under **References** > **Analyzers**.
31+
Visual Studio installs the latest version of the Microsoft.CodeAnalysis.FxCopAnalyzers package. The assemblies appear in **Solution Explorer** under **References** > **Analyzers**.
3232

3333
![Analyzers node in Solution Explorer](media/solution-explorer-analyzers-node.png)
3434

docs/debugger/decompilation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ When debugging a .NET application, you may find that you want to view source cod
2222
> [!NOTE]
2323
> * Source code generation (decompilation) is only available for .NET applications and is based on the open source [ILSpy](https://github.com/icsharpcode/ILSpy) project.
2424
> * Decompilation is only available in Visual Studio 2019 16.5 and later.
25+
> * Applying the [SuppressIldasmAttribute](https://docs.microsoft.com/dotnet/api/system.runtime.compilerservices.suppressildasmattribute) attribute to an assembly or module prevents Visual Studio from attempting decompilation.
2526
2627
## Generate source code
2728

docs/ide/editorconfig-code-style-settings-reference.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,29 +220,32 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
220220

221221
dotnet_naming_symbols.interface.applicable_kinds = interface
222222
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
223-
dotnet_naming_symbols.interface.required_modifiers =
223+
dotnet_naming_symbols.interface.required_modifiers =
224224

225225
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
226226
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
227-
dotnet_naming_symbols.types.required_modifiers =
227+
dotnet_naming_symbols.types.required_modifiers =
228228

229229
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
230230
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
231-
dotnet_naming_symbols.non_field_members.required_modifiers =
231+
dotnet_naming_symbols.non_field_members.required_modifiers =
232232

233233
# Naming styles
234234

235-
dotnet_naming_style.pascal_case.required_prefix =
236-
dotnet_naming_style.pascal_case.required_suffix =
237-
dotnet_naming_style.pascal_case.word_separator =
235+
dotnet_naming_style.pascal_case.required_prefix =
236+
dotnet_naming_style.pascal_case.required_suffix =
237+
dotnet_naming_style.pascal_case.word_separator =
238238
dotnet_naming_style.pascal_case.capitalization = pascal_case
239239

240240
dotnet_naming_style.begins_with_i.required_prefix = I
241-
dotnet_naming_style.begins_with_i.required_suffix =
242-
dotnet_naming_style.begins_with_i.word_separator =
241+
dotnet_naming_style.begins_with_i.required_suffix =
242+
dotnet_naming_style.begins_with_i.word_separator =
243243
dotnet_naming_style.begins_with_i.capitalization = pascal_case
244244
```
245245

246+
> [!NOTE]
247+
> For more information about the supported .NET coding convention categories, see the [Language conventions](../ide/editorconfig-language-conventions.md), [Formatting conventions](../ide/editorconfig-formatting-conventions.md), and [Naming conventions](../ide/editorconfig-naming-conventions.md) pages.
248+
246249
## See also
247250

248251
- [Quick Actions](../ide/quick-actions.md)

subscriptions/sign-in-issues.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Issues Signing in to Visual Studio Subscriptions | Microsoft Docs
33
author: evanwindom
44
ms.author: lank
55
manager: lank
6-
ms.date: 07/19/2019
6+
ms.date: 03/11/2020
77
ms.topic: conceptual
88
description: Learn about issues that may arise when signing in to Visual Studio subscriptions
99
---
@@ -57,6 +57,12 @@ Aliasing can be encountered when a company has a Microsoft Online Service for th
5757
### What options do I have?
5858
From a subscriber perspective, it is important to first work with your administrator to understand your company’s identity configuration. If necessary, your administrator may have to update your account settings from their administration portal, or you may need to create a Microsoft Account (MSA) using your corporate email address. Before taking the steps to create an MSA, speak with your administrator regarding any policies or issues with taking this action.
5959

60+
## See also
61+
- [Visual Studio documentation](https://docs.microsoft.com/visualstudio/)
62+
- [Azure DevOps documentation](https://docs.microsoft.com/azure/devops/)
63+
- [Azure documentation](https://docs.microsoft.com/azure/)
64+
- [Microsoft 365 documentation](https://docs.microsoft.com/microsoft-365/)
65+
6066
## Next steps
6167
- Learn how to [link MSA and AAD accounts](/azure/active-directory/b2b/add-users-administrator) within AAD.
6268
- Learn more about [anonymization](anonymization.md).

subscriptions/sign-in-msa.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Signing in to Visual Studio Subscriptions with your Microsoft Account (MS
33
author: evanwindom
44
ms.author: lank
55
manager: lank
6-
ms.date: 07/11/2019
6+
ms.date: 03/11/2020
77
ms.topic: conceptual
88
description: How to Sign In to Your Visual Studio Subscription with your Microsoft Account (MSA)
99
---
@@ -31,10 +31,16 @@ A: The most common cause of sign in problems is attempting to sign in with an M
3131

3232
### Q: I can't see my subscription. Where is it?
3333
A: Many users have more than one subscription. If you are able to sign in to the subscriptions portal at https://my.visualstudio.com but cannot see your subscription, there are two common causes:
34-
1. You're logged in with a different Microsoft Account. It's possible that you have multiple subscriptions, such as a Professional or Enterprise subscription and a Visual Studio Dev Essentials membership, and they're associated with different email addresses. To see the other subscriptions, sign out and sign back in using the other MSA.
35-
2. You have multiple subscriptions associated with the same MSA. To see all of the subscriptions associated with your MSA, visit https://my.visualstudio.com/subscriptions and choose the subscription you wish to use.
34+
- You're logged in with a different Microsoft Account. It's possible that you have multiple subscriptions, such as a Professional or Enterprise subscription and a Visual Studio Dev Essentials membership, and they're associated with different email addresses. To see the other subscriptions, sign out and sign back in using the other MSA.
35+
- You have multiple subscriptions associated with the same MSA. To see all of the subscriptions associated with your MSA, visit https://my.visualstudio.com/subscriptions and choose the subscription you wish to use.
3636

3737
If you're still having trouble, you can reach out to our [subscriptions support](https://visualstudio.microsoft.com/subscriptions/support/) team for assistance.
3838

39+
## See also
40+
- [Visual Studio documentation](https://docs.microsoft.com/visualstudio/)
41+
- [Azure DevOps documentation](https://docs.microsoft.com/azure/devops/)
42+
- [Azure documentation](https://docs.microsoft.com/azure/)
43+
- [Microsoft 365 documentation](https://docs.microsoft.com/microsoft-365/)
44+
3945
## Next steps
4046
Once you've successfully signed in to the subscriptions portal, we recommend visiting the Benefits page at https://my.visualstudio.com/benefits and exploring the great tools, services, and offers available to you.

subscriptions/sign-in-work.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Signing in to Visual Studio Subscriptions with your work or school accoun
33
author: evanwindom
44
ms.author: lank
55
manager: lank
6-
ms.date: 07/11/2019
6+
ms.date: 03/11/2020
77
ms.topic: conceptual
88
description: Learn how to sign in to your Visual Studio subscription(s) with your work or school account.
99
---
@@ -65,5 +65,11 @@ A: Many users have more than one subscription. If you are able to sign in to t
6565

6666
If you're still having trouble, you can reach out to our [subscriptions support](https://visualstudio.microsoft.com/subscriptions/support/) team for assistance.
6767

68+
## See also
69+
- [Visual Studio documentation](https://docs.microsoft.com/visualstudio/)
70+
- [Azure DevOps documentation](https://docs.microsoft.com/azure/devops/)
71+
- [Azure documentation](https://docs.microsoft.com/azure/)
72+
- [Microsoft 365 documentation](https://docs.microsoft.com/microsoft-365/)
73+
6874
## Next steps
6975
Once you've successfully signed in to the subscriptions portal, we recommend visiting the Benefits page at https://my.visualstudio.com/benefits and exploring the great tools, services, and offers available to you.

subscriptions/software-download-list.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: What Software is Available for Download? | Microsoft Docs
33
author: evanwindom
44
ms.author: lank
55
manager: lank
6-
ms.date: 12/28/2017
6+
ms.date: 03/11/2020
77
ms.topic: conceptual
88
description: Find a list of the software downloads included with your Visual Studio subscription.
99
---
@@ -24,5 +24,11 @@ To quickly find products, use the "Search" functions at the top of the page or c
2424
2525
You can also download an Excel spreadsheet containing an extensive list of [available software titles](https://download.microsoft.com/download/1/5/4/15454442-CF17-47B9-A65D-DF84EF88511B/Visual_Studio_by_Subscription_Level.xlsx) for each subscription type.
2626

27+
## See also
28+
- [Visual Studio documentation](https://docs.microsoft.com/visualstudio/)
29+
- [Azure DevOps documentation](https://docs.microsoft.com/azure/devops/)
30+
- [Azure documentation](https://docs.microsoft.com/azure/)
31+
- [Microsoft 365 documentation](https://docs.microsoft.com/microsoft-365/)
32+
2733
## Next steps
2834
You can learn more about how to [download software](download-software.md) or obtain and manage [product keys](product-keys.md).

subscriptions/use-connected-identities.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: How to use connected Microsoft account and Azure Active Directory identit
33
author: evanwindom
44
ms.author: lank
55
manager: lank
6-
ms.date: 09/27/2019
6+
ms.date: 03/11/2020
77
ms.topic: conceptual
88
robots: "noindex, nofollow"
99
description: Learn how to work with connected Microsoft accounts and Azure Active Directory identities
@@ -33,5 +33,11 @@ Adding an alternate account to your Visual Studio subscription allows you to acc
3333
### Q: How can I contact my admin about this?
3434
A: Please see our [Contact your subscriptions administrator](contact-my-admin.md) article for information about contacting your admin.
3535

36+
## See also
37+
- [Visual Studio documentation](https://docs.microsoft.com/visualstudio/)
38+
- [Azure DevOps documentation](https://docs.microsoft.com/azure/devops/)
39+
- [Azure documentation](https://docs.microsoft.com/azure/)
40+
- [Microsoft 365 documentation](https://docs.microsoft.com/microsoft-365/)
41+
3642
## Next steps
3743
After your admin connects your Azure AD and MSA accounts, we recommend verifying that you can successfully sign in to the [subscription portal](https://my.visualstudio.com?wt.mc_id=o~msft~docs) and access benefits like Azure DevOps, Visual Studio, and your Azure DevTest individual credit.

0 commit comments

Comments
 (0)