cleanup

nkolev92 · nkolev92 · commit 20cc766ca4f0 · 2026-03-17T11:11:51.000-07:00
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/DependencyGraphResolver.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/DependencyGraphResolver.cs
@@ -1292,7 +1292,10 @@ .. chosenResolvedItem.Suppressions
                 // The list of suppressions should be an aggregate of all parent item's suppressions so add the parent suppressions to the list, otherwise just use the current item's suppressions
                 if (suppressions != null)
                 {
-                    suppressions.AddRange(currentDependencyGraphItem.Suppressions);
+                    if (currentDependencyGraphItem.Suppressions != null)
+                    {
+                        suppressions.AddRange(currentDependencyGraphItem.Suppressions);
+                    }
                 }
                 else
                 {
diff --git a/src/NuGet.Core/NuGet.Packaging/NuspecReader.cs b/src/NuGet.Core/NuGet.Packaging/NuspecReader.cs
@@ -482,7 +482,7 @@ public RepositoryMetadata GetRepositoryMetadata()
                             {
                                 try
                                 {
-                                    var expression = NuGetLicenseExpression.Parse(license);
+                                    var expression = NuGetLicenseExpression.Parse(license!);
 
                                     var invalidLicenseIdentifiers = GetNonStandardLicenseIdentifiers(expression);
                                     if (invalidLicenseIdentifiers != null)
@@ -502,7 +502,7 @@ public RepositoryMetadata GetRepositoryMetadata()
                                         errors.Add(string.Format(CultureInfo.CurrentCulture, Strings.NuGetLicenseExpression_UnlicensedPackageWarning));
                                     }
 
-                                    return new LicenseMetadata(type: licenseType, license: license, expression: expression, warningsAndErrors: errors, version: version);
+                                    return new LicenseMetadata(type: licenseType, license: license!, expression: expression, warningsAndErrors: errors, version: version);
                                 }
                                 catch (NuGetLicenseExpressionParsingException e)
                                 {
@@ -512,7 +512,7 @@ public RepositoryMetadata GetRepositoryMetadata()
                                     }
                                     errors.Add(e.Message);
                                 }
-                                return new LicenseMetadata(type: licenseType, license: license, expression: null, warningsAndErrors: errors, version: version);
+                                return new LicenseMetadata(type: licenseType, license: license!, expression: null, warningsAndErrors: errors, version: version);
                             }
                             else
                             {
@@ -528,11 +528,11 @@ public RepositoryMetadata GetRepositoryMetadata()
                                         version,
                                         LicenseMetadata.CurrentVersion));
 
-                                return new LicenseMetadata(type: licenseType, license: license, expression: null, warningsAndErrors: errors, version: version);
+                                return new LicenseMetadata(type: licenseType, license: license!, expression: null, warningsAndErrors: errors, version: version);
                             }
                         }
                     }
-                    return new LicenseMetadata(type: licenseType, license: license, expression: null, warningsAndErrors: errors, version: version);
+                    return new LicenseMetadata(type: licenseType, license: license!, expression: null, warningsAndErrors: errors, version: version);
                 }
             }
             return null;
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/FrameworkAssemblyReference.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/FrameworkAssemblyReference.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.Collections.Generic;
 using NuGet.Frameworks;
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/ManifestContentFiles.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/ManifestContentFiles.cs
@@ -1,20 +1,18 @@
 // 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
-
 namespace NuGet.Packaging
 {
     public class ManifestContentFiles
     {
-        public string Include { get; set; }
+        public required string Include { get; set; }
 
-        public string Exclude { get; set; }
+        public string? Exclude { get; set; }
 
-        public string BuildAction { get; set; }
+        public string? BuildAction { get; set; }
 
-        public string CopyToOutput { get; set; }
+        public string? CopyToOutput { get; set; }
 
-        public string Flatten { get; set; }
+        public string? Flatten { get; set; }
     }
 }
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/ManifestFile.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/ManifestFile.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.Collections.Generic;
 using System.Globalization;
@@ -22,40 +20,40 @@ public class ManifestFile
         internal static readonly char[] ReferenceFileInvalidCharacters = _invalidSourceCharacters.Concat(new[] { ':', '*', '?', '\\', '/' }).ToArray();
         private static readonly char[] _invalidTargetChars = ReferenceFileInvalidCharacters.Except(new[] { '\\', '/' }).ToArray();
 
-        private string _target;
-        public string Source { get; set; }
+        private string? _target;
+        public string? Source { get; set; }
 
-        public string Target
+        public string? Target
         {
             get
             {
                 return _target;
             }
             set
             {
-                _target = string.IsNullOrEmpty(value) ? value : PathUtility.GetPathWithDirectorySeparator(value);
+                _target = string.IsNullOrEmpty(value) ? value : PathUtility.GetPathWithDirectorySeparator(value!);
             }
         }
 
-        public string Exclude { get; set; }
+        public string? Exclude { get; set; }
 
         public IEnumerable<string> Validate()
         {
             if (String.IsNullOrEmpty(Source))
             {
                 yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_RequiredMetadataMissing, "Source");
             }
-            else if (Source.IndexOfAny(_invalidSourceCharacters) != -1)
+            else if (Source!.IndexOfAny(_invalidSourceCharacters) != -1)
             {
                 yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_SourceContainsInvalidCharacters, Source);
             }
 
-            if (!String.IsNullOrEmpty(Target) && Target.IndexOfAny(_invalidTargetChars) != -1)
+            if (!String.IsNullOrEmpty(Target) && Target!.IndexOfAny(_invalidTargetChars) != -1)
             {
                 yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_TargetContainsInvalidCharacters, Target);
             }
 
-            if (!String.IsNullOrEmpty(Exclude) && Exclude.IndexOfAny(_invalidSourceCharacters) != -1)
+            if (!String.IsNullOrEmpty(Exclude) && Exclude!.IndexOfAny(_invalidSourceCharacters) != -1)
             {
                 yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_ExcludeContainsInvalidCharacters, Exclude);
             }
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageReferenceSet.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageReferenceSet.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.Collections.Generic;
 using System.Globalization;
@@ -19,7 +17,7 @@ public class PackageReferenceSet
         /// </summary>
         /// <param name="references">IEnumerable set of string references</param>
         public PackageReferenceSet(IEnumerable<string> references)
-            : this((NuGetFramework)null, references)
+            : this((NuGetFramework?)null, references)
         {
         }
 
@@ -28,7 +26,7 @@ public PackageReferenceSet(IEnumerable<string> references)
         /// </summary>
         /// <param name="targetFramework">The target framework to use, pass Any for AnyFramework. Does not allow null.</param>
         /// <param name="references">IEnumerable set of string references</param>
-        public PackageReferenceSet(string targetFramework, IEnumerable<string> references)
+        public PackageReferenceSet(string? targetFramework, IEnumerable<string> references)
             : this(targetFramework != null ? NuGetFramework.Parse(targetFramework) : null, references)
         {
         }
@@ -38,7 +36,7 @@ public PackageReferenceSet(string targetFramework, IEnumerable<string> reference
         /// </summary>
         /// <param name="targetFramework">The target framework to use.</param>
         /// <param name="references">IEnumerable set of string references</param>
-        public PackageReferenceSet(NuGetFramework targetFramework, IEnumerable<string> references)
+        public PackageReferenceSet(NuGetFramework? targetFramework, IEnumerable<string> references)
         {
             if (references == null)
             {
@@ -51,7 +49,7 @@ public PackageReferenceSet(NuGetFramework targetFramework, IEnumerable<string> r
 
         public IReadOnlyCollection<string> References { get; }
 
-        public NuGetFramework TargetFramework { get; }
+        public NuGetFramework? TargetFramework { get; }
 
         public IEnumerable<string> Validate()
         {
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/CollectionExtensions.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/CollectionExtensions.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.Collections.Generic;
 
 namespace NuGet.Packaging
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/FrameworksExtensions.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/FrameworksExtensions.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#nullable disable
-
 using System;
 using System.Runtime.Versioning;
 using NuGet.Frameworks;
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/StringExtensions.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/StringExtensions.cs
@@ -1,13 +1,11 @@
 // 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
-
 namespace NuGet.Packaging
 {
     internal static class StringExtensions
     {
-        public static string SafeTrim(this string value)
+        public static string? SafeTrim(this string? value)
         {
             return value == null ? null : value.Trim();
         }
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/XElementExtensions.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/XElementExtensions.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.Collections.Generic;
 using System.Linq;
@@ -13,16 +11,16 @@ namespace NuGet.Packaging
 {
     public static class XElementExtensions
     {
-        public static string GetOptionalAttributeValue(this XElement element, string localName, string namespaceName = null)
+        public static string? GetOptionalAttributeValue(this XElement element, string localName, string? namespaceName = null)
         {
-            XAttribute attr;
+            XAttribute? attr;
             if (String.IsNullOrEmpty(namespaceName))
             {
                 attr = element.Attribute(localName);
             }
             else
             {
-                attr = element.Attribute(XName.Get(localName, namespaceName));
+                attr = element.Attribute(XName.Get(localName, namespaceName!));
             }
             return attr != null ? attr.Value : null;
         }
@@ -32,7 +30,7 @@ public static IEnumerable<XElement> ElementsNoNamespace(this XContainer containe
             return container.Elements().Where(e => e.Name.LocalName == localName);
         }
 
-        public static XElement Except(this XElement source, XElement target)
+        public static XElement Except(this XElement source, XElement? target)
         {
             if (target == null)
             {
@@ -82,7 +80,7 @@ where AttributeEquals(e, target.Attribute(e.Name))
             return source;
         }
 
-        private static XElement FindElement(XElement source, XElement targetChild)
+        private static XElement? FindElement(XElement source, XElement targetChild)
         {
             // Get all of the elements in the source that match this name
             var sourceElements = source.Elements(targetChild.Name).ToList();
@@ -132,7 +130,7 @@ private static bool HasConflict(XElement source, XElement target)
             // Loop over all the other attributes and see if there are
             foreach (var targetAttr in target.Attributes())
             {
-                string sourceValue;
+                string? sourceValue;
                 // if any of the attributes are in the source (names match) but the value doesn't match then we've found a conflict
                 if (sourceAttr.TryGetValue(targetAttr.Name, out sourceValue)
                     && sourceValue != targetAttr.Value)
@@ -143,7 +141,7 @@ private static bool HasConflict(XElement source, XElement target)
             return false;
         }
 
-        private static bool AttributeEquals(XAttribute source, XAttribute target)
+        private static bool AttributeEquals(XAttribute? source, XAttribute? target)
         {
             if (source == null
                 && target == null)
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Utility/FrameworkNameUtility.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Utility/FrameworkNameUtility.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.Linq;
@@ -14,7 +12,7 @@ namespace NuGet.Packaging
 {
     public static class FrameworkNameUtility
     {
-        public static FrameworkName ParseFrameworkNameFromFilePath(string filePath, out string effectivePath)
+        public static FrameworkName? ParseFrameworkNameFromFilePath(string filePath, out string effectivePath)
         {
             foreach (string knownFolder in PackagingConstants.Folders.Known)
             {
@@ -53,7 +51,7 @@ public static FrameworkName ParseFrameworkNameFromFilePath(string filePath, out
         /// <param name="strictParsing">if set to <see langword="true" />, parse the first folder of path even if it is unrecognized framework.</param>
         /// <param name="effectivePath">returns the path after the parsed target framework</param>
         /// <returns></returns>
-        public static FrameworkName ParseFrameworkFolderName(string path, bool strictParsing, out string effectivePath)
+        public static FrameworkName? ParseFrameworkFolderName(string path, bool strictParsing, out string effectivePath)
         {
             // The path for a reference might look like this for assembly foo.dll:
             // foo.dll
@@ -63,7 +61,7 @@ public static FrameworkName ParseFrameworkFolderName(string path, bool strictPar
             // {FrameworkName}{Version}\sub1\sub2\foo.dll
 
             // Get the target framework string if specified
-            string targetFrameworkString = Path.GetDirectoryName(path).Split(Path.DirectorySeparatorChar).First();
+            string targetFrameworkString = Path.GetDirectoryName(path)!.Split(Path.DirectorySeparatorChar).First();
 
             effectivePath = path;
 
@@ -84,7 +82,7 @@ public static FrameworkName ParseFrameworkFolderName(string path, bool strictPar
             return null;
         }
 
-        public static NuGetFramework ParseNuGetFrameworkFromFilePath(string filePath, out string effectivePath)
+        public static NuGetFramework? ParseNuGetFrameworkFromFilePath(string filePath, out string effectivePath)
         {
             foreach (string knownFolder in PackagingConstants.Folders.Known)
             {
@@ -123,7 +121,7 @@ public static NuGetFramework ParseNuGetFrameworkFromFilePath(string filePath, ou
         /// <param name="strictParsing">if set to <see langword="true" />, parse the first folder of path even if it is unrecognized framework.</param>
         /// <param name="effectivePath">returns the path after the parsed target framework</param>
         /// <returns></returns>
-        public static NuGetFramework ParseNuGetFrameworkFolderName(string path, bool strictParsing, out string effectivePath)
+        public static NuGetFramework? ParseNuGetFrameworkFolderName(string path, bool strictParsing, out string effectivePath)
         {
             // The path for a reference might look like this for assembly foo.dll:
             // foo.dll
@@ -133,7 +131,7 @@ public static NuGetFramework ParseNuGetFrameworkFolderName(string path, bool str
             // {FrameworkName}{Version}\sub1\sub2\foo.dll
 
             // Get the target framework string if specified
-            string targetFrameworkString = Path.GetDirectoryName(path).Split(Path.DirectorySeparatorChar).First();
+            string targetFrameworkString = Path.GetDirectoryName(path)!.Split(Path.DirectorySeparatorChar).First();
 
             effectivePath = path;
 
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Utility/PackageIdValidator.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Utility/PackageIdValidator.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.Globalization;
 using System.Text.RegularExpressions;
diff --git a/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Shipped.txt
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

Original file line number	Diff line number	Diff line change
`@@ -1292,7 +1292,10 @@ .. chosenResolvedItem.Suppressions`
`1292`	`1292`	`// The list of suppressions should be an aggregate of all parent item's suppressions so add the parent suppressions to the list, otherwise just use the current item's suppressions`
`1293`	`1293`	`if (suppressions != null)`
`1294`	`1294`	`{`
`1295`		`- suppressions.AddRange(currentDependencyGraphItem.Suppressions);`
	`1295`	`+ if (currentDependencyGraphItem.Suppressions != null)`
	`1296`	`+ {`
	`1297`	`+ suppressions.AddRange(currentDependencyGraphItem.Suppressions);`
	`1298`	`+ }`
`1296`	`1299`	`}`
`1297`	`1300`	`else`
`1298`	`1301`	`{`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ public RepositoryMetadata GetRepositoryMetadata()`
`482`	`482`	`{`
`483`	`483`	`try`
`484`	`484`	`{`
`485`		`- var expression = NuGetLicenseExpression.Parse(license);`
	`485`	`+ var expression = NuGetLicenseExpression.Parse(license!);`
`486`	`486`
`487`	`487`	`var invalidLicenseIdentifiers = GetNonStandardLicenseIdentifiers(expression);`
`488`	`488`	`if (invalidLicenseIdentifiers != null)`
`@@ -502,7 +502,7 @@ public RepositoryMetadata GetRepositoryMetadata()`
`502`	`502`	`errors.Add(string.Format(CultureInfo.CurrentCulture, Strings.NuGetLicenseExpression_UnlicensedPackageWarning));`
`503`	`503`	`}`
`504`	`504`
`505`		`- return new LicenseMetadata(type: licenseType, license: license, expression: expression, warningsAndErrors: errors, version: version);`
	`505`	`+ return new LicenseMetadata(type: licenseType, license: license!, expression: expression, warningsAndErrors: errors, version: version);`
`506`	`506`	`}`
`507`	`507`	`catch (NuGetLicenseExpressionParsingException e)`
`508`	`508`	`{`
`@@ -512,7 +512,7 @@ public RepositoryMetadata GetRepositoryMetadata()`
`512`	`512`	`}`
`513`	`513`	`errors.Add(e.Message);`
`514`	`514`	`}`
`515`		`- return new LicenseMetadata(type: licenseType, license: license, expression: null, warningsAndErrors: errors, version: version);`
	`515`	`+ return new LicenseMetadata(type: licenseType, license: license!, expression: null, warningsAndErrors: errors, version: version);`
`516`	`516`	`}`
`517`	`517`	`else`
`518`	`518`	`{`
`@@ -528,11 +528,11 @@ public RepositoryMetadata GetRepositoryMetadata()`
`528`	`528`	`version,`
`529`	`529`	`LicenseMetadata.CurrentVersion));`
`530`	`530`
`531`		`- return new LicenseMetadata(type: licenseType, license: license, expression: null, warningsAndErrors: errors, version: version);`
	`531`	`+ return new LicenseMetadata(type: licenseType, license: license!, expression: null, warningsAndErrors: errors, version: version);`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`	`}`
`535`		`- return new LicenseMetadata(type: licenseType, license: license, expression: null, warningsAndErrors: errors, version: version);`
	`535`	`+ return new LicenseMetadata(type: licenseType, license: license!, expression: null, warningsAndErrors: errors, version: version);`
`536`	`536`	`}`
`537`	`537`	`}`
`538`	`538`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,18 @@`
`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`	`namespace NuGet.Packaging`
`7`	`5`	`{`
`8`	`6`	`public class ManifestContentFiles`
`9`	`7`	`{`
`10`		`- public string Include { get; set; }`
	`8`	`+ public required string Include { get; set; }`
`11`	`9`
`12`		`- public string Exclude { get; set; }`
	`10`	`+ public string? Exclude { get; set; }`
`13`	`11`
`14`		`- public string BuildAction { get; set; }`
	`12`	`+ public string? BuildAction { get; set; }`
`15`	`13`
`16`		`- public string CopyToOutput { get; set; }`
	`14`	`+ public string? CopyToOutput { get; set; }`
`17`	`15`
`18`		`- public string Flatten { get; set; }`
	`16`	`+ public string? Flatten { get; set; }`
`19`	`17`	`}`
`20`	`18`	`}`
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.Collections.Generic;`
`8`	`6`	`using System.Globalization;`
`@@ -22,40 +20,40 @@ public class ManifestFile`
`22`	`20`	`internal static readonly char[] ReferenceFileInvalidCharacters = _invalidSourceCharacters.Concat(new[] { ':', '*', '?', '\\', '/' }).ToArray();`
`23`	`21`	`private static readonly char[] _invalidTargetChars = ReferenceFileInvalidCharacters.Except(new[] { '\\', '/' }).ToArray();`
`24`	`22`
`25`		`- private string _target;`
`26`		`- public string Source { get; set; }`
	`23`	`+ private string? _target;`
	`24`	`+ public string? Source { get; set; }`
`27`	`25`
`28`		`- public string Target`
	`26`	`+ public string? Target`
`29`	`27`	`{`
`30`	`28`	`get`
`31`	`29`	`{`
`32`	`30`	`return _target;`
`33`	`31`	`}`
`34`	`32`	`set`
`35`	`33`	`{`
`36`		`- _target = string.IsNullOrEmpty(value) ? value : PathUtility.GetPathWithDirectorySeparator(value);`
	`34`	`+ _target = string.IsNullOrEmpty(value) ? value : PathUtility.GetPathWithDirectorySeparator(value!);`
`37`	`35`	`}`
`38`	`36`	`}`
`39`	`37`
`40`		`- public string Exclude { get; set; }`
	`38`	`+ public string? Exclude { get; set; }`
`41`	`39`
`42`	`40`	`public IEnumerable<string> Validate()`
`43`	`41`	`{`
`44`	`42`	`if (String.IsNullOrEmpty(Source))`
`45`	`43`	`{`
`46`	`44`	`yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_RequiredMetadataMissing, "Source");`
`47`	`45`	`}`
`48`		`- else if (Source.IndexOfAny(_invalidSourceCharacters) != -1)`
	`46`	`+ else if (Source!.IndexOfAny(_invalidSourceCharacters) != -1)`
`49`	`47`	`{`
`50`	`48`	`yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_SourceContainsInvalidCharacters, Source);`
`51`	`49`	`}`
`52`	`50`
`53`		`- if (!String.IsNullOrEmpty(Target) && Target.IndexOfAny(_invalidTargetChars) != -1)`
	`51`	`+ if (!String.IsNullOrEmpty(Target) && Target!.IndexOfAny(_invalidTargetChars) != -1)`
`54`	`52`	`{`
`55`	`53`	`yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_TargetContainsInvalidCharacters, Target);`
`56`	`54`	`}`
`57`	`55`
`58`		`- if (!String.IsNullOrEmpty(Exclude) && Exclude.IndexOfAny(_invalidSourceCharacters) != -1)`
	`56`	`+ if (!String.IsNullOrEmpty(Exclude) && Exclude!.IndexOfAny(_invalidSourceCharacters) != -1)`
`59`	`57`	`{`
`60`	`58`	`yield return String.Format(CultureInfo.CurrentCulture, NuGetResources.Manifest_ExcludeContainsInvalidCharacters, Exclude);`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`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`	`namespace NuGet.Packaging`
`7`	`5`	`{`
`8`	`6`	`internal static class StringExtensions`
`9`	`7`	`{`
`10`		`- public static string SafeTrim(this string value)`
	`8`	`+ public static string? SafeTrim(this string? value)`
`11`	`9`	`{`
`12`	`10`	`return value == null ? null : value.Trim();`
`13`	`11`	`}`