Skip to content

Commit 5d2fc1a

Browse files
authored
Merge pull request #4416 from MicrosoftDocs/master637109289519159304
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 11c3ef3 + 49ebf69 commit 5d2fc1a

13 files changed

+72
-22
lines changed

docs/containers/container-build.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.date: 11/20/2019
77
ms.technology: vs-azure
88
ms.topic: conceptual
99
---
10-
# Build and debug containerized apps using Visual Studio or the command line
10+
# How Visual Studio builds containerized apps
1111

12-
Whether you're building from the Visual Studio IDE, or setting up a command-line build, you need to know how Visual Studio builds uses the Dockerfile to build your projects. For performance reasons, Visual Studio follows a special process for containerized apps. Understanding how Visual Studio builds your projects is especially important when you customize your build process by modifying the Dockerfile.
12+
Whether you're building from the Visual Studio IDE, or setting up a command-line build, you need to know how Visual Studio uses the Dockerfile to build your projects. For performance reasons, Visual Studio follows a special process for containerized apps. Understanding how Visual Studio builds your projects is especially important when you customize your build process by modifying the Dockerfile.
1313

1414
When Visual Studio builds a project that doesn't use Docker containers, it invokes MSBuild on the local machine and generates the output files in a folder (typically `bin`) under your local solution folder. For a containerized project, however, the build process takes account of the Dockerfile's instructions for building the containerized app. The Dockerfile that Visual Studio uses is divided into multiple stages. This process relies on Docker's *multistage build* feature.
1515

@@ -78,7 +78,7 @@ MSBuild MyProject.csproj /t:ContainerBuild /p:Configuration=Release
7878

7979
You'll see output similar to what you see in the **Output** window when you build your solution from the Visual Studio IDE. Always use `/p:Configuration=Release`, since in cases where Visual Studio uses the multistage build optimization, results when building the **Debug** configuration might not be as expected. See [Debugging](#debugging).
8080

81-
If you are using a Docker Compose project, use the command to build images:
81+
If you are using a Docker Compose project, use this command to build images:
8282

8383
```cmd
8484
msbuild /p:SolutionPath=<solution-name>.sln /p:Configuration=Release docker-compose.dcproj
@@ -93,7 +93,7 @@ msbuild /p:SolutionPath=<solution-name>.sln /p:Configuration=Release docker-comp
9393
- Pull the images in the first stage of the Dockerfile (the `base` stage in most Dockerfiles).
9494
- Build the Dockerfile and start the container.
9595

96-
Warmup will only happen in **Fast** mode, so the running container will have the app folder volume mounted and any changes to the app should not invalidate the container. This therefore improves the debugging performance significantly and decreases the wait time for long running tasks such as pulling large images.
96+
Warmup will only happen in **Fast** mode, so the running container will have the app folder volume-mounted. That means that any changes to the app won't invalidate the container. This therefore improves the debugging performance significantly and decreases the wait time for long running tasks such as pulling large images.
9797

9898
## Volume mapping
9999

docs/containers/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
href: container-tools-configure.md
3737
- name: Concepts
3838
items:
39-
- name: Building containerized apps
39+
- name: How Visual Studio builds containerized apps
4040
href: container-build.md
4141
- name: Troubleshooting
4242
href: troubleshooting-docker-errors.md

docs/cross-platform/change-log-visual-studio-tools-for-unity.md

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Change Log (Visual Studio Tools for Unity, Windows) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "09/18/2019"
4+
ms.date: "12/02/2019"
55
ms.technology: vs-unity-tools
66
ms.topic: "conceptual"
77
ms.assetid: ea490b7e-fc0d-44b1-858a-a725ce20e396
@@ -15,6 +15,54 @@ ms.workload:
1515

1616
Visual Studio Tools for Unity change log.
1717

18+
## 4.4.2.0
19+
20+
Released December 3, 2019
21+
22+
### Bug fixes
23+
24+
- **Integration:**
25+
26+
- Fixed diagnostics with user-defined interfaces.
27+
28+
- Fixed quick tooltips with malformed expressions.
29+
30+
## 4.4.1.0
31+
32+
Released November 6, 2019
33+
34+
### New Features
35+
36+
- **Integration:**
37+
38+
- Added support for Unity background processes. (The debugger is able to auto-connect to the main process instead of a child process).
39+
40+
- Added a quick tooltip for Unity messages, displaying the associated documentation.
41+
42+
### Bug fixes
43+
44+
- **Integration:**
45+
46+
- Fixed the tag comparison analyzer `UNT0002` with advanced binary and invocation expressions.
47+
48+
### Deprecated Features
49+
50+
- **Integration:**
51+
52+
- Going forward, Visual Studio Tools for Unity will only support Visual Studio 2017+.
53+
54+
## 4.4.0.0
55+
56+
Released October 15, 2019
57+
58+
### New Features
59+
60+
- **Integration:**
61+
62+
- Added a suppressor for `IDE0060` (unused parameter) for all Unity messages.
63+
64+
- Added a quick tooltip for fields tagged with `TooltipAttribute`. (This will work for a simple get accessor using this field as well).
65+
1866
## 4.3.3.0
1967

2068
Released September 23, 2019

docs/vs-2015/deployment/deploying-com-components-with-clickonce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Deployment of legacy COM components has traditionally been a difficult task. Com
2727

2828
[!INCLUDE[ndptecclick](../includes/ndptecclick-md.md)] provides an easy and safe mechanism for deploying your .NET applications. However, if your applications use legacy COM components, you will need to take additional steps for deploying them. This topic describes how to deploy isolated COM components and reference native components (for example, from Visual Basic 6.0 or Visual C++).
2929

30-
For more information on deploying isolated COM components, see "Simplify App Deployment with [!INCLUDE[ndptecclick](../includes/ndptecclick-md.md)] and Registration-Free COM" at [https://msdn.microsoft.com/magazine/msdn-magazine-issues.aspx](https://msdn.microsoft.com/magazine/msdn-magazine-issues.aspx).
30+
For more information on deploying isolated COM components, see [Simplify App Deployment with ClickOnce and Registration-Free COM](/archive/msdn-magazine/2005/april/simplify-app-deployment-with-clickonce-and-registration-free-com).
3131

3232
## Registration-Free COM
3333
Registration-free COM is a new technology for deploying and activating isolated COM components. It works by putting all the component's type-library and registration information that is typically installed into the system registry into an XML file called a manifest, stored in the same folder as the application.

subscriptions/manage-vs-subscriptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ On the Benefits page, the subscription in use will be prominently displayed in t
3737
## Renewing my subscriptions
3838

3939
**Standard subscriptions**
40-
- Microsoft Store: If you purchased your subscription from the [Microsoft Store](http://www.microsoft.com/store), you can renew it there as well.
40+
- Microsoft Store: If you purchased your subscription from the [Microsoft Store](https://www.microsoft.com/store), you can renew it there as well.
4141
- Volume License: If your company buys subscriptions through a Volume License, your admin should contact a reseller to renew your subscriptions.
4242

4343
**Cloud subscriptions:** Cloud subscriptions don't need to be renewed. As long as your subscription is paid, it will remain active.

subscriptions/product-availability.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ There are several reasons why particular products may not be available to subscr
2020
- **The product is not included in your subscription level or program.** [Learn more](https://visualstudio.microsoft.com/vs/pricing/) about the software and benefits available with your subscription or [download the full list](https://download.microsoft.com/download/1/5/4/15454442-CF17-47B9-A65D-DF84EF88511B/Products_by_Benefit_Level.xlsx) of products available by subscription level. Some programs, such as [Microsoft Partner Network](https://partner.microsoft.com/), provide Visual Studio subscriptions as a part of their benefits. Those subscriptions do not include all products included in purchased Visual Studio subscriptions. Subscribers to these programs should direct questions about availability of product downloads to the support teams for those programs.
2121
- **The product is not included in subscriptions.** Some Microsoft products are not included in subscriptions due to special licensing terms, technical restrictions, or developer relevance. If you would like to suggest a product be added to the subscription, please send email to your Visual Studio [Customer Service Center](https://visualstudio.microsoft.com/subscriptions/support/).
2222
- **The product is publicly available.** Some tools, SDKs, DDKs, and service packs are publicly available from the [Microsoft Download Center](https://www.microsoft.com/download). Some such products may not be published to Downloads.
23-
- **The product has not yet released.** Many pre-release (beta) versions and release candidates are available from Downloads. However, not all betas can be included; for instance, some betas require special registration or eligibility. For more information about open technical beta programs, please visit [Microsoft Connect](http://connect.microsoft.com/).
23+
- **The product has not yet released.** Many pre-release (beta) versions and release candidates are available from Downloads. However, not all betas can be included; for instance, some betas require special registration or eligibility. For more information about open technical beta programs, please visit [Microsoft Connect](https://connect.microsoft.com/).
2424
- **The product is not available in your country.** Some Microsoft products are not available due to regional restrictions.
2525
- **Redundant software.** Select Office suites and standalone Office downloads and product keys are no longer available in subscriptions that include Office. Downloads and product keys are available for the corresponding highest Office suite of the same version. For example, if you search for PowerPoint 2010, the search will not produce any results. However, you can search for Office 2010 - the Office suite that contained PowerPoint 2010 - and download the suite.
2626

2727
## What do I get?
28-
The number and type of downloads depends on your subscription level and program memberships. Subscribers with Visual Studio Enterprise standard subscriptions, for example, may have different downloads available to them than subscribers who obtain their subscriptions through a Microsoft Partner Network or BizSpark program subscription. To learn more about what downloads are available for each subscription level, download the list of [Products By Benefit Level](http://download.microsoft.com/download/1/5/4/15454442-CF17-47B9-A65D-DF84EF88511B/Visual_Studio_by_Subscription_Level.xlsx).
28+
The number and type of downloads depends on your subscription level and program memberships. Subscribers with Visual Studio Enterprise standard subscriptions, for example, may have different downloads available to them than subscribers who obtain their subscriptions through a Microsoft Partner Network or BizSpark program subscription. To learn more about what downloads are available for each subscription level, download the list of [Products By Benefit Level](https://download.microsoft.com/download/1/5/4/15454442-CF17-47B9-A65D-DF84EF88511B/Visual_Studio_by_Subscription_Level.xlsx).
2929

3030
> [!NOTE]
3131
> If you have multiple subscriptions associated with the same email address, the software titles available to you are determined by the **highest** level subscription you have. For example, if you have a Visual Studio Enterprise subscription and a Visual Studio Test Professional subscription, you will have access to the software titles included with the Visual Studio Enterprise subscription, regardless of which subscription is currently in use in the subscriptions portal.

subscriptions/sign-in-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ However, if you try to sign up for a Microsoft app that supports personal and wo
3434
> ![Work/school accounts supported](_img/sign-in-issues/existing-account.png)
3535
3636
### Are existing accounts affected?
37-
The sign-up block described here only prevents the creation of new accounts. It has no impact on users who already have a Microsoft Account with a work/school email address. If you are already in this situation, we've made making it easier to rename a personal Microsoft account. This [support article](http://windows.microsoft.com/en-US/Windows/rename-personal-microsoft-account) provides simple step-by-step guidance. Renaming your personal Microsoft account means changing the username, and does not impact your work email or how you sign in to business services such as Office 365. It also doesn't impact your personal stuff—it just changes the way you sign in to it. You can use another (personal) email address, get a new @outlook.com email address from Microsoft, or use your phone number as a new username.
37+
The sign-up block described here only prevents the creation of new accounts. It has no impact on users who already have a Microsoft Account with a work/school email address. If you are already in this situation, we've made making it easier to rename a personal Microsoft account. This [support article](https://windows.microsoft.com/en-US/Windows/rename-personal-microsoft-account) provides simple step-by-step guidance. Renaming your personal Microsoft account means changing the username, and does not impact your work email or how you sign in to business services such as Office 365. It also doesn't impact your personal stuff—it just changes the way you sign in to it. You can use another (personal) email address, get a new @outlook.com email address from Microsoft, or use your phone number as a new username.
3838

3939
> [!NOTE]
4040
> If your IT department asked you to create a personal Microsoft account with your work/school email, for example to access Microsoft business services like Premier Support, then talk to your admin team before renaming your account.

subscriptions/software-download-list.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: Find a list of the software downloads included with your Visual St
1010

1111
# What software is available for download?
1212

13-
The [list of software downloads](http://download.microsoft.com/download/1/5/4/15454442-CF17-47B9-A65D-DF84EF88511B/Visual_Studio_by_Subscription_Level.xlsx) available to you depends on the subscription you're using. If you have more than one subscription associated with the same sign-in address, you will see the downloads included with the highest level subscription, regardless of which subscription you're viewing. For example, if you have a Visual Studio Enterprise standard subscription and a Visual Studio Professional subscription, you will see the complete list of downloads available with your Enterprise subscription. To see the list of your subscriptions, visit [https://my.visualstudio.com/subscriptions](https://my.visualstudio.com/subscriptions?wt.mc_id=o~msft~docs).
13+
The [list of software downloads](https://download.microsoft.com/download/1/5/4/15454442-CF17-47B9-A65D-DF84EF88511B/Visual_Studio_by_Subscription_Level.xlsx) available to you depends on the subscription you're using. If you have more than one subscription associated with the same sign-in address, you will see the downloads included with the highest level subscription, regardless of which subscription you're viewing. For example, if you have a Visual Studio Enterprise standard subscription and a Visual Studio Professional subscription, you will see the complete list of downloads available with your Enterprise subscription. To see the list of your subscriptions, visit [https://my.visualstudio.com/subscriptions](https://my.visualstudio.com/subscriptions?wt.mc_id=o~msft~docs).
1414

1515
If you already have a Visual Studio subscription:
1616
1. Go to [https://my.visualstudio.com/downloads](https://my.visualstudio.com/downloads?wt.mc_id=o~msft~docs)
@@ -22,7 +22,7 @@ To quickly find products, use the "Search" functions at the top of the page or c
2222
> [!TIP]
2323
> If you're looking for your product keys, click on the **Product Keys** tab at the top of the page.
2424
25-
You can also download an Excel spreadsheet containing an extensive list of [available software titles](http://download.microsoft.com/download/1/5/4/15454442-CF17-47B9-A65D-DF84EF88511B/Visual_Studio_by_Subscription_Level.xlsx) for each subscription type.
25+
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

2727
## Next steps
2828
You can learn more about how to [download software](download-software.md) or obtain and manage [product keys](product-keys.md).

subscriptions/using-the-subscriber-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Using the Subscriber Portal - http://my.visualstudio.com | Microsoft Docs
2+
title: Using the Subscriber Portal - https://my.visualstudio.com | Microsoft Docs
33
author: evanwindom
44
ms.author: lank
55
manager: lank

subscriptions/vs-datacamp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Eligible Visual Studio subscriptions include subscriptions to DataCamp. With Da
4545
> [!div class="mx-imgBorder"]
4646
> ![DataCamp Getting Started](_img/vs-datacamp/vs-datacamp-getting-started.png)
4747
48-
You can stop at any point, and resume your training in your next session. Just visit [http://www.datacamp.com](http://www.datacamp.com), and sign in. You'll see your dashboard and can resume your training right where you paused. Simply click **Continue Track**.
48+
You can stop at any point, and resume your training in your next session. Just visit [https://www.datacamp.com](https://www.datacamp.com), and sign in. You'll see your dashboard and can resume your training right where you paused. Simply click **Continue Track**.
4949

5050
> [!div class="mx-imgBorder"]
5151
> ![DataCamp Continue Training](_img/vs-datacamp/vs-datacamp-continue-training.png)

subscriptions/vs-m365.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ Not sure which subscription you're using? Connect to [https://my.visualstudio.c
8484
### Q: How do current users upgrade to E5?
8585
A: Currently, only new Office 365 Developer Program members will get the E5 offer automatically. Rest assured, we are working to enable all Office 365 Developer Program members to move from E3 to E5. Stay tuned for more information in the coming months.
8686

87+
### Q: Can I activate Microsoft 365 using an existing tenant, or do I need to create a new one?
88+
A: To activate the Office Developer subscription, a new tenant is required.
89+
8790
### Q: Can I choose E3 or E5?
8891
As of September 2019, new Developer Program members are only offered E5, which is our flagship version of Office 365. This version of Office 365 offers even more value than E3, and can normally cost substantially more than our previous E3 subscription.
8992

@@ -96,7 +99,6 @@ You can verify your version now in the subscription tile located on your Office
9699

97100
Look for the E3 or E5 indication in your tile.
98101

99-
100102
### Q: If Microsoft 365 doesn't include Windows, how do I get Windows?
101103
A: The Visual Studio subscriptions that include the Microsoft 365 benefit also include Windows as part of the subscriber downloads. Visit [downloads](https://my.visualstudio.com/downloads) to download Windows. (If you don't see downloads enabled in your subscription, please [contact your administrator](contact-my-admin.md).)
102104

0 commit comments

Comments
 (0)