Skip to content

Commit f213bec

Browse files
authored
Merge pull request #6086 from MicrosoftDocs/master637406520826222267
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 0b19822 + 8e8e302 commit f213bec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+176
-162
lines changed

docs/designers/walkthrough-windows-forms-designer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The DemoCalculator control contains several Windows Forms controls. In this proc
6767
> [!NOTE]
6868
> Several controls offer smart tags to facilitate design. For more information, see [Walkthrough: Perform common tasks using Smart Tags on Windows Forms controls](/dotnet/framework/winforms/controls/performing-common-tasks-using-smart-tags-on-wf-controls).
6969
70-
5. Select the vertical border between the panels and drag it to the right, so that most of the space in taken by the left panel.
70+
5. Select the vertical border between the panels and drag it to the right, so that most of the space is taken by the left panel.
7171

7272
The `SplitContainer` divides the DemoCalculator control into two panels with a movable border separating them. The panel on the left will hold the calculator buttons and display, and the panel on the right will show a record of the arithmetic operations performed by the user.
7373

docs/ide/git-with-visual-studio.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Visual Studio also makes it easy to commit and sync with one click by using the
8888
:::image type="content" source="media/git-file-version-compare.png" alt-text="Screenshot of the line-by-line comparison of file versions in Visual Studio ":::
8989

9090
> [!TIP]
91-
> You can associate Azure DevOps work item with a commit by using the "#" character if you are connected to the Azure DevOps repository. You can connect your Azure DevOps repository through **Team Explorer** > **Manage Connections**.
91+
> You can associate an Azure DevOps work item with a commit by using the "#" character if you are connected to the Azure DevOps repository. You can connect your Azure DevOps repository through **Team Explorer** > **Manage Connections**.
9292
9393
### Select an existing branch
9494

@@ -174,7 +174,7 @@ To personalize and customize your Git settings at a repository level as well as
174174

175175
:::image type="content" source="media/git-options-settings.png" alt-text="Screenshot of the Options dialog box where you can choose personalization and customization settings in Visual Studio IDE ":::
176176

177-
## How to use legacy Team Explorer experience in Visual Studio
177+
## How to use the legacy Team Explorer experience in Visual Studio
178178

179179
The new Git experience is the default version control system in Visual Studio 2019 from [version 16.8](/visualstudio/releases/2019/release-notes/) onwards. However, if you want to turn it off, you can. Go to **Tools** > **Options** > **Environment** > **Preview Features** and then toggle the **New Git user experience** checkbox, which will switch you back to the legacy Team Explorer experience.
180180

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

Lines changed: 7 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, so
55
author: ornellaalt
66
ms.author: ornella
77
manager: jillfra
8-
ms.date: 10/27/2020
8+
ms.date: 11/10/2020
99
ms.topic: reference
1010
ms.workload:
1111
- multiple
@@ -23,6 +23,11 @@ The following table lists the build numbers and release dates for Visual Studio
2323

2424
| **Version**| **Channel** | **Release date** | **Build version** |
2525
| ---------------------- | ----------- | ---------------- | ----------------- |
26+
| 16.9.0 | Preview 1 | November 10, 2020 | 16.9.30709.64 |
27+
| 16.7.8 | Release | November 10, 2020 | 16.7.30704.19 |
28+
| 16.4.15 | Release | November 10, 2020 | 16.4.30703.110 |
29+
| 16.0.20 | Release | November 10, 2020 | 16.0.28803.868 |
30+
| 16.8.0 | Release | November 10, 2020 | 16.8.30709.132 |
2631
| 16.8.0 | Preview 6 | October 27, 2020 | 16.8.30626.31 |
2732
| 16.7.7 | Release | October 27, 2020 | 16.7.30621.155 |
2833
| 16.8.0 | Preview 5 | October 20, 2020 | 16.8.30615.102 |
@@ -181,6 +186,7 @@ The following table lists the build numbers and release dates for Visual Studio
181186

182187
| **Version**| **Channel** | **Release date** | **Build version** |
183188
| ---------------------- | ----------- | ---------------- | ----------------- |
189+
| 15.9.29 | Release | November 10, 2020 | 15.9.28307.1300 |
184190
| 15.9.28 | Release | October 13, 2020 | 15.9.28307.1274 |
185191
| 15.9.27 | Release | September 8, 2020 | 15.9.28307.1259 |
186192
| 15.9.26 | Release | August 11, 2020 | 15.9.28307.1234 |

docs/xaml-tools/xaml-designtime-data.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Use Design Time Data with the XAML Designer in Visual Studio
33
description: Learn how to use design-time data in XAML.
4-
ms.date: 09/29/2020
4+
ms.date: 11/10/2020
55
ms.topic: overview
66
author: alihamie
77
ms.author: tglee
@@ -20,7 +20,7 @@ Some layouts are hard to visualize without data. In this document, we'll be revi
2020

2121
Design-time data is mock data you set to make your controls easier to visualize in the XAML Designer. To get started, add the following lines of code to the header of your XAML document if they aren't already present:
2222

23-
```xml
23+
```xml
2424
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
2525
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
2626
mc:Ignorable="d"
@@ -61,7 +61,7 @@ You can set a design-time Source for images that are bound to the page or loaded
6161
6262
## Design-time data for ListViews
6363

64-
ListViews are a popular way to display data in your Desktop app. However, they're difficult to visualize without any data. You can use this feature to create an inline design-time data ItemSource. The XAML Designer displays what is in that array in your ListView at design time. This is an example for WPF .NET Core. To use the system:String type, make sure you include
64+
ListViews are a popular way to display data in your Desktop app. However, they're difficult to visualize without any data. You can use this feature to create an inline design-time data ItemSource. The XAML Designer displays what is in that array in your ListView at design time. This is an example for WPF .NET Core. To use the system:String type, make sure you include
6565
`xmlns:system="clr-namespace:System;assembly=mscorlib` in your XAML header.
6666

6767
```xml
@@ -134,9 +134,9 @@ The benefit here is that you can bind your controls to a design-time static vers
134134

135135
## Use design-time data with custom types and properties
136136

137-
This feature by default works only with platform controls and properties. In this section we go over the steps needed to enable you to use your own custom controls as design-time controls, a new capability available to customers using Visual Studio 2019 preview version [16.8](/visualstudio/releases/2019/preview-notes) or later. There are three requirements to enable this:
137+
This feature by default works only with platform controls and properties. In this section we go over the steps needed to enable you to use your own custom controls as design-time controls, a new capability available to customers using Visual Studio 2019 version [16.8](/visualstudio/releases/2019/release-notes/) or later. There are three requirements to enable this:
138138

139-
- A custom xmlns namespace
139+
- A custom xmlns namespace
140140

141141
```xml
142142
xmlns:myControls="http://MyCustomControls"

mac/accessibility-ide-options.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ ms.topic: how-to
1212

1313
In addition to features built right into macOS, Visual Studio for Mac has a number of accessibility features to enable users of varying abilities.
1414

15-
## Resize pad and editor content
15+
## Resize tool windows and editor content
1616

17-
1. Choose the pad or window for which you want to resize the content.
17+
1. Choose the tool window or editor window for which you want to resize the content.
1818

1919
1. Choose **View (menu)**, and then select **Zoom In (⌘+)** or **Zoom Out (⌘-)**.
2020

@@ -23,13 +23,13 @@ In addition to features built right into macOS, Visual Studio for Mac has a numb
2323
2424
## Change the content font and size
2525

26-
It's possible to customize the font and size of content in most pads in Visual Studio for Mac. Here's how:
26+
It's possible to customize the font and size of content in most tool windows in Visual Studio for Mac. Here's how:
2727

2828
1. Go to **Visual Studio (menu)** > **Preferences... (⌘,)**.
2929

3030
1. In **Preferences**, go to **Environment** > **Fonts**.
3131

32-
1. For either **Text Editor**, **General Pad Text**, or **Output Pad Contents**, select the font and size button.
32+
1. For either **Text Editor**, **General Tool Window Text**, or **Output Window Contents**, select the font and size button.
3333

3434
1. Select your desired font, style, and size, and select **OK**.
3535

mac/accessibility.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ms.topic: overview
1010

1111
# Accessibility
1212

13-
There are a number of accessibility tools and features built right into macOS that will assist you to use with Visual Studio for Mac. In addition to these, Visual Studio for Mac also has the following features to make it more accessible for people of varying abilities:
13+
There are a number of accessibility tools and features built right into macOS to assist you when using Visual Studio for Mac. In addition to these, Visual Studio for Mac also has the following features to make it more accessible for people of varying abilities:
1414

1515
* Editor text enlargement
16-
* Pad text enlargement
16+
* Tool window text enlargement
1717
* Code editor color theme customization
1818
* Keyboard shortcut customization
1919
* Keyboard navigation

mac/add-and-remove-project-items.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: "Adding and Removing Project Items"
33
description: This document describes how to add and remove project items in Visual Studio for Mac
44
author: heiligerdankgesang
55
ms.author: dominicn
6-
ms.date: 05/06/2018
6+
ms.date: 11/06/2020
77
ms.assetid: 4071689D-1C21-42D7-8963-550E7BCB4B67
88
ms.topic: how-to
99
---
1010
# Adding and Removing Project Items
1111

12-
You can add new project items to your project by right-clicking on the Project node in the **Solution Pad** and browsing to **Add > New File**:
12+
You can add new project items to your project by right-clicking on the Project node in the **Solution Window** and browsing to **Add > New File**:
1313

1414
![Add New Project Item](media/add-and-remove-project-items-image1.png)
1515

mac/asp-net-core.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: "Getting Started with ASP.NET Core"
33
description: "This article describes how to get started with ASP.NET in Visual Studio for Mac, including installation and creating a new project."
4-
author: sayedihashimi
5-
ms.author: sayedha
6-
ms.date: 04/02/2019
4+
author: jmatthiesen
5+
ms.author: jomatthi
6+
ms.date: 11/06/2020
77
ms.assetid: 6E8B0C90-33D6-4546-8207-CE0787584565
88
ms.custom: video
99
no-loc: [Blazor, "Blazor WebAssembly"]
@@ -16,7 +16,7 @@ ms.topic: how-to
1616

1717
## Installing .NET Core
1818

19-
.NET Core 3.1 is automatically installed when you install Visual Studio for Mac. For more information about versions of .NET Core supported in Visual Studio for Mac see [.NET Core Support](./net-core-support.md).
19+
.NET Core 3.1 is automatically installed when you install Visual Studio for Mac. For more information about versions of .NET Core supported in Visual Studio for Mac, see [.NET Core Support](./net-core-support.md).
2020

2121
## Creating an ASP.NET Core app in Visual Studio for Mac
2222

@@ -37,13 +37,13 @@ There are a number of projects that will provide you with a pre-built template t
3737

3838
![ASP.NET Project Options](media/asp-net-core-2019-new-asp-core.png)
3939

40-
Select the **ASP.NET Core Empty Web Application** and press **Next**. Give the Project a Name and press **Create**. This creates a new ASP.NET Core app. In the solution pad's left pane, expand the second arrow and then select **Startup.cs**. It should look similar to the image below:
40+
Select the **ASP.NET Core Empty Web Application** and press **Next**. Give the Project a Name and press **Create**. This creates a new ASP.NET Core app. In the solution window's left pane, expand the second arrow and then select **Startup.cs**. It should look similar to the image below:
4141

4242
![New ASP.NET Core Empty Project view](media/asp-net-core-2019-empty-project.png)
4343

4444
The ASP.NET Core Empty template creates a web application with two default files: **Program.cs** and **Startup.cs**, which are explained below. It also creates a Dependencies folder, which contains your project's NuGet package dependencies such as ASP.NET Core, the .NET Core framework, and the MSBuild targets that build the project:
4545

46-
![Solution Pad displaying dependencies](media/asp-net-core-2019-solution-dependencies.png)
46+
![Solution window displaying dependencies](media/asp-net-core-2019-solution-dependencies.png)
4747

4848
### Program.cs
4949

@@ -63,7 +63,7 @@ Open and inspect the **Program.cs** file in your project. Notice that several th
6363
}
6464
```
6565

66-
An ASP.NET Core app creates a web server in its main method by configuring and launching a host via an instance of [`WebHostBuilder`](/aspnet/core/fundamentals/hosting). This builder provides methods to allow the host to be configured. In the template app the following configurations are used:
66+
An ASP.NET Core app creates a web server in its main method by configuring and launching a host via an instance of [`WebHostBuilder`](/aspnet/core/fundamentals/hosting). This builder provides methods to allow the host to be configured. In the template app, the following configurations are used:
6767

6868
* `.UseStartup<Startup>()`: Specifies the Startup class.
6969

@@ -121,7 +121,7 @@ This simple Hello, World project can run now without any additional code being a
121121

122122
![Browser Run](media/asp-net-web-picker.png)
123123

124-
Visual Studio for Mac uses a random port to launch your web project. To find out what port this is, open the Application Output, which is listed under **View > Pads**. You should find output similar to that shown below:
124+
Visual Studio for Mac uses a random port to launch your web project. To find out what port this is, open the Application Output, which is listed under the **View > Other Windows** menu. You should find output similar to that shown below:
125125

126126
![Application Output displaying listening port](media/asp-net-core-image6.png)
127127

@@ -131,13 +131,13 @@ Once the project is running, your default web browser should launch and connect
131131

132132
## Adding a Controller
133133

134-
ASP.NET Core Apps use the Model-View-Controller (MVC) design pattern to provide a logical separation of responsibilities for each part of the app. MVC consists of the following:
134+
ASP.NET Core Apps use the Model-View-Controller (MVC) design pattern to provide a logical separation of responsibilities for each part of the app. The MVC design pattern consists of the following concepts:
135135

136136
- **Model**: A class that represents the data of the app.
137137
- **View**: Displays the app's user interface (which is often the model data).
138138
- **Controller**: A class which handles browser requests, responds to user input and interaction.
139139

140-
For more information on using MVC refer to [Overview of ASP.NET Core MVC](/aspnet/core/mvc/overview) guide.
140+
For more information on using MVC, see the [Overview of ASP.NET Core MVC](/aspnet/core/mvc/overview) guide.
141141

142142
To add a controller, do the following:
143143

@@ -223,7 +223,7 @@ To add a controller, do the following:
223223

224224
## Troubleshooting
225225

226-
If you need to install .NET Core manually on Mac OS 10.12 (Sierra) and higher, do the following:
226+
If you need to install .NET Core manually on macOS 10.12 (Sierra) and higher, do the following:
227227

228228
1. Before you start installing .NET Core, ensure that you have updated all OS updates to the latest stable version. You can check this by going to the App Store application, and selecting the Updates tab.
229229

@@ -234,8 +234,8 @@ Make sure to complete all steps successfully to ensure that .NET Core is install
234234
## Summary
235235

236236
This guide gave an introduction to ASP.NET Core. It describes what it is, when to use it, and provided information on using it in Visual Studio for Mac.
237-
For more information on the next steps from here, refer to the following guides:
238-
- [ASP.NET Core](/aspnet/core/?view=aspnetcore-2.1) docs.
237+
For more information on the next steps from here, see the following guides:
238+
- [ASP.NET Core](/aspnet/core/) docs.
239239
- [Creating Backend Services for Native Mobile Applications](/aspnet/core/mobile/native-mobile-backend), which shows how to build a REST service using ASP.NET Core for a Xamarin.Forms app.
240240
- [ASP.NET Core hands-on lab](https://github.com/Microsoft/vs4mac-labs/tree/master/Web/Getting-Started).
241241

mac/azure-functions-lab.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: "Tutorial: Azure Functions"
3-
description: "Using Azure functions in Visual Studio for Mac."
4-
author: sayedihashimi
5-
ms.author: sayedha
6-
ms.date: 05/06/2018
3+
description: "A detailed walkthrough of working with Azure Functions in Visual Studio for Mac."
4+
author: jmatthiesen
5+
ms.author: jomatthi
6+
ms.date: 11/06/2020
77
ms.technology: vs-ide-install
88
ms.assetid: 38FD2070-5151-482E-B0A9-993715128736
99
ms.topic: tutorial
@@ -39,7 +39,7 @@ In this lab, you'll learn how to get started building Azure Functions using Visu
3939

4040
![naming and creating your azure function project](media/azure-functions-lab-image2.png)
4141

42-
5. Expand the nodes in **Solution Pad**. The default project template includes NuGet references to a variety of Azure WebJobs packages, as well as the Newtonsoft.Json package.
42+
5. Expand the nodes in the **Solution Window**. The default project template includes NuGet references to a variety of Azure WebJobs packages, as well as the Newtonsoft.Json package.
4343

4444
There are also three files:
4545
- **host.json** for describing the global configuration options for the host
@@ -48,7 +48,7 @@ In this lab, you'll learn how to get started building Azure Functions using Visu
4848

4949
Open **local.settings.json**. It defaults to having two empty connection string settings.
5050

51-
![solution pad displaying local.settings.json file](media/azure-functions-lab-image3.png)
51+
![solution window displaying local.settings.json file](media/azure-functions-lab-image3.png)
5252

5353
## Exercise 2: Creating an Azure storage account
5454

@@ -86,7 +86,7 @@ In this lab, you'll learn how to get started building Azure Functions using Visu
8686

8787
## Example 3: Creating and debugging an Azure Function
8888

89-
1. You're now ready to start adding some code. When working with a .NET class library, Azure Functions are added as static methods. From **Solution Pad**, right-click the **AzureFunctions** project node and select **Add > Add Function**:
89+
1. You're now ready to start adding some code. When working with a .NET class library, Azure Functions are added as static methods. From the **Solution Window**, right-click the **AzureFunctions** project node and select **Add > Add Function**:
9090

9191
![Add function option](media/azure-functions-lab-image11.png)
9292

@@ -190,7 +190,7 @@ In this lab, you'll learn how to get started building Azure Functions using Visu
190190

191191
## Exercise 4: Working with function.json
192192

193-
1. In an earlier exercise, it was mentioned that Visual Studio for Mac "generated" a job function for the Azure Function defined in the library. This is because Azure Functions doesn't actually use the method attributes at runtime, but rather uses a compile-time file system convention to configure where and how Azure Functions are made available. From **Solution Pad**, right-click on your project node and select **Reveal in Finder**.
193+
1. In an earlier exercise, it was mentioned that Visual Studio for Mac "generated" a job function for the Azure Function defined in the library. This is because Azure Functions doesn't actually use the method attributes at runtime, but rather uses a compile-time file system convention to configure where and how Azure Functions are made available. From the **Solution Window**, right-click on your project node and select **Reveal in Finder**.
194194

195195
![Reveal in Finder menu option](media/azure-functions-lab-image23.png)
196196

@@ -202,7 +202,7 @@ In this lab, you'll learn how to get started building Azure Functions using Visu
202202

203203
![function.json file open in visual studio for mac](media/azure-functions-lab-image25.png)
204204

205-
1. In **Solution Pad**, right-click the **AzureFunctionsLab** project node and select **Add > New Folder**. Name the new folder **Adder**. By default convention, the name of this folder will define the path to the API, such as **api/Adder**.
205+
1. In the **Solution Window**, right-click the **AzureFunctionsLab** project node and select **Add > New Folder**. Name the new folder **Adder**. By default convention, the name of this folder will define the path to the API, such as **api/Adder**.
206206

207207
![New folder option](media/azure-functions-lab-image26.png)
208208

0 commit comments

Comments
 (0)