Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
* stable:
  0.9.8.28-alpha3
  (doc) fix for shim arg parsing
  (shimgen) Enhance argument parsing
  • Loading branch information
ferventcoder committed Oct 6, 2014
2 parents aa85464 + 372a262 commit e4469d5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

BUG FIXES:

* Fix - Shim argument parsing needs fixed for quoting - [ShimGen #1](https://github.com/chocolatey/shimgen/issues/1)
* Fix - Forcing x86 does not use 32bit checksum - [#535](https://github.com/chocolatey/chocolatey/issues/535)
* Fix - Powershell v2 fails to download SSLv3 files - [#531](https://github.com/chocolatey/chocolatey/issues/531)

Expand Down
3 changes: 2 additions & 1 deletion nuget/chocolatey.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>chocolatey</id>
<title>Chocolatey</title>
<version>0.9.8.28-alpha2</version>
<version>0.9.8.28-alpha3</version>
<authors>Rob Reynolds, The Chocolatey Team</authors>
<owners>Rob Reynolds</owners>
<summary>Chocolatey is your machine level NuGet repository. Think apt-get for Windows (executables/application packages), not library packages.</summary>
Expand Down Expand Up @@ -45,6 +45,7 @@ See all - https://github.com/chocolatey/chocolatey/blob/master/CHANGELOG.md

### BUG FIXES:

* Fix - Shim argument parsing needs fixed for quoting - https://github.com/chocolatey/shimgen/issues/1
* Fix - Forcing x86 does not use 32bit checksum - https://github.com/chocolatey/chocolatey/issues/535
* Fix - Powershell v2 fails to download SSLv3 files - https://github.com/chocolatey/chocolatey/issues/531

Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ $currentThread.CurrentCulture = $culture;
$currentThread.CurrentUICulture = $culture;

#Let's get Chocolatey!
$chocVer = '0.9.8.28-alpha2'
$chocVer = '0.9.8.28-alpha3'
$nugetChocolateyPath = (Split-Path -parent $MyInvocation.MyCommand.Definition)
$nugetPath = (Split-Path -Parent $nugetChocolateyPath)
$nugetExePath = Join-Path $nuGetPath 'bin'
Expand Down
Binary file modified src/tools/shimgen.exe
Binary file not shown.

0 comments on commit e4469d5

Please sign in to comment.