summaryrefslogtreecommitdiff
path: root/lib/license
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-07-10 10:04:22 +0000
committerCan Eldem <celdem@gitlab.com>2020-07-10 10:04:22 +0000
commitc7385965b4166fb6ab2db3387c67cd54aef1b8df (patch)
tree65a2255570610e2f8d4141da60a3c683c5e96bf1 /lib/license
parent2bc8522495d25ac6ef984883bf98f398a4ff436c (diff)
parent1696dc714370772b50497b192097cc277e9d4c6b (diff)
Merge branch 'dotnet-jit' into 'master'v3.16.0
Remove GUI packages and install nuget/dotnet at scan time See merge request gitlab-org/security-products/license-management!185
Diffstat (limited to 'lib/license')
-rw-r--r--lib/license/finder/ext.rb1
-rw-r--r--lib/license/finder/ext/dotnet.rb11
-rw-r--r--lib/license/finder/ext/nuget.rb2
-rw-r--r--lib/license/management/version.rb2
4 files changed, 15 insertions, 1 deletions
diff --git a/lib/license/finder/ext.rb b/lib/license/finder/ext.rb
index da6a006..1154a4a 100644
--- a/lib/license/finder/ext.rb
+++ b/lib/license/finder/ext.rb
@@ -4,6 +4,7 @@ require 'license/finder/ext/bower'
require 'license/finder/ext/bundler'
require 'license/finder/ext/conan'
require 'license/finder/ext/dependency'
+require 'license/finder/ext/dotnet'
require 'license/finder/ext/go_modules'
require 'license/finder/ext/gradle'
require 'license/finder/ext/license'
diff --git a/lib/license/finder/ext/dotnet.rb b/lib/license/finder/ext/dotnet.rb
new file mode 100644
index 0000000..1b98881
--- /dev/null
+++ b/lib/license/finder/ext/dotnet.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LicenseFinder
+ class Dotnet
+ def prepare
+ shell.execute(['apt-get', :update, '-q'])
+ shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'dotnet-sdk-3.1'])
+ shell.execute([:dotnet, :restore])
+ end
+ end
+end
diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb
index fc06e21..1aa3b1b 100644
--- a/lib/license/finder/ext/nuget.rb
+++ b/lib/license/finder/ext/nuget.rb
@@ -3,6 +3,8 @@
module LicenseFinder
class Nuget
def prepare_command
+ shell.execute(['apt-get', :update, '-q'])
+ shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'mono-complete'])
"mono /usr/local/bin/nuget.exe restore -Verbosity detailed"
end
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 50e69a0..214f7b5 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.15.0'
+ VERSION = '3.16.0'
end
end