Merge branch 'stable'

* stable: (version) 0.9.9.2 (doc) update changelog/nuspec (GH-142) shimgen - write errors to stderr (GH-150) Fix: InstallArguments is broken
chocolatey · Mar 7, 2015 · 9fd1a79 · 9fd1a79
2 parents 33cf250 + 1d88b85
commit 9fd1a79
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 2 deletions.
diff --git a/.uppercut b/.uppercut
@@ -18,7 +18,7 @@
   <property name="version.major" value="0" overwrite="false" />
   <property name="version.minor" value="9" overwrite="false" />
   <property name="version.patch" value="9" overwrite="false" />
-  <property name="version.fix" value="1" overwrite="false" />
+  <property name="version.fix" value="2" 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" />

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,22 @@
-## [0.9.9](https://github.com/chocolatey/choco/issues?q=is%3Aissue+milestone%3A0.9.9+is%3Aclosed) (March 3, 2015)
+## [0.9.9.2](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.2+is%3Aclosed) (March 6, 2015)
+
+### BUG FIXES
+
+ * Fix - Allow passing install arguments again (regression in 0.9.9 series) - see [#150](https://github.com/chocolatey/choco/issues/150)
+ * Fix - Allow apostrophes to be used as quotes - quoting style that worked with previous client - see [#141](https://github.com/chocolatey/choco/issues/141)
+ * Fix - Shims write errors to stderr - see [#142](https://github.com/chocolatey/choco/issues/142) and [ShimGen #14](https://github.com/chocolatey/shimgen/issues/14)
+
+### IMPROVEMENTS
+
+ * Upgrade `-r` should always return a value - see [#153](https://github.com/chocolatey/choco/issues/153)
+
+## [0.9.9.1](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.1+is%3Aclosed) (March 3, 2015)
+
+### BUG FIXES
+
+ * Fix - Get-BinRoot broken - see [#144](https://github.com/chocolatey/choco/issues/144)
+
+## [0.9.9](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9+is%3Aclosed) (March 3, 2015)
 
 This also includes issues that were being tracked in the old Chocolatey repository: [Chocolatey 0.9.9](https://github.com/chocolatey/chocolatey/issues?q=is%3Aclosed+label%3Av0.9.9).
 

diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec
@@ -40,6 +40,24 @@ In that mess there is a link to the [Helper Reference](https://github.com/chocol
     <releaseNotes>
 See all - https://github.com/chocolatey/choco/blob/master/CHANGELOG.md
 
+## 0.9.9.2
+
+### BUG FIXES
+
+ * Fix - Allow passing install arguments again (regression in 0.9.9 series) - see [#150](https://github.com/chocolatey/choco/issues/150)
+ * Fix - Allow apostrophes to be used as quotes - quoting style that worked with previous client - see [#141](https://github.com/chocolatey/choco/issues/141)
+ * Fix - Shims write errors to stderr - see [#142](https://github.com/chocolatey/choco/issues/142) and [ShimGen #14](https://github.com/chocolatey/shimgen/issues/14)
+
+### IMPROVEMENTS
+
+ * Upgrade `-r` should always return a value - see [#153](https://github.com/chocolatey/choco/issues/153)
+
+## 0.9.9.1
+
+### BUG FIXES
+
+ * Fix - Get-BinRoot broken - see [#144](https://github.com/chocolatey/choco/issues/144)
+
 ##0.9.9
 
 This also includes issues that were being tracked in the old Chocolatey repository: [Chocolatey 0.9.9](https://github.com/chocolatey/chocolatey/issues?q=is%3Aclosed+label%3Av0.9.9).

diff --git a/src/chocolatey.resources/redirects/choco.exe b/src/chocolatey.resources/redirects/choco.exe
diff --git a/src/chocolatey.resources/redirects/chocolatey.exe b/src/chocolatey.resources/redirects/chocolatey.exe
diff --git a/src/chocolatey.resources/redirects/cinst.exe b/src/chocolatey.resources/redirects/cinst.exe
diff --git a/src/chocolatey.resources/redirects/clist.exe b/src/chocolatey.resources/redirects/clist.exe
diff --git a/src/chocolatey.resources/redirects/cpack.exe b/src/chocolatey.resources/redirects/cpack.exe
diff --git a/src/chocolatey.resources/redirects/cpush.exe b/src/chocolatey.resources/redirects/cpush.exe
diff --git a/src/chocolatey.resources/redirects/cuninst.exe b/src/chocolatey.resources/redirects/cuninst.exe
diff --git a/src/chocolatey.resources/redirects/cup.exe b/src/chocolatey.resources/redirects/cup.exe
diff --git a/src/chocolatey.resources/redirects/cver.exe b/src/chocolatey.resources/redirects/cver.exe
diff --git a/src/chocolatey.resources/tools/shimgen.exe b/src/chocolatey.resources/tools/shimgen.exe
diff --git a/src/chocolatey/infrastructure.app/services/PowershellService.cs b/src/chocolatey/infrastructure.app/services/PowershellService.cs
@@ -161,6 +161,7 @@ public bool run_action(ChocolateyConfiguration configuration, PackageResult pack
                 Environment.SetEnvironmentVariable("chocolateyPackageFolder", packageDirectory);
                 Environment.SetEnvironmentVariable("packageFolder", packageDirectory);
                 Environment.SetEnvironmentVariable("installerArguments", configuration.InstallArguments);
+                Environment.SetEnvironmentVariable("chocolateyInstallArguments", configuration.InstallArguments);
                 Environment.SetEnvironmentVariable("chocolateyPackageParameters", configuration.PackageParameters);
                 if (configuration.ForceX86)
                 {