dependabot-nuget 0.322.2 → 0.325.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs

@@ -30,8 +30,7 @@ internal static partial class MSBuildHelper
         // Ensure MSBuild types are registered before calling a method that loads the types
         if (!IsMSBuildRegistered)
         {
-            var experimentsManager = new ExperimentsManager() { InstallDotnetSdks = false }; // `global.json` definitely needs to be moved for this operation
-            HandleGlobalJsonAsync(currentDirectory, rootDirectory, experimentsManager, () =>
+            HandleGlobalJsonAsync(currentDirectory, rootDirectory, () =>
             {
                 var defaultInstance = MSBuildLocator.QueryVisualStudioInstances().First();
                 MSBuildPath = defaultInstance.MSBuildPath;
@@ -44,19 +43,11 @@ internal static partial class MSBuildHelper
     public static async Task<T> HandleGlobalJsonAsync<T>(
         string currentDirectory,
         string rootDirectory,
-        ExperimentsManager experimentsManager,
         Func<Task<T>> action,
         ILogger logger,
         bool retainMSBuildSdks = false
     )
     {
-        if (experimentsManager.InstallDotnetSdks)
-        {
-            logger.Info($"{nameof(ExperimentsManager.InstallDotnetSdks)} == true; retaining `global.json` contents.");
-            var result = await action();
-            return result;
-        }
-
         var candidateDirectories = PathHelper.GetAllDirectoriesToRoot(currentDirectory, rootDirectory);
         var globalJsonPaths = candidateDirectories.Select(d => Path.Combine(d, "global.json")).Where(File.Exists).Select(p => (p, p + Guid.NewGuid().ToString())).ToArray();
         foreach (var (globalJsonPath, tempGlobalJsonPath) in globalJsonPaths)
@@ -96,15 +87,15 @@ internal static partial class MSBuildHelper
         }
     }
 
-    internal static async Task<ImmutableArray<Dependency>?> ResolveDependencyConflicts(string repoRoot, string projectPath, string targetFramework, ImmutableArray<Dependency> packages, ImmutableArray<Dependency> update, ExperimentsManager experimentsManager, ILogger logger)
+    internal static async Task<ImmutableArray<Dependency>?> ResolveDependencyConflicts(string repoRoot, string projectPath, string targetFramework, ImmutableArray<Dependency> packages, ImmutableArray<Dependency> update, ILogger logger)
     {
         var tempDirectory = Directory.CreateTempSubdirectory("package-dependency-coherence_");
         PackageManager packageManager = new PackageManager(repoRoot, projectPath);
 
         try
         {
-            string tempProjectPath = await CreateTempProjectAsync(tempDirectory, repoRoot, projectPath, targetFramework, packages, experimentsManager, logger);
-            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["restore", tempProjectPath], tempDirectory.FullName, experimentsManager);
+            string tempProjectPath = await CreateTempProjectAsync(tempDirectory, repoRoot, projectPath, targetFramework, packages, logger);
+            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["restore", tempProjectPath], tempDirectory.FullName);
 
             // Add Dependency[] packages to List<PackageToUpdate> existingPackages
             List<PackageToUpdate> existingPackages = packages
@@ -287,11 +278,10 @@ internal static partial class MSBuildHelper
         string projectPath,
         string targetFramework,
         IReadOnlyCollection<Dependency> packages,
-        ExperimentsManager experimentsManager,
         ILogger logger,
         bool usePackageDownload = false,
         bool importDependencyTargets = true
-    ) => CreateTempProjectAsync(tempDir, repoRoot, projectPath, new XElement("TargetFramework", targetFramework), packages, experimentsManager, logger, usePackageDownload, importDependencyTargets);
+    ) => CreateTempProjectAsync(tempDir, repoRoot, projectPath, new XElement("TargetFramework", targetFramework), packages, logger, usePackageDownload, importDependencyTargets);
 
     internal static Task<string> CreateTempProjectAsync(
         DirectoryInfo tempDir,
@@ -299,11 +289,10 @@ internal static partial class MSBuildHelper
         string projectPath,
         ImmutableArray<string> targetFrameworks,
         IReadOnlyCollection<Dependency> packages,
-        ExperimentsManager experimentsManager,
         ILogger logger,
         bool usePackageDownload = false,
         bool importDependencyTargets = true
-    ) => CreateTempProjectAsync(tempDir, repoRoot, projectPath, new XElement("TargetFrameworks", string.Join(";", targetFrameworks)), packages, experimentsManager, logger, usePackageDownload, importDependencyTargets);
+    ) => CreateTempProjectAsync(tempDir, repoRoot, projectPath, new XElement("TargetFrameworks", string.Join(";", targetFrameworks)), packages, logger, usePackageDownload, importDependencyTargets);
 
     private static async Task<string> CreateTempProjectAsync(
         DirectoryInfo tempDir,
@@ -311,7 +300,6 @@ internal static partial class MSBuildHelper
         string projectPath,
         XElement targetFrameworkElement,
         IReadOnlyCollection<Dependency> packages,
-        ExperimentsManager experimentsManager,
         ILogger logger,
         bool usePackageDownload,
         bool importDependencyTargets)
@@ -319,13 +307,10 @@ internal static partial class MSBuildHelper
         var projectDirectory = Path.GetDirectoryName(projectPath);
         projectDirectory ??= repoRoot;
 
-        if (experimentsManager.InstallDotnetSdks)
+        var globalJsonPath = PathHelper.GetFileInDirectoryOrParent(projectPath, repoRoot, "global.json", caseSensitive: true);
+        if (globalJsonPath is not null)
         {
-            var globalJsonPath = PathHelper.GetFileInDirectoryOrParent(projectPath, repoRoot, "global.json", caseSensitive: true);
-            if (globalJsonPath is not null)
-            {
-                File.Copy(globalJsonPath, Path.Combine(tempDir.FullName, "global.json"));
-            }
+            File.Copy(globalJsonPath, Path.Combine(tempDir.FullName, "global.json"));
         }
 
         var nugetConfigPath = PathHelper.GetFileInDirectoryOrParent(projectPath, repoRoot, "NuGet.Config", caseSensitive: false);
@@ -417,10 +402,10 @@ internal static partial class MSBuildHelper
         return tempProjectPath;
     }
 
-    internal static async Task<ImmutableArray<string>> GetTargetFrameworkValuesFromProject(string repoRoot, string projectPath, ExperimentsManager experimentsManager, ILogger logger)
+    internal static async Task<ImmutableArray<string>> GetTargetFrameworkValuesFromProject(string repoRoot, string projectPath, ILogger logger)
     {
         var projectDirectory = Path.GetDirectoryName(projectPath)!;
-        var (exitCode, stdOut, stdErr) = await HandleGlobalJsonAsync(projectDirectory, repoRoot, experimentsManager, async () =>
+        var (exitCode, stdOut, stdErr) = await HandleGlobalJsonAsync(projectDirectory, repoRoot, async () =>
         {
             var targetsHelperPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "TargetFrameworkReporter.targets");
             var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(
@@ -431,8 +416,7 @@ internal static partial class MSBuildHelper
                     $"/p:CustomAfterMicrosoftCommonCrossTargetingTargets={targetsHelperPath}",
                     $"/p:CustomAfterMicrosoftCommonTargets={targetsHelperPath}",
                 ],
-                projectDirectory,
-                experimentsManager
+                projectDirectory
             );
             return (exitCode, stdOut, stdErr);
         }, logger);
@@ -500,7 +484,6 @@ internal static partial class MSBuildHelper
         string projectPath,
         string targetFramework,
         IReadOnlyCollection<Dependency> packages,
-        ExperimentsManager experimentsManager,
         ILogger logger
     )
     {
@@ -508,9 +491,9 @@ internal static partial class MSBuildHelper
         try
         {
             var topLevelPackagesNames = packages.Select(p => p.Name).ToHashSet(StringComparer.OrdinalIgnoreCase);
-            var tempProjectPath = await CreateTempProjectAsync(tempDirectory, repoRoot, projectPath, targetFramework, packages, experimentsManager, logger, importDependencyTargets: false);
+            var tempProjectPath = await CreateTempProjectAsync(tempDirectory, repoRoot, projectPath, targetFramework, packages, logger, importDependencyTargets: false);
 
-            var projectDiscovery = await SdkProjectDiscovery.DiscoverAsync(repoRoot, tempDirectory.FullName, tempProjectPath, experimentsManager, logger);
+            var projectDiscovery = await SdkProjectDiscovery.DiscoverAsync(repoRoot, tempDirectory.FullName, tempProjectPath, logger);
             var allDependencies = projectDiscovery
                 .Where(p => p.FilePath == Path.GetFileName(tempProjectPath))
                 .FirstOrDefault()

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/NuGetHelper.cs

@@ -1,16 +1,14 @@
-using System.Diagnostics.CodeAnalysis;
-
 namespace NuGetUpdater.Core;
 
 internal static class NuGetHelper
 {
-    internal static async Task<bool> DownloadNuGetPackagesAsync(string repoRoot, string projectPath, IReadOnlyCollection<Dependency> packages, ExperimentsManager experimentsManager, ILogger logger)
+    internal static async Task<bool> DownloadNuGetPackagesAsync(string repoRoot, string projectPath, IReadOnlyCollection<Dependency> packages, ILogger logger)
     {
         var tempDirectory = Directory.CreateTempSubdirectory("msbuild_sdk_restore_");
         try
         {
-            var tempProjectPath = await MSBuildHelper.CreateTempProjectAsync(tempDirectory, repoRoot, projectPath, "netstandard2.0", packages, experimentsManager, logger, usePackageDownload: true);
-            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["restore", tempProjectPath], tempDirectory.FullName, experimentsManager);
+            var tempProjectPath = await MSBuildHelper.CreateTempProjectAsync(tempDirectory, repoRoot, projectPath, "netstandard2.0", packages, logger, usePackageDownload: true);
+            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["restore", tempProjectPath], tempDirectory.FullName);
 
             return exitCode == 0;
         }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ProcessExtensions.cs

@@ -8,21 +8,20 @@ public static class ProcessEx
     /// <summary>
     /// Run the `dotnet` command with the given values.  This will exclude all `MSBuild*` environment variables from the execution.
     /// </summary>
-    public static Task<(int ExitCode, string Output, string Error)> RunDotnetWithoutMSBuildEnvironmentVariablesAsync(IEnumerable<string> arguments, string workingDirectory, ExperimentsManager experimentsManager)
+    public static Task<(int ExitCode, string Output, string Error)> RunDotnetWithoutMSBuildEnvironmentVariablesAsync(IEnumerable<string> arguments, string workingDirectory)
     {
-        var environmentVariablesToUnset = new List<string>();
-        if (experimentsManager.InstallDotnetSdks)
+        // When using the SDK specified by a `global.json` file, these environment variables need to be unset to
+        // allow the new process to discover the correct MSBuild binaries to load, and not load the ones that
+        // this process is using.
+        var environmentVariablesToUnset = new List<string>
         {
-            // If using the SDK specified by a `global.json` file, these environment variables need to be unset to
-            // allow the new process to discover the correct MSBuild binaries to load, and not load the ones that
-            // this process is using.
-            environmentVariablesToUnset.Add("MSBuildExtensionsPath");
-            environmentVariablesToUnset.Add("MSBuildLoadMicrosoftTargetsReadOnly");
-            environmentVariablesToUnset.Add("MSBUILDLOGIMPORTS");
-            environmentVariablesToUnset.Add("MSBuildSDKsPath");
-            environmentVariablesToUnset.Add("MSBUILDTARGETOUTPUTLOGGING");
-            environmentVariablesToUnset.Add("MSBUILD_EXE_PATH");
-        }
+            "MSBuildExtensionsPath",
+            "MSBuildLoadMicrosoftTargetsReadOnly",
+            "MSBUILDLOGIMPORTS",
+            "MSBuildSDKsPath",
+            "MSBUILDTARGETOUTPUTLOGGING",
+            "MSBUILD_EXE_PATH"
+        };
 
         var environmentVariableOverrides = environmentVariablesToUnset.Select(name => (name, (string?)null));
         return RunAsync("dotnet",

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/XmlExtensions.cs

@@ -83,16 +83,16 @@ public static class XmlExtensions
         return CreateOpenCloseXmlElementSyntax(name, new SyntaxList<SyntaxNode>(leadingTrivia));
     }
 
-    public static XmlElementSyntax CreateOpenCloseXmlElementSyntax(string name, SyntaxList<SyntaxNode> leadingTrivia)
+    public static XmlElementSyntax CreateOpenCloseXmlElementSyntax(string name, SyntaxList<SyntaxNode> leadingTrivia, bool insertIntermediateNewline = true)
     {
-        var newlineTrivia = SyntaxFactory.WhitespaceTrivia(Environment.NewLine);
+        var newlineTrivia = SyntaxFactory.EndOfLineTrivia(Environment.NewLine);
 
         return SyntaxFactory.XmlElement(
             SyntaxFactory.XmlElementStartTag(
                 SyntaxFactory.Punctuation(SyntaxKind.LessThanToken, "<", leadingTrivia, default),
                 SyntaxFactory.XmlName(null, SyntaxFactory.XmlNameToken(name, null, null)),
                 new SyntaxList<XmlAttributeSyntax>(),
-                SyntaxFactory.Punctuation(SyntaxKind.GreaterThanToken, ">", null, newlineTrivia)),
+                SyntaxFactory.Punctuation(SyntaxKind.GreaterThanToken, ">", null, insertIntermediateNewline ? newlineTrivia : null)),
             new SyntaxList<SyntaxNode>(),
             SyntaxFactory.XmlElementEndTag(
                 SyntaxFactory.Punctuation(SyntaxKind.LessThanSlashToken, "</", leadingTrivia, default),

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/AnalyzeWorkerTests.cs

@@ -546,6 +546,8 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 _ => (404, Encoding.UTF8.GetBytes("{}")), // nothing else is found
             };
         }
+        var aspNetCoreAppRefPackage = MockNuGetPackage.WellKnownReferencePackage("Microsoft.AspNetCore.App", "net8.0");
+        var netCoreAppRefPackage = MockNuGetPackage.WellKnownReferencePackage("Microsoft.NETCore.App", "net8.0");
         var desktopAppRefPackage = MockNuGetPackage.WellKnownReferencePackage("Microsoft.WindowsDesktop.App", "net8.0");
         (int, byte[]) TestHttpHandler2(string uriString)
         {
@@ -610,6 +612,46 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                     return (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0").GetZipStream().ReadAllBytes());
                 case "/api/v2/package/Some.Package/1.2.3":
                     return (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0").GetZipStream().ReadAllBytes());
+                case "/api/v2/FindPackagesById()?id='Microsoft.AspNetCore.App.Ref'&semVerLevel=2.0.0":
+                    return (200, Encoding.UTF8.GetBytes($"""
+                        <feed xml:base="{baseUrl}/api/v2" xmlns="http://www.w3.org/2005/Atom"
+                            xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+                            xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
+                            xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+                            <m:count>1</m:count>
+                            <id>http://schemas.datacontract.org/2004/07/</id>
+                            <title />
+                            <updated>{DateTime.UtcNow:O}</updated>
+                            <link rel="self" href="{baseUrl}/api/v2/Packages" />
+                            <entry>
+                                <id>{baseUrl}/api/v2/Packages(Id='Microsoft.AspNetCore.App.Ref',Version='{aspNetCoreAppRefPackage.Version}')</id>
+                                <content type="application/zip" src="{baseUrl}/api/v2/package/Microsoft.AspNetCore.App.Ref/{aspNetCoreAppRefPackage.Version}" />
+                                <m:properties>
+                                    <d:Version>{aspNetCoreAppRefPackage.Version}</d:Version>
+                                </m:properties>
+                            </entry>
+                        </feed>
+                        """));
+                case "/api/v2/FindPackagesById()?id='Microsoft.NETCore.App.Ref'&semVerLevel=2.0.0":
+                    return (200, Encoding.UTF8.GetBytes($"""
+                        <feed xml:base="{baseUrl}/api/v2" xmlns="http://www.w3.org/2005/Atom"
+                            xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+                            xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
+                            xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+                            <m:count>1</m:count>
+                            <id>http://schemas.datacontract.org/2004/07/</id>
+                            <title />
+                            <updated>{DateTime.UtcNow:O}</updated>
+                            <link rel="self" href="{baseUrl}/api/v2/Packages" />
+                            <entry>
+                                <id>{baseUrl}/api/v2/Packages(Id='Microsoft.NETCore.App.Ref',Version='{netCoreAppRefPackage.Version}')</id>
+                                <content type="application/zip" src="{baseUrl}/api/v2/package/Microsoft.NETCore.App.Ref/{netCoreAppRefPackage.Version}" />
+                                <m:properties>
+                                    <d:Version>{netCoreAppRefPackage.Version}</d:Version>
+                                </m:properties>
+                            </entry>
+                        </feed>
+                        """));
                 case "/api/v2/FindPackagesById()?id='Microsoft.WindowsDesktop.App.Ref'&semVerLevel=2.0.0":
                     return (200, Encoding.UTF8.GetBytes($"""
                         <feed xml:base="{baseUrl}/api/v2" xmlns="http://www.w3.org/2005/Atom"
@@ -631,7 +673,15 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                         </feed>
                         """));
                 default:
-                    if (uri.PathAndQuery == $"/api/v2/package/Microsoft.WindowsDesktop.App.Ref/{desktopAppRefPackage.Version}")
+                    if (uri.PathAndQuery == $"/api/v2/package/Microsoft.AspNetCore.App.Ref/{aspNetCoreAppRefPackage.Version}")
+                    {
+                        return (200, aspNetCoreAppRefPackage.GetZipStream().ReadAllBytes());
+                    }
+                    else if (uri.PathAndQuery == $"/api/v2/package/Microsoft.NETCore.App.Ref/{netCoreAppRefPackage.Version}")
+                    {
+                        return (200, netCoreAppRefPackage.GetZipStream().ReadAllBytes());
+                    }
+                    else if (uri.PathAndQuery == $"/api/v2/package/Microsoft.WindowsDesktop.App.Ref/{desktopAppRefPackage.Version}")
                     {
                         return (200, desktopAppRefPackage.GetZipStream().ReadAllBytes());
                     }
@@ -727,6 +777,8 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 _ => (404, Encoding.UTF8.GetBytes("{}")), // nothing else is found
             };
         }
+        var aspNetCoreAppRefPackage = MockNuGetPackage.WellKnownReferencePackage("Microsoft.AspNetCore.App", "net8.0");
+        var netCoreAppRefPackage = MockNuGetPackage.WellKnownReferencePackage("Microsoft.NETCore.App", "net8.0");
         var desktopAppRefPackage = MockNuGetPackage.WellKnownReferencePackage("Microsoft.WindowsDesktop.App", "net8.0");
         (int, byte[]) TestHttpHandler2(string uriString)
         {
@@ -790,6 +842,22 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                             ]
                         }
                         """));
+                case "/download/microsoft.aspnetcore.app.ref/index.json":
+                    return (200, Encoding.UTF8.GetBytes($$"""
+                        {
+                            "versions": [
+                                "{{aspNetCoreAppRefPackage.Version}}"
+                            ]
+                        }
+                        """));
+                case "/download/microsoft.netcore.app.ref/index.json":
+                    return (200, Encoding.UTF8.GetBytes($$"""
+                        {
+                            "versions": [
+                                "{{netCoreAppRefPackage.Version}}"
+                            ]
+                        }
+                        """));
                 case "/download/microsoft.windowsdesktop.app.ref/index.json":
                     return (200, Encoding.UTF8.GetBytes($$"""
                         {
@@ -803,7 +871,15 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 case "/download/some.package/1.2.3/some.package.1.2.3.nupkg":
                     return (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0").GetZipStream().ReadAllBytes());
                 default:
-                    if (uri.PathAndQuery == $"/download/microsoft.windowsdesktop.app.ref/{desktopAppRefPackage.Version}/microsoft.windowsdesktop.app.ref.{desktopAppRefPackage.Version}.nupkg")
+                    if (uri.PathAndQuery == $"/download/microsoft.aspnetcore.app.ref/{aspNetCoreAppRefPackage.Version}/microsoft.aspnetcore.app.ref.{aspNetCoreAppRefPackage.Version}.nupkg")
+                    {
+                        return (200, aspNetCoreAppRefPackage.GetZipStream().ReadAllBytes());
+                    }
+                    else if (uri.PathAndQuery == $"/download/microsoft.netcore.app.ref/{netCoreAppRefPackage.Version}/microsoft.netcore.app.ref.{netCoreAppRefPackage.Version}.nupkg")
+                    {
+                        return (200, netCoreAppRefPackage.GetZipStream().ReadAllBytes());
+                    }
+                    else if (uri.PathAndQuery == $"/download/microsoft.windowsdesktop.app.ref/{desktopAppRefPackage.Version}/microsoft.windowsdesktop.app.ref.{desktopAppRefPackage.Version}.nupkg")
                     {
                         return (200, desktopAppRefPackage.GetZipStream().ReadAllBytes());
                     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/VersionFinderTests.cs

@@ -1,6 +1,8 @@
 using System.Collections.Immutable;
+using System.Text;
 using System.Text.Json;
 
+using NuGet;
 using NuGet.Frameworks;
 using NuGet.Versioning;
 
@@ -218,7 +220,7 @@ public class VersionFinderTests : TestBase
         var currentVersion = NuGetVersion.Parse("1.0.0");
         var logger = new TestLogger();
         var nugetContext = new NuGetContext(tempDir.DirectoryPath);
-        var versionResult = await VersionFinder.GetVersionsAsync(projectTfms, packageId, currentVersion, nugetContext, logger, CancellationToken.None);
+        var versionResult = await VersionFinder.GetVersionsByNameAsync(projectTfms, packageId, currentVersion, nugetContext, logger, CancellationToken.None);
         var versions = versionResult.GetVersions();
 
         // assert
@@ -286,7 +288,7 @@ public class VersionFinderTests : TestBase
         var nugetContext = new NuGetContext(tempDir.DirectoryPath);
         var exception = await Assert.ThrowsAsync<BadResponseException>(async () =>
         {
-            await VersionFinder.GetVersionsAsync([tfm], dependencyInfo, nugetContext, logger, CancellationToken.None);
+            await VersionFinder.GetVersionsAsync([tfm], dependencyInfo, DateTimeOffset.UtcNow, nugetContext, logger, CancellationToken.None);
         });
         var error = JobErrorBase.ErrorFromException(exception, "TEST-JOB-ID", tempDir.DirectoryPath);
 
@@ -328,11 +330,132 @@ public class VersionFinderTests : TestBase
         var nugetContext = new NuGetContext(tempDir.DirectoryPath);
 
         // act
-        var versionResult = await VersionFinder.GetVersionsAsync([tfm], dependencyInfo, nugetContext, logger, CancellationToken.None);
+        var versionResult = await VersionFinder.GetVersionsAsync([tfm], dependencyInfo, DateTimeOffset.UtcNow, nugetContext, logger, CancellationToken.None);
         var versions = versionResult.GetVersions();
 
         // assert
         var actualVersions = versions.Select(v => v.ToString()).OrderBy(v => v).ToArray();
         AssertEx.Equal(expectedVersions, actualVersions);
     }
+
+    [Fact]
+    public async Task CooldownValuesAreHonored()
+    {
+        // updating from version 1.0.0 only to 1.2.0 because the cooldown settings prohibit major updates
+
+        // arrange
+        var tfm = "net8.0";
+        var packageVersionsAndDates = new[]
+        {
+            // major = month, minor = day, patch = hour
+            ("1.1.0", "\"2025-01-01T00:00:00.00+00:00\""),
+            ("1.1.1", "\"2025-01-01T01:00:00.00+00:00\""),
+            ("1.2.0", "\"2025-01-02T00:00:00.00+00:00\""),
+            ("1.3.0", "null"),
+            ("2.1.0", "\"2025-02-01T00:00:00.00+00:00\""),
+        };
+        var cooldown = new Cooldown()
+        {
+            DefaultDays = 1,
+            SemVerMajorDays = 10,
+            SemVerMinorDays = 1,
+            SemVerPatchDays = 1,
+            Include = ["Some.Package"],
+        };
+        // can only update a major version if 10 days have passed since the publish date, but it's currently only 7 days after the publish date
+        var currentTime = DateTimeOffset.Parse(packageVersionsAndDates.Last().Item2.Trim('"')).AddDays(7);
+        using var http = TestHttpServer.CreateTestServer(url =>
+        {
+            var uri = new Uri(url, UriKind.Absolute);
+            var baseUrl = $"{uri.Scheme}://{uri.Host}:{uri.Port}";
+            return uri.PathAndQuery switch
+            {
+                "/index.json" => (200, Encoding.UTF8.GetBytes($$"""
+                    {
+                        "version": "3.0.0",
+                        "resources": [
+                            {
+                                "@id": "{{baseUrl}}/base",
+                                "@type": "PackageBaseAddress/3.0.0"
+                            },
+                            {
+                                "@id": "{{baseUrl}}/query",
+                                "@type": "SearchQueryService"
+                            },
+                            {
+                                "@id": "{{baseUrl}}/registrations",
+                                "@type": "RegistrationsBaseUrl/3.6.0"
+                            }
+                        ]
+                    }
+                    """)),
+                "/base/some.package/index.json" => (200, Encoding.UTF8.GetBytes($$"""
+                    {
+                      "versions": [{{string.Join(", ", packageVersionsAndDates.Select(d => $"\"{d.Item1}\""))}}]
+                    }
+                    """)),
+                "/base/some.package/1.1.0/some.package.1.1.0.nupkg" => (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.1.0", tfm).GetZipStream().ReadAllBytes()),
+                "/base/some.package/1.1.1/some.package.1.1.1.nupkg" => (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.1.1", tfm).GetZipStream().ReadAllBytes()),
+                "/base/some.package/1.2.0/some.package.1.2.0.nupkg" => (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.0", tfm).GetZipStream().ReadAllBytes()),
+                "/base/some.package/1.3.0/some.package.1.3.0.nupkg" => (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.3.0", tfm).GetZipStream().ReadAllBytes()),
+                "/base/some.package/2.1.0/some.package.2.1.0.nupkg" => (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "2.1.0", tfm).GetZipStream().ReadAllBytes()),
+                "/registrations/some.package/index.json" => (200, Encoding.UTF8.GetBytes($$"""
+                    {
+                      "count": 1,
+                      "items": [
+                        {
+                          "count": {{packageVersionsAndDates.Length}},
+                          "lower": "{{packageVersionsAndDates.First().Item1}}",
+                          "upper": "{{packageVersionsAndDates.Last().Item1}}",
+                          "items": [
+                            {{string.Join(", ", packageVersionsAndDates.Select(d => $$"""
+                                {
+                                  "catalogEntry": {
+                                    "id": "Some.Package",
+                                    "version": "{{d.Item1}}",
+                                    "published": {{d.Item2}}
+                                  }
+                                }
+                                """))}}
+                          ]
+                        }
+                      ]
+                    }
+                    """)),
+                _ => (404, Encoding.UTF8.GetBytes("{}"))
+            };
+        });
+        var feedUrl = $"{http.BaseUrl.TrimEnd('/')}/index.json";
+        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
+            ("NuGet.Config", $"""
+                <configuration>
+                  <packageSources>
+                    <clear />
+                    <add key="private_feed" value="{feedUrl}" allowInsecureConnections="true" />
+                  </packageSources>
+                </configuration>
+                """)
+        );
+
+        // act
+        var currentVersion = NuGetVersion.Parse("1.0.0");
+        var dependencyInfo = new DependencyInfo()
+        {
+            Name = "Some.Package",
+            Version = currentVersion.ToString(),
+            IsVulnerable = false,
+            Cooldown = cooldown,
+        };
+        var logger = new TestLogger();
+        var nugetContext = new NuGetContext(tempDir.DirectoryPath);
+        var versionResult = await VersionFinder.GetVersionsAsync([NuGetFramework.Parse(tfm)], dependencyInfo, currentVersion, currentTime, nugetContext, logger, CancellationToken.None);
+        var versions = versionResult.GetVersions();
+
+        // assert
+        // including 1.3.0 because the publish date was null
+        // not including 2.1.0 because the major update isn't allowed yet
+        var expected = new[] { "1.1.0", "1.1.1", "1.2.0", "1.3.0" };
+        var actual = versions.Select(v => v.ToString()).ToArray();
+        AssertEx.Equal(expected, actual);
+    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Clone/CloneWorkerTests.cs

@@ -50,6 +50,20 @@ public class CloneWorkerTests
         );
     }
 
+    [Fact]
+    public void GheOnPremCloneCommandsAreGenerated()
+    {
+        TestCommands(
+            provider: "github",
+            hostname: "ghe-onprem-url.example.com",
+            repoMoniker: "OwnerName/RepoName",
+            expectedCommands:
+            [
+                (["clone", "--no-tags", "--depth", "1", "--recurse-submodules", "--shallow-submodules", "https://ghe-onprem-url.example.com/OwnerName/RepoName", TestRepoPath], null)
+            ]
+        );
+    }
+
     [Fact]
     public void CloneCommandsAreGeneratedWhenBranchIsSpecified()
     {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/DependencySolver/MSBuildDependencySolverTests.cs

@@ -614,9 +614,8 @@ public class MSBuildDependencySolverTests : TestBase
         await Update.UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, tempDir.DirectoryPath);
         var repoContentsPath = new DirectoryInfo(tempDir.DirectoryPath);
         var projectPath = new FileInfo(Path.Combine(repoContentsPath.FullName, projectName));
-        var experimentsManager = new ExperimentsManager();
         var logger = new TestLogger();
-        var msbuildDepSolver = new MSBuildDependencySolver(repoContentsPath, projectPath, experimentsManager, logger);
+        var msbuildDepSolver = new MSBuildDependencySolver(repoContentsPath, projectPath, logger);
 
         // act
         var resolvedDependencies = await msbuildDepSolver.SolveAsync(

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs

@@ -41,7 +41,7 @@ public class DiscoveryWorkerTestBase : TestBase
         Assert.Equal(expectedResult.Path.NormalizePathToUnix(), actualResult.Path.NormalizePathToUnix());
         ValidateResultWithDependencies(expectedResult.GlobalJson, actualResult.GlobalJson);
         ValidateResultWithDependencies(expectedResult.DotNetToolsJson, actualResult.DotNetToolsJson);
-        ValidateProjectResults(expectedResult.Projects, actualResult.Projects, experimentsManager);
+        ValidateProjectResults(expectedResult.Projects, actualResult.Projects);
         Assert.Equal(expectedResult.ExpectedProjectCount ?? expectedResult.Projects.Length, actualResult.Projects.Length);
         ValidateDiscoveryOperationResult(expectedResult, actualResult);
 
@@ -81,7 +81,7 @@ public class DiscoveryWorkerTestBase : TestBase
         }
     }
 
-    internal static void ValidateProjectResults(ImmutableArray<ExpectedSdkProjectDiscoveryResult> expectedProjects, ImmutableArray<ProjectDiscoveryResult> actualProjects, ExperimentsManager experimentsManager)
+    internal static void ValidateProjectResults(ImmutableArray<ExpectedSdkProjectDiscoveryResult> expectedProjects, ImmutableArray<ProjectDiscoveryResult> actualProjects)
     {
         if (expectedProjects.IsDefaultOrEmpty)
         {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs

@@ -55,7 +55,7 @@ public partial class DiscoveryWorkerTests
                             Properties = [
                                 new("TargetFrameworks", "net7.0;net8.0", "myproj.csproj"),
                             ],
-                            TargetFrameworks = ["net7.0"], // net8.0 has no packages and is not reported
+                            TargetFrameworks = ["net7.0", "net8.0"],
                             ReferencedProjectPaths = [],
                             ImportedFiles = [
                                 "Directory.Build.props",
@@ -786,7 +786,6 @@ public partial class DiscoveryWorkerTests
             // `@(References)` item group in the `_HandlePackageFileConflicts` target.  Since we don't want to involve
             // the real SDK, we fake some required targets.
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true },
                 packages: [],
                 workspacePath: "",
                 files:

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.cs

@@ -548,10 +548,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                     """),
                 ("global.json", """
                     {
-                      "sdk": {
-                        "version": "6.0.405",
-                        "rollForward": "latestPatch"
-                      },
                       "msbuild-sdks": {
                         "My.Custom.Sdk": "5.0.0",
                         "My.Other.Sdk": "1.0.0-beta"
@@ -1216,7 +1212,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         // this test mimics a package feed that doesn't have the common Microsoft.Windows.App.Ref package; common in Azure DevOps
         // Windows machines always have the package, so this test only makes sense on Linux
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true },
             includeCommonPackages: false,
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
@@ -1321,7 +1316,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     {
         await TestDiscoveryAsync(
             packages: [],
-            experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true },
             workspacePath: "",
             files: [
                 ("project.csproj", """

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/SdkProjectDiscoveryTests.cs

@@ -637,8 +637,7 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
 
         var logger = new TestLogger();
         var fullProjectPath = Path.Combine(testDirectory.DirectoryPath, projectPath);
-        var experimentsManager = new ExperimentsManager();
-        var projectDiscovery = await SdkProjectDiscovery.DiscoverAsync(testDirectory.DirectoryPath, Path.GetDirectoryName(fullProjectPath)!, fullProjectPath, experimentsManager, logger);
-        ValidateProjectResults(expectedProjects, projectDiscovery, experimentsManager);
+        var projectDiscovery = await SdkProjectDiscovery.DiscoverAsync(testDirectory.DirectoryPath, Path.GetDirectoryName(fullProjectPath)!, fullProjectPath, logger);
+        ValidateProjectResults(expectedProjects, projectDiscovery);
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/MockNuGetPackage.cs

@@ -318,8 +318,7 @@ namespace NuGetUpdater.Core.Test
                     </Project>
                     """
                 );
-                var experimentsManager = new ExperimentsManager();
-                var (exitCode, stdout, stderr) = ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["msbuild", projectPath, "/t:_ReportCurrentSdkVersion"], projectDir.FullName, experimentsManager).Result;
+                var (exitCode, stdout, stderr) = ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["msbuild", projectPath, "/t:_ReportCurrentSdkVersion"], projectDir.FullName).Result;
                 if (exitCode != 0)
                 {
                     throw new Exception($"Failed to report the current SDK version:\n{stdout}\n{stderr}");