albacore 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66eb87201827d6f4d68a891f33f8d92176012954
-  data.tar.gz: e9a46f390f4f2f9adc3cddcae4e65e217ee2b668
+  metadata.gz: 569f47e4cc889df5d9202cf8a7a25e49d8ab10fe
+  data.tar.gz: fb33c7409649a6a79a51a45cc04913d26430a6fe
 SHA512:
-  metadata.gz: c19de60b56f2c059ea64893124dbfa6e249379a89ea3d20a8164465c5dcf7ef8ea90d8c4b677df88a350fcda34abcad5c7b853d7ecfef6fbee4c98487b04a5bd
-  data.tar.gz: 5e061937da4fb68c6086d6a90c57eedda356e3a2bc59963bbe644ad944f944fde7e50ad84f59b1ab035ffec9bac67666a20962b624e6603cad7f1431c5ed7f6d
+  metadata.gz: 657d342f87d71efa8a73b7806cf22e6244f04c74a7cdca259daf1af0a1a858cc394dad2b5e10ef0fe2f23d5bb90d092255d6263b00f52217e808e26a5192e836
+  data.tar.gz: 78cc075bcdc8a0a081e0283f84f6a1970f30bff1660eb0f6fd4345c029b3cf5c24f06bbe7aefc5b86a24b3e83b829bfd8ce87451f4f5f7827c9c9efb374a6f90

data/lib/albacore/nuget_model.rb

@@ -144,6 +144,11 @@ end})
                 x.dependency id: d.id, version: d.version
               }
             }
+            x.frameworkAssemblies {
+              @framework_assemblies.each { |k, d|
+                x.frameworkAssembly assemblyName: d.id, targetFramework: d.version
+              }
+            }
           }
         end
       end
@@ -192,9 +197,9 @@ end})
             n.children.reject { |n| n.text? }.each do |dep|
               m.add_dependency dep['id'], dep['version']
             end
-          elsif n.name == 'frameworkDepdendencies'
+          elsif n.name == 'frameworkDependencies'
             n.children.reject { |n| n.text? }.each do |dep|
-              m.add_framework_depdendency dep['id'], dep['version']
+              m.add_framework_dependency dep['id'], dep['version']
             end
           else
             # just set the property
@@ -348,7 +353,8 @@ end})
             configuration:        'Debug',
             project_dependencies: true,
             verify_files:         false,
-            nuget_dependencies:   true })
+            nuget_dependencies:   true,
+            framework_dependencies: true })
 
         trace { "#from_xxproj proj: '#{proj}' opts: #{opts} [nuget model: package]" }
 
@@ -380,6 +386,13 @@ end})
           end
         end
 
+        if opts.get :framework_dependencies
+          fd = opts.get :framework_dependencies
+          fd.each { |n, p|
+            package.metadata.add_framework_dependency p.id, p.version
+          }
+        end
+
         output = get_output_path proj, opts
         target_lib = %W[lib #{opts.get(:dotnet_version)}].join(Albacore::Paths.separator)
 

data/lib/albacore/task_types/nugets_pack.rb

@@ -320,6 +320,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
 
       def create_nuspec proj, knowns
         version = @opts.get(:package).metadata.version
+        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
@@ -333,7 +334,8 @@ and report a bug to albacore with the full output. Here's the nuget process outp
           version:        version,
           configuration:  (@opts.get(:configuration)),
           project_dependencies: project_dependencies,
-          nuget_dependencies: nuget_dependencies
+          nuget_dependencies: nuget_dependencies,
+          framework_dependencies: framework_dependencies
 
         # take data from package as configured in Rakefile, choosing what is in
         # Rakefile over what is in projfile.
@@ -350,7 +352,8 @@ and report a bug to albacore with the full output. Here's the nuget process outp
             version:        version,
             configuration:  (@opts.get(:configuration)),
             project_dependencies: project_dependencies,
-            nuget_dependencies: nuget_dependencies
+            nuget_dependencies: nuget_dependencies,
+            framework_dependencies: framework_dependencies
 
           nuspec_symbols = nuspec_symbols.merge_with @opts.get(:package)
           trace { "nuspec symbols: #{nuspec_symbols.to_s} [nugets pack: task]" }

data/lib/albacore/task_types/nugets_restore.rb

@@ -50,7 +50,11 @@ module Albacore
         @opts = opts
 
         pars = opts.getopt(:parameters, :default => [])
-        @parameters = [%W{install #{opts.getopt(:pkgcfg)} -OutputDirectory #{opts.getopt(:out)}}, pars.to_a].flatten
+
+        if (opts.getopt :source)
+          @parameters = [%W{install #{opts.getopt(:pkgcfg)} -OutputDirectory #{opts.getopt(:out)} -source #{@opts[:source][:uri]}}, pars.to_a].flatten
+        else
+          @parameters = [%W{install #{opts.getopt(:pkgcfg)} -OutputDirectory #{opts.getopt(:out)}}, pars.to_a].flatten
 
         mono_command
       end
@@ -117,6 +121,9 @@ module Albacore
       # defaults to true
       attr_accessor :include_official
 
+      # allows a source without credentials be added
+      attr_accessor :allow_insecure_source
+
       def exclude_version
         add_parameter "-ExcludeVersion"
       end
@@ -145,16 +152,18 @@ module Albacore
         pars = parameters.to_a
         debug "include_official nuget repo: #{include_official}"
         pars << %W[-source #{OFFICIAL_REPO}] if include_official
-        
+
         map = Map.new({ :pkgcfg     => Albacore::Paths.normalise_slashes(pkg),
                         :out        => @out,
                         :parameters => pars })
 
-        if has_credentials?
+        if allow_insecure_source
+          map.set :source, source
+        elsif has_credentials?
           map.set :username, username
           map.set :password, password
           map.set :source, source
-        end 
+        end
         map
       end
     end

data/lib/albacore/task_types/test_runner.rb

@@ -191,7 +191,7 @@ module Albacore
                 [Paths.normalise_slashes(Pathname.new(File.dirname(dll))), Pathname.new(exe)]
             end
 
-          exe_rel = exe.relative_path_from dir
+          exe_rel = (Pathname.new exe.to_s).absolute? ? exe : exe.relative_path_from(dir)
           yield [File.dirname(dll), exe_rel.to_s]
         end
       end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.6.3"
+  VERSION = "2.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake