Merge pull request #369 from OfficeDev/dev

June 2016 Intermediate Release

Author: erwinvanhunen

Binaries/SharePointPnPPowerShell2013.msi

@@ -197,10 +197,13 @@ private void ExtractTemplate(XMLPnPSchemaVersion schema, string path, string pac
                 }
             }
 
+            var fileSystemConnector = new FileSystemConnector(path, "");
             if (extension == ".pnp")
             {
-                var fileSystemConnector = new FileSystemConnector(path, "");
                 creationInformation.FileConnector = new OpenXMLConnector(packageName, fileSystemConnector);
+            } else
+            {
+                creationInformation.FileConnector = fileSystemConnector;
             }
 #pragma warning disable 618
             creationInformation.PersistBrandingFiles = PersistBrandingFiles || PersistComposedLookFiles;

Binaries/SharePointPnPPowerShell2016.msi

@@ -44,6 +44,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.1606.0")]
-[assembly: AssemblyFileVersion("2.5.1606.0")]
+[assembly: AssemblyVersion("2.5.1606.1")]
+[assembly: AssemblyFileVersion("2.5.1606.1")]
 [assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]

Binaries/SharePointPnPPowerShellOnline.msi

@@ -24,7 +24,7 @@
   <Product Id="*"
            Name="$(var.ProductName)"
            Language="1033"
-           Version="2.5.1606.0"
+           Version="2.5.1606.1"
            Manufacturer="SharePoint PnP"
            UpgradeCode="630fe2af-dc42-467d-94c8-6eefd065cbfa">
 

Commands/Branding/GetProvisioningTemplate.cs

@@ -10,6 +10,7 @@
 
 **2016-05-09**
 * Namespace, Assembly and Project rename from OfficeDevPnP.PowerShell to SharePointPnP.PowerShell
+
 **2016-04-08**
 * Added -ExtensibilityHandlers parameter to Get-SPOPRovisioningTemplate