Skip to content

Commit 6f6c736

Browse files
nkolev92nkolev92
committed
more packaging annotations
1 parent 7cc1f0a commit 6f6c736

2 files changed

Lines changed: 39 additions & 3 deletions

File tree

‎src/NuGet.Core/NuGet.Packaging/ContentModel/ContentItemCollection.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void PopulateItemGroups(PatternSet definition, IList<ContentItemGroup> co
9898
{
9999
foreach (var groupPattern in groupPatterns)
100100
{
101-
var item = groupPattern.Match(asset.Path, definition.PropertyDefinitions);
101+
var item = groupPattern.Match(asset.Path!, definition.PropertyDefinitions);
102102
if (item != null)
103103
{
104104
groupAssets ??= GroupAssetsPool.Allocate();
@@ -257,7 +257,7 @@ private List<ContentItem> FindItemsImplementation(PatternSet definition, IEnumer
257257

258258
foreach (var pathPattern in pathPatterns)
259259
{
260-
var contentItem = pathPattern.Match(path, definition.PropertyDefinitions);
260+
var contentItem = pathPattern.Match(path!, definition.PropertyDefinitions);
261261
if (contentItem != null)
262262
{
263263
//If the item is assembly, populate the "related files extensions property".
@@ -341,7 +341,7 @@ static bool ReadOnlyMemoryEquals(ReadOnlyMemory<char> x, ReadOnlyMemory<char> y)
341341

342342
static ReadOnlyMemory<char> GetExtension(Asset asset)
343343
{
344-
int lastIndexOfDot = asset.Path.LastIndexOf('.');
344+
int lastIndexOfDot = asset.Path!.LastIndexOf('.');
345345
if (lastIndexOfDot != -1)
346346
{
347347
return asset.Path.AsMemory(lastIndexOfDot);

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,11 +1531,25 @@ static NuGet.Packaging.MinClientVersionUtility.GetNuGetClientVersion() -> NuGet.
15311531
static NuGet.Packaging.MinClientVersionUtility.IsMinClientVersionCompatible(NuGet.Packaging.Core.NuspecCoreReaderBase! nuspecReader) -> bool
15321532
static NuGet.Packaging.MinClientVersionUtility.IsMinClientVersionCompatible(NuGet.Versioning.NuGetVersion! packageMinClientVersion) -> bool
15331533
static NuGet.Packaging.MinClientVersionUtility.VerifyMinClientVersion(NuGet.Packaging.Core.NuspecCoreReaderBase! nuspecReader) -> void
1534+
<<<<<<< HEAD
1535+
=======
1536+
<<<<<<< HEAD
1537+
~static NuGet.Packaging.NupkgMetadataFileFormat.Read(System.IO.Stream stream, NuGet.Common.ILogger log, string path) -> NuGet.Packaging.NupkgMetadataFile
1538+
~static NuGet.Packaging.NupkgMetadataFileFormat.Read(string filePath) -> NuGet.Packaging.NupkgMetadataFile
1539+
~static NuGet.Packaging.NupkgMetadataFileFormat.Read(string filePath, NuGet.Common.ILogger log) -> NuGet.Packaging.NupkgMetadataFile
1540+
~static NuGet.Packaging.NupkgMetadataFileFormat.Write(System.IO.Stream stream, NuGet.Packaging.NupkgMetadataFile hashFile) -> void
1541+
~static NuGet.Packaging.NupkgMetadataFileFormat.Write(string filePath, NuGet.Packaging.NupkgMetadataFile hashFile) -> void
1542+
=======
1543+
>>>>>>> 333c58ec6 (more packaging annotations)
15341544
static NuGet.Packaging.NupkgMetadataFileFormat.Read(System.IO.Stream! stream, NuGet.Common.ILogger! log, string! path) -> NuGet.Packaging.NupkgMetadataFile!
15351545
static NuGet.Packaging.NupkgMetadataFileFormat.Read(string! filePath) -> NuGet.Packaging.NupkgMetadataFile!
15361546
static NuGet.Packaging.NupkgMetadataFileFormat.Read(string! filePath, NuGet.Common.ILogger! log) -> NuGet.Packaging.NupkgMetadataFile!
15371547
static NuGet.Packaging.NupkgMetadataFileFormat.Write(System.IO.Stream! stream, NuGet.Packaging.NupkgMetadataFile! hashFile) -> void
15381548
static NuGet.Packaging.NupkgMetadataFileFormat.Write(string! filePath, NuGet.Packaging.NupkgMetadataFile! hashFile) -> void
1549+
<<<<<<< HEAD
1550+
=======
1551+
>>>>>>> 5a6e72242 (more packaging annotations)
1552+
>>>>>>> 333c58ec6 (more packaging annotations)
15391553
~static NuGet.Packaging.PackageBuilder.ValidateReferenceAssemblies(System.Collections.Generic.IEnumerable<NuGet.Packaging.IPackageFile> files, System.Collections.Generic.IEnumerable<NuGet.Packaging.PackageReferenceSet> packageAssemblyReferences) -> void
15401554
static NuGet.Packaging.PackageExtraction.PackageExtractionBehavior.XmlDocFileSaveMode.get -> NuGet.Packaging.XmlDocFileSaveMode
15411555
static NuGet.Packaging.PackageExtraction.PackageExtractionBehavior.XmlDocFileSaveMode.set -> void
@@ -1557,11 +1571,25 @@ static NuGet.Packaging.PackageHelper.IsRoot(string! path) -> bool
15571571
~static NuGet.Packaging.PackageIdValidator.ValidatePackageId(string packageId) -> void
15581572
static NuGet.Packaging.PackagePathHelper.GetInstalledPackageFilePath(NuGet.Packaging.Core.PackageIdentity! packageIdentity, NuGet.Packaging.PackagePathResolver! packagePathResolver) -> string?
15591573
static NuGet.Packaging.PackagePathHelper.GetPackageLookupPaths(NuGet.Packaging.Core.PackageIdentity! packageIdentity, NuGet.Packaging.PackagePathResolver! packagePathResolver) -> System.Collections.Generic.IEnumerable<string!>!
1574+
<<<<<<< HEAD
1575+
=======
1576+
<<<<<<< HEAD
1577+
~static NuGet.Packaging.PackageReaderBase.GetNuspecFile(System.Collections.Generic.IEnumerable<string> files) -> string
1578+
~static NuGet.Packaging.PackageReaderBase.IsAllowedBuildFile(string packageId, string path) -> bool
1579+
~static NuGet.Packaging.PackageReaderBase.IsReferenceAssembly(string path) -> bool
1580+
~static NuGet.Packaging.PackageReaderBase.ValidatePackageEntries(string normalizedDestination, System.Collections.Generic.IEnumerable<string> packageFiles, NuGet.Packaging.Core.PackageIdentity packageIdentity) -> void
1581+
~static NuGet.Packaging.PackageReaderBase.ValidatePackageEntry(string normalizedDestination, string normalizedFilePath, NuGet.Packaging.Core.PackageIdentity packageIdentity) -> void
1582+
=======
1583+
>>>>>>> 333c58ec6 (more packaging annotations)
15601584
static NuGet.Packaging.PackageReaderBase.GetNuspecFile(System.Collections.Generic.IEnumerable<string!>! files) -> string!
15611585
static NuGet.Packaging.PackageReaderBase.IsAllowedBuildFile(string! packageId, string! path) -> bool
15621586
static NuGet.Packaging.PackageReaderBase.IsReferenceAssembly(string! path) -> bool
15631587
static NuGet.Packaging.PackageReaderBase.ValidatePackageEntries(string! normalizedDestination, System.Collections.Generic.IEnumerable<string!>! packageFiles, NuGet.Packaging.Core.PackageIdentity! packageIdentity) -> void
15641588
static NuGet.Packaging.PackageReaderBase.ValidatePackageEntry(string! normalizedDestination, string! normalizedFilePath, NuGet.Packaging.Core.PackageIdentity! packageIdentity) -> void
1589+
<<<<<<< HEAD
1590+
=======
1591+
>>>>>>> 5a6e72242 (more packaging annotations)
1592+
>>>>>>> 333c58ec6 (more packaging annotations)
15651593
static NuGet.Packaging.PackageReaderExtensions.GetPackageFilesAsync(this NuGet.Packaging.Core.IAsyncPackageCoreReader! packageReader, NuGet.Packaging.PackageSaveMode packageSaveMode, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<string!>!>!
15661594
static NuGet.Packaging.PackageReaderExtensions.GetSatelliteFilesAsync(this NuGet.Packaging.IAsyncPackageContentReader! packageReader, string! packageLanguage, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<string!>!>!
15671595
static NuGet.Packaging.PackagesConfig.BoolAttribute(System.Xml.Linq.XElement! node, string! name, bool defaultValue = false) -> bool
@@ -1814,7 +1842,15 @@ virtual NuGet.ContentModel.ContentPropertyDefinition.Compare(object? criteriaVal
18141842
virtual NuGet.ContentModel.ContentPropertyDefinition.IsCriteriaSatisfied(object? critieriaValue, object? candidateValue) -> bool
18151843
virtual NuGet.ContentModel.SelectionCriteriaBuilder.Add.get -> NuGet.ContentModel.SelectionCriteriaEntryBuilder!
18161844
virtual NuGet.ContentModel.SelectionCriteriaBuilder.Criteria.get -> NuGet.ContentModel.SelectionCriteria!
1845+
<<<<<<< HEAD
18171846
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
1847+
=======
1848+
<<<<<<< HEAD
1849+
~virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency>
1850+
=======
1851+
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
1852+
>>>>>>> 5a6e72242 (more packaging annotations)
1853+
>>>>>>> 333c58ec6 (more packaging annotations)
18181854
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetDevelopmentDependency() -> bool
18191855
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetId() -> string!
18201856
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetIdentity() -> NuGet.Packaging.Core.PackageIdentity!

0 commit comments

Comments
 (0)