Skip to content

Commit b16bf4d

Browse files
authored
Merge pull request #4309 from MicrosoftDocs/master637092006566629136
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents c2683a4 + b968f3a commit b16bf4d

13 files changed

+28
-17
lines changed

docs/install/visual-studio-build-numbers-and-release-dates.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: "A list of released versions and build numbers for Visual Studio, s
55
author: TerryGLee
66
ms.author: tglee
77
manager: jillfra
8-
ms.date: 11/06/2019
8+
ms.date: 11/12/2019
99
ms.topic: reference
1010
ms.custom: "seodec18"
1111
ms.workload:
@@ -23,6 +23,7 @@ The following table lists the build numbers and release dates for Visual Studio
2323

2424
| **Version**| **Channel** | **Release date** | **Build version** |
2525
| ---------------------- | ----------- | ---------------- | ----------------- |
26+
| 16.3.9 | Release | November 12, 2019 | 16.3.29509.3 |
2627
| 16.4.0 | Preview 4 | November 6, 2019 | 16.4.29505.145 |
2728
| 16.3.8 | Release | November 5, 2019 | 16.3.29503.13 |
2829
| 16.4.0 | Preview 3 | November 4, 2019 | 16.4.29430.225 |

docs/modeling/directed-graph-markup-language-dgml-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Directed Graph Markup Language (DGML) describes information used for visualizati
1515
Note that some versions of Visual Studio support only a subset of DGML capabilities, see [Version support for architecture and modeling tools](../modeling/what-s-new-for-design-in-visual-studio.md#VersionSupport).
1616

1717
> [!NOTE]
18-
> When you edit a .dgml file, IntelliSense helps you identify attributes that are available for each element and their values. To specify color in an attribute, use names for common colors, such as "Blue", or ARGB hexadecimal values, such as "#ffa0b1c3". DGML uses a small subset of Windows Presentation Foundation (WPF) color definition formats. For more information, see [Colors Class](/dotnet/api/system.windows.media.colors&view=netframework-4.8).
18+
> When you edit a .dgml file, IntelliSense helps you identify attributes that are available for each element and their values. To specify color in an attribute, use names for common colors, such as "Blue", or ARGB hexadecimal values, such as "#ffa0b1c3". DGML uses a small subset of Windows Presentation Foundation (WPF) color definition formats. For more information, see [Colors Class](/dotnet/api/system.windows.media.colors?view=netframework-4.8).
1919
2020
## <a name="DGML"></a> DGML syntax
2121

docs/msbuild/msbuild-dot-targets-files.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "MSBuild .Targets Files | Microsoft Docs"
2+
title: "MSBuild .targets Files | Microsoft Docs"
33
ms.date: "02/24/2017"
44
ms.topic: "reference"
55
dev_langs:
@@ -8,8 +8,8 @@ dev_langs:
88
- "C++"
99
- "jsharp"
1010
helpviewer_keywords:
11-
- ".Targets files"
12-
- "MSBuild, .Targets files"
11+
- ".targets files"
12+
- "MSBuild, .targets files"
1313
ms.assetid: f6d98eb4-d2fa-49b7-8e3c-bae1ca3cf596
1414
author: mikejo5000
1515
ms.author: mikejo

docs/profiling/da0001-use-stringbuilder-for-concatenations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ ms.workload:
3535
## How to investigate a warning
3636
Double-click the message in the **Error List** window to navigate to the [Function Details View](../profiling/function-details-view.md) of the sampling profile data. Find the sections of the program that make the most frequent use of string concatenation. Use the StringBuilder class for complex string manipulations, including frequent string concatenation operations.
3737

38-
For more information about how to work with strings, the [String Operations](/previous-versions/msp-n-p/ff647790(v=pandp.10)#scalenetchapt05_topic26) section of [Chapter 5 - Improving Managed Code Performance](/previous-versions/msp-n-p/ff647790(v=pandp.10)) in the Microsoft Patterns and Practices library.
38+
For more information about how to work with strings, the [String Operations](/previous-versions/msp-n-p/ff647790(v=pandp.10)#string-operations) section of [Chapter 5 - Improving Managed Code Performance](/previous-versions/msp-n-p/ff647790(v=pandp.10)) in the Microsoft Patterns and Practices library.

docs/sharepoint/security-for-sharepoint-solutions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.workload:
2020
[!INCLUDE[vsprvs](../sharepoint/includes/vsprvs-md.md)] incorporates the following features to help enhance the security of SharePoint applications.
2121

2222
## Safe control entries
23-
Every SharePoint project item created in [!include[vsprvs](../sharepoint/includes/vsprvs-md.md)] has a **Safe Control Entries** property that represents a safe controls collection. Its **Safe** subproperty enables you to specify the controls that you consider secure. For more information, see [Provide package and deployment information in project items](../sharepoint/providing-packaging-and-deployment-information-in-project-items.md) and [Specifying Safe Web Parts](/previous-versions/office/developer/sharepoint2003/dd583154(v=office.11)#sharepoint_northwindwebparts_topic19).
23+
Every SharePoint project item created in [!include[vsprvs](../sharepoint/includes/vsprvs-md.md)] has a **Safe Control Entries** property that represents a safe controls collection. Its **Safe** subproperty enables you to specify the controls that you consider secure. For more information, see [Provide package and deployment information in project items](../sharepoint/providing-packaging-and-deployment-information-in-project-items.md) and [Specifying Safe Web Parts](/previous-versions/office/developer/sharepoint2003/dd583154(v=office.11)#specifying-safe-web-parts).
2424

2525
## AllowPartiallyTrustedCallers attribute
2626
By default, only applications that are fully trusted by the runtime code access security (CAS) system can access a shared managed code assembly. Marking a fully trusted assembly with the AllowPartiallyTrustedCallers attribute allows partially trusted assemblies to access it.

docs/sharepoint/walkthrough-creating-and-debugging-a-sharepoint-workflow-solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ ms.workload:
279279

280280
- To learn more about SharePoint workflow activities, see [Workflow Activities for SharePoint Foundation](/previous-versions/office/developer/sharepoint-2010/ms446847(v=office.14)).
281281

282-
- To learn more about Windows Workflow Foundation activities, see [System.Workflow.Activities Namespace](/dotnet/api/system.workflow.activities&view=netframework-4.8).
282+
- To learn more about Windows Workflow Foundation activities, see [System.Workflow.Activities Namespace](/dotnet/api/system.windows.media.color).
283283

284284
## See also
285285
- [Create SharePoint workflow solutions](../sharepoint/creating-sharepoint-workflow-solutions.md)

docs/vs-2015/extensibility/debugger/visual-studio-debugger-extensibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ manager: jillfra
1515
# Visual Studio Debugger Extensibility
1616
[!INCLUDE[vs2017banner](../../includes/vs2017banner.md)]
1717

18-
Visual Studio includes a fully interactive source code debugger, providing a powerful and easy-to-use tool for tracking down bugs in your program. The debugger has complete support Visual Basic, C#, C/C++, and JavaScript. However, with the [!INCLUDE[vsipsdk](../../includes/vsipsdk-md.md)], that is available from the [Microsoft Download Center](http://go.microsoft.com/fwlink/?LinkId=214453),, other programming languages can be supported in the debugger with the same rich features.
18+
Visual Studio includes a fully interactive source code debugger, providing a powerful and easy-to-use tool for tracking down bugs in your program. The debugger has complete support Visual Basic, C#, C/C++, and JavaScript. However, with the [!INCLUDE[vsipsdk](../../includes/vsipsdk-md.md)], that is available from the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=21835), other programming languages can be supported in the debugger with the same rich features.
1919

2020
The [!INCLUDE[vsprvs](../../includes/vsprvs-md.md)] debugger is the common front end (that is, the user interface) to the debugging components that are, in turn, specific to the language being debugged. For new languages, all that is necessary for support by the [!INCLUDE[vsprvs](../../includes/vsprvs-md.md)] debugger is to create the necessary back-end components, such as a debug engine (DE). That is where the [!INCLUDE[vsipsdk](../../includes/vsipsdk-md.md)] comes in.
2121

docs/vs-2015/install/how-to-locate-the-visual-studio-product-key.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ You may want to locate the product key for [!INCLUDE[vsprvs](../includes/vsprvs-
2929
- Documentation or other communication from the vendor from whom you purchased the software.
3030

3131
## See Also
32-
[How to: Upgrade from a Trial Edition of Visual Studio](../install/how-to-upgrade-from-a-trial-edition-of-visual-studio.md)
33-
[Install Visual Studio](../install/install-visual-studio-2015.md)
34-
[Visual Studio and MSDN Licensing White Paper](http://go.microsoft.com/fwlink/?LinkId=191417)
32+
* [How to: Upgrade from a Trial Edition of Visual Studio](../install/how-to-upgrade-from-a-trial-edition-of-visual-studio.md)
33+
* [Install Visual Studio](../install/install-visual-studio-2015.md)
34+
* [Visual Studio Licensing White Paper](https://www.microsoft.com/download/details.aspx?id=13350)

docs/vs-2015/profiling/profiling-on-hpc-high-performance-computing-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can profile on compute nodes of Microsoft Windows HPC clusters by using the
3030
## Prerequisites
3131
To profile on a HPC compute node, you must do the following:
3232

33-
- Install Microsoft HPC Pack 2008 on the same computer as [!INCLUDE[vsPreLong](../includes/vsprelong-md.md)]. The computer does not have to be part of the HPC cluster. You can install the HPC Pack at the [Microsoft Download Center](http://go.microsoft.com/fwlink/?LinkID=177414).
33+
- Install Microsoft HPC Pack 2008 on the same computer as [!INCLUDE[vsPreLong](../includes/vsprelong-md.md)]. The computer does not have to be part of the HPC cluster. You can install the HPC Pack at the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=2800).
3434

3535
- Install the [!INCLUDE[net_v40_long](../includes/net-v40-long-md.md)] and the stand-alone version of the Profiling Tools on the HPC compute node. Install programs for both the [!INCLUDE[dnprdnshort](../includes/dnprdnshort-md.md)] and the stand alone profiler are available on the [!INCLUDE[vsPreShort](../includes/vspreshort-md.md)] installation media. **Note** You must restart the compute after you have installed [!INCLUDE[dnprdnshort](../includes/dnprdnshort-md.md)] and before you install the Profiling Tools.
3636

subscriptions/vs-azure-community.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ Availability of the Azure Community benefit depends on your subscription level a
4545
| Subscription Level | Channels | Benefit | Renewable? |
4646
|-------------------------------------------------------------------------------------------------------|-------------------|---------------|------------|
4747
| Visual Studio Enterprise (Standard) | VL, Azure, Retail | One year | Yes |
48+
| Visual Studio Enterprise with GitHub Enterprise | VL, Azure, Retail | One year | Yes |
4849
| Visual Studio Professional (Standard) | VL, Azure, Retail | One year | Yes |
50+
| Visual Studio Professional with GitHub Enterprise | VL, Azure, Retail | One year | Yes |
4951
| Visual Studio Test Professional (Standard) | VL, Retail | One year | Yes |
5052
| MSDN Platforms (Standard) | VL, Retail | One year | Yes |
5153
| Visual Studio Enterprise (monthly cloud), Visual Studio Professional (monthly cloud), NFR<sup>1</sup> | All | Not available | No |

subscriptions/vs-azure-devops.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ When you sign in to Azure DevOps using either the identity that you used for act
1919
| Subscription Level | Channels | Benefit | Renewable? |
2020
|--------------------------------------------------------------------|---------------------------------------------------------|------------------------------------------------------------------|---------------|
2121
| Visual Studio Enterprise (Standard, monthly cloud) | VL, Azure, Retail, selected NFR<sup>1</sup> | Azure Boards & Repos (Basic), Azure Test Plans, Azure Pipelines (self-hosted) | Yes |
22-
| Visual Studio Professional (Standard, monthly cloud) | VL, Azure, Retail, | Azure Boards & Repos (Basic) | Yes |
22+
| Visual Studio Enterprise with GitHub Enterprise | VL| Azure Boards & Repos (Basic), Azure Test Plans, Azure Pipelines (self-hosted) | Yes |
23+
| Visual Studio Professional (Standard, monthly cloud) | VL, Azure, Retail | Azure Boards & Repos (Basic) | Yes |
24+
| Visual Studio Professional with GitHub Enterprise | VL| Azure Boards & Repos (Basic) | Yes |
2325
| Visual Studio Test Professional (Standard) | VL, Retail | Azure Boards & Repos (Basic), Azure Test Plans | Yes |
2426
| MSDN Platforms (Standard) | VL, Retail | Azure Boards & Repos (Basic), Azure Test Plans | Yes |
2527
||
@@ -43,4 +45,6 @@ If you don't see all your subscriptions, you may have one or more assigned to a
4345
Learn more about Azure DevOps features:
4446
- [Azure Boards & Repos (Basic)](https://azure.microsoft.com/services/devops/compare-features/)
4547
- [Azure Test Plans](https://marketplace.visualstudio.com/items?itemName=ms.vss-testmanager-web)
46-
- [Azure Artifacts](https://marketplace.visualstudio.com/items?itemName=ms.feed)
48+
- [Azure Artifacts](https://marketplace.visualstudio.com/items?itemName=ms.feed)
49+
50+
Learn how to activate your [Azure DevTest individual credit](vs-azure.md).

subscriptions/vs-azure.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ If you have an existing subscription, click the check box to accept the agreemen
3636
## Eligibility
3737
| Subscription Level / Program | Benefit | Renewable? |
3838
|--------------------------------------------------------------|-----------------------------|-------------------------------------------------------------|
39-
| Visual Studio Enterprise Standard | $150 monthly credit | Yes ||
39+
| Visual Studio Enterprise Standard | $150 monthly credit | Yes |
40+
| Visual Studio Enterprise with GitHub Enterprise | $150 monthly credit | Yes |
4041
| Visual Studio Enterprise monthly | Not available | |
4142
| Visual Studio Professional Standard | $50 monthly credit | Yes
43+
| Visual Studio Professional with GitHub Enterprise | $150 monthly credit | Yes |
4244
| Visual Studio Professional monthly | Not available | |
4345
| Visual Studio Test Pro | $50 monthly credit | Yes |
4446
| MSDN Platforms | $100 monthly credit | Yes |

subscriptions/vs-cast.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ Upon approval of your request, you'll receive a second email confirming successf
7171
| Subscription Level | Channels | Benefit | Renewable? |
7272
|--------------------------------------------------------------------|---------------------------------------------------------|------------------------------------------------------------------|---------------|
7373
| Visual Studio Enterprise (Standard) | VL, Azure, Retail, | Assess 5 apps for 30 days| No. Available to new subscribers only |
74+
| Visual Studio Enterprise with GitHub Enterprise | VL | Assess 5 apps for 30 days| No. Available to new subscribers only |
7475
| Visual Studio Professional (Standard) | VL, Azure, Retail | Not available | N/A |
76+
| Visual Studio Professional with GitHub Enterprise | VL | Not available | N/A |
7577
| Visual Studio Test Professional (Standard) | VL, Retail | Not available | N/A |
7678
| MSDN Platforms (Standard) | VL, Retail | Not available | N/A |
7779
| Visual Studio Enterprise (Standard) | NFR<sup>1</sup> |Not available | N/A |
@@ -93,6 +95,6 @@ Not sure which subscription you're using? Connect to [https://my.visualstudio.c
9395
- 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/).
9496

9597
## Next steps
96-
If you haven't already activated the Azure benefit that comes with your subscription, visit [https://my.visualstudio.com/benefits](https://my.visualstudio.com/benefits?wt.mc_id=o~msft~docs) and click on the Azure tile in the Tools category to set up your Azure subscription and redeem your Azure DevTest individual credit.
98+
If you haven't already activated the Azure DevTest individual credit benefit that comes with your subscription, visit [https://my.visualstudio.com/benefits](https://my.visualstudio.com/benefits?wt.mc_id=o~msft~docs) and click on the Azure tile in the Tools category to set up your Azure subscription and redeem your Azure DevTest individual credit.
9799

98100
And don't forget to check out the demo, user's guide, and tutorial videos mentioned in Greg's email.

0 commit comments

Comments
 (0)