Merge pull request #299 from OfficeDev/dev

April 2016 Intermediate Release
pnp · Apr 20, 2016 · 2c859e8 · 2c859e8
2 parents 13f20ed + 8b63b5e
commit 2c859e8
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/Binaries/PnPPowerShellCommands15.msi b/Binaries/PnPPowerShellCommands15.msi
diff --git a/Binaries/PnPPowerShellCommands16.msi b/Binaries/PnPPowerShellCommands16.msi
diff --git a/Commands/Branding/GetProvisioningTemplate.cs b/Commands/Branding/GetProvisioningTemplate.cs
@@ -92,7 +92,7 @@ public class GetProvisioningTemplate : SPOWebCmdlet
         public Handlers ExcludeHandlers;
 
         [Parameter(Mandatory = false, HelpMessage = "Allows you to specify ExtensbilityHandlers to execute while extracting a template")]
-        public ExtensibilityHandler[] ExtensbilityHandlers;
+        public ExtensibilityHandler[] ExtensibilityHandlers;
 
         [Parameter(Mandatory = false, HelpMessage = "Overwrites the output file if it exists.")]
         public SwitchParameter Force;
@@ -104,7 +104,7 @@ public class GetProvisioningTemplate : SPOWebCmdlet
         [Parameter(Mandatory = false)]
         public System.Text.Encoding Encoding = System.Text.Encoding.Unicode;
 
-     
+
 
         protected override void ExecuteCmdlet()
         {
@@ -164,7 +164,10 @@ private string GetProvisioningTemplateXML(XMLPnPSchemaVersion schema, string pat
             creationInformation.PersistPublishingFiles = PersistPublishingFiles;
             creationInformation.IncludeNativePublishingFiles = IncludeNativePublishingFiles;
             creationInformation.IncludeSiteGroups = IncludeSiteGroups;
-            creationInformation.ExtensibilityHandlers = ExtensbilityHandlers.ToList<ExtensibilityHandler>();
+            if (ExtensibilityHandlers != null)
+            {
+                creationInformation.ExtensibilityHandlers = ExtensibilityHandlers.ToList<ExtensibilityHandler>();
+            }
             creationInformation.FileConnector = new FileSystemConnector(path, "");
 
 #pragma warning disable CS0618 // Type or member is obsolete

diff --git a/Commands/ModuleFiles/OfficeDevPnP.PowerShell.V15.Commands.psd1 b/Commands/ModuleFiles/OfficeDevPnP.PowerShell.V15.Commands.psd1
diff --git a/Commands/ModuleFiles/OfficeDevPnP.PowerShell.V16.Commands.psd1 b/Commands/ModuleFiles/OfficeDevPnP.PowerShell.V16.Commands.psd1
diff --git a/Documentation/GetSPOProvisioningTemplate.md b/Documentation/GetSPOProvisioningTemplate.md
@@ -2,7 +2,7 @@
 Generates a provisioning template from a web
 ##Syntax
 ```powershell
-Get-SPOProvisioningTemplate [-IncludeAllTermGroups [<SwitchParameter>]] [-IncludeSiteCollectionTermGroup [<SwitchParameter>]] [-IncludeSiteGroups [<SwitchParameter>]] [-PersistBrandingFiles [<SwitchParameter>]] [-PersistPublishingFiles [<SwitchParameter>]] [-IncludeNativePublishingFiles [<SwitchParameter>]] [-Handlers <Handlers>] [-ExcludeHandlers <Handlers>] [-ExtensbilityHandlers <ExtensibilityHandler[]>] [-Force [<SwitchParameter>]] [-Encoding <Encoding>] [-Web <WebPipeBind>] [-Out <String>] [-Schema <XMLPnPSchemaVersion>]
+Get-SPOProvisioningTemplate [-IncludeAllTermGroups [<SwitchParameter>]] [-IncludeSiteCollectionTermGroup [<SwitchParameter>]] [-IncludeSiteGroups [<SwitchParameter>]] [-PersistBrandingFiles [<SwitchParameter>]] [-PersistPublishingFiles [<SwitchParameter>]] [-IncludeNativePublishingFiles [<SwitchParameter>]] [-Handlers <Handlers>] [-ExcludeHandlers <Handlers>] [-ExtensibilityHandlers <ExtensibilityHandler[]>] [-Force [<SwitchParameter>]] [-Encoding <Encoding>] [-Web <WebPipeBind>] [-Out <String>] [-Schema <XMLPnPSchemaVersion>]
 ```
 
 
@@ -11,7 +11,7 @@ Parameter|Type|Required|Description
 ---------|----|--------|-----------
 |Encoding|Encoding|False||
 |ExcludeHandlers|Handlers|False|Allows you to run all handlers, excluding the ones specified.|
-|ExtensbilityHandlers|ExtensibilityHandler[]|False|Allows you to specify ExtensbilityHandlers to execute while extracting a template|
+|ExtensibilityHandlers|ExtensibilityHandler[]|False|Allows you to specify ExtensbilityHandlers to execute while extracting a template|
 |Force|SwitchParameter|False|Overwrites the output file if it exists.|
 |Handlers|Handlers|False|Allows you to only process a specific type of artifact in the site. Notice that this might result in a non-working template, as some of the handlers require other artifacts in place if they are not part of what your extracting.|
 |IncludeAllTermGroups|SwitchParameter|False|If specified, all term groups will be included. Overrides IncludeSiteCollectionTermGroup.|

diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -16,7 +16,7 @@
   <Product Id="*"
            Name="$(var.ProductName)"
            Language="1033"
-           Version="2.3.1604.0"
+           Version="2.3.1604.1"
            Manufacturer="OfficeDev PnP"
            UpgradeCode="630fe2af-dc42-467d-94c8-6eefd065cbfa">