albacore 2.6.8 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd7da28f41d358858e327a54c3378cdf22778b8
-  data.tar.gz: 442052d33e2d352603046db85fa044d893eab437
+  metadata.gz: aef5de193931f046bcf24674b1fad2bb6c1bb95e
+  data.tar.gz: c8dd8962e6ec0b0568aa177f868ed9d75957ec50
 SHA512:
-  metadata.gz: 53ebedaaeca50e8bddae319591ac688f79d7bb189ae45f23762b73efe328b15c5916462b97fdad4b1d6b405d0979969bc3b1fe4d16cdf9fa6dcb60658ec2d827
-  data.tar.gz: 083a1406657644e9ef0bc0df4369ad69da2aa71d6c63c9e184f6b926bd9f1175ec9b4b1805798ee21dd141bd69cd2f26d726b766e2707796ba6a2fdcda87921d
+  metadata.gz: 82f80d6e1e3dc636c19401d971c7751d4aef9bd550e91f55769fdc0cf51fbb64333fcdab2c64c2413c1b3367ed79bdbb65ebf533e5a95a261f784c886deba8d3
+  data.tar.gz: 9890885e7f6b3c618fdaf192f6968378df1321934d47716e70d76354c4933ea8efa181dc4810a8f430ff23f083d6459b605853363c8b8a0a37740461c210765a

data/lib/albacore/project.rb

@@ -79,6 +79,11 @@ module Albacore
       read_property 'License'
     end
 
+    # the target .NET Framework / .NET Standard version
+    def target_framework
+      read_property 'TargetFrameworkVersion'
+    end
+    
     # gets the output path of the project given the configuration or raise
     # an error otherwise
     def output_path conf

data/lib/albacore/task_types/nugets_pack.rb

@@ -145,7 +145,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
 
       def initialize
         @package = Albacore::NugetModel::Package.new
-        @target  = 'net40'
+        @target  = ''
         @symbols = false
         @project_dependencies = true
         @nuget_dependencies = true
@@ -329,7 +329,10 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         framework_dependencies = @opts.get(:package).metadata.framework_assemblies
         project_dependencies = @opts.get(:project_dependencies, true)
         nuget_dependencies = @opts.get(:nuget_dependencies, true)
-        target = @opts.get :target
+        target = if '' == @opts.get(:target) then proj.target_framework else @opts.get :target end
+        if target.start_with? 'v'
+          target = "net#{target[1..target.size].gsub('.', '')}"
+        end
 
         trace "creating NON-SYMBOL package for '#{proj.name}', targeting '#{target}' [nugets pack: task]"
         nuspec = Albacore::NugetModel::Package.from_xxproj proj,

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.6.8"
+  VERSION = "2.7.0"
 end

data/spec/nugets_pack_spec.rb

@@ -9,10 +9,13 @@ require 'albacore/nuget_model'
 
 include ::Albacore::NugetsPack
 
+# The .NET Framework / .NET Standard specified by default
+DEFAULT_FRAMEWORK = 'net461'
+
 class ConfigFac
-  def self.create id, curr, gen_symbols = true
+  def self.create id, curr, target, gen_symbols = true
     cfg = Albacore::NugetsPack::Config.new
-    cfg.target        = 'mono32'
+    cfg.target        = target
     cfg.configuration = 'Debug'
     cfg.files         = Dir.glob(File.join(curr, 'testdata', 'Project', '*.fsproj'))
     cfg.out           = 'spec/testdata/pkg'
@@ -48,7 +51,7 @@ shared_context 'pack_config' do
     File.dirname(__FILE__)
   end
   let :config do
-    cfg = ConfigFac.create id, curr, true
+    cfg = ConfigFac.create id, curr, DEFAULT_FRAMEWORK, true
   end
 end
 
@@ -60,7 +63,7 @@ shared_context 'pack_config no symbols' do
     File.dirname(__FILE__)
   end
   let :config do
-    cfg = ConfigFac.create id, curr, false
+    cfg = ConfigFac.create id, curr, DEFAULT_FRAMEWORK, false
   end
 end
 
@@ -229,12 +232,12 @@ end
 
 # testing project task
 
-describe ProjectTask do
+describe ProjectTask, 'when target framework is specified' do
   include_context 'pack_config no symbols'
   include_context 'package_metadata_dsl'
 
-  it 'sanity: should have config with target=mono32' do
-    expect(config.opts().get(:target)).to eq('mono32')
+  it "sanity: should have config with target=#{DEFAULT_FRAMEWORK}" do
+    expect(config.opts().get(:target)).to eq(DEFAULT_FRAMEWORK)
   end
 
   let :projfile do
@@ -247,7 +250,26 @@ describe ProjectTask do
     ProjectTask.new( config.opts() ).send(:create_nuspec, proj, [])[0] # index0 first nuspec Alabacore::Package
   end 
 
-  has_file 'bin/Debug/Project.dll', 'lib/mono32'
+  has_file 'bin/Debug/Project.dll', "lib/#{DEFAULT_FRAMEWORK}"
+end
+
+describe ProjectTask, 'when target framework is unspecified' do
+  include_context 'pack_config no symbols'
+  include_context 'package_metadata_dsl'
+
+  let :projfile do
+    curr = File.dirname(__FILE__)
+    File.join curr, "testdata", "Project", "Project.fsproj"
+  end 
+  let :vanilla_config do
+    cfg = ConfigFac.create id, curr, '', false
+  end
+  subject do
+    proj = Albacore::Project.new projfile
+    ProjectTask.new( vanilla_config.opts() ).send(:create_nuspec, proj, [])[0] # index0 first nuspec Alabacore::Package
+  end 
+
+  has_file 'bin/Debug/Project.dll', 'lib/net45'
 end
 
 describe ProjectTask, "when testing public interface" do

data/spec/project_spec.rb

@@ -68,7 +68,10 @@ describe Albacore::Project, "when reading project file" do
   it "should contain library1" do
     expect(library1).to_not be_nil
   end
-
+  it 'should contain the target framework' do
+    expect(subject.target_framework).to eq "v4.5"
+  end
+  
   describe 'public API' do
     it do
       expect(subject).to respond_to :name
@@ -85,6 +88,15 @@ describe Albacore::Project, "when reading project file" do
     it do
       expect(subject).to respond_to :authors
     end
+    it do
+      expect(subject).to respond_to :description
+    end
+    it do
+      expect(subject).to respond_to :license
+    end
+    it do
+      expect(subject).to respond_to :target_framework
+    end
     it 'should have five referenced assemblies' do
       expect(subject.find_refs.length).to eq 5
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.7.0
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake