Skip to content

Commit c6848fd

Browse files
nkolev92nkolev92
committed
cleanup
1 parent 6f6c736 commit c6848fd

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,7 @@ static NuGet.Packaging.MinClientVersionUtility.IsMinClientVersionCompatible(NuGe
15321532
static NuGet.Packaging.MinClientVersionUtility.IsMinClientVersionCompatible(NuGet.Versioning.NuGetVersion! packageMinClientVersion) -> bool
15331533
static NuGet.Packaging.MinClientVersionUtility.VerifyMinClientVersion(NuGet.Packaging.Core.NuspecCoreReaderBase! nuspecReader) -> void
15341534
<<<<<<< HEAD
1535+
<<<<<<< HEAD
15351536
=======
15361537
<<<<<<< HEAD
15371538
~static NuGet.Packaging.NupkgMetadataFileFormat.Read(System.IO.Stream stream, NuGet.Common.ILogger log, string path) -> NuGet.Packaging.NupkgMetadataFile
@@ -1541,15 +1542,20 @@ static NuGet.Packaging.MinClientVersionUtility.VerifyMinClientVersion(NuGet.Pack
15411542
~static NuGet.Packaging.NupkgMetadataFileFormat.Write(string filePath, NuGet.Packaging.NupkgMetadataFile hashFile) -> void
15421543
=======
15431544
>>>>>>> 333c58ec6 (more packaging annotations)
1545+
=======
1546+
>>>>>>> 33c9d54c7 (cleanup)
15441547
static NuGet.Packaging.NupkgMetadataFileFormat.Read(System.IO.Stream! stream, NuGet.Common.ILogger! log, string! path) -> NuGet.Packaging.NupkgMetadataFile!
15451548
static NuGet.Packaging.NupkgMetadataFileFormat.Read(string! filePath) -> NuGet.Packaging.NupkgMetadataFile!
15461549
static NuGet.Packaging.NupkgMetadataFileFormat.Read(string! filePath, NuGet.Common.ILogger! log) -> NuGet.Packaging.NupkgMetadataFile!
15471550
static NuGet.Packaging.NupkgMetadataFileFormat.Write(System.IO.Stream! stream, NuGet.Packaging.NupkgMetadataFile! hashFile) -> void
15481551
static NuGet.Packaging.NupkgMetadataFileFormat.Write(string! filePath, NuGet.Packaging.NupkgMetadataFile! hashFile) -> void
15491552
<<<<<<< HEAD
1553+
<<<<<<< HEAD
15501554
=======
15511555
>>>>>>> 5a6e72242 (more packaging annotations)
15521556
>>>>>>> 333c58ec6 (more packaging annotations)
1557+
=======
1558+
>>>>>>> 33c9d54c7 (cleanup)
15531559
~static NuGet.Packaging.PackageBuilder.ValidateReferenceAssemblies(System.Collections.Generic.IEnumerable<NuGet.Packaging.IPackageFile> files, System.Collections.Generic.IEnumerable<NuGet.Packaging.PackageReferenceSet> packageAssemblyReferences) -> void
15541560
static NuGet.Packaging.PackageExtraction.PackageExtractionBehavior.XmlDocFileSaveMode.get -> NuGet.Packaging.XmlDocFileSaveMode
15551561
static NuGet.Packaging.PackageExtraction.PackageExtractionBehavior.XmlDocFileSaveMode.set -> void
@@ -1572,6 +1578,7 @@ static NuGet.Packaging.PackageHelper.IsRoot(string! path) -> bool
15721578
static NuGet.Packaging.PackagePathHelper.GetInstalledPackageFilePath(NuGet.Packaging.Core.PackageIdentity! packageIdentity, NuGet.Packaging.PackagePathResolver! packagePathResolver) -> string?
15731579
static NuGet.Packaging.PackagePathHelper.GetPackageLookupPaths(NuGet.Packaging.Core.PackageIdentity! packageIdentity, NuGet.Packaging.PackagePathResolver! packagePathResolver) -> System.Collections.Generic.IEnumerable<string!>!
15741580
<<<<<<< HEAD
1581+
<<<<<<< HEAD
15751582
=======
15761583
<<<<<<< HEAD
15771584
~static NuGet.Packaging.PackageReaderBase.GetNuspecFile(System.Collections.Generic.IEnumerable<string> files) -> string
@@ -1581,15 +1588,20 @@ static NuGet.Packaging.PackagePathHelper.GetPackageLookupPaths(NuGet.Packaging.C
15811588
~static NuGet.Packaging.PackageReaderBase.ValidatePackageEntry(string normalizedDestination, string normalizedFilePath, NuGet.Packaging.Core.PackageIdentity packageIdentity) -> void
15821589
=======
15831590
>>>>>>> 333c58ec6 (more packaging annotations)
1591+
=======
1592+
>>>>>>> 33c9d54c7 (cleanup)
15841593
static NuGet.Packaging.PackageReaderBase.GetNuspecFile(System.Collections.Generic.IEnumerable<string!>! files) -> string!
15851594
static NuGet.Packaging.PackageReaderBase.IsAllowedBuildFile(string! packageId, string! path) -> bool
15861595
static NuGet.Packaging.PackageReaderBase.IsReferenceAssembly(string! path) -> bool
15871596
static NuGet.Packaging.PackageReaderBase.ValidatePackageEntries(string! normalizedDestination, System.Collections.Generic.IEnumerable<string!>! packageFiles, NuGet.Packaging.Core.PackageIdentity! packageIdentity) -> void
15881597
static NuGet.Packaging.PackageReaderBase.ValidatePackageEntry(string! normalizedDestination, string! normalizedFilePath, NuGet.Packaging.Core.PackageIdentity! packageIdentity) -> void
15891598
<<<<<<< HEAD
1599+
<<<<<<< HEAD
15901600
=======
15911601
>>>>>>> 5a6e72242 (more packaging annotations)
15921602
>>>>>>> 333c58ec6 (more packaging annotations)
1603+
=======
1604+
>>>>>>> 33c9d54c7 (cleanup)
15931605
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!>!>!
15941606
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!>!>!
15951607
static NuGet.Packaging.PackagesConfig.BoolAttribute(System.Xml.Linq.XElement! node, string! name, bool defaultValue = false) -> bool
@@ -1843,6 +1855,7 @@ virtual NuGet.ContentModel.ContentPropertyDefinition.IsCriteriaSatisfied(object?
18431855
virtual NuGet.ContentModel.SelectionCriteriaBuilder.Add.get -> NuGet.ContentModel.SelectionCriteriaEntryBuilder!
18441856
virtual NuGet.ContentModel.SelectionCriteriaBuilder.Criteria.get -> NuGet.ContentModel.SelectionCriteria!
18451857
<<<<<<< HEAD
1858+
<<<<<<< HEAD
18461859
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
18471860
=======
18481861
<<<<<<< HEAD
@@ -1851,6 +1864,9 @@ virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collec
18511864
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
18521865
>>>>>>> 5a6e72242 (more packaging annotations)
18531866
>>>>>>> 333c58ec6 (more packaging annotations)
1867+
=======
1868+
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
1869+
>>>>>>> 33c9d54c7 (cleanup)
18541870
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetDevelopmentDependency() -> bool
18551871
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetId() -> string!
18561872
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetIdentity() -> NuGet.Packaging.Core.PackageIdentity!

0 commit comments

Comments
 (0)