From 7ae62dc2a88ef84226b1f224a36e49fa23c502ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 02:38:18 +0000 Subject: [PATCH 1/2] chore(deps): update dependency bogus to 35.6.2 --- tests/NuGetUtility.Test/NuGetUtility.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj index 3b4829f8..9e76bb0c 100644 --- a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj +++ b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj @@ -20,7 +20,7 @@ - + From dbf6df5546595ae94c404487c66e2f541ace4d9c Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Thu, 6 Mar 2025 08:26:02 +0000 Subject: [PATCH 2/2] update license information mapping --- .../Tests/overwritePackageInformation.json | 10 ++- .../LicenseValidator/UrlToLicenseMapping.cs | 2 - ...cted_License_9ebdd180c55382b0.verified.txt | 83 ------------------- 3 files changed, 8 insertions(+), 87 deletions(-) delete mode 100644 tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_9ebdd180c55382b0.verified.txt diff --git a/.github/workflows/assets/Tests/overwritePackageInformation.json b/.github/workflows/assets/Tests/overwritePackageInformation.json index 86cfd63d..fea366bf 100644 --- a/.github/workflows/assets/Tests/overwritePackageInformation.json +++ b/.github/workflows/assets/Tests/overwritePackageInformation.json @@ -482,8 +482,7 @@ "Copyright": "\u00A9 Microsoft Corporation. All rights reserved.", "Authors": "Microsoft", "License": "MIT", - "LicenseUrl": "http://go.microsoft.com/fwlink/?LinkId=329770", - "LicenseInformationOrigin": 1 + "LicenseUrl": "http://go.microsoft.com/fwlink/?LinkId=329770" }, { "Id": "NetArchTest.Rules", @@ -492,5 +491,12 @@ "Copyright": "Copyright (c) 2021 Ben Morris", "Authors": "Ben Morris", "License": "MIT" + }, + { + "Id": "Bogus", + "Version": "35.6.2", + "ProjectUrl": "https://github.com/bchavez/Bogus", + "Authors": "Brian Chavez", + "License": "MIT AND BSD-3-Clause" } ] \ No newline at end of file diff --git a/src/NuGetUtility/LicenseValidator/UrlToLicenseMapping.cs b/src/NuGetUtility/LicenseValidator/UrlToLicenseMapping.cs index a796ce41..3ae5256e 100644 --- a/src/NuGetUtility/LicenseValidator/UrlToLicenseMapping.cs +++ b/src/NuGetUtility/LicenseValidator/UrlToLicenseMapping.cs @@ -11,7 +11,6 @@ public static class UrlToLicenseMapping private const string Gpl20 = "GPL-2.0"; private const string Mit = "MIT"; private const string MsPl = "MS-PL"; - private const string MitAndBsd3Clause = "MIT AND BSD-3-Clause"; public static IImmutableDictionary Default { get; } = ImmutableDictionary.CreateRange( new[] @@ -37,7 +36,6 @@ public static class UrlToLicenseMapping new KeyValuePair(new Uri("http://go.microsoft.com/fwlink/?linkid=833178"), Mit), new KeyValuePair(new Uri("http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"), Gpl20), new KeyValuePair(new Uri("https://raw.githubusercontent.com/AArnott/Validation/8377954d86/LICENSE.txt"), MsPl), - new KeyValuePair(new Uri("https://raw.githubusercontent.com/bchavez/Bogus/master/LICENSE"), MitAndBsd3Clause), new KeyValuePair(new Uri("https://github.com/Microsoft/dotnet/blob/master/LICENSE"), Mit) } ); diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_9ebdd180c55382b0.verified.txt b/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_9ebdd180c55382b0.verified.txt deleted file mode 100644 index b17f213e..00000000 --- a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_9ebdd180c55382b0.verified.txt +++ /dev/null @@ -1,83 +0,0 @@ -MIT License - -Bogus - Copyright (c) 2015 Brian Chavez -* http://github.com/bchavez/Bogus -* http://bchavez.bitarmory.com - -faker.js - Copyright (c) 2014-2015 Matthew Bergman & Marak Squires -http://github.com/marak/faker.js/ - -faker.js was inspired by and has used data definitions from: - -Copyright (c) 2007-2010 Benjamin Curtis -https://github.com/stympy/faker/ - -Copyright 2004-2005 by Jason Kohles -http://search.cpan.org/~jasonk/Data-Faker-0.07/ - -Copyright (c) ZZZ Projects Inc. 2014 - 2016 -https://github.com/zzzprojects/Z.ExtensionMethods/ - -Copyright (c) 2015 kernys -https://github.com/kernys/Kernys.Bson - -Copyright (c) 2015 Victor Quinn -https://github.com/chancejs/chancejs - -Copyright (c) 2014 Chris Veness -https://github.com/chrisveness/geodesy/ - -Copyright (c) 2013, Richard Morris -https://github.com/domaindrivendev/Swashbuckle/blob/master/LICENSE - -Copyright (c) 2012 Daniele Faraglia -https://github.com/joke2k/faker/ - - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -================================================================================ - -The BSD 3-Clause License (BSD3) - -Copyright (c) 2013-2017 Sascha Droste -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. -* Neither the name of the author nor the names of its contributors may be used -to endorse or promote products derived from this software without specific prior -written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file