Merge pull request #4442 from MicrosoftDocs/master637111874699470355

ghogen · web-flow · commit 613741fe549f · 2019-12-05T16:04:56.000-08:00
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
diff --git a/docs/sharepoint/creating-sharepoint-solution-packages.md b/docs/sharepoint/creating-sharepoint-solution-packages.md
@@ -31,7 +31,7 @@ ms.workload:
 |-------------------------------|------------------------------------|
 |Name|Required. The default name of the package is set to *ProjectName*.|
 |Reset WebServer|Optional. Select if you want to restart the Web server after the *.wsp* file is installed on the SharePoint server.|
-|Deployment Server Type|Required. By default, the scope is set to ApplicationServer.<br /><br /> ApplicationServer: Describes a server that hosts services.<br /><br /> WebFrontEnd: Describes a server that hosts Web sites.|
+|Deployment Server Type|Optional. Represents the type of server hosting the package. If not set this will default to WebFrontEnd.<br /><br /> ApplicationServer: Describes a server that hosts services.<br /><br /> WebFrontEnd: Describes a server that hosts Web sites.|
 |Items in the Solution|All SharePoint project items and Features that can be added to the package.|
 |Items in the Package|Optional. All SharePoint items and Features that you want to deploy in your package.|
 
diff --git a/docs/sharepoint/includes/new-project-dialog-search-md.md b/docs/sharepoint/includes/new-project-dialog-search-md.md
@@ -0,0 +1,2 @@
+>[!NOTE]
+> You can also search for templates by typing **SharePoint** in the Search text box at the top of the **Create a New Project** dialog. You can also filter the list of templates to show only the templates for Office and SharePoint by selecting "Office" in the Project type drop-down box. For more information, see [Create a new project in Visual Studio](../../ide/create-new-project.md).
diff --git a/docs/sharepoint/walkthrough-create-a-site-column-content-type-and-list-for-sharepoint.md b/docs/sharepoint/walkthrough-create-a-site-column-content-type-and-list-for-sharepoint.md
@@ -48,41 +48,60 @@ ms.workload:
 #### To create the project
 
 1. On the [!INCLUDE[vsprvs](../sharepoint/includes/vsprvs-md.md)] **File** menu, choose **New** > **Project**.
+::: moniker range="=vs-2017"
+2. In the **New Project** dialog box, under either **Visual C#** or **Visual Basic**, expand the **Office/SharePoint** node, and then select **SharePoint Solutions**.
 
-2. In the **New Project** dialog box, under either **Visual C#** or **Visual Basic**, expand the **SharePoint** node, and then choose **2010**.
+3. In the **Templates** pane, choose the **SharePoint Empty Project** for the particular version of SharePoint you have installed. For example, if you have SharePoint 2016 install select the **SharePoint 2016 - Empty Project** template.  
 
-3. In the **Templates** pane, choose **SharePoint 2010 Project**, change the name of the project to **Clinic**, and then choose the **OK** button.
+4. Change the name of the project to **Clinic**, and then choose the **OK** button.
 
-     The SharePoint 2010 Project template is an empty project that's used in this example to contain site columns and other project items that are added later.
+5. On the **Specify the site and security level for debugging** dialog, enter the URL for the local SharePoint site to which you want to add the new custom field item, or use the default location (`http://<`*SystemName*`>/)`.
 
-4. On the **Specify the site and security level for debugging** page, enter the URL for the local SharePoint site to which you want to add the new custom field item, or use the default location (`http://<`*SystemName*`>/)`.
+6. In the **What is the trust level for this SharePoint solution?** section, use the default value **Deploy as a sandboxed solution**.
+
+     For more information about sandboxed and farm solutions, see [Sandboxed solution considerations](../sharepoint/sandboxed-solution-considerations.md).
+
+7. Choose the **Finish** button. The project is now listed in **Solution Explorer**.
+::: moniker-end
+::: moniker range=">=vs-2019"
+2.  On the **Create a New Project** dialog select the **SharePoint Empty Project** for the particular version of SharePoint you have installed. For example, if you have SharePoint 2016 install select the **SharePoint 2016 - Empty Project** template.
+    [!INCLUDE[new-project-dialog-search](../sharepoint/includes/new-project-dialog-search-md.md)]
+
+3. Change the name of the project to **Clinic**, and then choose the **Create** button.
+
+4. On the **Specify the site and security level for debugging** dialog, enter the URL for the local SharePoint site to which you want to add the new custom field item, or use the default location (`http://<`*SystemName*`>/)`.
 
 5. In the **What is the trust level for this SharePoint solution?** section, use the default value **Deploy as a sandboxed solution**.
 
      For more information about sandboxed and farm solutions, see [Sandboxed solution considerations](../sharepoint/sandboxed-solution-considerations.md).
 
 6. Choose the **Finish** button. The project is now listed in **Solution Explorer**.
+::: moniker-end
 
 #### To add site columns
 
-1. Add a new site column. To do this, in **Solution Explorer**, open the shortcut menu for **Clinic**, and then choose **Add** > **New Item**.
+1. Add a new site column. To do this, in **Solution Explorer**, right-click on the **Clinic** project, and then choose **Add** > **New Item**.
 
-2. In the **Add New Item** dialog box, choose **Site Column**, change the name to **Patient Name**, and then choose the **Add** button.
+2. In the **Add New Item** dialog box, choose **Site Column**, change the name to **PatientName**, and then choose the **Add** button.
 
-3. In the site column's *Elements.xml* file, leave the **Type** setting as **Text**, and change the **Group** setting to **Clinic Site Columns**. When complete, the site column's *Elements.xml* file should look like the following example.
+3. In the site column's *Elements.xml* file, leave the **Type** setting as **Text**, change the **Group** setting to **Clinic Site Columns**. When complete, the site column's *Elements.xml* file should look like the following example.
 
     ```xml
     <Field
          ID="{f9ba60d1-5631-41fb-b016-a38cf48eef63}"
-         Name="Clinic - Patient Name"
+         Name="PatientName"
          DisplayName="Patient Name"
          Type="Text"
          Required="FALSE"
          Group="Clinic Site Columns">
     </Field>
     ```
 
-4. Using the same procedure, add two more site columns to the project: **Patient ID** (Type = "Integer") and **Doctor Name** (Type = "Text"). Set their Group value to **Clinic Site Columns**.
+    > [!TIP]
+    > Visual Studio will automatically add a space in the DisplayName for you if you use camel casing in the name of the Site Column.
+    > It's recommended not to use spaces in the Site Column name as it may cause issues when you try to deploy the solution to SharePoint.
+
+4. Using the same procedure, add two more site columns to the project: **PatientID** (Type = "Integer") and **DoctorName** (Type = "Text"). Set their Group value to **Clinic Site Columns**.
 
 ## Create a custom content type
  Next, create a content type—based on the Contacts content type—that includes the site columns that you created in the previous procedure. By basing a content type on an existing content type, you can save time because the base content type provides several site columns for use in the new content type.
@@ -127,11 +146,11 @@ ms.workload:
 
 2. On the menu bar, choose **Project** > **Add New Item**.
 
-3. Under either **Visual C#** or **Visual Basic**, expand the **SharePoint** node, and then choose the **2010** node.
+3. Under either **Visual C#** or **Visual Basic**, expand the **SharePoint** node.
 
 4. In the **Templates** pane, choose the **List** template, change the name to **Patients**, and then choose the **Add** button.
 
-5. Leave the **Customize the list based on** setting as **Default (Blank)**, and then choose the **Finish** button.
+5. Leave the **Customize the list based on** setting as **Default (Custom List)**, and then choose the **Finish** button.
 
 6. In the List Designer, choose the **Content Types** button to display the **Content Type Settings** dialog box.
 
@@ -164,7 +183,7 @@ ms.workload:
 
 10. Next to the **Patient ID** and **Patient Name** boxes, select the **Required** check box.
 
-11. On the **Views** tab, choose an empty row to create a view. Enter **Patient Details**.
+11. On the **Views** tab, choose an empty row to create a view. Enter **Patient Details** in a blank row under the **View Name** column.
 
      On the **Views** tab, you can specify the columns that you want to appear in the SharePoint list.
 
diff --git a/docs/vsto/codesnippet/CSharp/Trin_OL_SearchEmail/thisaddin.cs b/docs/vsto/codesnippet/CSharp/Trin_OL_SearchEmail/thisaddin.cs
@@ -20,19 +20,25 @@ private void ThisAddIn_Startup(object sender, System.EventArgs e)
         private void SearchforEmail(string partialAddress)
         {
             string contactMessage = string.Empty;
+            Outlook.ContactItem foundContact;
             Outlook.MAPIFolder contacts = (Outlook.MAPIFolder)
                 this.Application.ActiveExplorer().Session.GetDefaultFolder
                  (Outlook.OlDefaultFolders.olFolderContacts);
-            foreach (Outlook.ContactItem foundContact in contacts.Items)
+            foreach (var contact in contacts.Items)
             {
-                if (foundContact.Email1Address != null)
+                //The contacts folder may also distribution list so check to make sure we have a ContactItem
+                if (contact is Outlook.ContactItem)
                 {
-                    if (foundContact.Email1Address.Contains(partialAddress))
+                    foundContact = contact as Outlook.ContactItem;
+                    if (foundContact.Email1Address != null)
                     {
-                        contactMessage = contactMessage + "New contact"
-                        + foundContact.FirstName + " " + foundContact.LastName
-                        + " Email Address is " + foundContact.Email1Address +
-                        ". \n";
+                        if (foundContact.Email1Address.Contains(partialAddress))
+                        {
+                            contactMessage = contactMessage + "New contact"
+                            + foundContact.FirstName + " " + foundContact.LastName
+                            + " Email Address is " + foundContact.Email1Address +
+                            ". \n";
+                        }
                     }
                 }
             }
diff --git a/subscriptions/TOC.md b/subscriptions/TOC.md
@@ -1,96 +1,96 @@
-# [Visual Studio subscriptions](index.md)
-## [What's New](whats-new-in-subscriptions.md)
-## Subscriptions
-### Buy subscriptions
-#### [Retail](https://visualstudio.microsoft.com/vs/pricing)
-#### Cloud 
-##### [Overview](vscloud-overview.md)
-##### [Billing FAQ](vscloud-billing-faq.md)
-##### [Buying for CSPs](vscloud-csp.md)
-#### [Visual Studio with GitHub Enterprise](access-github.md)
-#### Microsoft Partner Network
-##### [Subscriptions for partners](program-mpn.md)
-##### [Manage subscriptions for MPN](manage-mpn-subscriptions.md)
-#### [Microsoft for Startups](program-startups.md)
-### Sign in 
-#### [Activate retail subscriptions](activate-store-subscriptions.md)
-#### [Sign in with Microsoft Accounts](sign-in-msa.md)
-#### [Sign in with work/school accounts](sign-in-work.md)
-#### [Sign in with GitHub](sign-in-github.md)
-#### [Alternate identities](vs-alternate-identity.md)
-#### [Sign in problems](sign-in-issues.md)
-#### [Anonymizations of subscriber data](anonymization.md)
-### [Subscriptions portal overview](using-the-subscriber-portal.md)
-### [Manage your subscriptions](manage-vs-subscriptions.md)
-### [Contact your subscriptions administrator](contact-my-admin.md)
-### Benefits
-#### Tools
-##### [Azure DevTest individual credit](vs-azure.md)
-##### [Azure DevOps](vs-azure-devops.md)
-##### [Azure Pay-As-You-Go](vs-azure-payg.md)
-##### [CAST Highlight](vs-cast.md)
-##### [CloudPilot](vs-cloudpilot.md)
-##### [Enterprise Mobility & Security](vs-ems.md)
-##### [Microsoft 365](vs-m365.md)
-##### [Office 365 subscription](vs-office365.md)
-##### [Parasoft](vs-parasoft.md)
-##### [Power BI Pro](vs-pbi.md)
-##### [Visual Studio App Center](vs-visual-studio-app-center.md)
-##### [Visual Studio IDE](vs-ide-benefit.md)
-##### [WhiteSource Bolt](vs-whitesource.md)
-##### [Windows Developer Account](vs-windows-dev.md)
-#### Professional development
-##### [CODE Magazine](vs-code-magazine.md)
-##### [DataCamp](vs-datacamp.md)
-##### [LinkedIn Learning](vs-linkedin-learning.md)
-##### [Pluralsight](vs-pluralsight.md)
-#### Support 
-##### [Azure Community](vs-azure-community.md)
-##### [Concierge Support](vs-concierge-chat.md)
-##### [Technical Support](vs-tech-support.md)
-## Software and keys
-### Software downloads
-#### [Product availability](product-availability.md)
-#### [Download software](download-software.md)
-### [List of available software downloads](software-download-list.md)
-### Product keys
-#### [Product keys overview](product-keys.md)
-#### [Find and claim keys](find-keys.md)
-#### [Internet demonstrations](internet-demos.md)
-## Administrators
-### Administrator responsibilities
-#### [Administrator responsibilities](admin-responsibilities.md)
-#### [Pre-production inventory](admin-inventory.md)
-#### [Manage large teams and external contractors](manage-teams.md)
-#### [Track user assignments and process orders](assignments-orders.md)
-### Accessing the admin portal
-#### [Volume License](volume-license.md)
-#### [MPSA](mpsa.md)
-#### [Cloud subscriptions](cloud-admin.md)
-#### [Partners managing for customers](open-migration.md)
-#### [Video tutorial: Access the admin portal](https://youtu.be/plSu6fpi7UI)
-### Using the admin portal
-#### [Super admins and administrators](admin-roles.md)
-#### [Set agreement preferences](admin-prefs.md)
-#### [Overview](using-admin-portal.md)
-#### [Video tutorial: Use the admin portal](https://www.youtube.com/watch?v=XG-E-IDjA-w&list=PLReL099Y5nReJhZ6o8CQFPSBgzGCHX99_&index=3&t=0s)
-#### Assign subscriptions
-##### [Add single users](assign-license.md)
-##### [Add multiple users](assign-license-bulk.md)
-#### [Edit subscriptions](edit-license.md)
-#### [Delete subscriptions](delete-license.md)
-#### [Search for a subscription](search-license.md)
-#### [Export subscriptions](exporting-subscriptions.md)
-#### [Overallocations](handle-overclaimed-license.md)
-#### [Maximum usage](maximum-usage.md)
-#### [Expired subscriptions](handle-expired-license.md)
-#### [Subscribers using aliases](aliasing.md)
-#### [Subscribers with personal email sign-ins](personal-email-sign-ins.md)
-#### [Managing Visual Studio with GitHub Enterprise](assign-github.md)
-## Resources
-### [Visual Studio licensing white paper](https://aka.ms/vslicensing)
-### [Compare subscription options and pricing](https://visualstudio.microsoft.com/vs/pricing)
-### [Compare Visual Studio IDE features](https://visualstudio.microsoft.com/vs/compare)
-### [Visual Studio Administration and Subscriptions Support](https://visualstudio.microsoft.com/support/support-overview-vs)
-### [Volume licensing terms](https://www.microsoft.com/licensing/product-licensing/products.aspx)
-### [Microsoft Products and Services Agreement (MPSA)](https://www.microsoft.com/licensing/mpsa/default.aspx)
+# [Visual Studio subscriptions](index.yml)
+# [What's New](whats-new-in-subscriptions.md)
+# Subscriptions
+## Buy subscriptions
+### [Retail](https://visualstudio.microsoft.com/vs/pricing)
+### Cloud 
+#### [Overview](vscloud-overview.md)
+#### [Billing FAQ](vscloud-billing-faq.md)
+#### [Buying for CSPs](vscloud-csp.md)
+### [Visual Studio with GitHub Enterprise](access-github.md)
+### Microsoft Partner Network
+#### [Subscriptions for partners](program-mpn.md)
+#### [Manage subscriptions for MPN](manage-mpn-subscriptions.md)
+### [Microsoft for Startups](program-startups.md)
+## Sign in 
+### [Activate retail subscriptions](activate-store-subscriptions.md)
+### [Sign in with Microsoft Accounts](sign-in-msa.md)
+### [Sign in with work/school accounts](sign-in-work.md)
+### [Sign in with GitHub](sign-in-github.md)
+### [Alternate identities](vs-alternate-identity.md)
+### [Sign in problems](sign-in-issues.md)
+### [Anonymizations of subscriber data](anonymization.md)
+## [Subscriptions portal overview](using-the-subscriber-portal.md)
+## [Manage your subscriptions](manage-vs-subscriptions.md)
+## [Contact your subscriptions administrator](contact-my-admin.md)
+## Benefits
+### Tools
+#### [Azure DevTest individual credit](vs-azure.md)
+#### [Azure DevOps](vs-azure-devops.md)
+#### [Azure Pay-As-You-Go](vs-azure-payg.md)
+#### [CAST Highlight](vs-cast.md)
+#### [CloudPilot](vs-cloudpilot.md)
+#### [Enterprise Mobility & Security](vs-ems.md)
+#### [Microsoft 365](vs-m365.md)
+#### [Office 365 subscription](vs-office365.md)
+#### [Parasoft](vs-parasoft.md)
+#### [Power BI Pro](vs-pbi.md)
+#### [Visual Studio App Center](vs-visual-studio-app-center.md)
+#### [Visual Studio IDE](vs-ide-benefit.md)
+#### [WhiteSource Bolt](vs-whitesource.md)
+#### [Windows Developer Account](vs-windows-dev.md)
+### Professional development
+#### [CODE Magazine](vs-code-magazine.md)
+#### [DataCamp](vs-datacamp.md)
+#### [LinkedIn Learning](vs-linkedin-learning.md)
+#### [Pluralsight](vs-pluralsight.md)
+### Support 
+#### [Azure Community](vs-azure-community.md)
+#### [Concierge Support](vs-concierge-chat.md)
+#### [Technical Support](vs-tech-support.md)
+# Software and keys
+## Software downloads
+### [Product availability](product-availability.md)
+### [Download software](download-software.md)
+## [List of available software downloads](software-download-list.md)
+## Product keys
+### [Product keys overview](product-keys.md)
+### [Find and claim keys](find-keys.md)
+### [Internet demonstrations](internet-demos.md)
+# Administrators
+## Administrator responsibilities
+### [Administrator responsibilities](admin-responsibilities.md)
+### [Pre-production inventory](admin-inventory.md)
+### [Manage large teams and external contractors](manage-teams.md)
+### [Track user assignments and process orders](assignments-orders.md)
+## Accessing the admin portal
+### [Volume License](volume-license.md)
+### [MPSA](mpsa.md)
+### [Cloud subscriptions](cloud-admin.md)
+### [Partners managing for customers](open-migration.md)
+### [Video tutorial: Access the admin portal](https://youtu.be/plSu6fpi7UI)
+## Using the admin portal
+### [Super admins and administrators](admin-roles.md)
+### [Set agreement preferences](admin-prefs.md)
+### [Overview](using-admin-portal.md)
+### [Video tutorial: Use the admin portal](https://www.youtube.com/watch?v=XG-E-IDjA-w&list=PLReL099Y5nReJhZ6o8CQFPSBgzGCHX99_&index=3&t=0s)
+### Assign subscriptions
+#### [Add single users](assign-license.md)
+#### [Add multiple users](assign-license-bulk.md)
+### [Edit subscriptions](edit-license.md)
+### [Delete subscriptions](delete-license.md)
+### [Search for a subscription](search-license.md)
+### [Export subscriptions](exporting-subscriptions.md)
+### [Overallocations](handle-overclaimed-license.md)
+### [Maximum usage](maximum-usage.md)
+### [Expired subscriptions](handle-expired-license.md)
+### [Subscribers using aliases](aliasing.md)
+### [Subscribers with personal email sign-ins](personal-email-sign-ins.md)
+### [Managing Visual Studio with GitHub Enterprise](assign-github.md)
+# Resources
+## [Visual Studio licensing white paper](https://aka.ms/vslicensing)
+## [Compare subscription options and pricing](https://visualstudio.microsoft.com/vs/pricing)
+## [Compare Visual Studio IDE features](https://visualstudio.microsoft.com/vs/compare)
+## [Visual Studio Administration and Subscriptions Support](https://visualstudio.microsoft.com/support/support-overview-vs)
+## [Volume licensing terms](https://www.microsoft.com/licensing/product-licensing/products.aspx)
+## [Microsoft Products and Services Agreement (MPSA)](https://www.microsoft.com/licensing/mpsa/default.aspx)
diff --git a/subscriptions/_breadcrumb/toc.yml b/subscriptions/_breadcrumb/toc.yml
@@ -1,3 +1,11 @@
 - name: Docs
   tocHref: /
-  topicHref: /
+  topicHref: /
+  items:
+  - name: Visual Studio
+    tocHref: /visualstudio/products/
+    topicHref: /visualstudio/products
+    items:
+      - name: Subscriptions
+        tocHref: /visualstudio/subscriptions/
+        topicHref: /visualstudio/subscriptions
diff --git a/subscriptions/docfx.json b/subscriptions/docfx.json
@@ -34,7 +34,7 @@
       "feedback_system": "GitHub",
       "feedback_github_repo": "MicrosoftDocs/visualstudio-docs",
       "feedback_product_url": "https://developercommunity.visualstudio.com/",
-      "breadcrumb_path": "~/_breadcrumb/toc.yml",
+      "breadcrumb_path": "/visualstudio/subscriptions/_breadcrumb/toc.json",
       "extendBreadcrumb": true,
       "manager": "lank",
       "ms.topic": "conceptual",
diff --git a/subscriptions/index.md b/subscriptions/index.md
diff --git a/subscriptions/index.yml b/subscriptions/index.yml
diff --git a/subscriptions/using-admin-portal.md b/subscriptions/using-admin-portal.md

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+>[!NOTE]`
	`2`	`+> You can also search for templates by typing SharePoint in the Search text box at the top of the Create a New Project dialog. You can also filter the list of templates to show only the templates for Office and SharePoint by selecting "Office" in the Project type drop-down box. For more information, see [Create a new project in Visual Studio](../../ide/create-new-project.md).`
Original file line number	Diff line number	Diff line change
`@@ -20,19 +20,25 @@ private void ThisAddIn_Startup(object sender, System.EventArgs e)`
`20`	`20`	`private void SearchforEmail(string partialAddress)`
`21`	`21`	`{`
`22`	`22`	`string contactMessage = string.Empty;`
	`23`	`+ Outlook.ContactItem foundContact;`
`23`	`24`	`Outlook.MAPIFolder contacts = (Outlook.MAPIFolder)`
`24`	`25`	`this.Application.ActiveExplorer().Session.GetDefaultFolder`
`25`	`26`	`(Outlook.OlDefaultFolders.olFolderContacts);`
`26`		`- foreach (Outlook.ContactItem foundContact in contacts.Items)`
	`27`	`+ foreach (var contact in contacts.Items)`
`27`	`28`	`{`
`28`		`- if (foundContact.Email1Address != null)`
	`29`	`+ //The contacts folder may also distribution list so check to make sure we have a ContactItem`
	`30`	`+ if (contact is Outlook.ContactItem)`
`29`	`31`	`{`
`30`		`- if (foundContact.Email1Address.Contains(partialAddress))`
	`32`	`+ foundContact = contact as Outlook.ContactItem;`
	`33`	`+ if (foundContact.Email1Address != null)`
`31`	`34`	`{`
`32`		`- contactMessage = contactMessage + "New contact"`
`33`		`- + foundContact.FirstName + " " + foundContact.LastName`
`34`		`- + " Email Address is " + foundContact.Email1Address +`
`35`		`- ". \n";`
	`35`	`+ if (foundContact.Email1Address.Contains(partialAddress))`
	`36`	`+ {`
	`37`	`+ contactMessage = contactMessage + "New contact"`
	`38`	`+ + foundContact.FirstName + " " + foundContact.LastName`
	`39`	`+ + " Email Address is " + foundContact.Email1Address +`
	`40`	`+ ". \n";`
	`41`	`+ }`
`36`	`42`	`}`
`37`	`43`	`}`
`38`	`44`	`}`