Merge pull request #95 from OfficeDev/dev

October Release 2015 V2

Author: erwinvanhunen

Binaries/PnPPowerShellCommands15.msi

@@ -21,7 +21,7 @@
 namespace OfficeDevPnP.PowerShell.Commands.Branding
 {
     [Cmdlet(VerbsCommon.Get, "SPOProvisioningTemplate", SupportsShouldProcess = true)]
-    [CmdletHelp("Generates a provisioning template from a web", 
+    [CmdletHelp("Generates a provisioning template from a web",
         Category = CmdletHelpCategory.Branding)]
     [CmdletExample(
        Code = @"
@@ -58,7 +58,7 @@ public class GetProvisioningTemplate : SPOWebCmdlet
         [Parameter(Mandatory = false, Position = 0, HelpMessage = "Filename to write to, optionally including full path")]
         public string Out;
 
-        [Parameter(Mandatory = false, Position = 0, HelpMessage = "The schema of the output to use, defaults to the latest schema")]
+        [Parameter(Mandatory = false, Position = 1, HelpMessage = "The schema of the output to use, defaults to the latest schema")]
         public XMLPnPSchemaVersion Schema = XMLPnPSchemaVersion.LATEST;
 
         [Parameter(Mandatory = false, HelpMessage = "If specified, all term groups will be included. Overrides IncludeSiteCollectionTermGroup.")]
@@ -71,14 +71,16 @@ public class GetProvisioningTemplate : SPOWebCmdlet
         public SwitchParameter IncludeSiteGroups;
 
         [Parameter(Mandatory = false, HelpMessage = "If specified the files making up the composed look (background image, font file and color file) will be saved.")]
-        public SwitchParameter PersistComposedLookFiles;        
+        public SwitchParameter PersistComposedLookFiles;
 
         [Parameter(Mandatory = false, HelpMessage = "Overwrites the output file if it exists.")]
         public SwitchParameter Force;
 
+        [Parameter(Mandatory = false, DontShow = true, HelpMessage = "Exports the template without the use of a base template, causing all OOTB artifacts to be included. Using this switch is generally not required/recommended.")]
+        public SwitchParameter NoBaseTemplate;
 
         [Parameter(Mandatory = false)]
-        public Encoding Encoding = System.Text.Encoding.Unicode;
+        public System.Text.Encoding Encoding = System.Text.Encoding.Unicode;
 
 
         protected override void ExecuteCmdlet()
@@ -117,15 +119,25 @@ protected override void ExecuteCmdlet()
         private string GetProvisioningTemplateXML(XMLPnPSchemaVersion schema, string path)
         {
             SelectedWeb.EnsureProperty(w => w.Url);
-            
+
             var creationInformation = new ProvisioningTemplateCreationInformation(SelectedWeb);
 
+
+
             creationInformation.PersistComposedLookFiles = PersistComposedLookFiles;
             creationInformation.IncludeSiteGroups = IncludeSiteGroups;
 
             creationInformation.FileConnector = new FileSystemConnector(path, "");
 
-            creationInformation.BaseTemplate = this.SelectedWeb.GetBaseTemplate();
+            if (NoBaseTemplate)
+            {
+                creationInformation.BaseTemplate = null;
+            }
+            else
+            {
+                creationInformation.BaseTemplate = this.SelectedWeb.GetBaseTemplate();
+            }
+
             creationInformation.ProgressDelegate = (message, step, total) =>
             {
                 WriteProgress(new ProgressRecord(0, string.Format("Extracting Template from {0}", SelectedWeb.Url), message) { PercentComplete = (100 / total) * step });

Binaries/PnPPowerShellCommands16.msi

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OfficeDevPnP.PowerShell.Commands.Enums
+{
+    public enum Encoding
+    {
+        Unicode = 0,
+        ASCII = 1,
+        BigEndianUnicode = 2,
+        UTF32 = 3,
+        UTF7 = 4,
+        UTF8 = 5
+    }
+}

Commands/Branding/GetProvisioningTemplate.cs

@@ -269,6 +269,7 @@
     <Compile Include="Enums\ConnectionType.cs" />
     <Compile Include="Enums\CredentialType.cs" />
     <Compile Include="Enums\DocumentSetFieldScope.cs" />
+    <Compile Include="Enums\Encoding.cs" />
     <Compile Include="Enums\SearchConfigurationScope.cs" />
     <Compile Include="Enums\CustomActionScope.cs" />
     <Compile Include="Enums\FeatureScope.cs" />

Commands/Enums/Encoding.cs

@@ -31,5 +31,5 @@
 // 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("1.7.1015.0")]
-[assembly: AssemblyFileVersion("1.7.1015.0")]
+[assembly: AssemblyVersion("1.7.1015.1")]
+[assembly: AssemblyFileVersion("1.7.1015.1")]

Commands/OfficeDevPnP.PowerShell.Commands.csproj

@@ -7,22 +7,23 @@
 using OfficeDevPnP.PowerShell.Commands.Base.PipeBinds;
 using File = System.IO.File;
 using Resources = OfficeDevPnP.PowerShell.Commands.Properties.Resources;
+using OfficeDevPnP.PowerShell.Commands.Enums;
 
 namespace OfficeDevPnP.PowerShell.Commands
 {
     [Cmdlet(VerbsData.Export, "SPOTaxonomy", SupportsShouldProcess = true)]
     [CmdletHelp("Exports a taxonomy to either the output or to a file.",
         Category = CmdletHelpCategory.Taxonomy)]
     [CmdletExample
-        (Code = @"PS:> Export-SPOTaxonomy", 
+        (Code = @"PS:> Export-SPOTaxonomy",
         Remarks = "Exports the full taxonomy to the standard output",
         SortOrder = 1)]
     [CmdletExample(
-        Code = @"PS:> Export-SPOTaxonomy -Path c:\output.txt", 
+        Code = @"PS:> Export-SPOTaxonomy -Path c:\output.txt",
         Remarks = "Exports the full taxonomy the file output.txt",
         SortOrder = 2)]
     [CmdletExample(
-        Code = @"PS:> Export-SPOTaxonomy -Path c:\output.txt -TermSet f6f43025-7242-4f7a-b739-41fa32847254 ", 
+        Code = @"PS:> Export-SPOTaxonomy -Path c:\output.txt -TermSet f6f43025-7242-4f7a-b739-41fa32847254 ",
         Remarks = "Exports the term set with the specified id",
         SortOrder = 3)]
     public class ExportTaxonomy : SPOCmdlet
@@ -45,6 +46,9 @@ public class ExportTaxonomy : SPOCmdlet
         [Parameter(Mandatory = false)]
         public string Delimiter = "|";
 
+        [Parameter(Mandatory = false)]
+        public Encoding Encoding = Encoding.Unicode;
+
 
         protected override void ExecuteCmdlet()
         {
@@ -82,16 +86,53 @@ protected override void ExecuteCmdlet()
                     Path = System.IO.Path.Combine(SessionState.Path.CurrentFileSystemLocation.Path, Path);
                 }
 
+                System.Text.Encoding textEncoding = System.Text.Encoding.Unicode;
+                switch (Encoding)
+                {
+                    case Encoding.ASCII:
+                        {
+                            textEncoding = System.Text.Encoding.ASCII;
+                            break;
+                        }
+
+                    case Encoding.BigEndianUnicode:
+                        {
+                            textEncoding = System.Text.Encoding.BigEndianUnicode;
+                            break;
+                        }
+                    case Encoding.UTF32:
+                        {
+                            textEncoding = System.Text.Encoding.UTF32;
+                            break;
+                        }
+                    case Encoding.UTF7:
+                        {
+                            textEncoding = System.Text.Encoding.UTF7;
+                            break;
+                        }
+                    case Encoding.UTF8:
+                        {
+                            textEncoding = System.Text.Encoding.UTF8;
+                            break;
+                        }
+                    case Encoding.Unicode:
+                        {
+                            textEncoding = System.Text.Encoding.Unicode;
+                            break;
+                        }
+
+                }
+
                 if (File.Exists(Path))
                 {
                     if (Force || ShouldContinue(string.Format(Resources.File0ExistsOverwrite, Path), Resources.Confirm))
                     {
-                        File.WriteAllLines(Path, exportedTerms);
+                        File.WriteAllLines(Path, exportedTerms, textEncoding);
                     }
                 }
                 else
                 {
-                    File.WriteAllLines(Path, exportedTerms);
+                    File.WriteAllLines(Path, exportedTerms, textEncoding);
                 }
             }
         }