correct licenses

sensslen · Aug 12, 2024 · 165596b · 165596b
1 parent 8753910
commit 165596b
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 23 deletions.
diff --git a/.github/workflows/assets/App/allowedLicenses.json b/.github/workflows/assets/App/allowedLicenses.json
@@ -1 +1,5 @@
-["MIT","Apache-2.0","MS-EULA"]
+[
+    "MIT",
+    "Apache-2.0",
+    "MS-EULA"
+]
diff --git a/.github/workflows/assets/App/ignorePackages.json b/.github/workflows/assets/App/ignorePackages.json
@@ -1 +1,3 @@
-["NETStandard.Library"]
+[
+    "NETStandard.Library"
+]
diff --git a/.github/workflows/assets/App/projectsToCheck.json b/.github/workflows/assets/App/projectsToCheck.json
@@ -1 +1,4 @@
-["./src/NuGetLicenseCore/NuGetLicenseCore.csproj","./src/NuGetLicenseFramework/NuGetLicenseFramework.csproj"]
+[
+    "./src/NuGetLicenseCore/NuGetLicenseCore.csproj",
+    "./src/NuGetLicenseFramework/NuGetLicenseFramework.csproj"
+]
diff --git a/.github/workflows/assets/App/urlToLicenseMapping.json b/.github/workflows/assets/App/urlToLicenseMapping.json
@@ -1,2 +1 @@
-{
-}
+{}
diff --git a/...hub/workflows/assets/ProjectWithReferenceContainingLicenseExpression/allowedLicenses.json b/...hub/workflows/assets/ProjectWithReferenceContainingLicenseExpression/allowedLicenses.json
@@ -1 +1,5 @@
-["MIT","Apache-2.0","MS-EULA"]
+[
+    "MIT",
+    "Apache-2.0",
+    "MS-EULA"
+]
diff --git a/.github/workflows/assets/ProjectWithReferenceContainingLicenseExpression/ignorePackages.json b/.github/workflows/assets/ProjectWithReferenceContainingLicenseExpression/ignorePackages.json
@@ -1 +1,3 @@
-["NETStandard.Library"]
+[
+    "NETStandard.Library"
+]
diff --git a/...s/assets/ProjectWithReferenceContainingLicenseExpression/overwritePackageInformation.json b/...s/assets/ProjectWithReferenceContainingLicenseExpression/overwritePackageInformation.json
@@ -1,2 +1 @@
-[
-]
+[]
diff --git a/...hub/workflows/assets/ProjectWithReferenceContainingLicenseExpression/projectsToCheck.json b/...hub/workflows/assets/ProjectWithReferenceContainingLicenseExpression/projectsToCheck.json
@@ -1 +1,3 @@
-["./integration/ProjectWithReferenceContainingLicenseExpression/ProjectWithReferenceContainingLicenseExpression.csproj"]
+[
+    "./integration/ProjectWithReferenceContainingLicenseExpression/ProjectWithReferenceContainingLicenseExpression.csproj"
+]
diff --git a/...workflows/assets/ProjectWithReferenceContainingLicenseExpression/urlToLicenseMapping.json b/...workflows/assets/ProjectWithReferenceContainingLicenseExpression/urlToLicenseMapping.json
@@ -1,2 +1 @@
-{
-}
+{}
diff --git a/.github/workflows/assets/Tests/allowedLicenses.json b/.github/workflows/assets/Tests/allowedLicenses.json
@@ -1 +1,6 @@
-["MIT","Apache-2.0","MS-EULA","BSD-3-Clause"]
+[
+    "MIT",
+    "Apache-2.0",
+    "MS-EULA",
+    "BSD-3-Clause"
+]
diff --git a/.github/workflows/assets/Tests/ignorePackages.json b/.github/workflows/assets/Tests/ignorePackages.json
@@ -1 +1,3 @@
-["NETStandard.Library"]
+[
+    "NETStandard.Library"
+]
diff --git a/.github/workflows/assets/Tests/overwritePackageInformation.json b/.github/workflows/assets/Tests/overwritePackageInformation.json
@@ -114,5 +114,13 @@
         "Copyright": "\u00A9 Microsoft Corporation.  All rights reserved.",
         "Authors": "Microsoft",
         "License": "MIT"
+    },
+    {
+        "Id": "Microsoft.NETCore.Platforms",
+        "Version": "1.1.0",
+        "ProjectUrl": "https://dot.net/",
+        "Copyright": "\u00A9 Microsoft Corporation.  All rights reserved.",
+        "Authors": "Microsoft",
+        "License": "MIT"
     }
 ]
diff --git a/.github/workflows/assets/Tests/projectsToCheck.json b/.github/workflows/assets/Tests/projectsToCheck.json
@@ -1 +1,3 @@
-["./tests/NuGetUtility.Test/NuGetUtility.Test.csproj"]
+[
+    "./tests/NuGetUtility.Test/NuGetUtility.Test.csproj"
+]
diff --git a/.github/workflows/assets/Tests/urlToLicenseMapping.json b/.github/workflows/assets/Tests/urlToLicenseMapping.json
@@ -1,2 +1 @@
-{
-}
+{}
diff --git a/src/NuGetUtility/LicenseValidator/LicenseValidator.cs b/src/NuGetUtility/LicenseValidator/LicenseValidator.cs
@@ -246,7 +246,7 @@ private bool IsLicenseValid(string licenseId)
 
         private string GetLicenseNotAllowedMessage(string license)
         {
-            return $"License {license} not found in list of supported licenses";
+            return $"License \"{license}\" not found in list of supported licenses";
         }
 
         private Uri GetLicenseUrl(string spdxIdentifier)

diff --git a/tests/NuGetUtility.Test/LicenseValidator/LicenseValidatorTest.cs b/tests/NuGetUtility.Test/LicenseValidator/LicenseValidatorTest.cs
@@ -627,7 +627,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             LicenseInformationOrigin.Expression,
                             new List<ValidationError>
                             {
-                                new ValidationError($"License {license} not found in list of supported licenses",
+                                new ValidationError($"License \"{license}\" not found in list of supported licenses",
                                     _context)
                             })
                     })
@@ -665,7 +665,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             LicenseInformationOrigin.Expression,
                             new List<ValidationError>
                             {
-                                new ValidationError($"License {expression} not found in list of supported licenses",
+                                new ValidationError($"License \"{expression}\" not found in list of supported licenses",
                                     _context)
                             })
                     })
@@ -705,7 +705,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             LicenseInformationOrigin.Expression,
                             new List<ValidationError>
                             {
-                                new ValidationError($"License {expression} not found in list of supported licenses",
+                                new ValidationError($"License \"{expression}\" not found in list of supported licenses",
                                     _context)
                             })
                     })
@@ -736,7 +736,7 @@ public async Task ValidatingLicensesWithOverwriteLicenseInformation_Should_GiveC
                             LicenseInformationOrigin.Overwrite,
                             new List<ValidationError>
                             {
-                                new ValidationError($"License {license} not found in list of supported licenses",
+                                new ValidationError($"License \"{license}\" not found in list of supported licenses",
                                     _context)
                             })
                     })
@@ -874,7 +874,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
                             LicenseInformationOrigin.Url,
                             new List<ValidationError>
                             {
-                                new ValidationError($"License {urlMatch.Value} not found in list of supported licenses",
+                                new ValidationError($"License \"{urlMatch.Value}\" not found in list of supported licenses",
                                     _context)
                             })
                     })
-Original file line number
+Diff line change
@@ -1,2 +1 @@
-    {
-    }
+    {}