cleanup

nkolev92 · nkolev92 · commit 066d2d0818cc · 2026-03-17T11:11:51.000-07:00
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/EmptyFrameworkFolderFile.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/EmptyFrameworkFolderFile.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
 namespace NuGet.Packaging
@@ -12,6 +13,7 @@ namespace NuGet.Packaging
     /// </summary>
     internal sealed class EmptyFrameworkFolderFile : PhysicalPackageFile
     {
+        [SetsRequiredMembers]
         public EmptyFrameworkFolderFile(string directoryPathInPackage) :
             base(() => Stream.Null)
         {
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/IPackageFile.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/IPackageFile.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#nullable disable
-
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -30,7 +28,7 @@ string Path
         /// 
         /// If it is 'tools\init.ps1', the EffectivePath will be 'init.ps1'.
         /// </example>
-        string EffectivePath
+        string? EffectivePath
         {
             get;
         }
@@ -39,15 +37,15 @@ string EffectivePath
         /// FrameworkName object representing this package file's target framework. Deprecated. Must be null on net5.0 and greater.
         /// </summary>
         [Obsolete("Use NuGetFramework instead. This property will be null for any frameworks net5.0 or above.")]
-        FrameworkName TargetFramework
+        FrameworkName? TargetFramework
         {
             get;
         }
 
         /// <summary>
         /// NuGetFramework object representing this package file's target framework. Use this instead of TargetFramework.
         /// </summary>
-        NuGetFramework NuGetFramework
+        NuGetFramework? NuGetFramework
         {
             get;
         }
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PhysicalPackageFile.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PhysicalPackageFile.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Runtime.Versioning;
@@ -12,10 +10,8 @@ namespace NuGet.Packaging
 {
     public class PhysicalPackageFile : IPackageFile
     {
-        private readonly Func<Stream> _streamFactory;
-        private string _targetPath;
-        private FrameworkName _targetFramework;
-        private NuGetFramework _nugetFramework;
+        private readonly Func<Stream>? _streamFactory;
+        private string? _targetPath;
         private DateTimeOffset _lastWriteTime;
 
         public PhysicalPackageFile()
@@ -32,61 +28,49 @@ internal PhysicalPackageFile(Func<Stream> streamFactory)
             _streamFactory = streamFactory;
         }
 
-        private readonly MemoryStream _memoryStream;
+        private readonly MemoryStream? _memoryStream;
 
         /// <summary>
         /// Path on disk
         /// </summary>
-        public string SourcePath { get; set; }
+        public string? SourcePath { get; set; }
 
         /// <summary>
         /// Path in package
         /// </summary>
-        public string TargetPath
+        public required string TargetPath
         {
             get
             {
-                return _targetPath;
+                return _targetPath!;
             }
             set
             {
                 if (string.Compare(_targetPath, value, StringComparison.OrdinalIgnoreCase) != 0)
                 {
                     _targetPath = value;
                     string effectivePath;
-                    _nugetFramework = FrameworkNameUtility.ParseNuGetFrameworkFromFilePath(_targetPath, out effectivePath);
-                    if (_nugetFramework != null && _nugetFramework.Version.Major < 5)
+                    NuGetFramework = FrameworkNameUtility.ParseNuGetFrameworkFromFilePath(_targetPath!, out effectivePath);
+                    if (NuGetFramework != null && NuGetFramework.Version.Major < 5)
                     {
-                        _targetFramework = new FrameworkName(_nugetFramework.DotNetFrameworkName);
+                        TargetFramework = new FrameworkName(NuGetFramework.DotNetFrameworkName);
                     }
                     EffectivePath = effectivePath;
                 }
             }
         }
 
-        public string Path
-        {
-            get
-            {
-                return TargetPath;
-            }
-        }
+        public string Path => TargetPath;
 
-        public string EffectivePath
+        public string? EffectivePath
         {
             get;
             private set;
         }
 
-        public FrameworkName TargetFramework
-        {
-            get { return _targetFramework; }
-        }
+        public FrameworkName? TargetFramework { get; private set; }
 
-        public NuGetFramework NuGetFramework
-        {
-            get { return _nugetFramework; }
-        }
+        public NuGetFramework? NuGetFramework { get; private set; }
 
         public Stream GetStream()
         {
@@ -103,7 +87,7 @@ public Stream GetStream()
             else
             {
                 _lastWriteTime = DateTimeOffset.UtcNow;
-                return _memoryStream;
+                return _memoryStream!;
             }
         }
 
@@ -115,12 +99,12 @@ public DateTimeOffset LastWriteTime
             }
         }
 
-        public override string ToString()
+        public override string? ToString()
         {
             return TargetPath;
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             var file = obj as PhysicalPackageFile;
 
diff --git a/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Shipped.txt
@@ -284,12 +284,12 @@ NuGet.Packaging.IPackageDownloader.SetThrottle(System.Threading.SemaphoreSlim? t
 NuGet.Packaging.IPackageDownloader.SignedPackageReader.get -> NuGet.Packaging.Signing.ISignedPackageReader!
 NuGet.Packaging.IPackageDownloader.Source.get -> string!
 NuGet.Packaging.IPackageFile
-~NuGet.Packaging.IPackageFile.EffectivePath.get -> string
-~NuGet.Packaging.IPackageFile.GetStream() -> System.IO.Stream
+NuGet.Packaging.IPackageFile.EffectivePath.get -> string?
+NuGet.Packaging.IPackageFile.GetStream() -> System.IO.Stream!
 NuGet.Packaging.IPackageFile.LastWriteTime.get -> System.DateTimeOffset
-~NuGet.Packaging.IPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework
-~NuGet.Packaging.IPackageFile.Path.get -> string
-~NuGet.Packaging.IPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName
+NuGet.Packaging.IPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework?
+NuGet.Packaging.IPackageFile.Path.get -> string!
+NuGet.Packaging.IPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName?
 NuGet.Packaging.IPackageMetadata
 ~NuGet.Packaging.IPackageMetadata.Authors.get -> System.Collections.Generic.IEnumerable<string>
 ~NuGet.Packaging.IPackageMetadata.ContentFiles.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.ManifestContentFiles>
@@ -754,18 +754,18 @@ NuGet.Packaging.PackagesConfigWriterException.PackagesConfigWriterException(stri
 NuGet.Packaging.PackagingConstants
 NuGet.Packaging.PackagingConstants.Folders
 NuGet.Packaging.PhysicalPackageFile
-~NuGet.Packaging.PhysicalPackageFile.EffectivePath.get -> string
-~NuGet.Packaging.PhysicalPackageFile.GetStream() -> System.IO.Stream
+NuGet.Packaging.PhysicalPackageFile.EffectivePath.get -> string?
+NuGet.Packaging.PhysicalPackageFile.GetStream() -> System.IO.Stream!
 NuGet.Packaging.PhysicalPackageFile.LastWriteTime.get -> System.DateTimeOffset
-~NuGet.Packaging.PhysicalPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework
-~NuGet.Packaging.PhysicalPackageFile.Path.get -> string
+NuGet.Packaging.PhysicalPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework?
+NuGet.Packaging.PhysicalPackageFile.Path.get -> string!
 NuGet.Packaging.PhysicalPackageFile.PhysicalPackageFile() -> void
-~NuGet.Packaging.PhysicalPackageFile.PhysicalPackageFile(System.IO.MemoryStream stream) -> void
-~NuGet.Packaging.PhysicalPackageFile.SourcePath.get -> string
-~NuGet.Packaging.PhysicalPackageFile.SourcePath.set -> void
-~NuGet.Packaging.PhysicalPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName
-~NuGet.Packaging.PhysicalPackageFile.TargetPath.get -> string
-~NuGet.Packaging.PhysicalPackageFile.TargetPath.set -> void
+NuGet.Packaging.PhysicalPackageFile.PhysicalPackageFile(System.IO.MemoryStream! stream) -> void
+NuGet.Packaging.PhysicalPackageFile.SourcePath.get -> string?
+NuGet.Packaging.PhysicalPackageFile.SourcePath.set -> void
+NuGet.Packaging.PhysicalPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName?
+NuGet.Packaging.PhysicalPackageFile.TargetPath.get -> string!
+NuGet.Packaging.PhysicalPackageFile.TargetPath.set -> void
 NuGet.Packaging.RepositorySignatureInfo
 NuGet.Packaging.RepositorySignatureInfo.AllRepositorySigned.get -> bool
 NuGet.Packaging.RepositorySignatureInfo.RepositoryCertificateInfos.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.IRepositoryCertificateInfo!>!
@@ -1447,9 +1447,9 @@ override NuGet.Packaging.PackageFolderReader.GetStream(string! path) -> System.I
 override NuGet.Packaging.PackageFolderReader.IsSignedAsync(System.Threading.CancellationToken token) -> System.Threading.Tasks.Task<bool>!
 override NuGet.Packaging.PackageFolderReader.ValidateIntegrityAsync(NuGet.Packaging.Signing.SignatureContent! signatureContent, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task!
 override NuGet.Packaging.PackageReference.ToString() -> string!
-~override NuGet.Packaging.PhysicalPackageFile.Equals(object obj) -> bool
+override NuGet.Packaging.PhysicalPackageFile.Equals(object? obj) -> bool
 override NuGet.Packaging.PhysicalPackageFile.GetHashCode() -> int
-~override NuGet.Packaging.PhysicalPackageFile.ToString() -> string
+override NuGet.Packaging.PhysicalPackageFile.ToString() -> string?
 ~override NuGet.Packaging.Signing.AuthorPrimarySignature.FriendlyName.get -> string
 ~override NuGet.Packaging.Signing.AuthorPrimarySignature.Verify(NuGet.Packaging.Signing.Timestamp timestamp, NuGet.Packaging.Signing.SignatureVerifySettings settings, NuGet.Common.HashAlgorithmName fingerprintAlgorithm, System.Security.Cryptography.X509Certificates.X509Certificate2Collection certificateExtraStore) -> NuGet.Packaging.Signing.SignatureVerificationSummary
 override NuGet.Packaging.Signing.AuthorSignPackageRequest.SignatureType.get -> NuGet.Packaging.Signing.SignatureType
diff --git a/src/NuGet.Core/NuGet.Packaging/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Packaging/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -284,12 +284,12 @@ NuGet.Packaging.IPackageDownloader.SetThrottle(System.Threading.SemaphoreSlim? t
 NuGet.Packaging.IPackageDownloader.SignedPackageReader.get -> NuGet.Packaging.Signing.ISignedPackageReader!
 NuGet.Packaging.IPackageDownloader.Source.get -> string!
 NuGet.Packaging.IPackageFile
-~NuGet.Packaging.IPackageFile.EffectivePath.get -> string
-~NuGet.Packaging.IPackageFile.GetStream() -> System.IO.Stream
+NuGet.Packaging.IPackageFile.EffectivePath.get -> string?
+NuGet.Packaging.IPackageFile.GetStream() -> System.IO.Stream!
 NuGet.Packaging.IPackageFile.LastWriteTime.get -> System.DateTimeOffset
-~NuGet.Packaging.IPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework
-~NuGet.Packaging.IPackageFile.Path.get -> string
-~NuGet.Packaging.IPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName
+NuGet.Packaging.IPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework?
+NuGet.Packaging.IPackageFile.Path.get -> string!
+NuGet.Packaging.IPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName?
 NuGet.Packaging.IPackageMetadata
 ~NuGet.Packaging.IPackageMetadata.Authors.get -> System.Collections.Generic.IEnumerable<string>
 ~NuGet.Packaging.IPackageMetadata.ContentFiles.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.ManifestContentFiles>
@@ -754,18 +754,18 @@ NuGet.Packaging.PackagesConfigWriterException.PackagesConfigWriterException(stri
 NuGet.Packaging.PackagingConstants
 NuGet.Packaging.PackagingConstants.Folders
 NuGet.Packaging.PhysicalPackageFile
-~NuGet.Packaging.PhysicalPackageFile.EffectivePath.get -> string
-~NuGet.Packaging.PhysicalPackageFile.GetStream() -> System.IO.Stream
+NuGet.Packaging.PhysicalPackageFile.EffectivePath.get -> string?
+NuGet.Packaging.PhysicalPackageFile.GetStream() -> System.IO.Stream!
 NuGet.Packaging.PhysicalPackageFile.LastWriteTime.get -> System.DateTimeOffset
-~NuGet.Packaging.PhysicalPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework
-~NuGet.Packaging.PhysicalPackageFile.Path.get -> string
+NuGet.Packaging.PhysicalPackageFile.NuGetFramework.get -> NuGet.Frameworks.NuGetFramework?
+NuGet.Packaging.PhysicalPackageFile.Path.get -> string!
 NuGet.Packaging.PhysicalPackageFile.PhysicalPackageFile() -> void
-~NuGet.Packaging.PhysicalPackageFile.PhysicalPackageFile(System.IO.MemoryStream stream) -> void
-~NuGet.Packaging.PhysicalPackageFile.SourcePath.get -> string
-~NuGet.Packaging.PhysicalPackageFile.SourcePath.set -> void
-~NuGet.Packaging.PhysicalPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName
-~NuGet.Packaging.PhysicalPackageFile.TargetPath.get -> string
-~NuGet.Packaging.PhysicalPackageFile.TargetPath.set -> void
+NuGet.Packaging.PhysicalPackageFile.PhysicalPackageFile(System.IO.MemoryStream! stream) -> void
+NuGet.Packaging.PhysicalPackageFile.SourcePath.get -> string?
+NuGet.Packaging.PhysicalPackageFile.SourcePath.set -> void
+NuGet.Packaging.PhysicalPackageFile.TargetFramework.get -> System.Runtime.Versioning.FrameworkName?
+NuGet.Packaging.PhysicalPackageFile.TargetPath.get -> string!
+NuGet.Packaging.PhysicalPackageFile.TargetPath.set -> void
 NuGet.Packaging.RepositorySignatureInfo
 NuGet.Packaging.RepositorySignatureInfo.AllRepositorySigned.get -> bool
 NuGet.Packaging.RepositorySignatureInfo.RepositoryCertificateInfos.get -> System.Collections.Generic.IEnumerable<NuGet.Packaging.Core.IRepositoryCertificateInfo!>!
@@ -1433,9 +1433,9 @@ override NuGet.Packaging.PackageFolderReader.GetStream(string! path) -> System.I
 override NuGet.Packaging.PackageFolderReader.IsSignedAsync(System.Threading.CancellationToken token) -> System.Threading.Tasks.Task<bool>!
 override NuGet.Packaging.PackageFolderReader.ValidateIntegrityAsync(NuGet.Packaging.Signing.SignatureContent! signatureContent, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task!
 override NuGet.Packaging.PackageReference.ToString() -> string!
-~override NuGet.Packaging.PhysicalPackageFile.Equals(object obj) -> bool
+override NuGet.Packaging.PhysicalPackageFile.Equals(object? obj) -> bool
 override NuGet.Packaging.PhysicalPackageFile.GetHashCode() -> int
-~override NuGet.Packaging.PhysicalPackageFile.ToString() -> string
+override NuGet.Packaging.PhysicalPackageFile.ToString() -> string?
 ~override NuGet.Packaging.Signing.AuthorPrimarySignature.FriendlyName.get -> string
 ~override NuGet.Packaging.Signing.AuthorPrimarySignature.Verify(NuGet.Packaging.Signing.Timestamp timestamp, NuGet.Packaging.Signing.SignatureVerifySettings settings, NuGet.Common.HashAlgorithmName fingerprintAlgorithm, System.Security.Cryptography.X509Certificates.X509Certificate2Collection certificateExtraStore) -> NuGet.Packaging.Signing.SignatureVerificationSummary
 override NuGet.Packaging.Signing.AuthorSignPackageRequest.SignatureType.get -> NuGet.Packaging.Signing.SignatureType

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
	`5`	`+using System.Diagnostics.CodeAnalysis;`
`5`	`6`	`using System.IO;`
`6`	`7`
`7`	`8`	`namespace NuGet.Packaging`
`@@ -12,6 +13,7 @@ namespace NuGet.Packaging`
`12`	`13`	`/// </summary>`
`13`	`14`	`internal sealed class EmptyFrameworkFolderFile : PhysicalPackageFile`
`14`	`15`	`{`
	`16`	`+ [SetsRequiredMembers]`
`15`	`17`	`public EmptyFrameworkFolderFile(string directoryPathInPackage) :`
`16`	`18`	`base(() => Stream.Null)`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-#nullable disable`
`5`		`-`
`6`	`4`	`using System;`
`7`	`5`	`using System.Diagnostics.CodeAnalysis;`
`8`	`6`	`using System.IO;`
`@@ -30,7 +28,7 @@ string Path`
`30`	`28`	`///`
`31`	`29`	`/// If it is 'tools\init.ps1', the EffectivePath will be 'init.ps1'.`
`32`	`30`	`/// </example>`
`33`		`- string EffectivePath`
	`31`	`+ string? EffectivePath`
`34`	`32`	`{`
`35`	`33`	`get;`
`36`	`34`	`}`
`@@ -39,15 +37,15 @@ string EffectivePath`
`39`	`37`	`/// FrameworkName object representing this package file's target framework. Deprecated. Must be null on net5.0 and greater.`
`40`	`38`	`/// </summary>`
`41`	`39`	`[Obsolete("Use NuGetFramework instead. This property will be null for any frameworks net5.0 or above.")]`
`42`		`- FrameworkName TargetFramework`
	`40`	`+ FrameworkName? TargetFramework`
`43`	`41`	`{`
`44`	`42`	`get;`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`/// <summary>`
`48`	`46`	`/// NuGetFramework object representing this package file's target framework. Use this instead of TargetFramework.`
`49`	`47`	`/// </summary>`
`50`		`- NuGetFramework NuGetFramework`
	`48`	`+ NuGetFramework? NuGetFramework`
`51`	`49`	`{`
`52`	`50`	`get;`
`53`	`51`	`}`