Merge branch 'master' into (GH-533)UpgradeViaPackagesConfig

Author: Russell Mora

.build.custom/ilmergeDLL.build

@@ -52,6 +52,7 @@
           <include name="${dirs.merge.from}${path.separator}Rhino.Licensing.dll" />
           <include name="${dirs.merge.from}${path.separator}System.Reactive*.dll" />
           <include name="${dirs.merge.from}${path.separator}SimpleInjector.dll" />
+          <include name="${dirs.merge.from}${path.separator}AlphaFS.dll" />
           <!-- <exclude name="${dirs.merge.from}${path.separator}*" /> -->
         </items>
       </in>

.build/compile.step

@@ -21,8 +21,8 @@
   <property name="solution.path" value="${path::get-full-path(solution.path)}" />
   <property name="solution.path.windows.mono" value="${string::replace(dirs.current,'\','/')}/${string::replace(path_to_solution,'\','/')}/${project.name}.sln" />
   <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
-  <property name="nant.settings.currentframework" value="mono-4.0" if="${platform::is-unix()}" />
-  <property name="nant.settings.currentframework" value="net-3.5" if="${microsoft.framework !='vb6' and platform::is-windows()}" />
+  <property name="nant.settings.currentframework" value="mono-4.0" if="${platform::is-unix()}" overwrite="true" />
+  <property name="nant.settings.currentframework" value="net-3.5" if="${microsoft.framework !='vb6' and platform::is-windows()}" overwrite="false" />
   <property name="framework.multitargeting" value="false" />
   <property name="framework.multitargeting.delimiter" value="," />
   <target name="go" depends="load_uppercut_assemblies, run_tasks" />

.uppercut

@@ -7,7 +7,7 @@
   <!-- Required Items -->
   <property name="project.name" value="chocolatey" overwrite="false" />
   <property name="repository.path" value="https://github.com/chocolatey/choco" overwrite="false" />
-  <property name="company.name" value="RealDimensions Software, LLC" overwrite="false" />
+  <property name="company.name" value="Chocolatey Software, Inc." overwrite="false" />
 
   <!-- Folder Overrides -->
   <property name="folder.build_scripts" value=".build" overwrite="false" />
@@ -17,15 +17,17 @@
   <property name="version.use_semanticversioning" value="true" overwrite="false" />
   <property name="version.major" value="0" overwrite="false" />
   <property name="version.minor" value="10" overwrite="false" />
-  <property name="version.patch" value="3" overwrite="false" />
+  <property name="version.patch" value="5" overwrite="false" />
   <property name="version.fix" value="0" overwrite="false" />
   <property name="version.nuget.prerelease" value="" overwrite="false" />
   <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />
-  <property name="assembly.copyright" value="Copyright © 2011 - Present, ${company.name} - All Rights Reserved." overwrite="false" />
+  <property name="assembly.copyright" value="Copyright © 2017 ${company.name}. Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
   <property name="sign.project_with_key" value="true" overwrite="false" />
 
   <!-- Build Features Overrides -->
+  <property name="microsoft.framework" value="net-4.0" overwrite="false" if="${platform::is-windows()}" />
+  <property name="nant.settings.currentframework" value="net-4.0" overwrite="false" if="${platform::is-windows()}" />
   <property name="test.framework" value="nunit" overwrite="false" />
   <property name="cover.framework" value="opencover" overwrite="false" />
 

CHANGELOG.md

@@ -4,6 +4,167 @@ This covers changes for the "chocolatey.extension" package, where the licensed e
 
 **NOTE**: If you have a licensed edition of Chocolatey, refer to this in tandem with [Chocolatey Open source CHANGELOG](https://github.com/chocolatey/choco/blob/master/CHANGELOG.md).
 
+## 1.9.7 (March 20, 2017)
+
+### BUG FIXES 
+
+ * Fix - Support automatic decompression on downloads - see [#1056](https://github.com/chocolatey/choco/issues/1056)
+ * Fix - Package Builder - Restrict Get-UninstallRegistryKey params in chocolateyUninstall.ps1
+ * Fix - Package Internalizer - exit non-zero when variable replacement fails
+
+### IMPROVEMENTS
+
+ * Ensure PowerShell scripts use CRLF so authenticode verification doesn't fail
+ * Install Directory should see `INSTALLFOLDER` MSI Property
+ * Virus Scanner - provide context for other answers (No/Skip)
+ * Allow both 32bit and 64bit file parameters with Install-ChocolateyInstallPackage - see [#1187](https://github.com/chocolatey/choco/issues/1187)
+
+
+## 1.9.6 (March 3, 2017)
+
+### BUG FIXES
+
+ * Fix - Ensure silent args in logs are escaped
+ * Fix - Package Internalizer - use console adapter for downloading
+
+### IMPROVEMENTS
+
+ * Ensure proxy values are used with Chocolatey v0.10.4+ - see [#1141](https://github.com/chocolatey/choco/issues/1141) and [#1165](https://github.com/chocolatey/choco/issues/1165)
+ * Install - do not create a `.ignore` file outside Chocolatey directories - same as [#1180](https://github.com/chocolatey/choco/issues/1180)
+ * Package Synchronizer (Choco Sync):
+    * Use local directory for outputting created packages by default.
+    * Specify output directory for created packages.
+
+
+## 1.9.5 (January 31, 2017)
+
+### BUG FIXES
+
+ * Fix - Error when running Install-ChocolateyInstallPackage without specifying silent arguments
+ * Remove *.istext file before the content-type check that creates file - see [#1012](https://github.com/chocolatey/choco/issues/1012)
+
+### IMPROVEMENTS
+
+ * Package Builder (Choco New):
+    * Right click - create a package without bringing up the GUI.
+ * Package Internalizer (Choco Download)
+    * Don't delete the download directory unless `--force`
+ * Set user modes for terminal services (`change user /install` | `change user /execute`)
+
+
+## 1.9.4 (January 19, 2017)
+
+### BUG FIXES
+
+ * Fix - enabling preview features has no effect.
+
+
+## 1.9.3 (January 17, 2017)
+
+### BUG FIXES
+
+ * Fix - trial users unable to use Business version of Package Builder UI.
+
+
+## 1.9.2 (January 17, 2017)
+
+### BUG FIXES
+
+ * Fix - virus scanner not working properly
+
+
+## 1.9.1 (January 16, 2017)
+
+### BUG FIXES
+
+ * Fix - Ensure Pro users can call Package Builder from the command line ("packagebuilder") after install
+ * Fix - Correct title of package to "Chocolatey Licensed Edition"
+
+
+## 1.9.0 (January 15, 2017)
+
+This release brings the coveted PackageBuilder UI to the Pro+ license (minus auto detection) and adds a tabbed interface that allows you to fill out the entire nuspec. Package Synchronizer now has `choco sync` to compliment the automatic synchronization. The sync command brings all unmanaged software in Programs and Features under Chocolatey management.
+
+### FEATURES
+
+ * Package Synchronizer v2 - `choco sync` to associate existing packages with unmanaged software - see https://chocolatey.org/docs/features-synchronize#sync-command
+ * Package Builder UI:
+    * Starts at Professional edition (minus autodetection)
+    * Tabbed interface
+    * Tab for entire Nuspec
+    * [Business] Tab to generate from Programs and Features
+
+### BUG FIXES
+
+ * Self-Service / Background Mode:
+    * Fix - Add a line after progress is complete
+ * Fix - Automatic creation of ignore file in Install-ChocolateyInstallPackage throws errors when it fails - see [#380](https://github.com/chocolatey/chocolatey/issues/380) for original issue.
+ * Package Builder (Choco New):
+    * Fix - remove "version/ver" if next to version number in DisplayName
+    * Fix - todo / logging need to escape curly braces to properly format
+    * Fix - continue on error
+
+### IMPROVEMENTS
+
+ * User can turn on Preview Features - `choco feature enable -n allowPreviewFeatures`
+ * InstallDirectory switch added to Install-ChocolateyInstallPackage
+ * Package Internalizer (Choco Download)
+    * option to ignore dependencies `--ignore-dependencies`
+ * Package Builder (Choco New)
+    * Generates package arguments with install directory override
+    * Add optional scripts - beforeModify/uninstall
+    * Add other template files
+    * Remove any version number from package id
+    * allow for quiet logging
+    * auto detection fills out more fields for MSIs
+ * Self-Service / Background Mode Enhancements
+    * Do not warn if command is `choco feature`
+    * Provide user context when background service not available
+
+
+## 1.8.4 (January 5, 2017)
+
+### FEATURES
+
+ * Support Self-Service Install / Background Mode - see https://chocolatey.org/docs/features-agent-service
+ * Manage Windows Services
+
+ We've introduced some service management functions to the business edition. `Install-ChocolateyWindowsService`, `Uninstall-ChocolateyWindowsService`, `Start-ChocolateyWindowsService`, and `Stop-ChocolateyWindowsService`. Those will be documented soon enough. For now some example code should suffice.
+
+~~~powershell
+$toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+$serviceExe = Join-Path $toolsDir 'service\chocolatey-agent.exe'
+
+$packageArgs = @{
+  Name                  = 'chocolatey-agent'
+  DisplayName           = 'Chocolatey Agent'
+  Description           = 'Chocolatey Agent is a backgound service for Chocolatey.'
+  StartupType           = 'Automatic'
+  ServiceExecutablePath = $serviceExe
+}
+
+#Username, Password, -DoNotStartService are also considered
+
+Install-ChocolateyWindowsService @packageArgs
+
+# The other three methods simply take the service name.
+Start-ChocolateyWindowsService -Name 'chocolatey-agent'
+Stop-ChocolateyWindowsService -Name 'chocolatey-agent'
+Uninstall-ChocolateyWindowsService -Name 'chocolatey-agent'
+~~~
+
+### BUG FIXES
+
+ * Package Synchronizer - Do not run automatic sync when non-elevated. It fails in weird ways
+ * Package Builder (Choco New):
+    * Fix - fix "(Install)" - append space in nuspec Title.
+
+### IMPROVEMENTS
+
+ * Downloading remote files - don't show bytes, only formatted values
+ * Authenticode sign licensed binaries
+
+
 ## 1.8.3 (December 21, 2016)
 
 ### FEATURES

CHANGELOG_LICENSED.md

@@ -3,7 +3,7 @@ You can just call me choco.
 
 ![Chocolatey Logo](https://cdn.rawgit.com/chocolatey/choco/14a627932c78c8baaba6bef5f749ebfa1957d28d/docs/logo/chocolateyicon.gif "Chocolatey")
 
-[![](http://img.shields.io/chocolatey/dt/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](http://img.shields.io/chocolatey/v/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](http://img.shields.io/gittip/Chocolatey.svg)](https://www.gittip.com/Chocolatey/)
+[![](https://img.shields.io/chocolatey/dt/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](https://img.shields.io/chocolatey/v/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](https://img.shields.io/gittip/Chocolatey.svg)](https://www.gittip.com/Chocolatey/)
 
 [![Issue Stats](http://issuestats.com/github/Chocolatey/choco/badge/pr)](http://issuestats.com/github/Chocolatey/choco)
 
@@ -13,7 +13,7 @@ You can just call me choco.
 
 TeamCity  | AppVeyor | Travis
 ------------- | ------------- | -------------
-[![TeamCity Build Status](http://img.shields.io/teamcity/codebetter/bt429.svg)](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt429) | [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/jfxywa3xuwowt20w/branch/master?svg=true)](https://ci.appveyor.com/project/ferventcoder/choco/branch/master) | [![Travis Build Status](https://travis-ci.org/chocolatey/choco.svg?branch=master)](https://travis-ci.org/chocolatey/choco)
+[![TeamCity Build Status](https://img.shields.io/teamcity/codebetter/bt429.svg)](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt429) | [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/jfxywa3xuwowt20w/branch/master?svg=true)](https://ci.appveyor.com/project/ferventcoder/choco/branch/master) | [![Travis Build Status](https://travis-ci.org/chocolatey/choco.svg?branch=master)](https://travis-ci.org/chocolatey/choco)
 
 ## Chat Room
 
@@ -48,9 +48,9 @@ When requesting support, try to remember that we are all volunteers that have li
 
  * [Chocolatey site](https://chocolatey.org)
  * [Community Package Repository aka Chocolatey.org](https://chocolatey.org/packages)
- * [Mailing List/Forum](http://groups.google.com/group/chocolatey)
+ * [Mailing List/Forum](https://groups.google.com/group/chocolatey)
  * [Twitter](https://twitter.com/chocolateynuget)
- * [Build Status Email List](http://groups.google.com/group/chocolatey-build-status)
+ * [Build Status Email List](https://groups.google.com/group/chocolatey-build-status)
  * Join the [newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) and stay up to date with the latest happenings!
 
 ### Documentation
@@ -82,7 +82,7 @@ Prerequisites:
  * The issue has to do with choco itself and is not a package or website issue.
  * Please check to see if your issue already exists with a quick search of the issues. Start with one relevant term and then add if you get too many results.
  * You are not submitting an "Enhancement". Enhancements should observe [CONTRIBUTING](https://github.com/chocolatey/choco/blob/master/CONTRIBUTING.md) guidelines.
- * You are not submitting a question - questions are better served as [emails](http://groups.google.com/group/chocolatey) or [gitter chat questions](https://gitter.im/chocolatey/choco).
+ * You are not submitting a question - questions are better served as [emails](https://groups.google.com/group/chocolatey) or [gitter chat questions](https://gitter.im/chocolatey/choco).
  * Please make sure you've read over and agree with the [etiquette regarding communication](#etiquette-regarding-communication).
 
 Submitting a ticket:

README.md

@@ -462,15 +462,17 @@
  * should contain tags
  * should not contain packages and versions with a pipe between them
 
-### ChocolateyPackCommand [ 2 Scenario(s), 2 Observation(s) ]
+### ChocolateyPackCommand [ 2 Scenario(s), 4 Observation(s) ]
 
 #### when packing with an output directory
 
  * generated package should be in specified output directory
+ * sources should be set to specified output directory
 
 #### when packing without specifying an output directory
 
  * generated package should be in current directory
+ * sources should be set to current directory
 
 ### ChocolateyPinCommand [ 9 Scenario(s), 12 Observation(s) ]
 
@@ -647,7 +649,7 @@
 
  * should throw an error that it is not allowed
 
-### ChocolateyUpgradeCommand [ 29 Scenario(s), 236 Observation(s) ]
+### ChocolateyUpgradeCommand [ 36 Scenario(s), 305 Observation(s) ]
 
 #### when force upgrading a package
 
@@ -938,6 +940,20 @@
  * should report for all non skipped packages
  * should skip packages in except list
 
+#### when upgrading all packages with prereleases installed
+
+ * should report for all installed packages
+ * should skip packages without upgrades
+ * should upgrade packages with upgrades
+ * should upgrade upgradepackage
+
+#### when upgrading all packages with prereleases installed with excludeprerelease specified
+
+ * should not upgrade upgradepackage
+ * should report for all installed packages
+ * should skip packages without upgrades
+ * should upgrade packages with upgrades
+
 #### when upgrading an existing package happy path
 
  * config should match package result name
@@ -958,6 +974,82 @@
  * should upgrade the package
  * should upgrade where install location reports
 
+#### when upgrading an existing package with prerelease available and prerelease specified
+
+ * config should match package result name
+ * should contain a warning message that it upgraded successfully
+ * should contain a warning message with old and new versions
+ * should contain newer version in directory
+ * should delete the rollback
+ * should have a successful package result
+ * should have executed chocolateyBeforeModify before chocolateyInstall
+ * should have executed chocolateyBeforeModify script for original package
+ * should have executed chocolateyInstall script for new package
+ * should match the upgrade version of the new beta
+ * should not have executed chocolateyBeforeModify script for new package
+ * should not have executed chocolateyUninstall script for original package
+ * should not have inconclusive package result
+ * should not have warning package result
+ * should upgrade a package in the lib directory
+ * should upgrade the package
+ * should upgrade where install location reports
+
+#### when upgrading an existing package with prerelease available without prerelease specified
+
+ * should be the same version of the package
+ * should contain a message that no packages were upgraded
+ * should contain a message that you have the latest version available
+ * should have a successful package result
+ * should have inconclusive package result
+ * should match the original package version
+ * should not create a rollback
+ * should not have warning package result
+ * should not remove the package from the lib directory
+
+#### when upgrading an existing prerelease package with allow downgrade with excludeprelease and without prerelease specified
+
+ * should be the same version of the package
+ * should contain a message that no packages were upgraded
+ * should contain a message that you have the latest version available
+ * should have a successful package result
+ * should have inconclusive package result
+ * should not create a rollback
+ * should not have warning package result
+ * should not remove the package from the lib directory
+ * should only find the last stable version
+
+#### when upgrading an existing prerelease package with prerelease available with excludeprelease and without prerelease specified
+
+ * should be the same version of the package
+ * should contain a message that no packages were upgraded
+ * should contain a message that you have the latest version available
+ * should have a successful package result
+ * should have inconclusive package result
+ * should not create a rollback
+ * should not have warning package result
+ * should not remove the package from the lib directory
+ * should only find the last stable version
+
+#### when upgrading an existing prerelease package without prerelease specified
+
+ * config should match package result name
+ * should contain a warning message that it upgraded successfully
+ * should contain a warning message with old and new versions
+ * should contain newer version in directory
+ * should delete the rollback
+ * should have a successful package result
+ * should have executed chocolateyBeforeModify before chocolateyInstall
+ * should have executed chocolateyBeforeModify script for original package
+ * should have executed chocolateyInstall script for new package
+ * should match the upgrade version of the new beta
+ * should not have executed chocolateyBeforeModify script for new package
+ * should not have executed chocolateyUninstall script for original package
+ * should not have inconclusive package result
+ * should not have warning package result
+ * should upgrade a package in the lib directory
+ * should upgrade the package
+ * should upgrade where install location reports
+
 #### when upgrading packages with packages config
 
  * should contain a message that upgradepackage with an expected specified version was not installed