Install .NET Core 2.2 and .NET Core 3.0

9 files changed, 159 insertions, 2 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4432ad6..d78389b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,6 +165,26 @@ QA:js-v2:
     LM_REPORT_VERSION: 2
     QA_RESULTS: js-yarn-v2
 
+QA:dotnet:
+  extends: .QA
+  variables:
+    QA_PROJECT: csharp-nuget-dotnetcore
+    QA_REF: master
+
+QA:dotnet-v1-1:
+  extends: QA:dotnet
+  variables:
+    FEATURE_RUBY_REPORT: 'true'
+    LM_REPORT_VERSION: '1.1'
+    QA_RESULTS: csharp-nuget-dotnetcore-v1.1
+
+QA:dotnet-v2:
+  extends: QA:dotnet
+  variables:
+    FEATURE_RUBY_REPORT: 'true'
+    LM_REPORT_VERSION: 2
+    QA_RESULTS: csharp-nuget-dotnetcore-v2
+
 .docker_tag:
   image: docker:stable
   stage: tag
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 098f0d5..ab507a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v1.7.4
+
+- Install [.NET Core 2.2, 3.0](https://github.com/pivotal/LicenseFinder/pull/632) so that we can install packages for .NET Core 2.2, 3.0 projects.
+
 ## v1.7.3
 
 - Update SPDX.org catalogue from version `3.6` to `3.7`.
diff --git a/Dockerfile b/Dockerfile
index 3316698..7aed72b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,10 @@ RUN npm install npm-install-peers
 
 # Don't let Rubygem fail with the numerous projects using PG or MySQL,
 # install realpath, includes for python3, and pip for python3
+# Install .NET Core 2.2, 3.0 because it is not installed in the license_finder image (https://github.com/pivotal/LicenseFinder/pull/632).
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    libpq-dev libmysqlclient-dev realpath python3-dev python3-pip && \
+    libpq-dev libmysqlclient-dev realpath python3-dev python3-pip dotnet-sdk-2.2 dotnet-sdk-3.0 && \
     rm -rf /var/lib/apt/lists/*
 
 # Don't load RVM automatically, it doesn't work with GitLab-CI
diff --git a/bin/test_all b/bin/test_all
index 1eb5993..ca47027 100755
--- a/bin/test_all
+++ b/bin/test_all
@@ -20,4 +20,5 @@ do
   QA_PROJECT=python-pip QA_RESULTS="python3-pip-v$version" QA_REF=48e250a1 LM_PYTHON_VERSION=3 ./bin/test
   QA_PROJECT=ruby-bundler QA_REF=master ./bin/test
   QA_PROJECT=js-yarn QA_REF=master ./bin/test
+  QA_PROJECT=csharp-nuget-dotnetcore QA_REF=master ./bin/test
 done
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index b61aa01..9791b68 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '1.7.2'
+    VERSION = '1.7.3'
   end
 end
diff --git a/normalized-licenses.yml b/normalized-licenses.yml
index 3bfed18..2b372d2 100644
--- a/normalized-licenses.yml
+++ b/normalized-licenses.yml
@@ -11,6 +11,7 @@ ids:
   GPLv2: GPL-2.0
   GPLv3: GPL-3.0
   http://www.apache.org/licenses/LICENSE-2.0: Apache-2.0
+  http://www.opensource.org/licenses/mit-license.php: MIT
   ISC: ISC
   LGPL 2.1: LGPL-2.1
   LGPL2_1: LGPL-2.1
diff --git a/test/results/csharp-nuget-dotnetcore-v1.1.json b/test/results/csharp-nuget-dotnetcore-v1.1.json
new file mode 100644
index 0000000..8e5fbb2
--- /dev/null
+++ b/test/results/csharp-nuget-dotnetcore-v1.1.json
@@ -0,0 +1,51 @@
+{
+  "version": "1.1",
+  "licenses": [
+    {
+      "count": 1,
+      "name": "http://www.opensource.org/licenses/mit-license.php"
+    },
+    {
+      "count": 1,
+      "name": "unknown"
+    }
+  ],
+  "dependencies": [
+    {
+      "licenses": [
+        {
+          "name": "http://www.opensource.org/licenses/mit-license.php",
+          "url": ""
+        }
+      ],
+      "license": {
+        "name": "http://www.opensource.org/licenses/mit-license.php"
+      },
+      "dependency": {
+        "name": "MvcMailer",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "licenses": [
+        {
+          "name": "unknown",
+          "url": ""
+        }
+      ],
+      "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "T4Scaffolding.Core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    }
+  ]
+}
diff --git a/test/results/csharp-nuget-dotnetcore-v1.json b/test/results/csharp-nuget-dotnetcore-v1.json
new file mode 100644
index 0000000..e144278
--- /dev/null
+++ b/test/results/csharp-nuget-dotnetcore-v1.json
@@ -0,0 +1,38 @@
+{
+  "licenses": [
+    {
+      "count": 1,
+      "name": "http://www.opensource.org/licenses/mit-license.php"
+    },
+    {
+      "count": 1,
+      "name": "unknown"
+    }
+  ],
+  "dependencies": [
+    {
+      "license": {
+        "name": "http://www.opensource.org/licenses/mit-license.php"
+      },
+      "dependency": {
+        "name": "MvcMailer",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "T4Scaffolding.Core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    }
+  ]
+}
diff --git a/test/results/csharp-nuget-dotnetcore-v2.json b/test/results/csharp-nuget-dotnetcore-v2.json
new file mode 100644
index 0000000..a0e316c
--- /dev/null
+++ b/test/results/csharp-nuget-dotnetcore-v2.json
@@ -0,0 +1,41 @@
+{
+  "version": "2.0",
+  "licenses": [
+    {
+      "id": "MIT",
+      "name": "MIT License",
+      "url": "https://opensource.org/licenses/MIT",
+      "count": 1
+    },
+    {
+      "id": "unknown",
+      "name": "unknown",
+      "url": "",
+      "count": 1
+    }
+  ],
+  "dependencies": [
+    {
+      "name": "MvcMailer",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "MIT"
+      ]
+    },
+    {
+      "name": "T4Scaffolding.Core",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "unknown"
+      ]
+    }
+  ]
+}