Merge branch 'stable'

* stable: (maint) Specify mono version for Travis-CI (chocolateyGH-366) Add uninstaller keys back in
ferventcoder · Jul 30, 2015 · 459a288 · 459a288
2 parents ebf1f31 + d8943f2
commit 459a288
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,6 @@
 language: csharp
+mono:
+  - 3.12.0
 install:
   - sudo apt-get install mono-devel mono-gmcs
   - nuget restore src/chocolatey.sln

diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs
@@ -41,6 +41,9 @@ public class ChocolateyUninstallTemplate
 }
 
 $uninstalled = $false
+$local_key     = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*'
+$machine_key   = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*'
+$machine_key6432 = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*'
 
 Get-ItemProperty  -Path @($machine_key6432,$machine_key, $local_key) `
                   -ErrorAction SilentlyContinue `