Skip to content

Commit f74739c

Browse files
Merge pull request #7 from MicrosoftDocs/master
bringing in the changes
2 parents 15823f0 + b881ece commit f74739c

File tree

120 files changed

+1630
-906
lines changed

Some content is hidden

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

120 files changed

+1630
-906
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,11 @@
11391139
"redirect_url": "/visualstudio/ide/reference/devenv-command-line-switches",
11401140
"redirect_document_id": false
11411141
},
1142+
{
1143+
"source_path": "docs/ide/reference/open-solution-command.md",
1144+
"redirect_url": "/visualstudio/ide/reference/open-project-command",
1145+
"redirect_document_id": false
1146+
},
11421147
{
11431148
"source_path": "docs/ide/reference/resetaddin-devenv-exe.md",
11441149
"redirect_url": "/visualstudio/ide/reference/devenv-command-line-switches",

docs/_breadcrumb/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
- name: MSBuild
5858
tocHref: /visualstudio/msbuild/
5959
topicHref: /visualstudio/msbuild/msbuild
60-
- name: Nodejs
61-
tocHref: /visualstudio/nodejs/
62-
topicHref: /visualstudio/nodejs/tutorial-nodejs
60+
- name: Node.js
61+
tocHref: /visualstudio/javascript/
62+
topicHref: /visualstudio/javascript/tutorial-nodejs
6363
- name: Profiling
6464
tocHref: /visualstudio/profiling/
6565
topicHref: /visualstudio/profiling/index

docs/ai/index.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@ title: Visual Studio Tools for AI
44
metadata:
55
document_id: 83ceabb5-fb4f-a709-3fd2-37d024409f31
66
title: Visual Studio Tools for AI | Microsoft Docs
7-
meta.description:
8-
services: ai-tools-visual-studio
7+
ms.prod: visual-studio-dev15
8+
ms.technology: vs-ai-tools
99
author: lisawong19
10+
ms.author: liwong
1011
manager: routlaw
11-
ms.service: visual studio
12-
ms.tgt_pltfrm: na
13-
ms.devlang: na
1412
ms.topic: landing-page
1513
ms.date: 10-25-2017
16-
ms.author: liwong
17-
ms.technology: vs-ai-tools
1814
abstract:
1915
description: Visual Studio Tools for AI is an integrated development environment to build, test, and deploy deep learning solutions. Learn how to use AI Tools with our quickstarts, tutorials, and samples.
2016
sections:

docs/cross-platform/index.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: LandingPage
33
author: jasongroce
44
ms.author: apexprodleads
55
ms.topic: landing-page
6+
ms.prod: visual-studio-dev15
67
ms.technology: vs-ide-mobile
78
title: Mobile Development with C++ Documentation | Microsoft Docs
89
description: Create native C++ apps for iOS, Android and Windows devices with Visual Studio.
@@ -12,7 +13,7 @@ ms.workload:
1213

1314
# Mobile Development with C++ Documentation
1415

15-
Create native C++ apps for iOS, Android and Windows devices with Visual Studio.
16+
Create native C++ apps for iOS, Android, and Windows devices with Visual Studio.
1617

1718
<ul class="panelContent cardsF">
1819
<li>
@@ -27,7 +28,7 @@ Create native C++ apps for iOS, Android and Windows devices with Visual Studio.
2728
</div>
2829
<div class="cardText">
2930
<h3>Install Visual C++ for Cross-Platform Mobile Development</h3>
30-
<p>Setup the tools required to build cross-platform mobile apps.</p>
31+
<p>Set up the tools required to build cross-platform mobile apps.</p>
3132
</div>
3233
</div>
3334
</div>
@@ -65,7 +66,7 @@ Create native C++ apps for iOS, Android and Windows devices with Visual Studio.
6566
</div>
6667
<div class="cardText">
6768
<h3>Cross-Platform Mobile Development Examples</h3>
68-
<p>Samples to get you started with cross-platform mobile development.</p>
69+
<p>See samples to help you get started with cross-platform mobile development.</p>
6970
</div>
7071
</div>
7172
</div>

docs/cross-platform/learn-app-building-basics-with-xamarin-forms-in-visual-studio.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ms.custom: ""
44
ms.date: "03/30/2018"
55
ms.topic: "conceptual"
66
ms.assetid: d22b5186-9e03-4e85-afc9-7cbe28522a6d
7+
ms.prod: visual-studio-dev15
78
ms.technology: vs-ide-mobile
89
author: charlespetzold
910
ms.author: chape

docs/cross-platform/setup-and-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ ms.custom: ""
44
ms.date: "03/30/2018"
55
ms.topic: "conceptual"
66
ms.assetid: 2cfcad00-352c-4161-814c-f5ae32d8ada8
7+
ms.prod: visual-studio-dev15
78
ms.technology: vs-ide-mobile
89
author: charlespetzold
910
ms.author: chape
1011
manager: crdun
1112
ms.workload:
1213
- "xamarin"
1314
---
14-
1515
# Setup and install
1616

1717
To build native iOS, Android, and Windows apps from a common C#/.NET code base using Xamarin, you need the following hardware and software:

docs/cross-platform/setup-install-and-verifications-for-mac-users.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ms.custom: ""
44
ms.date: "04/13/2017"
55
ms.topic: "conceptual"
66
ms.assetid: 22725520-59ba-4f6f-80e4-097b1287a34b
7+
ms.prod: visual-studio-dev15
78
ms.technology: vs-ide-mobile
89
author: asb3993
910
ms.author: amburns
@@ -12,9 +13,10 @@ ms.workload:
1213
- "xamarin"
1314
---
1415
# Setup, install, and verifications for Mac users
16+
1517
This topic is meant for developers working primarily on a Mac who will optionally use Visual Studio inside a Windows virtual machine on the Mac. If you are a developer working primarily on a Windows computer and need to set up a secondary Mac for targeting iOS, see the main [Setup and install](../cross-platform/setup-and-install.md) topic.
1618

17-
To work with Xamarin on a Mac, you'll need the following:
19+
To work with Xamarin on a Mac, you'll need the following:
1820

1921
- A Mac with macOS Sierra 10.12 or above, with Xcode and Xamarin installed.
2022

@@ -24,7 +26,7 @@ This topic is meant for developers working primarily on a Mac who will optionall
2426

2527
- **If you already have Parallels or VMWare configured on your Mac:** run Windows with Visual Studio 2017 and Xamarin inside Parallels or VMWare. With this configuration, Xamarin is an extension that's installed with Visual Studio that provides the ability to use Visual Studio as your development environment for building Android, iOS, and Windows apps using C#. Note that you can obtain a free 3-month Parallels subscription as part of the Visual Studio Developer Essentials Program. See [Microsoft Visual Studio Dev Essentials Will Include Parallels Desktop Pro and Parallels Access](http://blog.parallels.com/blog/2015/11/18/visual-studio-dev-essentials/) (Parallels blog).
2628

27-
This topic provides instructions for these requirements. While the installation process is running, you can review the topic [Learn about mobile development with Xamarin](../cross-platform/learn-about-mobile-development-with-xamarin.md) to read and watch the necessary background material.
29+
This topic provides instructions for these requirements. While the installation process is running, you can review the topic [Learn about mobile development with Xamarin](../cross-platform/learn-about-mobile-development-with-xamarin.md) to read and watch the necessary background material.
2830

2931
## <a name="mac"></a> Mac setup (Apple ID, Xcode, and Xamarin)
3032

@@ -59,12 +61,14 @@ This topic is meant for developers working primarily on a Mac who will optionall
5961
6. Once you've completed installing Xamarin on both the Windows and Mac computers, follow the instructions on [Connecting to the Mac using XMA](http://developer.xamarin.com/guides/ios/getting_started/installation/windows/#Connecting_to_the_Mac_Using_XMA) (xamarin.com) so that you can work with iOS from Visual Studio.
6062

6163
## <a name="verify"></a> Verify your environment
62-
Once the installers have completed, spend a few minutes to verify that everything is ready to experience Xamarin development.
64+
65+
Once the installers have completed, spend a few minutes to verify that everything is ready to experience Xamarin development.
6366

6467
### Xamarin Studio
65-
First, ensure that when you navigate to the provided links, that you have **Xamarin Studio** selected in the upper right-hand corner so that you see the correct version of the Xamarin documentation:
6668

67-
![Selecting Xamarin Studio to see the correct documentation on Xamarin.com](../cross-platform/media/crossplat-xamarin-mac-1.png "CrossPlat Xamarin Mac 1")
69+
First, ensure that when you navigate to the provided links, that you have **Xamarin Studio** selected in the upper right-hand corner so that you see the correct version of the Xamarin documentation:
70+
71+
![Selecting Xamarin Studio to see the correct documentation on Xamarin.com](../cross-platform/media/crossplat-xamarin-mac-1.png "CrossPlat Xamarin Mac 1")
6872

6973
**Android**
7074

@@ -79,9 +83,10 @@ This topic is meant for developers working primarily on a Mac who will optionall
7983
2. Validate debugging in the iOS simulator through the [Debugging in the Simulator documentation](https://developer.xamarin.com/guides/ios/deployment,_testing,_and_metrics/debugging_in_xamarin_ios/#Debugging_on_the_Simulator) (xamarin.com).
8084

8185
### Visual Studio
82-
First, ensure that when you navigate to the provided links, that you have **Visual Studio** selected in the upper right-hand corner so that you see the correct version of the Xamarin documentation:
8386

84-
![Selecting Visual Studio to see the correct documentation on Xamarin.com](../cross-platform/media/crossplat-xamarin-mac-2.png "CrossPlat Xamarin Mac 2")
87+
First, ensure that when you navigate to the provided links, that you have **Visual Studio** selected in the upper right-hand corner so that you see the correct version of the Xamarin documentation:
88+
89+
![Selecting Visual Studio to see the correct documentation on Xamarin.com](../cross-platform/media/crossplat-xamarin-mac-2.png "CrossPlat Xamarin Mac 2")
8590

8691
**Android**
8792

0 commit comments

Comments
 (0)