NuGet.Protocol nullability v2

src/NuGet.Core/NuGet.Protocol/HttpSourceCacheContext.cs

@@ -1,16 +1,14 @@
 // 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;
 
 namespace NuGet.Protocol.Core.Types
 {
     public class HttpSourceCacheContext
     {
-        private HttpSourceCacheContext(string rootTempFolder, TimeSpan maxAge, bool directDownload, SourceCacheContext cacheContext)
+        private HttpSourceCacheContext(string? rootTempFolder, TimeSpan maxAge, bool directDownload, SourceCacheContext cacheContext)
         {
             if (maxAge <= TimeSpan.Zero)
             {
@@ -40,7 +38,7 @@ private HttpSourceCacheContext(string rootTempFolder, TimeSpan maxAge, bool dire
         /// A suggested root folder to drop temporary files under, it will get cleared by the
         /// disposal of the <see cref="SourceCacheContext"/> that was used to create this instance.
         /// </summary>
-        public string RootTempFolder { get; }
+        public string? RootTempFolder { get; }
 
         /// <summary>
         /// Inner cache context.

src/NuGet.Core/NuGet.Protocol/NullSourceCacheContext.cs

@@ -1,10 +1,8 @@
-#nullable disable
-
 namespace NuGet.Protocol.Core.Types
 {
     public class NullSourceCacheContext : SourceCacheContext
     {
-        private static SourceCacheContext _instance;
+        private static SourceCacheContext? _instance;
 
         public static SourceCacheContext Instance
         {
@@ -28,8 +26,8 @@ public override string GeneratedTempFolder
             }
         }
 
-        public override SourceCacheContext WithRefreshCacheTrue() { return _instance; }
+        public override SourceCacheContext WithRefreshCacheTrue() { return Instance; }
 
-        public override SourceCacheContext Clone() { return _instance; }
+        public override SourceCacheContext Clone() { return Instance; }
     }
 }

src/NuGet.Core/NuGet.Protocol/PackageDownloadContext.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 NuGet.Configuration;
 using NuGet.Packaging.Signing;
@@ -21,7 +19,7 @@ public PackageDownloadContext(SourceCacheContext sourceCacheContext) : this(
 
         public PackageDownloadContext(
             SourceCacheContext sourceCacheContext,
-            string directDownloadDirectory,
+            string? directDownloadDirectory,
             bool directDownload)
         {
             if (sourceCacheContext == null)
@@ -43,9 +41,9 @@ public PackageDownloadContext(
 
         public PackageDownloadContext(
             SourceCacheContext sourceCacheContext,
-            string directDownloadDirectory,
+            string? directDownloadDirectory,
             bool directDownload,
-            PackageSourceMapping packageSourceMappingConfiguration) : this(
+            PackageSourceMapping? packageSourceMappingConfiguration) : this(
             sourceCacheContext,
             directDownloadDirectory,
             directDownload)
@@ -55,11 +53,11 @@ public PackageDownloadContext(
 
         public SourceCacheContext SourceCacheContext { get; }
         public bool DirectDownload { get; }
-        public string DirectDownloadDirectory { get; }
+        public string? DirectDownloadDirectory { get; }
 
         public Guid ParentId { get; set; }
 
-        public ClientPolicyContext ClientPolicyContext { get; set; }
-        public PackageSourceMapping PackageSourceMapping { get; }
+        public ClientPolicyContext? ClientPolicyContext { get; set; }
+        public PackageSourceMapping? PackageSourceMapping { get; }
     }
 }

src/NuGet.Core/NuGet.Protocol/RemoteSourceDependencyInfo.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;
@@ -40,6 +38,11 @@ public RemoteSourceDependencyInfo(
                 throw new ArgumentNullException(nameof(dependencyGroups));
             }
 
+            if (contentUri == null)
+            {
+                throw new ArgumentNullException(nameof(contentUri));
+            }
+
             Identity = identity;
             Listed = listed;
             DependencyGroups = dependencyGroups.ToList();
@@ -66,15 +69,15 @@ public RemoteSourceDependencyInfo(
         /// </summary>
         public string ContentUri { get; set; }
 
-        public bool Equals(RemoteSourceDependencyInfo other)
+        public bool Equals(RemoteSourceDependencyInfo? other)
         {
             return other != null &&
                    Identity.Equals(other.Identity) &&
                    new HashSet<PackageDependencyGroup>(DependencyGroups).SetEquals(other.DependencyGroups) &&
                    string.Equals(ContentUri, other.ContentUri, StringComparison.Ordinal);
         }
 
-        public override bool Equals(object obj) => Equals(obj as PackageDependencyInfo);
+        public override bool Equals(object? obj) => Equals(obj as RemoteSourceDependencyInfo);
 
         public override int GetHashCode()
         {

src/NuGet.Core/NuGet.Protocol/SourceCacheContext.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;
 using System.IO;
@@ -19,7 +17,7 @@ public class SourceCacheContext : IDisposable
         /// <summary>
         /// Path of temp folder if requested by GeneratedTempFolder
         /// </summary>
-        private string _generatedTempFolder = null;
+        private string? _generatedTempFolder;
 
         /// <summary>
         /// Default amount of time to cache version lists.
@@ -121,16 +119,17 @@ public virtual string GeneratedTempFolder
         /// </summary>
         public virtual SourceCacheContext Clone()
         {
-            return new SourceCacheContext()
+            var clone = new SourceCacheContext()
             {
                 DirectDownload = DirectDownload,
                 IgnoreFailedSources = IgnoreFailedSources,
                 MaxAge = MaxAge,
                 NoCache = NoCache,
-                GeneratedTempFolder = _generatedTempFolder,
                 RefreshMemoryCache = RefreshMemoryCache,
                 SessionId = SessionId
             };
+            clone._generatedTempFolder = _generatedTempFolder;
+            return clone;
         }
 
         /// <summary>
@@ -161,7 +160,7 @@ protected virtual void Dispose(bool disposing)
             {
                 try
                 {
-                    Directory.Delete(_generatedTempFolder, recursive: true);
+                    Directory.Delete(currentTempFolder, recursive: true);
                 }
                 catch
                 {

src/NuGet.Core/NuGet.Protocol/SourcePackageDependencyInfo.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.Packaging.Core;
@@ -17,7 +15,7 @@ public SourcePackageDependencyInfo(
             NuGetVersion version,
             IEnumerable<PackageDependency> dependencies,
             bool listed,
-            SourceRepository source)
+            SourceRepository? source)
             : this(
                   new PackageIdentity(id, version),
                   dependencies,
@@ -33,9 +31,9 @@ public SourcePackageDependencyInfo(
             NuGetVersion version,
             IEnumerable<PackageDependency> dependencies,
             bool listed,
-            SourceRepository source,
-            Uri downloadUri,
-            string packageHash)
+            SourceRepository? source,
+            Uri? downloadUri,
+            string? packageHash)
             : this(
                   new PackageIdentity(id, version),
                   dependencies,
@@ -50,9 +48,9 @@ public SourcePackageDependencyInfo(
             PackageIdentity identity,
             IEnumerable<PackageDependency> dependencies,
             bool listed,
-            SourceRepository source,
-            Uri downloadUri,
-            string packageHash)
+            SourceRepository? source,
+            Uri? downloadUri,
+            string? packageHash)
             : base(identity, dependencies)
         {
             Listed = listed;
@@ -70,18 +68,18 @@ public SourcePackageDependencyInfo(
         /// <summary>
         /// Source repository the dependency information was retrieved from.
         /// </summary>
-        public SourceRepository Source { get; }
+        public SourceRepository? Source { get; }
 
         /// <summary>
         /// The HTTP, UNC, or local file URI to the package nupkg.
         /// </summary>
         /// <remarks>Optional</remarks>
-        public Uri DownloadUri { get; }
+        public Uri? DownloadUri { get; }
 
         /// <summary>
         /// Package hash
         /// </summary>
         /// <remarks>Optional</remarks>
-        public string PackageHash { get; }
+        public string? PackageHash { get; }
     }
 }

src/NuGet.Core/NuGet.Protocol/UserAgent.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.Net.Http;
 using NuGet.Packaging;

src/NuGet.Core/NuGet.Protocol/UserAgentStringBuilder.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
-
 #if NETCOREAPP
 using System;
 #endif
@@ -22,9 +20,9 @@ public class UserAgentStringBuilder
         private const string UserAgentTemplate = "{0}/{1}";
 
         private readonly string _clientName;
-        private string _vsInfo;
-        private string _osInfo;
-        private string _ciInfo;
+        private string? _vsInfo;
+        private string? _osInfo;
+        private string? _ciInfo;
 
         public UserAgentStringBuilder()
             : this(DefaultNuGetClientName)
@@ -54,7 +52,7 @@ internal UserAgentStringBuilder(string clientName, IEnvironmentVariableReader en
 
         public string NuGetClientVersion { get; }
 
-        public UserAgentStringBuilder WithVisualStudioSKU(string vsInfo)
+        public UserAgentStringBuilder WithVisualStudioSKU(string? vsInfo)
         {
             _vsInfo = vsInfo;
             return this;