Merge pull request #1567 from erwinvanhunen/dev

May 2018 Intermediate Release 1

Author: erwinvanhunen

CHANGELOG.md

@@ -5,19 +5,25 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [2.27.1806.0] Unreleased
+## [2.27.1806.0]
 ### Added
 
-- Added -CollapseSpecification option to Submit-PnPSearchQuery
-- Added -InSiteHierarchy to Get-PnPField to search for fields in the site collection
-
 ### Changed
-- Fix for issue where using Add-PnPFile and setting Created and Modified did not update values
 
 ### Deprecated
 
 ### Contributors
 
+## [2.26.1805.1]
+### Added
+
+- Added -Timeout option to Add-PnPApp
+- Added -CollapseSpecification option to Submit-PnPSearchQuery
+- Added -InSiteHierarchy to Get-PnPField to search for fields in the site collection
+
+### Changed
+- Fix for issue where using Add-PnPFile and setting Created and Modified did not update values
+
 ## [2.26.1805.0]
 ### Added
 - Added Enable-PnPPowerShellTelemetry, Disable-PnPPowerShellTelemetry, Get-PnPPowershellTelemetryEnabled

Commands/Apps/AddApp.cs

@@ -41,6 +41,9 @@ public class AddApp : PnPCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Overwrites the existing app package if it already exists")]
         public SwitchParameter Overwrite;
 
+        [Parameter(Mandatory = false, HelpMessage = "Specifies the timeout in seconds. Defaults to 200.")]
+        public int Timeout = 200;
+
         protected override void ExecuteCmdlet()
         {
             if (!System.IO.Path.IsPathRooted(Path))
@@ -54,7 +57,7 @@ protected override void ExecuteCmdlet()
 
             var manager = new AppManager(ClientContext);
 
-            var result = manager.Add(bytes, fileInfo.Name, Overwrite, Scope);
+            var result = manager.Add(bytes, fileInfo.Name, Overwrite, Scope, timeoutSeconds: Timeout);
 
             try
             {

Commands/Properties/AssemblyInfo.cs

@@ -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.27.1806.0")]
-[assembly: AssemblyFileVersion("2.27.1806.0")]
+[assembly: AssemblyVersion("2.26.1805.1")]
+[assembly: AssemblyFileVersion("2.26.1805.1")]
 [assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]