Install mono/nuget at build time

* Install ca-certificates-mono
* Download *.deb files to /opt/toolcache/mono

3 files changed, 14 insertions, 9 deletions

diff --git a/lib/license/finder/ext/dotnet.rb b/lib/license/finder/ext/dotnet.rb
index e9e0490..d2cb998 100644
--- a/lib/license/finder/ext/dotnet.rb
+++ b/lib/license/finder/ext/dotnet.rb
@@ -18,10 +18,10 @@ module LicenseFinder
       shell.execute([
         '/opt/asdf/installs/dotnet/latest/dotnet',
         :restore, detected_package_path.to_s,
+        '--locked-mode',
         '--no-cache',
         '--packages', vendor_path.to_s,
-        '--locked-mode',
-        '--verbosity', :detailed
+        '--verbosity', :normal
       ])
     end
 
diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb
index 6fb2553..93985ba 100644
--- a/lib/license/finder/ext/nuget.rb
+++ b/lib/license/finder/ext/nuget.rb
@@ -3,22 +3,24 @@
 module LicenseFinder
   class Nuget
     def prepare
-      shell.execute(['apt-get', :update, '-q'])
-      shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'mono-complete'])
+      shell.execute(['apt-get', :install, '-y', '/opt/toolcache/mono/*.deb'])
       shell.execute([:mkdir, '-p', vendor_path.to_s]) unless vendor_path.exist?
-
       Dir.chdir(project_path) do
         shell.execute([
           :mono, '/usr/local/bin/nuget.exe',
           :restore, detected_package_path,
-          '-Verbosity detailed',
-          '-PackagesDirectory', vendor_path,
+          '-LockedMode',
           '-NoCache',
-          '-LockedMode'
+          '-PackagesDirectory', vendor_path,
+          '-Verbosity', :normal
         ])
       end
     end
 
+    def installed?(*args)
+      File.exist?('/usr/local/bin/nuget.exe')
+    end
+
     def current_packages
       dependencies.map do |dependency|
         nupkg = vendor_path.glob("**/#{dependency.name}*.nupkg")[0]
@@ -45,6 +47,8 @@ module LicenseFinder
       []
     end
 
+    private
+
     def vendor_path
       @vendor_path ||= Pathname.pwd.join('.gitlab', 'cache', 'vendor')
     end
diff --git a/lib/license/management.rb b/lib/license/management.rb
index 58310f7..0824157 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -26,7 +26,8 @@ module License
     def self.logger
       @logger ||= Logger.new(STDOUT, level: ENV.fetch('LOG_LEVEL', Logger::WARN)).tap do |x|
         x.formatter = proc do |_severity, _datetime, _progname, message|
-          "[v#{VERSION}] #{message}\n"
+          prefix = message.start_with?("\n") ? "" : "[v#{VERSION}] "
+          "#{prefix}#{message}\n"
         end
       end
     end