From b9384429861a2383aed1903ad746484b0be8fb83 Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 5 Aug 2020 00:08:40 +0000 Subject: Update dotnet test fixtures Related to changes in https://gitlab.com/gitlab-org/security-products/tests/csharp-nuget-dotnetcore/-/merge_requests/19 --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- lib/license/management/version.rb | 2 +- .../expected/csharp/nuget-dotnetcore/v1.0.json | 16 ++++++++++++++++ .../expected/csharp/nuget-dotnetcore/v1.1.json | 22 ++++++++++++++++++++++ .../expected/csharp/nuget-dotnetcore/v2.0.json | 17 +++++++++++++++++ .../expected/csharp/nuget-dotnetcore/v2.1.json | 14 ++++++++++++++ 7 files changed, 75 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 901dcdf..9b34dcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.19.5 + +- Fix failing dotnet tests. (!199) + ## v3.19.4 - Exclude development dependencies from [composer](https://getcomposer.org) project scans (!198) diff --git a/Gemfile.lock b/Gemfile.lock index 0895976..c3dda98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - license-management (3.19.4) + license-management (3.19.5) license_finder (~> 6.6.0) GEM diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index c5742b1..851642e 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.19.4' + VERSION = '3.19.5' end end diff --git a/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.0.json b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.0.json index b589989..a8ef26c 100644 --- a/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.0.json +++ b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.0.json @@ -32,6 +32,10 @@ "count": 1, "name": "http://www.opensource.org/licenses/mit-license.php" }, + { + "count": 1, + "name": "https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt" + }, { "count": 1, "name": "https://raw.githubusercontent.com/antlr/antlrcs/master/LICENSE.txt" @@ -66,6 +70,18 @@ ] } }, + { + "license": { + "name": "https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt" + }, + "dependency": { + "name": "Microsoft.ChakraCore", + "description": "", + "pathes": [ + "." + ] + } + }, { "license": { "name": "http://go.microsoft.com/fwlink/?LinkId=329770" diff --git a/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.1.json b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.1.json index 61df691..db5f685 100644 --- a/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.1.json +++ b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.1.json @@ -33,6 +33,10 @@ "count": 1, "name": "http://www.opensource.org/licenses/mit-license.php" }, + { + "count": 1, + "name": "https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt" + }, { "count": 1, "name": "https://raw.githubusercontent.com/antlr/antlrcs/master/LICENSE.txt" @@ -79,6 +83,24 @@ ] } }, + { + "licenses": [ + { + "name": "https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt", + "url": "" + } + ], + "license": { + "name": "https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt" + }, + "dependency": { + "name": "Microsoft.ChakraCore", + "description": "", + "pathes": [ + "." + ] + } + }, { "licenses": [ { diff --git a/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.0.json b/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.0.json index c71d478..c25dbdd 100644 --- a/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.0.json +++ b/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.0.json @@ -37,6 +37,12 @@ "url": "https://opensource.org/licenses/LGPL-2.1", "count": 1 }, + { + "id": "https://github.com/microsoft/chakracore/blob/master/license.txt", + "name": "https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt", + "url": "", + "count": 1 + }, { "id": "https://raw.githubusercontent.com/antlr/antlrcs/master/license.txt", "name": "https://raw.githubusercontent.com/antlr/antlrcs/master/LICENSE.txt", @@ -73,6 +79,17 @@ "unknown" ] }, + { + "name": "Microsoft.ChakraCore", + "url": "", + "description": "", + "paths": [ + "." + ], + "licenses": [ + "https://github.com/microsoft/chakracore/blob/master/license.txt" + ] + }, { "name": "Microsoft.NETCore.Platforms", "url": "", diff --git a/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.1.json b/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.1.json index ce2faac..06918d4 100644 --- a/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.1.json +++ b/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.1.json @@ -26,6 +26,11 @@ "name": "https://github.com/dotnet/corefx/blob/master/LICENSE.TXT", "url": "" }, + { + "id": "https://github.com/microsoft/chakracore/blob/master/license.txt", + "name": "https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt", + "url": "" + }, { "id": "https://raw.githubusercontent.com/antlr/antlrcs/master/license.txt", "name": "https://raw.githubusercontent.com/antlr/antlrcs/master/LICENSE.txt", @@ -61,6 +66,15 @@ "unknown" ] }, + { + "name": "Microsoft.ChakraCore", + "version": "1.11.18", + "package_manager": "nuget", + "path": "api.net.sln", + "licenses": [ + "https://github.com/microsoft/chakracore/blob/master/license.txt" + ] + }, { "name": "Microsoft.NETCore.Platforms", "version": "1.1.0", -- cgit v1.2.3