albacore 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037fa6dbedf1e1239b915c4c550ac8f38fb28c13
-  data.tar.gz: 03dd9255fa541cdc7c0aa4233391c3ff02bb5308
+  metadata.gz: 85542d66384696f189f24a0f21558d9bc09132be
+  data.tar.gz: 2123d8810cff6bff2c7593a12613f6b6978209e6
 SHA512:
-  metadata.gz: 1fc9fd73a76056b48f398536be3d2a77de5dc69449a0218a6421a660cb2ca971784606b89db8309322992b532500adcaf76e5107004f0dff6f3487473aa3f0c8
-  data.tar.gz: c49f9b56d17b9a554136976c7323297b31763ff027bbe8d000698fa852dde8534df9adfa38509370222be90d7dabbfa12a770c9f4866bf64bb6847e10268d1fb
+  metadata.gz: dfbbd01eb04114a1f60bbddaf4afe32df9194c6cfd42b3e35e9e75e961a05a69f95bac1c843f3601b530d2b97a633a82854e029d3a38e4369486b5235cb4d4b6
+  data.tar.gz: 452747578a565fcf4482082b745fcfd9f58d533acbbe96153df6f7d7bf02f0ad0eea5c9bf52631004e5869b9ad69a4242237e7c3619b0f24b8a1d37df3041f4e

data/lib/albacore/nuget_model.rb

@@ -195,7 +195,7 @@ end})
           elsif n.name == 'frameworkDepdendencies'
             n.children.reject { |n| n.text? }.each do |dep|
               m.add_framework_depdendency dep['id'], dep['version']
-            end 
+            end
           else
             # just set the property
             m.send(:"#{underscore n.name}=", n.inner_text)

data/lib/albacore/project.rb

@@ -86,7 +86,8 @@ module Albacore
     end
 
     def try_output_path conf
-      path = @proj_xml_node.css("Project PropertyGroup[Condition*='#{conf}|'] OutputPath")
+      default_platform = @proj_xml_node.css('Project PropertyGroup Platform').first.inner_text || 'AnyCPU'
+      path = @proj_xml_node.css("Project PropertyGroup[Condition*='#{conf}|#{default_platform}'] OutputPath")
       # path = @proj_xml_node.xpath("//Project/PropertyGroup[matches(@Condition, '#{conf}')]/OutputPath")
 
       debug { "#{name}: output path node[#{conf}]: #{ (path.empty? ? 'empty' : path.inspect) } [albacore: project]" }

data/lib/albacore/task_types/build.rb

@@ -6,6 +6,7 @@ require 'albacore/cmd_config'
 require 'albacore/cross_platform_cmd'
 require 'albacore/logging'
 require 'albacore/facts'
+require 'albacore/task_types/find_msbuild_versions'
 
 module Albacore
   module Build
@@ -188,26 +189,10 @@ module Albacore
     	  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
-
+        versions = Albacore.find_msbuild_versions
+        if versions.any?
+          msb = versions[versions.keys.max]
+        end
     	  CrossPlatformCmd.which(msb) ? msb : nil
       end
 

data/lib/albacore/task_types/find_msbuild_versions.rb

@@ -0,0 +1,25 @@
+require 'rake'
+module Albacore
+  def self.find_msbuild_versions
+    return nil unless ::Rake::Win32.windows?
+    require 'win32/registry'
+    retval = Hash.new
+    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
+            msb = File.join(versionKey['MSBuildToolsPath'],'msbuild.exe')
+            retval[version] = msb
+          rescue
+            error "failed to open #{key}"
+          end
+        end
+      end
+    rescue
+      error "failed to open HKLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions"
+    end
+    return retval
+  end
+end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.5.4"
+  VERSION = "2.5.5"
 end

data/spec/testdata/Project/Project.fsproj

@@ -41,6 +41,15 @@
     <WarningLevel>3</WarningLevel>
     <DocumentationFile>bin\Release\Project.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\Project.xml</DocumentationFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,6 +170,7 @@ files:
 - lib/albacore/task_types/asmver/fs.rb
 - lib/albacore/task_types/asmver/vb.rb
 - lib/albacore/task_types/build.rb
+- lib/albacore/task_types/find_msbuild_versions.rb
 - lib/albacore/task_types/nugets.rb
 - lib/albacore/task_types/nugets_authentication.rb
 - lib/albacore/task_types/nugets_pack.rb
@@ -421,7 +422,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: albacore
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Dolphin-safe and awesome Mono and .Net Rake-tasks