Skip to content

Commit

Permalink
Merge pull request #2953 from MicrosoftDocs/master636893927324134660
Browse files Browse the repository at this point in the history
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
  • Loading branch information
gewarren authored Mar 28, 2019
2 parents 407b3cb + da73f7a commit 307c891
Show file tree
Hide file tree
Showing 475 changed files with 5,543 additions and 370 deletions.
5 changes: 5 additions & 0 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -1815,6 +1815,11 @@
"redirect_url": "/visualstudio/ide/class-designer/working-with-visual-cpp-code",
"redirect_document_id": false
},
{
"source_path": "docs/ide/visual-studio-2017-for-dotnet-developers.md",
"redirect_url": "/visualstudio/ide/csharp-developer-productivity",
"redirect_document_id": false
},
{
"source_path": "docs/install/index.md",
"redirect_url": "/visualstudio/install/install-visual-studio",
Expand Down
13 changes: 7 additions & 6 deletions docs/code-quality/install-fxcop-analyzers.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ Use the following guidelines to determine which version of the FxCop analyzers p

| Visual Studio version | FxCop analyzer package version |
| - | - |
| Visual Studio 2017 version 15.5 and later | 2.6.3, for example https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/2.6.3 |
| Visual Studio 2017 version 15.3 to 15.4 | 2.3.0-beta1, for example https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/2.3.0-beta1 |
| Visual Studio 2017 version 15.0 to 15.2 | 2.0.0-beta2, for example https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/2.0.0-beta2 |
| Visual Studio 2015 update 2 and 3 | Version 1.2.0-beta2, for example https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/1.2.0-beta2 |
| Visual Studio 2015 Update 1 | Version 1.1.0, for example https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/1.1. |
| Visual Studio 2015 RTW | Version 1.0.1, for example https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/1.0.1 |
| Visual Studio 2017 version 15.8 and later | [2.9.0](https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/2.9.0) |
| Visual Studio 2017 version 15.5 to 15.7 | [2.6.3](https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/2.6.3) |
| Visual Studio 2017 version 15.3 to 15.4 | [2.3.0-beta1](https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/2.3.0-beta1) |
| Visual Studio 2017 version 15.0 to 15.2 | [2.0.0-beta2](https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/2.0.0-beta2) |
| Visual Studio 2015 update 2 and 3 | [1.2.0-beta2](https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/1.2.0-beta2) |
| Visual Studio 2015 Update 1 | [1.1.0](https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/1.1.0) |
| Visual Studio 2015 RTW | [1.0.1](https://www.nuget.org/packages/Microsoft.CodeAnalysis.FxCopAnalyzers/1.0.1) |

## To install FxCop analyzers as a VSIX

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@ In [!INCLUDE[vs_current_short](../code-quality/includes/vs_current_short_md.md)]

#### To create and publish a ClickOnce project

1. Click **New Project** from the **File** menu. The **New Project** dialog box appears.
1. Open Visual Studio and create a new project.

2. Select **Windows Application** and name it `CmdLineDemo`.
Choose the **Windows Desktop Application** project template and name the project `CmdLineDemo`.

3. From the **Build** menu, click the **Publish** command.
1. From the **Build** menu, click the **Publish** command.

This step ensures that the project is properly configured to produce a [!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)] application deployment.

The Publish Wizard appears.

4. In the Publish Wizard, click **Finish**.
1. In the Publish Wizard, click **Finish**.

Visual Studio generates and displays the default Web page, called *Publish.htm*.

5. Save your project, and make note of the folder location in which it is stored.
1. Save your project, and make note of the folder location in which it is stored.

The steps above create a [!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)] project which has been published for the first time. Now you can reproduce the build outside of the IDE.

Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/how-to-create-a-package-manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ms.workload:
# How to: Create a package manifest
To deploy prerequisites for your application, you can use a bootstrapper package. A bootstrapper package contains a single product manifest file but a package manifest for each locale. Shared functionality across different localized versions should go into the product manifest.

For more information about package manifests, see [How to: Create a product manifest](../deployment/how-to-create-a-product-manifest.md).
For more information about product manifests, see [How to: Create a product manifest](../deployment/how-to-create-a-product-manifest.md).

## Create the package manifest

Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/how-to-create-a-product-manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ms.workload:
# How to: Create a product manifest
To deploy prerequisites for your application, you can create a bootstrapper package. A bootstrapper package contains a single product manifest file but a package manifest for each locale. The package manifest contains localization-specific aspects of your package. This includes strings, end-user license agreements, and the language packs.

For more information about product manifests, see [How to: Create a package manifest](../deployment/how-to-create-a-package-manifest.md).
For more information about package manifests, see [How to: Create a package manifest](../deployment/how-to-create-a-package-manifest.md).

## Create the product manifest

Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/tutorial-import-publish-settings-azure.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ A publish settings file (*\*.publishsettings*) is different than a publishing pr

## Create a new ASP.NET project in Visual Studio

1. On the computer running Visual Studio, choose **File** > **New Project**.
1. On the computer running Visual Studio, create a new project.

1. Under **Visual C#** or **Visual Basic**, choose **Web**, and then in the middle pane choose either **ASP.NET Web Application (.NET Framework)** or (for C# only) **ASP.NET Core Web Application**, and then click **OK**.
Choose the correct template. In this example, choose either **ASP.NET Web Application (.NET Framework)** or (for C# only) **ASP.NET Core Web Application**, and then click **OK**.

If you don't see the specified project templates, click the **Open Visual Studio Installer** link in the left pane of the **New Project** dialog box. The Visual Studio Installer launches. Install the **ASP.NET and web development** workload.

Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/tutorial-import-publish-settings-iis.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ A publish settings file (*\*.publishsettings*) is different than a publishing pr

## Create a new ASP.NET project in Visual Studio

1. On the computer running Visual Studio, choose **File** > **New Project**.
1. On the computer running Visual Studio, create a new project.

1. Under **Visual C#** or **Visual Basic**, choose **Web**, and then in the middle pane choose either **ASP.NET Web Application (.NET Framework)** or (for C# only) **ASP.NET Core Web Application**, and then click **OK**.
Choose the correct template. In this example, choose either **ASP.NET Web Application (.NET Framework)** or (for C# only) **ASP.NET Core Web Application**, and then click **OK**.

If you don't see the specified project templates, click the **Open Visual Studio Installer** link in the left pane of the **New Project** dialog box. The Visual Studio Installer launches. Install the **ASP.NET and web development** workload.

Expand Down
Loading

0 comments on commit 307c891

Please sign in to comment.