Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed merge conflict #1265

Merged
merged 1 commit into from
Nov 17, 2016
Merged

Fixed merge conflict #1265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 2 additions & 50 deletions docs/core/preview3/tools/dotnet-msbuild.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,5 @@
<<<<<<< 94aa2d71d55ffa4d42044bb4ebb8d8e06d13d394
---
title: dotnet-msmsbuild command | .NET Core SDK
description: The dotnet-msmsbuild command provides access to MSmsbuild command line
keywords: dotnet-msmsbuild, CLI, CLI command, .NET Core
author: mairaw
manager: wpickett
ms.date: 10/13/2016
ms.topic: article
ms.prod: .net-core
ms.technology: .net-core-technologies
ms.devlang: dotnet
ms.assetid: 70285a83-4103-4617-be8b-d0e1e9a4a91d
---

#dotnet-m/msbuild

## Name
dotnet-msbuild -- msbuilds a project and all of its dependencies

## Synopsis

`dotnet msbuild <msbuild_arguments>`

## Description
The `dotnet msbuild` command allows access to a fully functional MSBuild

The command has the exact same capablities as existing MSBuild command line client. The options are all the same. You can
use the [existing documentation](https://msdn.microsoft.com/en-us/library/ms164311.aspx) to get familiar with the command
reference.

## Examples

Build a project and its dependencies:

`dotnet msbuild`

Build a project and its dependencies using Release configuration:

`dotnet msbuild /p:Configuration=Release--configuration Release`

Run the publish target and publish for the `osx.10.11-x64` RID:

`dotnet msbuild /t:Publish /p:RuntimeIdentifiers=osx.10.11-x64`

=======
---
title: dotnet-msmsbuild command | .NET Core SDK
title: dotnet-msbuild command | .NET Core SDK
description: The dotnet-msmsbuild command provides access to MSmsbuild command line
keywords: dotnet-msmsbuild, CLI, CLI command, .NET Core
author: mairaw
Expand All @@ -70,7 +24,7 @@ dotnet-msbuild -- Builds a project and all of its dependencies
## Description
The `dotnet msbuild` command allows access to a fully functional MSBuild

The command has the exact same capablities as existing MSBuild command line client. The options are all the same. You can
The command has the exact same capabilities as existing MSBuild command line client. The options are all the same. You can
use the [existing documentation](https://msdn.microsoft.com/en-us/library/ms164311.aspx) to get familiar with the command
reference.

Expand All @@ -87,5 +41,3 @@ Build a project and its dependencies using Release configuration:
Run the publish target and publish for the `osx.10.11-x64` RID:

`dotnet msbuild /t:Publish /p:RuntimeIdentifiers=osx.10.11-x64`

>>>>>>> Responding to PR feedback