Skip to content

Commit 87a8622

Browse files
nkolev92nkolev92
committed
cleanup
1 parent 9a3bec4 commit 87a8622

1 file changed

Lines changed: 0 additions & 56 deletions

File tree

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

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,36 +1536,12 @@ static NuGet.Packaging.MinClientVersionUtility.GetNuGetClientVersion() -> NuGet.
15361536
static NuGet.Packaging.MinClientVersionUtility.IsMinClientVersionCompatible(NuGet.Packaging.Core.NuspecCoreReaderBase! nuspecReader) -> bool
15371537
static NuGet.Packaging.MinClientVersionUtility.IsMinClientVersionCompatible(NuGet.Versioning.NuGetVersion! packageMinClientVersion) -> bool
15381538
static NuGet.Packaging.MinClientVersionUtility.VerifyMinClientVersion(NuGet.Packaging.Core.NuspecCoreReaderBase! nuspecReader) -> void
1539-
<<<<<<< HEAD
1540-
<<<<<<< HEAD
1541-
=======
1542-
<<<<<<< HEAD
1543-
~static NuGet.Packaging.NupkgMetadataFileFormat.Read(System.IO.Stream stream, NuGet.Common.ILogger log, string path) -> NuGet.Packaging.NupkgMetadataFile
1544-
~static NuGet.Packaging.NupkgMetadataFileFormat.Read(string filePath) -> NuGet.Packaging.NupkgMetadataFile
1545-
~static NuGet.Packaging.NupkgMetadataFileFormat.Read(string filePath, NuGet.Common.ILogger log) -> NuGet.Packaging.NupkgMetadataFile
1546-
~static NuGet.Packaging.NupkgMetadataFileFormat.Write(System.IO.Stream stream, NuGet.Packaging.NupkgMetadataFile hashFile) -> void
1547-
~static NuGet.Packaging.NupkgMetadataFileFormat.Write(string filePath, NuGet.Packaging.NupkgMetadataFile hashFile) -> void
1548-
=======
1549-
>>>>>>> 333c58ec6 (more packaging annotations)
1550-
=======
1551-
>>>>>>> 33c9d54c7 (cleanup)
15521539
static NuGet.Packaging.NupkgMetadataFileFormat.Read(System.IO.Stream! stream, NuGet.Common.ILogger! log, string! path) -> NuGet.Packaging.NupkgMetadataFile!
15531540
static NuGet.Packaging.NupkgMetadataFileFormat.Read(string! filePath) -> NuGet.Packaging.NupkgMetadataFile!
15541541
static NuGet.Packaging.NupkgMetadataFileFormat.Read(string! filePath, NuGet.Common.ILogger! log) -> NuGet.Packaging.NupkgMetadataFile!
15551542
static NuGet.Packaging.NupkgMetadataFileFormat.Write(System.IO.Stream! stream, NuGet.Packaging.NupkgMetadataFile! hashFile) -> void
15561543
static NuGet.Packaging.NupkgMetadataFileFormat.Write(string! filePath, NuGet.Packaging.NupkgMetadataFile! hashFile) -> void
1557-
<<<<<<< HEAD
1558-
<<<<<<< HEAD
1559-
<<<<<<< HEAD
1560-
=======
1561-
>>>>>>> 5a6e72242 (more packaging annotations)
1562-
>>>>>>> 333c58ec6 (more packaging annotations)
1563-
=======
1564-
>>>>>>> 33c9d54c7 (cleanup)
1565-
~static NuGet.Packaging.PackageBuilder.ValidateReferenceAssemblies(System.Collections.Generic.IEnumerable<NuGet.Packaging.IPackageFile> files, System.Collections.Generic.IEnumerable<NuGet.Packaging.PackageReferenceSet> packageAssemblyReferences) -> void
1566-
=======
15671544
static NuGet.Packaging.PackageBuilder.ValidateReferenceAssemblies(System.Collections.Generic.IEnumerable<NuGet.Packaging.IPackageFile!>! files, System.Collections.Generic.IEnumerable<NuGet.Packaging.PackageReferenceSet!>! packageAssemblyReferences) -> void
1568-
>>>>>>> 24732990b (cleanup)
15691545
static NuGet.Packaging.PackageExtraction.PackageExtractionBehavior.XmlDocFileSaveMode.get -> NuGet.Packaging.XmlDocFileSaveMode
15701546
static NuGet.Packaging.PackageExtraction.PackageExtractionBehavior.XmlDocFileSaveMode.set -> void
15711547
static NuGet.Packaging.PackageExtractor.CopySatelliteFilesAsync(NuGet.Packaging.Core.PackageIdentity! packageIdentity, NuGet.Packaging.PackagePathResolver! packagePathResolver, NuGet.Packaging.PackageSaveMode packageSaveMode, NuGet.Packaging.PackageExtractionContext! packageExtractionContext, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<string!>!>!
@@ -1586,31 +1562,11 @@ static NuGet.Packaging.PackageIdValidator.IsValidPackageId(string! packageId) ->
15861562
static NuGet.Packaging.PackageIdValidator.ValidatePackageId(string! packageId) -> void
15871563
static NuGet.Packaging.PackagePathHelper.GetInstalledPackageFilePath(NuGet.Packaging.Core.PackageIdentity! packageIdentity, NuGet.Packaging.PackagePathResolver! packagePathResolver) -> string?
15881564
static NuGet.Packaging.PackagePathHelper.GetPackageLookupPaths(NuGet.Packaging.Core.PackageIdentity! packageIdentity, NuGet.Packaging.PackagePathResolver! packagePathResolver) -> System.Collections.Generic.IEnumerable<string!>!
1589-
<<<<<<< HEAD
1590-
<<<<<<< HEAD
1591-
=======
1592-
<<<<<<< HEAD
1593-
~static NuGet.Packaging.PackageReaderBase.GetNuspecFile(System.Collections.Generic.IEnumerable<string> files) -> string
1594-
~static NuGet.Packaging.PackageReaderBase.IsAllowedBuildFile(string packageId, string path) -> bool
1595-
~static NuGet.Packaging.PackageReaderBase.IsReferenceAssembly(string path) -> bool
1596-
~static NuGet.Packaging.PackageReaderBase.ValidatePackageEntries(string normalizedDestination, System.Collections.Generic.IEnumerable<string> packageFiles, NuGet.Packaging.Core.PackageIdentity packageIdentity) -> void
1597-
~static NuGet.Packaging.PackageReaderBase.ValidatePackageEntry(string normalizedDestination, string normalizedFilePath, NuGet.Packaging.Core.PackageIdentity packageIdentity) -> void
1598-
=======
1599-
>>>>>>> 333c58ec6 (more packaging annotations)
1600-
=======
1601-
>>>>>>> 33c9d54c7 (cleanup)
16021565
static NuGet.Packaging.PackageReaderBase.GetNuspecFile(System.Collections.Generic.IEnumerable<string!>! files) -> string!
16031566
static NuGet.Packaging.PackageReaderBase.IsAllowedBuildFile(string! packageId, string! path) -> bool
16041567
static NuGet.Packaging.PackageReaderBase.IsReferenceAssembly(string! path) -> bool
16051568
static NuGet.Packaging.PackageReaderBase.ValidatePackageEntries(string! normalizedDestination, System.Collections.Generic.IEnumerable<string!>! packageFiles, NuGet.Packaging.Core.PackageIdentity! packageIdentity) -> void
16061569
static NuGet.Packaging.PackageReaderBase.ValidatePackageEntry(string! normalizedDestination, string! normalizedFilePath, NuGet.Packaging.Core.PackageIdentity! packageIdentity) -> void
1607-
<<<<<<< HEAD
1608-
<<<<<<< HEAD
1609-
=======
1610-
>>>>>>> 5a6e72242 (more packaging annotations)
1611-
>>>>>>> 333c58ec6 (more packaging annotations)
1612-
=======
1613-
>>>>>>> 33c9d54c7 (cleanup)
16141570
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!>!>!
16151571
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!>!>!
16161572
static NuGet.Packaging.PackagesConfig.BoolAttribute(System.Xml.Linq.XElement! node, string! name, bool defaultValue = false) -> bool
@@ -1863,19 +1819,7 @@ virtual NuGet.ContentModel.ContentPropertyDefinition.Compare(object? criteriaVal
18631819
virtual NuGet.ContentModel.ContentPropertyDefinition.IsCriteriaSatisfied(object? critieriaValue, object? candidateValue) -> bool
18641820
virtual NuGet.ContentModel.SelectionCriteriaBuilder.Add.get -> NuGet.ContentModel.SelectionCriteriaEntryBuilder!
18651821
virtual NuGet.ContentModel.SelectionCriteriaBuilder.Criteria.get -> NuGet.ContentModel.SelectionCriteria!
1866-
<<<<<<< HEAD
1867-
<<<<<<< HEAD
18681822
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
1869-
=======
1870-
<<<<<<< HEAD
1871-
~virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency>
1872-
=======
1873-
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
1874-
>>>>>>> 5a6e72242 (more packaging annotations)
1875-
>>>>>>> 333c58ec6 (more packaging annotations)
1876-
=======
1877-
virtual NuGet.Packaging.Core.NuspecCoreReader.GetDependencies() -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.PackageDependency!>!
1878-
>>>>>>> 33c9d54c7 (cleanup)
18791823
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetDevelopmentDependency() -> bool
18801824
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetId() -> string!
18811825
virtual NuGet.Packaging.Core.NuspecCoreReaderBase.GetIdentity() -> NuGet.Packaging.Core.PackageIdentity!

0 commit comments

Comments
 (0)