Merge pull request #602 from SharePoint/dev

December 2016 Release

Author: erwinvanhunen

Binaries/SharePointPnPPowerShell2013.msi

@@ -0,0 +1 @@
+The PowerShell Setup Binaries can be downloaded from https://github.com/SharePoint/PnP-PowerShell/releases

Binaries/SharePointPnPPowerShell2016.msi

@@ -527,15 +527,15 @@ static void Main(string[] args)
             var psd1Path = $"{new FileInfo(inFile).Directory}\\ModuleFiles\\SharePointPnPPowerShell{spVersion}.psd1";
             var cmdletsToExportString = string.Join(",", cmdletsToExport.Select(x => "'" + x + "'"));
             var aliasesToExportString = string.Join(",", aliasesToExport.Select(x => "'" + x + "'"));
-            WriteModuleManifest(psd1Path, spVersion, cmdletsToExportString, aliasesToExportString);
+            WriteModuleManifest(psd1Path, spVersion, cmdletsToExportString, aliasesToExportString, assembly);
         }
 
-        private static void WriteModuleManifest(string path, string version, string cmdletsToExport, string aliasesToExport)
+        private static void WriteModuleManifest(string path, string version, string cmdletsToExport, string aliasesToExport, Assembly assembly)
         {
             var manifest = $@"@{{
     ModuleToProcess = 'SharePointPnPPowerShell{version}.psm1'
     NestedModules   = 'SharePointPnP.PowerShell.{version}.Commands.dll'
-    ModuleVersion = '2.9.1611.0'
+    ModuleVersion = '{assembly.GetName().Version}'
     Description = 'SharePoint Patterns and Practices PowerShell Cmdlets for SharePoint {version}'
     GUID = '8f1147be-a8e4-4bd2-a705-841d5334edc0'
     Author = 'SharePoint Patterns and Practices'

Binaries/SharePointPnPPowerShellOnline.msi

@@ -60,7 +60,7 @@ public class NewTenantSite : SPOAdminCmdlet
         public long StorageQuotaWarningLevel = 100;
 
 #if !ONPREMISES
-        [Parameter(Mandatory = false)]
+        [Parameter(Mandatory = false, HelpMessage = "Specifies if any existing site with the same URL should be removed from the recycle bin")]
         public SwitchParameter RemoveDeletedSite;
 #endif
         [Parameter(Mandatory = false)]

Binaries/readme.md

@@ -6,7 +6,7 @@
 namespace SharePointPnP.PowerShell.Commands
 {
     [Cmdlet(VerbsLifecycle.Uninstall, "PnPAppInstance", SupportsShouldProcess = true)]
-    [CmdletAlias("Uinstall-SPOAppInstance")]
+    [CmdletAlias("Uninstall-SPOAppInstance")]
     [CmdletHelp("Removes an app from a site", Category = CmdletHelpCategory.Apps)]
     [CmdletExample(Code = @"PS:> Uninstall-PnPAppInstance -Identity $appinstance", Remarks = "Uninstalls the app instance which was retrieved with the command Get-PnPAppInstance", SortOrder = 1)]
     [CmdletExample(Code = @"PS:> Uninstall-PnPAppInstance -Identity 99a00f6e-fb81-4dc7-8eac-e09c6f9132fe", Remarks = "Uninstalls the app instance with the ID '99a00f6e-fb81-4dc7-8eac-e09c6f9132fe'", SortOrder = 2)]

CmdletHelpGenerator/Program.cs

@@ -13,11 +13,11 @@ namespace SharePointPnP.PowerShell.Commands.Base
       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)]
     [CmdletExample(
       Code = @"PS:> Execute-PnPQuery -RetryWait 10",
-      Remarks = @"This will execute any queued actions / changes on the SharePoint Client Side Object Model Context and delay the execution with 10 seconds when it needs to retry the execution.", SortOrder = 2)]
+      Remarks = @"This will execute any queued actions / changes on the SharePoint Client Side Object Model Context and delay the execution for 10 seconds before it retries the execution.", SortOrder = 2)]
 
     public class ExecuteSPOQuery : SPOCmdlet
     {
-        [Parameter(Mandatory = false, HelpMessage = "Number to times to retry in case of throttling. Defaults to 10.")]
+        [Parameter(Mandatory = false, HelpMessage = "Number of times to retry in case of throttling. Defaults to 10.")]
         public int RetryCount = 10;
 
         [Parameter(Mandatory = false, HelpMessage = "Delay in seconds. Defaults to 1.")]

Commands/Admin/NewTenantSite.cs

@@ -22,7 +22,7 @@ namespace SharePointPnP.PowerShell.Commands.ContentTypes
         SortOrder = 2)]
     [CmdletExample(
         Code = @"PS:> Get-PnPContentType -Identity ""Project Document""",
-        Remarks = @"This will get a listing of content types within the current context",
+        Remarks = @"This will get the content type with the name ""Project Document"" within the current context",
         SortOrder = 3)]
     [CmdletExample(
         Code = @"PS:> Get-PnPContentType -List ""Documents""",

Commands/Apps/UninstallAppInstance.cs

@@ -8,7 +8,7 @@ namespace SharePointPnP.PowerShell.Commands.ContentTypes
 {
     [Cmdlet(VerbsCommon.Remove, "PnPContentType")]
     [CmdletAlias("Remove-SPOContentType")]
-    [CmdletHelp("Removes a content type", 
+    [CmdletHelp("Removes a content type from a web", 
         Category = CmdletHelpCategory.ContentTypes)]
     [CmdletExample(
         Code = @"PS:> Remove-PnPContentType -Identity ""Project Document""",