Merge branch '(chocolateyGH-83)_DL_Progress' into development

DSCResources/cChocoPackageInstall/cChocoPackageInstall.psm1

@@ -243,6 +243,12 @@ function InstallPackage
     if ($cParams) {
         $chocoinstallparams += " $cParams"
     }
+    # Check if Chocolatey version is Greater than 0.10.4, and add --no-progress 
+    $chocoVer = [system.version](Get-ChocoInstalledPackage | Where-Object { $_.name -eq 'chocolatey' }).Version
+    if ($chocoVer -ge 0.10.4) {
+        $chocoinstallparams += " --no-progress"
+    }
+
     Write-Verbose -Message "Install command: 'choco install $pName $chocoinstallparams'"
 
     $packageInstallOuput = Invoke-Expression -Command "choco install $pName $chocoinstallparams"
@@ -270,14 +276,23 @@ function UninstallPackage
     if (-not ($pParams))
     {
         Write-Verbose -Message 'Uninstalling Package Standard'
-        $packageUninstallOuput = choco uninstall $pName -y
     }
-    elseif ($pParams)
-    {
+    [string]$ChocoUninstallparams = '-y'
+    if ($pParams) {
         Write-Verbose -Message "Uninstalling Package with params $pParams"
-        $packageUninstallOuput = choco uninstall $pName --params="$pParams" -y
+        $ChocoUninstallparams += " --params=`"$pParams`""
+    }
+    if ($pVersion) {
+        $ChocoUninstallparams += " --version=`"$pVersion`""
+    }
+    # Check if Chocolatey version is Greater than 0.10.4, and add --no-progress 
+    $chocoVer = [system.version](Get-ChocoInstalledPackage | Where-Object { $_.name -eq 'chocolatey' }).Version
+    if ($chocoVer -ge 0.10.4) {
+        $chocoinstallparams += " --no-progress"
     }
 
+    $packageUninstallOuput = choco uninstall $ChocoUninstallparams
+
     Write-Verbose -Message "Package uninstall output $packageUninstallOuput "
 
     # Clear Package Cache
@@ -392,6 +407,12 @@ Function Upgrade-Package {
     if ($cParams) {
         $chocoupgradeparams += " $cParams"
     }
+    # Check if Chocolatey version is Greater than 0.10.4, and add --no-progress 
+    $chocoVer = [system.version](Get-ChocoInstalledPackage | Where-Object { $_.name -eq 'chocolatey' }).Version
+    if ($chocoVer -ge 0.10.4) {
+        $chocoinstallparams += " --no-progress"
+    }
+
     $cmd = "choco upgrade $pName $chocoupgradeparams"
     Write-Verbose -Message "Upgrade command: '$cmd'"