dependabot-nuget 0.321.3 → 0.322.1

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Update.cs

@@ -13,111 +13,6 @@ public partial class EntryPointTests
 {
     public class Update : UpdateWorkerTestBase
     {
-        [Fact]
-        public async Task WithSolution()
-        {
-            await Run(path =>
-                [
-                    "update",
-                    "--job-id",
-                    "TEST-JOB-ID",
-                    "--job-path",
-                    Path.Combine(path, "job.json"),
-                    "--repo-root",
-                    path,
-                    "--solution-or-project",
-                    Path.Combine(path, "path/to/solution.sln"),
-                    "--dependency",
-                    "Some.package",
-                    "--new-version",
-                    "13.0.1",
-                    "--previous-version",
-                    "7.0.1",
-                ],
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
-                    MockNuGetPackage.CreateSimplePackage("Some.Package", "13.0.1", "net45"),
-                ],
-                initialFiles:
-                [
-                    ("path/to/solution.sln", """
-                        Microsoft Visual Studio Solution File, Format Version 12.00
-                        # Visual Studio 14
-                        VisualStudioVersion = 14.0.22705.0
-                        MinimumVisualStudioVersion = 10.0.40219.1
-                        Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "my", "my.csproj", "{782E0C0A-10D3-444D-9640-263D03D2B20C}"
-                        EndProject
-                        Global
-                            GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                            Debug|Any CPU = Debug|Any CPU
-                            Release|Any CPU = Release|Any CPU
-                            EndGlobalSection
-                            GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                            {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                            {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                            {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                            {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.Build.0 = Release|Any CPU
-                            EndGlobalSection
-                            GlobalSection(SolutionProperties) = preSolution
-                            HideSolutionNode = FALSE
-                            EndGlobalSection
-                        EndGlobal
-                        """),
-                    ("path/to/my.csproj", """
-                        <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                          <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-                          <PropertyGroup>
-                            <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <None Include="packages.config" />
-                          </ItemGroup>
-                          <ItemGroup>
-                            <Reference Include="Some.Package">
-                              <HintPath>packages\Some.Package.7.0.1\lib\net45\Some.Package.dll</HintPath>
-                              <Private>True</Private>
-                            </Reference>
-                          </ItemGroup>
-                          <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-                        </Project>
-                        """),
-                    ("path/to/packages.config", """
-                        <packages>
-                          <package id="Some.Package" version="7.0.1" targetFramework="net45" />
-                        </packages>
-                        """)
-                      ],
-                expectedFiles:
-                [
-                    ("path/to/my.csproj", """
-                        <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                          <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-                          <PropertyGroup>
-                            <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <None Include="packages.config" />
-                          </ItemGroup>
-                          <ItemGroup>
-                            <Reference Include="Some.Package">
-                              <HintPath>packages\Some.Package.13.0.1\lib\net45\Some.Package.dll</HintPath>
-                              <Private>True</Private>
-                            </Reference>
-                          </ItemGroup>
-                          <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-                        </Project>
-                        """),
-                    ("path/to/packages.config", """
-                        <?xml version="1.0" encoding="utf-8"?>
-                        <packages>
-                          <package id="Some.Package" version="13.0.1" targetFramework="net45" />
-                        </packages>
-                        """)
-                ]
-            );
-        }
-
         [Fact]
         public async Task WithProject()
         {
@@ -200,127 +95,6 @@ public partial class EntryPointTests
             );
         }
 
-        [Fact]
-        public async Task WithDirsProjAndDirectoryBuildPropsThatIsOutOfDirectoryButStillMatchingThePackage()
-        {
-            await Run(path =>
-                [
-                    "update",
-                    "--job-id",
-                    "TEST-JOB-ID",
-                    "--job-path",
-                    Path.Combine(path, "job.json"),
-                    "--repo-root",
-                    path,
-                    "--solution-or-project",
-                    $"{path}/some-dir/dirs.proj",
-                    "--dependency",
-                    "Some.Package",
-                    "--new-version",
-                    "6.6.1",
-                    "--previous-version",
-                    "6.1.0"
-                ],
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Some.Package", "6.1.0", "net8.0"),
-                    MockNuGetPackage.CreateSimplePackage("Some.Package", "6.6.1", "net8.0"),
-                ],
-                initialFiles:
-                [
-                    ("some-dir/dirs.proj", """
-                        <Project Sdk="Microsoft.Build.Traversal">
-                          <ItemGroup>
-                            <ProjectFile Include="project1/project.csproj" />
-                            <ProjectReference Include="project2/project.csproj" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("some-dir/project1/project.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <OutputType>Exe</OutputType>
-                            <TargetFramework>net8.0</TargetFramework>
-                            <ImplicitUsings>enable</ImplicitUsings>
-                            <Nullable>enable</Nullable>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="6.1.0" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("some-dir/project2/project.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <OutputType>Exe</OutputType>
-                            <TargetFramework>net8.0</TargetFramework>
-                            <ImplicitUsings>enable</ImplicitUsings>
-                            <Nullable>enable</Nullable>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="6.1.0" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("other-dir/Directory.Build.props", """
-                        <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="6.1.0" />
-                          </ItemGroup>
-
-                        </Project>
-                        """)
-                ],
-                expectedFiles:
-                [
-                    ("some-dir/dirs.proj", """
-                        <Project Sdk="Microsoft.Build.Traversal">
-                          <ItemGroup>
-                            <ProjectFile Include="project1/project.csproj" />
-                            <ProjectReference Include="project2/project.csproj" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("some-dir/project1/project.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <OutputType>Exe</OutputType>
-                            <TargetFramework>net8.0</TargetFramework>
-                            <ImplicitUsings>enable</ImplicitUsings>
-                            <Nullable>enable</Nullable>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="6.6.1" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("some-dir/project2/project.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <OutputType>Exe</OutputType>
-                            <TargetFramework>net8.0</TargetFramework>
-                            <ImplicitUsings>enable</ImplicitUsings>
-                            <Nullable>enable</Nullable>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="6.6.1" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("other-dir/Directory.Build.props", """
-                        <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="6.1.0" />
-                          </ItemGroup>
-
-                        </Project>
-                        """)
-                ]
-            );
-        }
-
         [Theory]
         [InlineData(null)]
         [InlineData("src")]
@@ -349,9 +123,9 @@ public partial class EntryPointTests
                   }
                 }
                 """;
-            await File.WriteAllTextAsync(globalJsonPath, globalJsonContent);
+            await File.WriteAllTextAsync(globalJsonPath, globalJsonContent, TestContext.Current.CancellationToken);
             Directory.CreateDirectory(Path.Join(tempDir.DirectoryPath, "src"));
-            await File.WriteAllTextAsync(srcGlobalJsonPath, globalJsonContent);
+            await File.WriteAllTextAsync(srcGlobalJsonPath, globalJsonContent, TestContext.Current.CancellationToken);
             var projectPath = Path.Join(tempDir.DirectoryPath, "src", "project.csproj");
             await File.WriteAllTextAsync(projectPath, """
                 <Project Sdk="Microsoft.NET.Sdk">
@@ -362,7 +136,16 @@ public partial class EntryPointTests
                     <PackageReference Include="Some.Package" Version="7.0.1" />
                   </ItemGroup>
                 </Project>
-                """);
+                """, TestContext.Current.CancellationToken);
+            await File.WriteAllTextAsync(Path.Join(Path.GetDirectoryName(projectPath)!, "Directory.Build.props"), "<Project />", TestContext.Current.CancellationToken);
+            await File.WriteAllTextAsync(Path.Join(Path.GetDirectoryName(projectPath)!, "Directory.Build.targets"), "<Project />", TestContext.Current.CancellationToken);
+            await File.WriteAllTextAsync(Path.Join(Path.GetDirectoryName(projectPath)!, "Directory.Packages.props"), """
+                <Project>
+                  <PropertyGroup>
+                    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+                  </PropertyGroup>
+                </Project>
+                """, TestContext.Current.CancellationToken);
             var executableName = Path.Join(Path.GetDirectoryName(GetType().Assembly.Location), "NuGetUpdater.Cli.dll");
             IEnumerable<string> executableArgs = [
                 executableName,
@@ -394,15 +177,15 @@ public partial class EntryPointTests
             Assert.True(exitCode == 0, $"Error running update on unsupported SDK.\nSTDOUT:\n{output}\nSTDERR:\n{error}");
 
             // verify project update
-            var updatedProjectContents = await File.ReadAllTextAsync(projectPath);
+            var updatedProjectContents = await File.ReadAllTextAsync(projectPath, TestContext.Current.CancellationToken);
             Assert.Contains("13.0.1", updatedProjectContents);
 
             // verify `global.json` untouched
-            var updatedGlobalJsonContents = await File.ReadAllTextAsync(globalJsonPath);
+            var updatedGlobalJsonContents = await File.ReadAllTextAsync(globalJsonPath, TestContext.Current.CancellationToken);
             Assert.Contains("99.99.99", updatedGlobalJsonContents);
 
             // verify `src/global.json` untouched
-            var updatedSrcGlobalJsonContents = await File.ReadAllTextAsync(srcGlobalJsonPath);
+            var updatedSrcGlobalJsonContents = await File.ReadAllTextAsync(srcGlobalJsonPath, TestContext.Current.CancellationToken);
             Assert.Contains("99.99.99", updatedGlobalJsonContents);
         }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs

@@ -6,7 +6,6 @@ using System.Xml.XPath;
 using Microsoft.Build.Logging.StructuredLogger;
 
 using NuGet.Frameworks;
-using NuGet.Versioning;
 
 using NuGetUpdater.Core.Utilities;
 
@@ -55,18 +54,6 @@ internal static class SdkProjectDiscovery
     };
 
     public static async Task<ImmutableArray<ProjectDiscoveryResult>> DiscoverAsync(string repoRootPath, string workspacePath, string startingProjectPath, ExperimentsManager experimentsManager, ILogger logger)
-    {
-        if (experimentsManager.UseDirectDiscovery)
-        {
-            return await DiscoverWithBinLogAsync(repoRootPath, workspacePath, startingProjectPath, experimentsManager, logger);
-        }
-        else
-        {
-            return await DiscoverWithTempProjectAsync(repoRootPath, workspacePath, startingProjectPath, experimentsManager, logger);
-        }
-    }
-
-    public static async Task<ImmutableArray<ProjectDiscoveryResult>> DiscoverWithBinLogAsync(string repoRootPath, string workspacePath, string startingProjectPath, ExperimentsManager experimentsManager, ILogger logger)
     {
         // N.b., there are many paths used in this function.  The MSBuild binary log always reports fully qualified paths, so that's what will be used
         // throughout until the very end when the appropriate kind of relative path is returned.
@@ -595,7 +582,7 @@ internal static class SdkProjectDiscovery
 
             var tempProjectPath = await MSBuildHelper.CreateTempProjectAsync(tempDirectory, repoRootPath, projectPath, targetFrameworks, topLevelDependencies, experimentsManager, logger);
             var tempProjectDirectory = Path.GetDirectoryName(tempProjectPath)!;
-            var rediscoveredDependencies = await DiscoverWithBinLogAsync(tempProjectDirectory, tempProjectDirectory, tempProjectPath, experimentsManager, logger);
+            var rediscoveredDependencies = await DiscoverAsync(tempProjectDirectory, tempProjectDirectory, tempProjectPath, experimentsManager, logger);
             var rediscoveredDependenciesForThisProject = rediscoveredDependencies.Single(); // we started with a single temp project, this will be the only result
 
             // re-build packagesPerProject
@@ -798,144 +785,4 @@ internal static class SdkProjectDiscovery
 
         return property.Value;
     }
-
-    public static async Task<ImmutableArray<ProjectDiscoveryResult>> DiscoverWithTempProjectAsync(string repoRootPath, string workspacePath, string projectPath, ExperimentsManager experimentsManager, ILogger logger)
-    {
-        // Determine which targets and props files contribute to the build.
-        var (buildFiles, projectTargetFrameworks) = await MSBuildHelper.LoadBuildFilesAndTargetFrameworksAsync(repoRootPath, projectPath);
-        var tfms = projectTargetFrameworks.Order().ToImmutableArray();
-
-        // Get all the dependencies which are directly referenced from the project file or indirectly referenced from
-        // targets and props files.
-        var topLevelDependencies = MSBuildHelper.GetTopLevelPackageDependencyInfos(buildFiles);
-
-        var results = ImmutableArray.CreateBuilder<ProjectDiscoveryResult>();
-        if (tfms.Length > 0)
-        {
-            foreach (var buildFile in buildFiles)
-            {
-                // Only include build files that exist beneath the RepoRootPath.
-                if (buildFile.IsOutsideBasePath)
-                {
-                    continue;
-                }
-
-                // The build file dependencies have the correct DependencyType and the TopLevelDependencies have the evaluated version.
-                // Combine them to have the set of dependencies that are directly referenced from the build file.
-                var fileDependencies = BuildFile.GetDependencies(buildFile).ToImmutableArray();
-
-                // this is new-ish behavior; don't ever report this dependency because there's no meaningful way to update it
-                fileDependencies = fileDependencies.Where(d => !d.Name.Equals("Microsoft.NET.Sdk", StringComparison.OrdinalIgnoreCase)).ToImmutableArray();
-
-                var fileDependencyLookup = fileDependencies
-                    .ToLookup(d => d.Name, StringComparer.OrdinalIgnoreCase);
-                var sdkDependencies = fileDependencies
-                    .Where(d => d.Type == DependencyType.MSBuildSdk)
-                    .ToImmutableArray();
-                var indirectDependencies = topLevelDependencies
-                    .Where(d => !fileDependencyLookup.Contains(d.Name))
-                    .ToImmutableArray();
-                var directDependencies = topLevelDependencies
-                    .Where(d => fileDependencyLookup.Contains(d.Name))
-                    .SelectMany(d =>
-                    {
-                        var dependencies = fileDependencyLookup[d.Name];
-                        return dependencies.Select(fileDependency => d with
-                        {
-                            Type = fileDependency.Type,
-                            IsDirect = true
-                        });
-                    }).ToImmutableArray();
-
-                if (buildFile.GetFileType() == ProjectBuildFileType.Project)
-                {
-                    // Collect information that is specific to the project file.
-                    var properties = MSBuildHelper.GetProperties(buildFiles).Values
-                        .Where(p => !p.SourceFilePath.StartsWith(".."))
-                        .OrderBy(p => p.Name)
-                        .ToImmutableArray();
-                    var referencedProjectPaths = MSBuildHelper.GetProjectPathsFromProject(projectPath)
-                        .Select(path => Path.GetRelativePath(workspacePath, path).NormalizePathToUnix())
-                        .OrderBy(p => p)
-                        .ToImmutableArray();
-
-                    // Get the complete set of dependencies including transitive dependencies.
-                    var dependencies = indirectDependencies.Concat(directDependencies).ToImmutableArray();
-                    dependencies = dependencies
-                        .Select(d => d with { TargetFrameworks = tfms })
-                        .ToImmutableArray();
-                    var transitiveDependencies = await GetTransitiveDependencies(repoRootPath, projectPath, tfms, dependencies, experimentsManager, logger);
-                    ImmutableArray<Dependency> allDependencies = dependencies.Concat(transitiveDependencies).Concat(sdkDependencies)
-                        .OrderBy(d => d.Name)
-                        .ToImmutableArray();
-
-                    // for the temporary project, these directories correspond to $(OutputPath) and $(IntermediateOutputPath) and files from
-                    // these directories should not be reported
-                    var intermediateDirectories = new string[]
-                    {
-                        Path.Join(Path.GetDirectoryName(buildFile.Path), "bin"),
-                        Path.Join(Path.GetDirectoryName(buildFile.Path), "obj"),
-                    };
-                    var projectDirectory = Path.GetDirectoryName(buildFile.Path)!;
-                    var additionalFiles = ProjectHelper.GetAllAdditionalFilesFromProject(buildFile.Path, ProjectHelper.PathFormat.Relative);
-                    results.Add(new()
-                    {
-                        FilePath = Path.GetRelativePath(workspacePath, buildFile.Path).NormalizePathToUnix(),
-                        Properties = properties,
-                        TargetFrameworks = tfms,
-                        ReferencedProjectPaths = referencedProjectPaths,
-                        Dependencies = allDependencies,
-                        ImportedFiles = buildFiles.Where(b =>
-                            {
-                                var fileType = b.GetFileType();
-                                return fileType == ProjectBuildFileType.Props || fileType == ProjectBuildFileType.Targets;
-                            })
-                            .Where(b => !intermediateDirectories.Any(i => PathHelper.IsFileUnderDirectory(new DirectoryInfo(i), new FileInfo(b.Path))))
-                            .Select(b => Path.GetRelativePath(projectDirectory, b.Path).NormalizePathToUnix())
-                            .ToImmutableArray(),
-                        AdditionalFiles = additionalFiles,
-                    });
-                }
-            }
-        }
-
-        return results.ToImmutable();
-    }
-
-    private static async Task<ImmutableArray<Dependency>> GetTransitiveDependencies(
-        string repoRootPath,
-        string projectPath,
-        ImmutableArray<string> tfms,
-        ImmutableArray<Dependency> directDependencies,
-        ExperimentsManager experimentsManager,
-        ILogger logger
-    )
-    {
-        Dictionary<string, Dependency> transitiveDependencies = new(StringComparer.OrdinalIgnoreCase);
-        foreach (var tfm in tfms)
-        {
-            var tfmDependencies = await MSBuildHelper.GetAllPackageDependenciesAsync(repoRootPath, projectPath, tfm, directDependencies, experimentsManager, logger);
-            foreach (var dependency in tfmDependencies.Where(d => d.IsTransitive))
-            {
-                if (!transitiveDependencies.TryGetValue(dependency.Name, out var existingDependency))
-                {
-                    transitiveDependencies[dependency.Name] = dependency;
-                    continue;
-                }
-
-                transitiveDependencies[dependency.Name] = existingDependency with
-                {
-                    // Revisit this logic. We may want to return each dependency instead of merging them.
-                    Version = NuGetVersion.Parse(existingDependency.Version!) > NuGetVersion.Parse(dependency.Version!)
-                        ? existingDependency.Version
-                        : dependency.Version,
-                    TargetFrameworks = existingDependency.TargetFrameworks is not null && dependency.TargetFrameworks is not null
-                        ? existingDependency.TargetFrameworks.Value.AddRange(dependency.TargetFrameworks)
-                        : existingDependency.TargetFrameworks ?? dependency.TargetFrameworks,
-                };
-            }
-        }
-
-        return [.. transitiveDependencies.Values];
-    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/ExperimentsManager.cs

@@ -7,23 +7,17 @@ namespace NuGetUpdater.Core;
 
 public record ExperimentsManager
 {
+    public bool GenerateSimplePrBody { get; init; } = false;
     public bool InstallDotnetSdks { get; init; } = false;
     public bool NativeUpdater { get; init; } = false;
-    public bool UseLegacyDependencySolver { get; init; } = false;
-    public bool UseLegacyUpdateHandler { get; init; } = false;
-    public bool UseDirectDiscovery { get; init; } = false;
-    public bool UseNewFileUpdater { get; init; } = false;
 
     public Dictionary<string, object> ToDictionary()
     {
         return new()
         {
+            ["nuget_generate_simple_pr_body"] = GenerateSimplePrBody,
             ["nuget_install_dotnet_sdks"] = InstallDotnetSdks,
             ["nuget_native_updater"] = NativeUpdater,
-            ["nuget_legacy_dependency_solver"] = UseLegacyDependencySolver,
-            ["nuget_use_legacy_update_handler"] = UseLegacyUpdateHandler,
-            ["nuget_use_direct_discovery"] = UseDirectDiscovery,
-            ["nuget_use_new_file_updater"] = UseNewFileUpdater,
         };
     }
 
@@ -31,12 +25,9 @@ public record ExperimentsManager
     {
         return new ExperimentsManager()
         {
+            GenerateSimplePrBody = IsEnabled(experiments, "nuget_generate_simple_pr_body"),
             InstallDotnetSdks = IsEnabled(experiments, "nuget_install_dotnet_sdks"),
             NativeUpdater = IsEnabled(experiments, "nuget_native_updater"),
-            UseLegacyDependencySolver = IsEnabled(experiments, "nuget_legacy_dependency_solver"),
-            UseLegacyUpdateHandler = IsEnabled(experiments, "nuget_use_legacy_update_handler"),
-            UseDirectDiscovery = IsEnabled(experiments, "nuget_use_direct_discovery"),
-            UseNewFileUpdater = IsEnabled(experiments, "nuget_use_new_file_updater"),
         };
     }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/GlobalJsonBuildFile.cs

@@ -1,3 +1,4 @@
+using System.Collections.Immutable;
 using System.Text.Json.Nodes;
 
 namespace NuGetUpdater.Core;
@@ -12,28 +13,19 @@ internal sealed class GlobalJsonBuildFile : JsonBuildFile
     {
     }
 
-    public JsonObject? Sdk => Node.Value is JsonObject root ? root["sdk"]?.AsObject() : null;
-
     public JsonObject? MSBuildSdks => Node.Value is JsonObject root ? root["msbuild-sdks"]?.AsObject() : null;
 
     public IEnumerable<Dependency> GetDependencies()
     {
-        List<Dependency> dependencies = [];
-        if (Sdk is not null
-            && Sdk.TryGetPropertyValue("version", out var version))
-        {
-            dependencies.Add(GetSdkDependency("Microsoft.NET.Sdk", version));
-        }
-
         if (MSBuildSdks is null)
         {
-            return dependencies;
+            return [];
         }
 
         var msBuildDependencies = MSBuildSdks
-            .Select(t => GetSdkDependency(t.Key, t.Value));
-        dependencies.AddRange(msBuildDependencies);
-        return dependencies;
+            .Select(t => GetSdkDependency(t.Key, t.Value))
+            .ToImmutableArray();
+        return msBuildDependencies;
     }
 
     private Dependency GetSdkDependency(string name, JsonNode? version)

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/PrivateSourceTimedOutException.cs

@@ -0,0 +1,12 @@
+namespace NuGetUpdater.Core;
+
+internal class PrivateSourceTimedOutException : Exception
+{
+    public string Url { get; }
+
+    public PrivateSourceTimedOutException(string url)
+        : base($"The request to source {url} has timed out.")
+    {
+        Url = url;
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/JobErrorBase.cs

@@ -70,10 +70,14 @@ public abstract record JobErrorBase : MessageBase
 
                         return new UnknownError(ex, jobId);
                 }
+            case InvalidDataException invalidData when invalidData.Message == "Central Directory corrupt.":
+                return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory));
             case InvalidProjectFileException invalidProjectFile:
                 return new DependencyFileNotParseable(invalidProjectFile.ProjectFile);
             case MissingFileException missingFile:
                 return new DependencyFileNotFound(missingFile.FilePath, missingFile.Message);
+            case PrivateSourceTimedOutException timeout:
+                return new PrivateSourceTimedOut(timeout.Url);
             case UnparseableFileException unparseableFile:
                 return new DependencyFileNotParseable(unparseableFile.FilePath, unparseableFile.Message);
             case UpdateNotPossibleException updateNotPossible:

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/PrivateSourceTimedOut.cs

@@ -0,0 +1,10 @@
+namespace NuGetUpdater.Core.Run.ApiModel;
+
+public record PrivateSourceTimedOut : JobErrorBase
+{
+    public PrivateSourceTimedOut(string url)
+        : base("private_source_timed_out")
+    {
+        Details["source"] = url;
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/PullRequestBodyGenerator/AzurePackageDetailFinder.cs

@@ -0,0 +1,30 @@
+using NuGet.Versioning;
+
+namespace NuGetUpdater.Core.Run.PullRequestBodyGenerator;
+
+internal class AzurePackageDetailFinder : IPackageDetailFinder
+{
+    public string GetCompareUrlPath(string? oldTag, string? newTag)
+    {
+        // azure devops doesn't support direct tag listing so both parameters are likely to be null, but just in case, this is the correct url format
+        if (oldTag is not null && newTag is not null)
+        {
+            return $"branchCompare?baseVersion=GT{oldTag}&targetVersion=GT{newTag}";
+        }
+
+        if (newTag is not null)
+        {
+            return $"commits?itemVersion=GT{newTag}";
+        }
+
+        return "commits";
+    }
+
+    public Task<Dictionary<NuGetVersion, (string TagName, string? Details)>> GetReleaseDataForVersionsAsync(string repoName, NuGetVersion oldVersion, NuGetVersion newVersion)
+    {
+        // azure devops doesn't support direct tag listing
+        return Task.FromResult(new Dictionary<NuGetVersion, (string TagName, string? Details)>());
+    }
+
+    public string GetReleasesUrlPath() => "tags";
+}