Merge pull request #402 from OfficeDev/dev

August 2016 Release

Author: erwinvanhunen

Binaries/SharePointPnPPowerShell2013.msi

@@ -14,7 +14,7 @@ namespace SharePointPnP.PowerShell.Commands
     [CmdletRelatedLink(Text = "Locale IDs", Url = "http://go.microsoft.com/fwlink/p/?LinkId=242911Id=242911")]
     public class GetWebTemplates : SPOAdminCmdlet
     {
-        [Parameter(Mandatory = false, HelpMessage = "The language id like 1033 for English")]
+        [Parameter(Mandatory = false, HelpMessage = "The language ID. For instance: 1033 for English")]
         public uint Lcid;
 
         [Parameter(Mandatory = false, HelpMessage = "The version of SharePoint")]

Binaries/SharePointPnPPowerShell2016.msi

@@ -25,7 +25,7 @@ public class RemoveSite : SPOAdminCmdlet
         [Parameter(Mandatory = true, Position = 0, ValueFromPipeline = true, HelpMessage = "Specifies the full URL of the site collection that needs to be deleted")]
         public string Url;
 
-        [Parameter(Mandatory = false, HelpMessage = "Do not add to the trashcan if selected.")]
+        [Parameter(Mandatory = false, HelpMessage = "Do not add to the trashcan when selected.")]
         [Alias("SkipTrash")]
         public SwitchParameter SkipRecycleBin;
 

Binaries/SharePointPnPPowerShellOnline.msi

@@ -1,21 +1,30 @@
 #if !ONPREMISES
+using System;
 using System.Management.Automation;
 using Microsoft.Online.SharePoint.TenantManagement;
 using Microsoft.SharePoint.Client;
 using SharePointPnP.PowerShell.CmdletHelpAttributes;
 using SharePointPnP.PowerShell.Commands.Base;
+using System.Collections.Generic;
+using OfficeDevPnP.Core.Entities;
 
 namespace SharePointPnP.PowerShell.Commands
 {
     [Cmdlet(VerbsCommon.Set, "SPOTenantSite")]
-    [CmdletHelp(@"Office365 only: Uses the tenant API to set site information.", 
+    [CmdletHelp(@"Office365 only: Uses the tenant API to set site information.",
         Category = CmdletHelpCategory.TenantAdmin)]
     [CmdletExample(
       Code = @"PS:> Set-SPOTenantSite -Url https://contoso.sharepoint.com -Title 'Contoso Website' -Sharing Disabled",
-      Remarks = @"This will set the title of the site collection with the URL 'https://contoso.sharepoint.com' to 'Contoso Website' and disable sharing on this site collection.", SortOrder = 1)]        
+      Remarks = @"This will set the title of the site collection with the URL 'https://contoso.sharepoint.com' to 'Contoso Website' and disable sharing on this site collection.", SortOrder = 1)]
+    [CmdletExample(
+      Code = @"PS:> Set-SPOTenantSite -Url https://contoso.sharepoint.com -Title 'Contoso Website' -StorageWarningLevel 8000 -StorageMaximumLevel 10000",
+      Remarks = @"This will set the title of the site collection with the URL 'https://contoso.sharepoint.com' to 'Contoso Website', set the storage warning level to 8GB and set the storage maximum level to 10GB.", SortOrder = 2)]
+    [CmdletExample(
+      Code = @"PS:> Set-SPOTenantSite -Url https://contoso.sharepoint.com/sites/sales -Owners 'i:0#.f|membership|[email protected]'",
+      Remarks = @"This will set [email protected] as a site collection owner at 'https://contoso.sharepoint.com/sites/sales'.", SortOrder = 3)]   
     public class SetTenantSite : SPOAdminCmdlet
     {
-        [Parameter(Mandatory = false, HelpMessage = "Specifies the URL of the site", Position=0, ValueFromPipeline=true)]
+        [Parameter(Mandatory = false, HelpMessage = "Specifies the URL of the site", Position = 0, ValueFromPipeline = true)]
         public string Url;
 
         [Parameter(Mandatory = false, HelpMessage = "Specifies the title of the site")]
@@ -39,11 +48,24 @@ public class SetTenantSite : SPOAdminCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Specifies if the site administrator can upgrade the site collection")]
         public SwitchParameter? AllowSelfServiceUpgrade = null;
 
+        [Parameter(Mandatory = false, HelpMessage = "Specifies owners to add as site collection adminstrators. Can be both users and groups.")]
+        public List<string> Owners;
+
         protected override void ExecuteCmdlet()
         {
-            Tenant.SetSiteProperties(Url, title:Title, sharingCapability: Sharing, storageMaximumLevel: StorageMaximumLevel, allowSelfServiceUpgrade: AllowSelfServiceUpgrade, userCodeMaximumLevel: UserCodeMaximumLevel, userCodeWarningLevel: UserCodeWarningLevel);
+            Tenant.SetSiteProperties(Url, title: Title, sharingCapability: Sharing, storageMaximumLevel: StorageMaximumLevel, allowSelfServiceUpgrade: AllowSelfServiceUpgrade, userCodeMaximumLevel: UserCodeMaximumLevel, userCodeWarningLevel: UserCodeWarningLevel);
+
+            if (Owners != null && Owners.Count > 0)
+            {
+                var admins = new List<UserEntity>();
+                foreach (string owner in Owners)
+                {
+                    var userEntity = new UserEntity { LoginName = owner };
+                    admins.Add(userEntity);
+                }
+                Tenant.AddAdministrators(admins, new Uri(Url));
+            }
         }
     }
-
 }
 #endif

Commands/Admin/GetWebTemplates.cs

@@ -7,6 +7,8 @@
 using System.Net;
 using System.Security;
 using System.Linq;
+using Microsoft.SharePoint.Client;
+using File = System.IO.File;
 #if !ONPREMISES
 using Microsoft.SharePoint.Client.CompliancePolicy;
 #endif
@@ -43,6 +45,10 @@ namespace SharePointPnP.PowerShell.Commands.Base
 dir",
         Remarks = @"This will prompt you for credentials and creates a context for the other PowerShell commands to use. It will also create a SPO:\\ drive you can use to navigate around the site",
         SortOrder = 6)]
+    [CmdletExample(
+        Code = @"PS:> Connect-SPOnline -Url https://yourserver -Credentials (Get-Credential) -AuthenticationMode FormsAuthentication",
+        Remarks = @"This will prompt you for credentials and creates a context for the other PowerShell commands to use. It assumes your server is configured for Forms Based Authentication (FBA)",
+        SortOrder = 7)]
     public class ConnectSPOnline : PSCmdlet
     {
         [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterAttribute.AllParameterSets, ValueFromPipeline = true, HelpMessage = "The Url of the site collection to connect to.")]
@@ -81,6 +87,9 @@ public class ConnectSPOnline : PSCmdlet
         [Parameter(Mandatory = true, ParameterSetName = "Weblogin", HelpMessage = "If you want to connect to SharePoint with browser based login")]
         public SwitchParameter UseWebLogin;
 
+        [Parameter(Mandatory = false, ParameterSetName = "Main", HelpMessage = "Specify to use for instance use forms based authentication (FBA)")]
+        public ClientAuthenticationMode AuthenticationMode = ClientAuthenticationMode.Default;
+
         [Parameter(Mandatory = false, HelpMessage = "If you want to create a PSDrive connected to the URL")]
         public SwitchParameter CreateDrive;
 
@@ -164,7 +173,7 @@ protected override void ProcessRecord()
                         creds = Host.UI.PromptForCredential(Properties.Resources.EnterYourCredentials, "", "", "");
                     }
                 }
-                SPOnlineConnection.CurrentConnection = SPOnlineConnectionHelper.InstantiateSPOnlineConnection(new Uri(Url), creds, Host, CurrentCredentials, MinimalHealthScore, RetryCount, RetryWait, RequestTimeout, SkipTenantAdminCheck);
+                SPOnlineConnection.CurrentConnection = SPOnlineConnectionHelper.InstantiateSPOnlineConnection(new Uri(Url), creds, Host, CurrentCredentials, MinimalHealthScore, RetryCount, RetryWait, RequestTimeout, SkipTenantAdminCheck, AuthenticationMode);
             }
             WriteVerbose(string.Format("PnP PowerShell Cmdlets ({0}): Connected to {1}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(), Url));
 

Commands/Admin/RemoveTenantSite.cs

@@ -7,6 +7,9 @@ namespace SharePointPnP.PowerShell.Commands.Base
     [Cmdlet("Execute", "SPOQuery")]
     [CmdletHelp("Executes any queued actions / changes on the SharePoint Client Side Object Model Context",
         Category = CmdletHelpCategory.Base)]
+    [CmdletExample(
+      Code = @"PS:> Execute-SPOQuery -RetryCount 5",
+      Remarks = @"This will execute any queued actions / changes on the SharePoint Client Side Object Model Context and will retry 5 times in case of throttling.", SortOrder = 1)]
 
     public class ExecuteSPOQuery : SPOCmdlet
     {

Commands/Admin/SetTenantSite.cs

@@ -145,7 +145,7 @@ internal static SPOnlineConnection InstantiateWebloginConnection(Uri url, int mi
             throw new Exception("Error establishing a connection, context is null");
         }
 
-        internal static SPOnlineConnection InstantiateSPOnlineConnection(Uri url, PSCredential credentials, PSHost host, bool currentCredentials, int minimalHealthScore, int retryCount, int retryWait, int requestTimeout, bool skipAdminCheck = false)
+        internal static SPOnlineConnection InstantiateSPOnlineConnection(Uri url, PSCredential credentials, PSHost host, bool currentCredentials, int minimalHealthScore, int retryCount, int retryWait, int requestTimeout, bool skipAdminCheck = false, ClientAuthenticationMode authenticationMode = ClientAuthenticationMode.Default)
         {
             var context = new PnPClientContext(url.AbsoluteUri);
             context.RetryCount = retryCount;
@@ -157,6 +157,15 @@ internal static SPOnlineConnection InstantiateSPOnlineConnection(Uri url, PSCred
             context.DisableReturnValueCache = true;
 #endif
             context.RequestTimeout = requestTimeout;
+
+            context.AuthenticationMode = authenticationMode;
+
+            if (authenticationMode == ClientAuthenticationMode.FormsAuthentication)
+            {
+                var formsAuthInfo = new FormsAuthenticationLoginInfo(credentials.UserName, EncryptionUtility.ToInsecureString(credentials.Password));
+                context.FormsAuthenticationLoginInfo = formsAuthInfo;
+            }
+
             if (!currentCredentials)
             {
                 try
@@ -219,7 +228,7 @@ internal static SPOnlineConnection InstantiateSPOnlineConnection(Uri url, PSCred
 
         internal static SPOnlineConnection InstantiateAdfsConnection(Uri url, PSCredential credentials, PSHost host, int minimalHealthScore, int retryCount, int retryWait, int requestTimeout, bool skipAdminCheck = false)
         {
-           var authManager = new OfficeDevPnP.Core.AuthenticationManager();
+            var authManager = new OfficeDevPnP.Core.AuthenticationManager();
 
             var networkCredentials = credentials.GetNetworkCredential();
 

Commands/Base/ConnectSPOnline.cs

@@ -1,4 +1,4 @@
-using Microsoft.SharePoint.Client;
+using Microsoft.SharePoint.Client;
 using SharePointPnP.PowerShell.Commands.Enums;
 using System;
 using System.Management.Automation;
@@ -18,6 +18,14 @@ namespace SharePointPnP.PowerShell.Commands
         Code = @"PS:> Add-SPONavigationNode -Title ""Contoso USA"" -Url ""http://contoso.sharepoint.com/sites/contoso/usa/"" -Location ""QuickLaunch"" -Header ""Contoso""",
         Remarks = @"Adds a navigation node to the quicklaunch. The navigation node will have the title ""Contoso USA"", will link to the url ""http://contoso.sharepoint.com/sites/contoso/usa/"" and will have ""Contoso"" as a parent navigation node.",
         SortOrder = 2)]
+    [CmdletExample(
+        Code = @"PS:> Add-SPONavigationNode -Title ""Contoso"" -Url ""http://contoso.sharepoint.com/sites/contoso/"" -Location ""QuickLaunch"" -First",
+        Remarks = @"Adds a navigation node to the quicklaunch, as the first item. The navigation node will have the title ""Contoso"" and will link to the url ""http://contoso.sharepoint.com/sites/contoso/""",
+        SortOrder = 3)]
+    [CmdletExample(
+        Code = @"PS:> Add-SPONavigationNode -Title ""Contoso Pharmaceuticals"" -Url ""http://contoso.sharepoint.com/sites/contosopharma/"" -Location ""QuickLaunch"" -External",
+        Remarks = @"Adds a navigation node to the quicklaunch. The navigation node will have the title ""Contoso Pharmaceuticals"" and will link to the external url ""http://contoso.sharepoint.com/sites/contosopharma/""",
+        SortOrder = 4)]
     public class AddNavigationNode : SPOWebCmdlet
     {
         [Parameter(Mandatory = true, HelpMessage = "The location of the node to add. Either TopNavigationBar, QuickLaunch or SearchNav")]
@@ -31,6 +39,12 @@ public class AddNavigationNode : SPOWebCmdlet
 
         [Parameter(Mandatory = false, HelpMessage = "Optionally value of a header entry to add the menu item to.")]
         public string Header;
+        
+        [Parameter(Mandatory = false, HelpMessage = "Add the new menu item to beginning of the collection.")]
+        public SwitchParameter First;
+        
+        [Parameter(Mandatory = false, HelpMessage = "Indicates the destination URL is outside of the site collection.")]
+        public SwitchParameter External;
 
         protected override void ExecuteCmdlet()
         {
@@ -40,10 +54,7 @@ protected override void ExecuteCmdlet()
                 ClientContext.ExecuteQueryRetry();
                 Url = SelectedWeb.Url;
             }
-            SelectedWeb.AddNavigationNode(Title, new Uri(Url), Header, Location);
+            SelectedWeb.AddNavigationNode(Title, new Uri(Url), Header, Location, External.IsPresent, !First.IsPresent);
         }
-
     }
-
-
 }

Commands/Base/ExecuteQuery.cs

@@ -9,6 +9,7 @@
 using OfficeDevPnP.Core.Framework.Provisioning.ObjectHandlers;
 using System.Collections;
 using System.Linq;
+using OfficeDevPnP.Core.Framework.Provisioning.Providers;
 
 namespace SharePointPnP.PowerShell.Commands.Branding
 {
@@ -79,6 +80,9 @@ public class ApplyProvisioningTemplate : SPOWebCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Allows you to specify ExtensbilityHandlers to execute while applying a template")]
         public ExtensibilityHandler[] ExtensibilityHandlers;
 
+        [Parameter(Mandatory = false, HelpMessage = "Allows you to specify ITemplateProviderExtension to execute while applying a template.")]
+        public ITemplateProviderExtension[] TemplateProviderExtensions;
+
         protected override void ExecuteCmdlet()
         {
             SelectedWeb.EnsureProperty(w => w.Url);
@@ -133,7 +137,7 @@ protected override void ExecuteCmdlet()
                     throw new NotSupportedException("Only .pnp package files are supported from a SharePoint library");
                 }
             }
-            provisioningTemplate = provider.GetTemplate(templateFileName);
+            provisioningTemplate = provider.GetTemplate(templateFileName, TemplateProviderExtensions);
 
             if (provisioningTemplate == null) return;
 

Commands/Base/SPOnlineConnectionHelper.cs

@@ -88,14 +88,21 @@ protected override void BeginProcessing()
                         }
                     case XMLPnPSchemaVersion.V201508:
                         {
+#pragma warning disable CS0618 // Type or member is obsolete
                             formatter = XMLPnPSchemaFormatter.GetSpecificFormatter(XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2015_08);
+#pragma warning restore CS0618 // Type or member is obsolete
                             break;
                         }
                     case XMLPnPSchemaVersion.V201512:
                         {
                             formatter = XMLPnPSchemaFormatter.GetSpecificFormatter(XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2015_12);
                             break;
                         }
+                    case XMLPnPSchemaVersion.V201605:
+                        {
+                            formatter = XMLPnPSchemaFormatter.GetSpecificFormatter(XMLConstants.PROVISIONING_SCHEMA_NAMESPACE_2016_05);
+                            break;
+                        }
                 }
 
                 if (!string.IsNullOrEmpty(Out))