dependabot-nuget 0.296.2 → 0.297.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0708236b226ad34f8cb1e82936f302be130b22d309dd633e6274cfb50449c72d'
-  data.tar.gz: 48dcfb2d9de99161c31c973435e089ff4353a6f119dbb4cd9641b244420600b8
+  metadata.gz: a1c0055a192f1f7ba04688c5f10286d5103917786e7743ca8f8334743d544e66
+  data.tar.gz: 3b4185d98b4e4382f3f355a422db397995d542622da3f970b374e06762beec28
 SHA512:
-  metadata.gz: 3cb6577339fb9c6e552df77e5ef10b54f0cbeb78926a9903c2cee3876be37cff686f49514f47ae6fe769db3ebeb398d3f5c39a9007d2d9ac75a6dbddbf4b4a73
-  data.tar.gz: 3ef8f83134629fffc8e6402b471ee6777bd5cd04ec0daa2b4f9ecad84de109e265aea5b0b47f6ee981a762884ebc267a34adcdab4e7aa0c62890d33a39ead739
+  metadata.gz: d2d0fe1c5f5cd11ec52bca348a61f3b4548d9b71c5e4515b8f7484f9e4354f6cdd0b9c69fc40e05e3957a5be43f71608c0677605c2f083505d2179c77da5eedd
+  data.tar.gz: 432bd50b776f560ff5bc1e540a453f6cf0644e9c15e64a93e2d81cc08230b12d9f4bc062add5a4f728b27fd8c9a6b9da9291cc05ae592b265f52e04b71743c85

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.props

@@ -2,7 +2,7 @@
   <!-- The following properties enable target framework and dependency discovery when OS-specific workloads are required -->
   <PropertyGroup>
     <DesignTimeBuild>true</DesignTimeBuild>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <EnableWindowsTargeting Condition="$(TargetFramework.Contains('-windows'))">true</EnableWindowsTargeting>
     <TargetPlatformVersion Condition="$(TargetPlatformVersion) == '' AND $(TargetFramework.Contains('-'))">1.0</TargetPlatformVersion>
   </PropertyGroup>
 </Project>

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

@@ -784,11 +784,11 @@ internal static partial class MSBuildHelper
             var targetsHelperPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "TargetFrameworkReporter.targets");
             var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(
                 [
-                    "build",
+                    "msbuild",
                     projectPath,
                     "/t:ReportTargetFramework",
                     $"/p:CustomAfterMicrosoftCommonCrossTargetingTargets={targetsHelperPath}",
-                    $"/p:CustomAfterMicrosoftCommonTargets={targetsHelperPath}"
+                    $"/p:CustomAfterMicrosoftCommonTargets={targetsHelperPath}",
                 ],
                 projectDirectory,
                 experimentsManager
@@ -833,6 +833,12 @@ internal static partial class MSBuildHelper
                     var framework = string.IsNullOrWhiteSpace(tfpm.Item2)
                         ? NuGetFramework.Parse(tfpm.Item1)
                         : NuGetFramework.ParseComponents(tfpm.Item1, tfpm.Item2);
+                    if (framework.Framework == "_")
+                    {
+                        // error/default value
+                        return null;
+                    }
+
                     return framework;
                 }
                 catch

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

@@ -154,7 +154,7 @@ internal static class PathHelper
         }
 
         // Normalize all resulting paths to Unix format
-        return currentPaths.Select(path => path.NormalizePathToUnix()).ToList();
+        return currentPaths.Select(path => path.NormalizePathToUnix()).OrderBy(path => path, StringComparer.Ordinal).ToList();
     }
 
     /// <summary>

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

@@ -23,12 +23,13 @@ public class DiscoveryWorkerTestBase : TestBase
         TestFile[] files,
         ExpectedWorkspaceDiscoveryResult expectedResult,
         MockNuGetPackage[]? packages = null,
+        bool includeCommonPackages = true,
         ExperimentsManager? experimentsManager = null)
     {
         experimentsManager ??= new ExperimentsManager();
         var actualResult = await RunDiscoveryAsync(files, async directoryPath =>
         {
-            await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, directoryPath);
+            await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, directoryPath, includeCommonPackages: includeCommonPackages);
 
             var worker = new DiscoveryWorker("TEST-JOB-ID", experimentsManager, new TestLogger());
             var result = await worker.RunWithErrorHandlingAsync(directoryPath, workspacePath);

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

@@ -1247,4 +1247,51 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             }
         );
     }
+
+    [LinuxOnlyFact]
+    public async Task DiscoverySucceedsWhenNoWindowsAppRefPackageCanBeFound()
+    {
+        // 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, UseDirectDiscovery = true },
+            includeCommonPackages: false,
+            packages: [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
+            ],
+            workspacePath: "",
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.2.3" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            expectedResult: new()
+            {
+                Path = "",
+                Projects = [
+                    new()
+                    {
+                        FilePath = "project.csproj",
+                        TargetFrameworks = ["net8.0"],
+                        Dependencies = [
+                            new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
+                        ],
+                        Properties = [
+                            new("TargetFramework", "net8.0", "project.csproj"),
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
+                    }
+                ]
+            }
+        );
+    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs

@@ -298,13 +298,17 @@ public abstract class UpdateWorkerTestBase : TestBase
         await File.WriteAllTextAsync(Path.Join(temporaryDirectory, "job.json"), JsonSerializer.Serialize(jobFile, RunWorker.SerializerOptions));
     }
 
-    public static async Task MockNuGetPackagesInDirectory(MockNuGetPackage[]? packages, string temporaryDirectory)
+    public static async Task MockNuGetPackagesInDirectory(MockNuGetPackage[]? packages, string temporaryDirectory, bool includeCommonPackages = true)
     {
         if (packages is not null)
         {
             string localFeedPath = Path.Join(temporaryDirectory, "local-feed");
             Directory.CreateDirectory(localFeedPath);
-            MockNuGetPackage[] allPackages = packages.Concat(MockNuGetPackage.CommonPackages).ToArray();
+            var allPackages = packages;
+            if (includeCommonPackages)
+            {
+                allPackages = allPackages.Concat(MockNuGetPackage.CommonPackages).ToArray();
+            }
 
             // write all packages to disk
             foreach (MockNuGetPackage package in allPackages)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.296.2
+  version: 0.297.0
 platform: ruby
 authors:
 - Dependabot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.296.2
+        version: 0.297.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.296.2
+        version: 0.297.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -533,7 +533,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.296.2
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.297.0
 post_install_message:
 rdoc_options: []
 require_paths: