albacore 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed4e5ebd8a606482ca886f5c025967a793553061
-  data.tar.gz: b5713f0ccf76962f2871166a64d9afff26a1796e
+  metadata.gz: 4fd3ff9ec3194fa9be37b1c6d14c587f2259387e
+  data.tar.gz: 9897cd7a1685e39db5a9f625e505f789f7cb9bb7
 SHA512:
-  metadata.gz: 4c46556532c61b5957b31eea8b9858ac39b7f682e1c90822d13d5499cf16927396947c27def6b2e4c11ce0a67fe4fcbaec24595e9d9a1e55f9a0c185a10bbf3d
-  data.tar.gz: f0d6b2f76c60044fe3cb3b82d12bcb5caa1f3da6b390c98c2d965fb947d0bf5f9b3c573802b0d8c20ed9c9b97e19a187171572d5fd702fd73676c39bbabd8a1d
+  metadata.gz: 3229d518b1dc001258d4bed570d56d928868742660dbbebe98e20aa4244fc9314551de55f5539915cef7a590888a155a94d06f02fd8f16233dfd5e2af7e3d8e5
+  data.tar.gz: d158465aebea3b14ee53fe2ae5dc6f55358543f3d1e18a497e66cb4ef5d345fb540ca632acb515e7c00cb68972dc21c0864664c878f80d64d9b341ccdb0387cf

data/lib/albacore/task_types/build.rb

@@ -91,10 +91,10 @@ module Albacore
         @parameters.add "/property:#{make_props}"
       end
 
-      # Specifies the amount of information to display in the build log. 
+      # Specifies the amount of information to display in the build log.
       # Each logger displays events based on the verbosity level that you set for that logger.
-      # You can specify the following verbosity levels: q[uiet], m[inimal], 
-      # n[ormal], d[etailed], and diag[nostic]. 
+      # You can specify the following verbosity levels: q[uiet], m[inimal],
+      # n[ormal], d[etailed], and diag[nostic].
       attr_path_accessor :logging do |mode|
         set_logging mode
       end
@@ -156,7 +156,7 @@ module Albacore
         # @targets ||= []
         instance_variable_set field, [] unless instance_variable_defined? field
         # parameters.delete "/target:#{make_target}" if @targets.any?
-        @parameters.delete "/#{prop_name}:#{callable_prop_val.call}" if 
+        @parameters.delete "/#{prop_name}:#{callable_prop_val.call}" if
           instance_variable_get(field).any?
         if value.respond_to? 'each'
           value.each { |v| instance_variable_get(field) << v }
@@ -183,24 +183,32 @@ module Albacore
       end
 
       def heuristic_executable
-        if ::Rake::Win32.windows?
-          require 'win32/registry'
-          trace 'build tasktype finding msbuild.exe'
-          %w{12.0 4.0 3.5 2.0}.collect { |msbuild_ver|
-            msb = "msbuild_not_found"
-            key = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\#{msbuild_ver}"
-            begin
-              Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
-                  msb = "#{reg['MSBuildToolsPath']}\\msbuild.exe"
-              end
-            rescue
-              error "failed to open HKLM\\#{key}\\MSBuildToolsPath"
-            end
-            CrossPlatformCmd.which(msb) ? msb : nil
-          }.compact.first
-        else
-          nil
-        end
+    	  return nil unless ::Rake::Win32.windows?
+    	  require 'win32/registry'
+    	  trace 'build tasktype finding msbuild.exe'
+
+    	  msb = "msbuild_not_found"
+    	  maxVersion = -1
+    	  begin
+    		Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Microsoft\MSBuild\ToolsVersions') do |toolsVersion|
+    		  toolsVersion.each_key do |key|
+    			begin
+    			  versionKey = toolsVersion.open(key)
+    			  version = key.to_i
+    			  if maxVersion < version
+    				maxVersion = version
+    				msb = "#{versionKey['MSBuildToolsPath']}\\msbuild.exe"
+    			  end
+    			rescue
+    			  error "failed to open #{key}"
+    			end
+    		  end
+    		end
+    	  rescue
+    		error "failed to open HKLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions"
+    	  end
+
+    	  CrossPlatformCmd.which(msb) ? msb : nil
       end
 
     end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake