Skip to content

Commit a8f3e53

Browse files
zivkanzivkan
authored
Nullable annotate SPDX license data (#6965)
1 parent bf048eb commit a8f3e53

4 files changed

Lines changed: 16 additions & 1836 deletions

File tree

‎src/NuGet.Core/NuGet.Packaging/Licenses/NuGetLicenseData.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
#nullable disable
5-
64
using System.Collections.Generic;
75

86
namespace NuGet.Packaging.Licenses
@@ -11,7 +9,7 @@ namespace NuGet.Packaging.Licenses
119
// Auto-Generated by the GenerateLicenseList tool. DO NOT EDIT this manually. Use the update script at $repositoryRoot/scripts/utils/UpdateNuGetLicenseSPDXList.ps1
1210
public static class NuGetLicenseData
1311
{
14-
public static string LicenseListVersion { get; } = "687638f";
12+
public static string LicenseListVersion { get; } = "2ffd3ae";
1513

1614
public static readonly IReadOnlyDictionary<string, LicenseData> LicenseList = new Dictionary<string, LicenseData>()
1715
{
@@ -805,6 +803,7 @@ public static class NuGetLicenseData
805803
{ "SANE-exception", new ExceptionData(licenseID: "SANE-exception", isDeprecatedLicenseId: false) },
806804
{ "SHL-2.0", new ExceptionData(licenseID: "SHL-2.0", isDeprecatedLicenseId: false) },
807805
{ "SHL-2.1", new ExceptionData(licenseID: "SHL-2.1", isDeprecatedLicenseId: false) },
806+
{ "Simple-Library-Usage-exception", new ExceptionData(licenseID: "Simple-Library-Usage-exception", isDeprecatedLicenseId: false) },
808807
{ "stunnel-exception", new ExceptionData(licenseID: "stunnel-exception", isDeprecatedLicenseId: false) },
809808
{ "SWI-exception", new ExceptionData(licenseID: "SWI-exception", isDeprecatedLicenseId: false) },
810809
{ "Swift-exception", new ExceptionData(licenseID: "Swift-exception", isDeprecatedLicenseId: false) },

‎src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Shipped.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,15 +339,15 @@ NuGet.Packaging.LicenseType
339339
NuGet.Packaging.LicenseType.Expression = 1 -> NuGet.Packaging.LicenseType
340340
NuGet.Packaging.LicenseType.File = 0 -> NuGet.Packaging.LicenseType
341341
NuGet.Packaging.Licenses.ExceptionData
342-
~NuGet.Packaging.Licenses.ExceptionData.ExceptionData(string licenseID, bool isDeprecatedLicenseId) -> void
342+
NuGet.Packaging.Licenses.ExceptionData.ExceptionData(string! licenseID, bool isDeprecatedLicenseId) -> void
343343
NuGet.Packaging.Licenses.ExceptionData.IsDeprecatedLicenseId.get -> bool
344-
~NuGet.Packaging.Licenses.ExceptionData.LicenseExceptionID.get -> string
344+
NuGet.Packaging.Licenses.ExceptionData.LicenseExceptionID.get -> string!
345345
NuGet.Packaging.Licenses.LicenseData
346346
NuGet.Packaging.Licenses.LicenseData.IsDeprecatedLicenseId.get -> bool
347347
NuGet.Packaging.Licenses.LicenseData.IsFsfLibre.get -> bool
348348
NuGet.Packaging.Licenses.LicenseData.IsOsiApproved.get -> bool
349-
~NuGet.Packaging.Licenses.LicenseData.LicenseData(string licenseID, bool isOsiApproved, bool isDeprecatedLicenseId, bool isFsfLibre) -> void
350-
~NuGet.Packaging.Licenses.LicenseData.LicenseID.get -> string
349+
NuGet.Packaging.Licenses.LicenseData.LicenseData(string! licenseID, bool isOsiApproved, bool isDeprecatedLicenseId, bool isFsfLibre) -> void
350+
NuGet.Packaging.Licenses.LicenseData.LicenseID.get -> string!
351351
NuGet.Packaging.Licenses.LicenseExpressionType
352352
NuGet.Packaging.Licenses.LicenseExpressionType.License = 0 -> NuGet.Packaging.Licenses.LicenseExpressionType
353353
NuGet.Packaging.Licenses.LicenseExpressionType.Operator = 1 -> NuGet.Packaging.Licenses.LicenseExpressionType
@@ -1528,7 +1528,7 @@ static NuGet.ContentModel.PatternDefinition.implicit operator NuGet.ContentModel
15281528
~static NuGet.Packaging.FrameworkNameUtility.ParseNuGetFrameworkFolderName(string path, bool strictParsing, out string effectivePath) -> NuGet.Frameworks.NuGetFramework
15291529
~static NuGet.Packaging.FrameworkNameUtility.ParseNuGetFrameworkFromFilePath(string filePath, out string effectivePath) -> NuGet.Frameworks.NuGetFramework
15301530
~static NuGet.Packaging.FrameworksExtensions.GetFrameworkString(this NuGet.Frameworks.NuGetFramework self) -> string
1531-
~static NuGet.Packaging.Licenses.NuGetLicenseData.LicenseListVersion.get -> string
1531+
static NuGet.Packaging.Licenses.NuGetLicenseData.LicenseListVersion.get -> string!
15321532
~static NuGet.Packaging.Licenses.NuGetLicenseExpression.Parse(string expression) -> NuGet.Packaging.Licenses.NuGetLicenseExpression
15331533
~static NuGet.Packaging.Licenses.NuGetLicenseExpressionExtensions.HasOnlyStandardIdentifiers(this NuGet.Packaging.Licenses.NuGetLicenseExpression expression) -> bool
15341534
~static NuGet.Packaging.Licenses.NuGetLicenseExpressionExtensions.IsUnlicensed(this NuGet.Packaging.Licenses.NuGetLicense license) -> bool
@@ -1789,8 +1789,8 @@ static NuGet.RuntimeModel.RuntimeGraph.Merge(NuGet.RuntimeModel.RuntimeGraph! le
17891789
~static readonly NuGet.Packaging.LicenseMetadata.EmptyVersion -> System.Version
17901790
~static readonly NuGet.Packaging.LicenseMetadata.LicenseFileDeprecationUrl -> System.Uri
17911791
~static readonly NuGet.Packaging.LicenseMetadata.LicenseServiceLinkTemplate -> string
1792-
~static readonly NuGet.Packaging.Licenses.NuGetLicenseData.ExceptionList -> System.Collections.Generic.IReadOnlyDictionary<string, NuGet.Packaging.Licenses.ExceptionData>
1793-
~static readonly NuGet.Packaging.Licenses.NuGetLicenseData.LicenseList -> System.Collections.Generic.IReadOnlyDictionary<string, NuGet.Packaging.Licenses.LicenseData>
1792+
static readonly NuGet.Packaging.Licenses.NuGetLicenseData.ExceptionList -> System.Collections.Generic.IReadOnlyDictionary<string!, NuGet.Packaging.Licenses.ExceptionData!>!
1793+
static readonly NuGet.Packaging.Licenses.NuGetLicenseData.LicenseList -> System.Collections.Generic.IReadOnlyDictionary<string!, NuGet.Packaging.Licenses.LicenseData!>!
17941794
static readonly NuGet.Packaging.NupkgMetadataFileFormat.Version -> int
17951795
~static readonly NuGet.Packaging.PackagesConfig.IdAttributeName -> string
17961796
~static readonly NuGet.Packaging.PackagesConfig.MinClientAttributeName -> string

‎src/NuGet.Core/NuGet.Packaging/PublicAPI/net8.0/PublicAPI.Shipped.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,15 +339,15 @@ NuGet.Packaging.LicenseType
339339
NuGet.Packaging.LicenseType.Expression = 1 -> NuGet.Packaging.LicenseType
340340
NuGet.Packaging.LicenseType.File = 0 -> NuGet.Packaging.LicenseType
341341
NuGet.Packaging.Licenses.ExceptionData
342-
~NuGet.Packaging.Licenses.ExceptionData.ExceptionData(string licenseID, bool isDeprecatedLicenseId) -> void
342+
NuGet.Packaging.Licenses.ExceptionData.ExceptionData(string! licenseID, bool isDeprecatedLicenseId) -> void
343343
NuGet.Packaging.Licenses.ExceptionData.IsDeprecatedLicenseId.get -> bool
344-
~NuGet.Packaging.Licenses.ExceptionData.LicenseExceptionID.get -> string
344+
NuGet.Packaging.Licenses.ExceptionData.LicenseExceptionID.get -> string!
345345
NuGet.Packaging.Licenses.LicenseData
346346
NuGet.Packaging.Licenses.LicenseData.IsDeprecatedLicenseId.get -> bool
347347
NuGet.Packaging.Licenses.LicenseData.IsFsfLibre.get -> bool
348348
NuGet.Packaging.Licenses.LicenseData.IsOsiApproved.get -> bool
349-
~NuGet.Packaging.Licenses.LicenseData.LicenseData(string licenseID, bool isOsiApproved, bool isDeprecatedLicenseId, bool isFsfLibre) -> void
350-
~NuGet.Packaging.Licenses.LicenseData.LicenseID.get -> string
349+
NuGet.Packaging.Licenses.LicenseData.LicenseData(string! licenseID, bool isOsiApproved, bool isDeprecatedLicenseId, bool isFsfLibre) -> void
350+
NuGet.Packaging.Licenses.LicenseData.LicenseID.get -> string!
351351
NuGet.Packaging.Licenses.LicenseExpressionType
352352
NuGet.Packaging.Licenses.LicenseExpressionType.License = 0 -> NuGet.Packaging.Licenses.LicenseExpressionType
353353
NuGet.Packaging.Licenses.LicenseExpressionType.Operator = 1 -> NuGet.Packaging.Licenses.LicenseExpressionType
@@ -1513,7 +1513,7 @@ static NuGet.ContentModel.PatternDefinition.implicit operator NuGet.ContentModel
15131513
~static NuGet.Packaging.FrameworkNameUtility.ParseNuGetFrameworkFolderName(string path, bool strictParsing, out string effectivePath) -> NuGet.Frameworks.NuGetFramework
15141514
~static NuGet.Packaging.FrameworkNameUtility.ParseNuGetFrameworkFromFilePath(string filePath, out string effectivePath) -> NuGet.Frameworks.NuGetFramework
15151515
~static NuGet.Packaging.FrameworksExtensions.GetFrameworkString(this NuGet.Frameworks.NuGetFramework self) -> string
1516-
~static NuGet.Packaging.Licenses.NuGetLicenseData.LicenseListVersion.get -> string
1516+
static NuGet.Packaging.Licenses.NuGetLicenseData.LicenseListVersion.get -> string!
15171517
~static NuGet.Packaging.Licenses.NuGetLicenseExpression.Parse(string expression) -> NuGet.Packaging.Licenses.NuGetLicenseExpression
15181518
~static NuGet.Packaging.Licenses.NuGetLicenseExpressionExtensions.HasOnlyStandardIdentifiers(this NuGet.Packaging.Licenses.NuGetLicenseExpression expression) -> bool
15191519
~static NuGet.Packaging.Licenses.NuGetLicenseExpressionExtensions.IsUnlicensed(this NuGet.Packaging.Licenses.NuGetLicense license) -> bool
@@ -1773,8 +1773,8 @@ static NuGet.RuntimeModel.RuntimeGraph.Merge(NuGet.RuntimeModel.RuntimeGraph! le
17731773
~static readonly NuGet.Packaging.LicenseMetadata.EmptyVersion -> System.Version
17741774
~static readonly NuGet.Packaging.LicenseMetadata.LicenseFileDeprecationUrl -> System.Uri
17751775
~static readonly NuGet.Packaging.LicenseMetadata.LicenseServiceLinkTemplate -> string
1776-
~static readonly NuGet.Packaging.Licenses.NuGetLicenseData.ExceptionList -> System.Collections.Generic.IReadOnlyDictionary<string, NuGet.Packaging.Licenses.ExceptionData>
1777-
~static readonly NuGet.Packaging.Licenses.NuGetLicenseData.LicenseList -> System.Collections.Generic.IReadOnlyDictionary<string, NuGet.Packaging.Licenses.LicenseData>
1776+
static readonly NuGet.Packaging.Licenses.NuGetLicenseData.ExceptionList -> System.Collections.Generic.IReadOnlyDictionary<string!, NuGet.Packaging.Licenses.ExceptionData!>!
1777+
static readonly NuGet.Packaging.Licenses.NuGetLicenseData.LicenseList -> System.Collections.Generic.IReadOnlyDictionary<string!, NuGet.Packaging.Licenses.LicenseData!>!
17781778
static readonly NuGet.Packaging.NupkgMetadataFileFormat.Version -> int
17791779
~static readonly NuGet.Packaging.PackagesConfig.IdAttributeName -> string
17801780
~static readonly NuGet.Packaging.PackagesConfig.MinClientAttributeName -> string

0 commit comments

Comments
 (0)