Skip to content

Commit 7b498ad

Browse files
nkolev92nkolev92
committed
Annotate rules
1 parent cc9c5b5 commit 7b498ad

16 files changed

Lines changed: 63 additions & 91 deletions

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -776,29 +776,29 @@ NuGet.Packaging.RepositorySignatureInfoProvider.RepositorySignatureInfoProvider(
776776
NuGet.Packaging.RepositorySignatureInfoProvider.TryGetRepositorySignatureInfo(string! source, out NuGet.Packaging.RepositorySignatureInfo? repositorySignatureInfo) -> bool
777777
NuGet.Packaging.Rules.AnalysisResources
778778
NuGet.Packaging.Rules.DefaultManifestValuesRule
779-
~NuGet.Packaging.Rules.DefaultManifestValuesRule.DefaultManifestValuesRule(string messageFormat) -> void
780-
~NuGet.Packaging.Rules.DefaultManifestValuesRule.MessageFormat.get -> string
781-
~NuGet.Packaging.Rules.DefaultManifestValuesRule.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
779+
NuGet.Packaging.Rules.DefaultManifestValuesRule.DefaultManifestValuesRule(string! messageFormat) -> void
780+
NuGet.Packaging.Rules.DefaultManifestValuesRule.MessageFormat.get -> string!
781+
NuGet.Packaging.Rules.DefaultManifestValuesRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
782782
NuGet.Packaging.Rules.IPackageRule
783783
NuGet.Packaging.Rules.IPackageRule.MessageFormat.get -> string!
784784
NuGet.Packaging.Rules.IPackageRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
785785
NuGet.Packaging.Rules.IconUrlDeprecationWarning
786-
~NuGet.Packaging.Rules.IconUrlDeprecationWarning.IconUrlDeprecationWarning(string messageFormat) -> void
787-
~NuGet.Packaging.Rules.IconUrlDeprecationWarning.MessageFormat.get -> string
788-
~NuGet.Packaging.Rules.IconUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
786+
NuGet.Packaging.Rules.IconUrlDeprecationWarning.IconUrlDeprecationWarning(string! messageFormat) -> void
787+
NuGet.Packaging.Rules.IconUrlDeprecationWarning.MessageFormat.get -> string!
788+
NuGet.Packaging.Rules.IconUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
789789
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning
790-
~NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.LicenseUrlDeprecationWarning(string messageFormat) -> void
791-
~NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.MessageFormat.get -> string
792-
~NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
790+
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.LicenseUrlDeprecationWarning(string! messageFormat) -> void
791+
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.MessageFormat.get -> string!
792+
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
793793
NuGet.Packaging.Rules.PathTooLongRule
794-
~NuGet.Packaging.Rules.PathTooLongRule.MessageFormat.get -> string
795-
~NuGet.Packaging.Rules.PathTooLongRule.PathTooLongRule(string messageFormat) -> void
796-
~NuGet.Packaging.Rules.PathTooLongRule.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
794+
NuGet.Packaging.Rules.PathTooLongRule.MessageFormat.get -> string!
795+
NuGet.Packaging.Rules.PathTooLongRule.PathTooLongRule(string! messageFormat) -> void
796+
NuGet.Packaging.Rules.PathTooLongRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
797797
NuGet.Packaging.Rules.RuleSet
798798
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule
799-
~NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.MessageFormat.get -> string
800-
~NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.UnspecifiedDependencyVersionRule(string messageFormat) -> void
801-
~NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
799+
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.MessageFormat.get -> string!
800+
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.UnspecifiedDependencyVersionRule(string! messageFormat) -> void
801+
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
802802
NuGet.Packaging.Sha512HashFunction
803803
NuGet.Packaging.Sha512HashFunction.Dispose() -> void
804804
NuGet.Packaging.Sha512HashFunction.GetHash() -> string!
@@ -1628,8 +1628,8 @@ static NuGet.Packaging.RepositorySignatureInfoProvider.Instance.get -> NuGet.Pac
16281628
~static NuGet.Packaging.Rules.AnalysisResources.UnrecognizedScriptWarning.get -> string
16291629
~static NuGet.Packaging.Rules.AnalysisResources.UnspecifiedDependencyVersionWarning.get -> string
16301630
~static NuGet.Packaging.Rules.AnalysisResources.WinRTObsoleteWarning.get -> string
1631-
~static NuGet.Packaging.Rules.RuleSet.PackageCreationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule>
1632-
~static NuGet.Packaging.Rules.RuleSet.PackagesConfigToPackageReferenceMigrationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule>
1631+
static NuGet.Packaging.Rules.RuleSet.PackageCreationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule!>!
1632+
static NuGet.Packaging.Rules.RuleSet.PackagesConfigToPackageReferenceMigrationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule!>!
16331633
~static NuGet.Packaging.Signing.Accuracy.Read(byte[] bytes) -> NuGet.Packaging.Signing.Accuracy
16341634
~static NuGet.Packaging.Signing.AlgorithmIdentifier.Read(byte[] bytes) -> NuGet.Packaging.Signing.AlgorithmIdentifier
16351635
~static NuGet.Packaging.Signing.AttributeUtility.CreateCommitmentTypeIndication(NuGet.Packaging.Signing.SignatureType type) -> System.Security.Cryptography.CryptographicAttributeObject

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -776,29 +776,29 @@ NuGet.Packaging.RepositorySignatureInfoProvider.RepositorySignatureInfoProvider(
776776
NuGet.Packaging.RepositorySignatureInfoProvider.TryGetRepositorySignatureInfo(string! source, out NuGet.Packaging.RepositorySignatureInfo? repositorySignatureInfo) -> bool
777777
NuGet.Packaging.Rules.AnalysisResources
778778
NuGet.Packaging.Rules.DefaultManifestValuesRule
779-
~NuGet.Packaging.Rules.DefaultManifestValuesRule.DefaultManifestValuesRule(string messageFormat) -> void
780-
~NuGet.Packaging.Rules.DefaultManifestValuesRule.MessageFormat.get -> string
781-
~NuGet.Packaging.Rules.DefaultManifestValuesRule.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
779+
NuGet.Packaging.Rules.DefaultManifestValuesRule.DefaultManifestValuesRule(string! messageFormat) -> void
780+
NuGet.Packaging.Rules.DefaultManifestValuesRule.MessageFormat.get -> string!
781+
NuGet.Packaging.Rules.DefaultManifestValuesRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
782782
NuGet.Packaging.Rules.IPackageRule
783783
NuGet.Packaging.Rules.IPackageRule.MessageFormat.get -> string!
784784
NuGet.Packaging.Rules.IPackageRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
785785
NuGet.Packaging.Rules.IconUrlDeprecationWarning
786-
~NuGet.Packaging.Rules.IconUrlDeprecationWarning.IconUrlDeprecationWarning(string messageFormat) -> void
787-
~NuGet.Packaging.Rules.IconUrlDeprecationWarning.MessageFormat.get -> string
788-
~NuGet.Packaging.Rules.IconUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
786+
NuGet.Packaging.Rules.IconUrlDeprecationWarning.IconUrlDeprecationWarning(string! messageFormat) -> void
787+
NuGet.Packaging.Rules.IconUrlDeprecationWarning.MessageFormat.get -> string!
788+
NuGet.Packaging.Rules.IconUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
789789
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning
790-
~NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.LicenseUrlDeprecationWarning(string messageFormat) -> void
791-
~NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.MessageFormat.get -> string
792-
~NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
790+
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.LicenseUrlDeprecationWarning(string! messageFormat) -> void
791+
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.MessageFormat.get -> string!
792+
NuGet.Packaging.Rules.LicenseUrlDeprecationWarning.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
793793
NuGet.Packaging.Rules.PathTooLongRule
794-
~NuGet.Packaging.Rules.PathTooLongRule.MessageFormat.get -> string
795-
~NuGet.Packaging.Rules.PathTooLongRule.PathTooLongRule(string messageFormat) -> void
796-
~NuGet.Packaging.Rules.PathTooLongRule.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
794+
NuGet.Packaging.Rules.PathTooLongRule.MessageFormat.get -> string!
795+
NuGet.Packaging.Rules.PathTooLongRule.PathTooLongRule(string! messageFormat) -> void
796+
NuGet.Packaging.Rules.PathTooLongRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
797797
NuGet.Packaging.Rules.RuleSet
798798
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule
799-
~NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.MessageFormat.get -> string
800-
~NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.UnspecifiedDependencyVersionRule(string messageFormat) -> void
801-
~NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.Validate(NuGet.Packaging.PackageArchiveReader builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage>
799+
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.MessageFormat.get -> string!
800+
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.UnspecifiedDependencyVersionRule(string! messageFormat) -> void
801+
NuGet.Packaging.Rules.UnspecifiedDependencyVersionRule.Validate(NuGet.Packaging.PackageArchiveReader! builder) -> System.Collections.Generic.IEnumerable<NuGet.Common.PackagingLogMessage!>!
802802
NuGet.Packaging.Sha512HashFunction
803803
NuGet.Packaging.Sha512HashFunction.Dispose() -> void
804804
NuGet.Packaging.Sha512HashFunction.GetHash() -> string!
@@ -1652,8 +1652,8 @@ static NuGet.Packaging.RepositorySignatureInfoProvider.Instance.get -> NuGet.Pac
16521652
~static NuGet.Packaging.Rules.AnalysisResources.UnrecognizedScriptWarning.get -> string
16531653
~static NuGet.Packaging.Rules.AnalysisResources.UnspecifiedDependencyVersionWarning.get -> string
16541654
~static NuGet.Packaging.Rules.AnalysisResources.WinRTObsoleteWarning.get -> string
1655-
~static NuGet.Packaging.Rules.RuleSet.PackageCreationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule>
1656-
~static NuGet.Packaging.Rules.RuleSet.PackagesConfigToPackageReferenceMigrationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule>
1655+
static NuGet.Packaging.Rules.RuleSet.PackageCreationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule!>!
1656+
static NuGet.Packaging.Rules.RuleSet.PackagesConfigToPackageReferenceMigrationRuleSet.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Rules.IPackageRule!>!
16571657
~static NuGet.Packaging.Signing.Accuracy.Read(byte[] bytes) -> NuGet.Packaging.Signing.Accuracy
16581658
~static NuGet.Packaging.Signing.AlgorithmIdentifier.Read(byte[] bytes) -> NuGet.Packaging.Signing.AlgorithmIdentifier
16591659
~static NuGet.Packaging.Signing.AttributeUtility.CreateCommitmentTypeIndication(NuGet.Packaging.Signing.SignatureType type) -> System.Security.Cryptography.CryptographicAttributeObject

‎src/NuGet.Core/NuGet.Packaging/Rules/DefaultManifestValuesRule.cs‎

Lines changed: 1 addition & 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;
75
using System.Collections.Generic;
86
using System.Globalization;
@@ -46,7 +44,7 @@ public IEnumerable<PackagingLogMessage> Validate(PackageArchiveReader builder)
4644
Uri.TryCreate(nuspecReader.GetLicenseUrl(), UriKind.RelativeOrAbsolute, out var licenseUrl);
4745
if (licenseUrl == SampleLicenseUrl)
4846
{
49-
yield return CreateIssueFor("licenseUrl", nuspecReader.GetLicenseUrl());
47+
yield return CreateIssueFor("licenseUrl", nuspecReader.GetLicenseUrl()!);
5048
}
5149

5250
Uri.TryCreate(nuspecReader.GetIconUrl(), UriKind.RelativeOrAbsolute, out var iconUrl);

‎src/NuGet.Core/NuGet.Packaging/Rules/DependenciesGroupsForEachTFMRule.cs‎

Lines changed: 1 addition & 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;
75
using System.Collections.Generic;
86
using System.IO;
@@ -193,7 +191,7 @@ private static IEnumerable<NuGetFramework> ExtractTFMsFromNuspec(Stream packageN
193191
var nuspec = packageNuspec.Xml;
194192
if (nuspec != null)
195193
{
196-
XNamespace name = nuspec.Root.Name.Namespace;
194+
XNamespace name = nuspec.Root!.Name.Namespace;
197195
return nuspec.Descendants(XName.Get("{" + name.NamespaceName + "}dependencies")).Elements().Attributes("targetFramework").Select(f => NuGetFramework.Parse(f.Value));
198196
}
199197
return Array.Empty<NuGetFramework>();

‎src/NuGet.Core/NuGet.Packaging/Rules/IconUrlDeprecationWarning.cs‎

Lines changed: 0 additions & 2 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;
75
using System.Collections.Generic;
86
using System.Globalization;

‎src/NuGet.Core/NuGet.Packaging/Rules/InitScriptNotUnderToolsRule.cs‎

Lines changed: 1 addition & 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;
75
using System.Collections.Generic;
86
using System.Globalization;
@@ -24,7 +22,7 @@ public IEnumerable<PackagingLogMessage> Validate(PackageArchiveReader builder)
2422
foreach (var file in builder.GetFiles())
2523
{
2624
var name = Path.GetFileName(file);
27-
var dirName = Path.GetFileName(Path.GetDirectoryName(file));
25+
var dirName = Path.GetFileName(Path.GetDirectoryName(file))!;
2826
if (name.Equals("init.ps1", StringComparison.OrdinalIgnoreCase) && !dirName.Equals(PackagingConstants.Folders.Tools, StringComparison.OrdinalIgnoreCase))
2927
{
3028
yield return CreatePackageIssue(file);

‎src/NuGet.Core/NuGet.Packaging/Rules/InvalidPlaceholderFileRule.cs‎

Lines changed: 2 additions & 4 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;
75
using System.Collections.Generic;
86
using System.Globalization;
@@ -27,8 +25,8 @@ public IEnumerable<PackagingLogMessage> Validate(PackageArchiveReader builder)
2725
{
2826
if (Path.GetFileName(file).Equals(PackagingCoreConstants.EmptyFolder, StringComparison.Ordinal))
2927
{
30-
var directory = PathUtility.EnsureTrailingSlash(Path.GetDirectoryName(file));
31-
if (builder.GetFiles().Count(f => PathUtility.EnsureTrailingSlash(Path.GetDirectoryName(f)).StartsWith(directory, StringComparison.OrdinalIgnoreCase)) > 1)
28+
var directory = PathUtility.EnsureTrailingSlash(Path.GetDirectoryName(file)!);
29+
if (builder.GetFiles().Count(f => PathUtility.EnsureTrailingSlash(Path.GetDirectoryName(f)!).StartsWith(directory, StringComparison.OrdinalIgnoreCase)) > 1)
3230
{
3331
yield return CreatePackageIssueForPlaceholderFile(file);
3432
}

‎src/NuGet.Core/NuGet.Packaging/Rules/InvalidPrereleaseDependencyRule.cs‎

Lines changed: 1 addition & 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
using System.Globalization;
86
using System.Linq;
@@ -22,7 +20,7 @@ public InvalidPrereleaseDependencyRule(string messageFormat)
2220
}
2321
public IEnumerable<PackagingLogMessage> Validate(PackageArchiveReader builder)
2422
{
25-
var nuspecReader = builder?.NuspecReader;
23+
var nuspecReader = builder.NuspecReader;
2624
if (nuspecReader.GetDependencyGroups() == null)
2725
{
2826
// We have independent validation for null-versions.

0 commit comments

Comments
 (0)