dependabot-nuget 0.310.0 → 0.311.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d194f7c1aa9c0a61df000bad1d3030110a66a73cb86615c97fe0a3d053cc56
-  data.tar.gz: d87118a0fb76c9b571b27ec5a66a3ae65d808e17daa9d68cb734962ee3aa5fd7
+  metadata.gz: a32c81e06aafe3606a77d89ae351b246b6e80c9fd272bfe0001e6486eebf989b
+  data.tar.gz: 7796df4d53b7b86d9ea7472ff82fd4801dd7144d93b087fe32423dfb535c50e5
 SHA512:
-  metadata.gz: 6d9fcc54e90b7c3ea93eedab675ce512a989176b02c676d442f9b9edcbbb5653dd9bacc777d77c52f1061ede4048523dfc9693a50c01ce089c5205dcf1cdfddb
-  data.tar.gz: 12abc6e3b3c04933d6d341ea9532d9dbae1cc121310c1f4252e0f7d9f2776861c1b3cb696d813a1c37717363c219c4196743665001ecf7ade03d8bf40aaf58bc
+  metadata.gz: b487988ea2bc084a70c73216d9ab773be814a442c3a9e160374ae5bdefd03e9067ca9b7cc12d55725da0396e3e14af7bb1cb037742ac7f2aba7c9b65130cfb8a
+  data.tar.gz: 281290949ba2b0dccaff75e68aaeab2e886721cc19c79cf379ce5302cbe719f2fa7e1ec491720a30f3bda4617136c03e7b8e8a4dc20fef9c6632f79ed3c0a9ae

data/helpers/lib/NuGetUpdater/Directory.Packages.props

@@ -38,7 +38,7 @@
     <PackageVersion Include="System.Text.Json" Version="9.0.3" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.3" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.v3" Version="2.0.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
   </ItemGroup>
 </Project>

data/helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Test/DotNetPackageCorrelation.Test.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/NuGetUpdater.Cli.Test.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 

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

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Text;
 using System.Text.Json.Serialization;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
@@ -9,4 +10,16 @@ public sealed record ClosePullRequest : MessageBase
     public required ImmutableArray<string> DependencyNames { get; init; }
 
     public string Reason { get; init; } = "up_to_date";
+
+    public override string GetReport()
+    {
+        var report = new StringBuilder();
+        report.AppendLine($"{nameof(ClosePullRequest)}: {Reason}");
+        foreach (var dependencyName in DependencyNames)
+        {
+            report.AppendLine($"- {dependencyName}");
+        }
+
+        return report.ToString().Trim();
+    }
 }

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

@@ -1,5 +1,8 @@
+using System.Text;
 using System.Text.Json.Serialization;
 
+using NuGet.Versioning;
+
 namespace NuGetUpdater.Core.Run.ApiModel;
 
 public sealed record CreatePullRequest : MessageBase
@@ -15,4 +18,21 @@ public sealed record CreatePullRequest : MessageBase
     public required string PrTitle { get; init; }
     [JsonPropertyName("pr-body")]
     public required string PrBody { get; init; }
+
+    public override string GetReport()
+    {
+        var dependencyNames = Dependencies
+            .OrderBy(d => d.Name, StringComparer.OrdinalIgnoreCase)
+            .ThenBy(d => NuGetVersion.Parse(d.Version!))
+            .Select(d => $"{d.Name}/{d.Version}")
+            .ToArray();
+        var report = new StringBuilder();
+        report.AppendLine(nameof(CreatePullRequest));
+        foreach (var d in dependencyNames)
+        {
+            report.AppendLine($"- {d}");
+        }
+
+        return report.ToString().Trim();
+    }
 }

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

@@ -2,7 +2,6 @@ using System.Collections.Immutable;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-using NuGet.Credentials;
 using NuGet.Versioning;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
@@ -32,7 +31,7 @@ public sealed record Job
     public bool RejectExternalCode { get; init; } = false;
     public bool RepoPrivate { get; init; } = false;
     public CommitOptions? CommitMessageOptions { get; init; } = null;
-    public ImmutableArray<Dictionary<string, string>>? CredentialsMetadata { get; init; } = null;
+    public ImmutableArray<Dictionary<string, object>>? CredentialsMetadata { get; init; } = null;
     public int MaxUpdaterRunTime { get; init; } = 0;
 
     public IEnumerable<string> GetAllDirectories()

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

@@ -1,4 +1,5 @@
 using System.Net;
+using System.Text;
 using System.Text.Json.Serialization;
 
 using Microsoft.Build.Exceptions;
@@ -20,6 +21,24 @@ public abstract record JobErrorBase : MessageBase
     [JsonPropertyName("error-details")]
     public Dictionary<string, object> Details { get; init; } = new();
 
+    public override string GetReport()
+    {
+        var report = new StringBuilder();
+        report.AppendLine($"Error type: {Type}");
+        foreach (var (key, value) in Details)
+        {
+            var valueString = value.ToString();
+            if (value is IEnumerable<string> strings)
+            {
+                valueString = string.Join(", ", strings);
+            }
+
+            report.AppendLine($"- {key}: {valueString}");
+        }
+
+        return report.ToString().Trim();
+    }
+
     public static JobErrorBase ErrorFromException(Exception ex, string jobId, string currentDirectory)
     {
         return ex switch

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

@@ -2,4 +2,5 @@ namespace NuGetUpdater.Core.Run.ApiModel;
 
 public abstract record MessageBase
 {
+    public abstract string GetReport();
 }

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

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Text;
 using System.Text.Json.Serialization;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
@@ -25,4 +26,19 @@ public sealed record UpdatePullRequest : MessageBase
 
     [JsonPropertyName("dependency-group")]
     public required string? DependencyGroup { get; init; }
+
+    public override string GetReport()
+    {
+        var dependencyNames = DependencyNames
+            .Order(StringComparer.OrdinalIgnoreCase)
+            .ToArray();
+        var report = new StringBuilder();
+        report.AppendLine(nameof(UpdatePullRequest));
+        foreach (var d in dependencyNames)
+        {
+            report.AppendLine($"- {d}");
+        }
+
+        return report.ToString().Trim();
+    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/PullRequestTextGenerator.cs

@@ -1,5 +1,7 @@
 using System.Collections.Immutable;
 
+using NuGet.Versioning;
+
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Updater;
 
@@ -7,34 +9,68 @@ namespace NuGetUpdater.Core.Run;
 
 public class PullRequestTextGenerator
 {
+    private const int MaxTitleLength = 70;
+
     public static string GetPullRequestTitle(Job job, ImmutableArray<UpdateOperationBase> updateOperationsPerformed, string? dependencyGroupName)
     {
         // simple version looks like
         //   Update Some.Package to 1.2.3
         // if multiple packages are updated to multiple versions, result looks like:
         //   Update Package.A to 1.0.0, 2.0.0; Package.B to 3.0.0, 4.0.0
-        var dependencySets = updateOperationsPerformed
-            .GroupBy(d => d.DependencyName, StringComparer.OrdinalIgnoreCase)
-            .OrderBy(g => g.Key, StringComparer.OrdinalIgnoreCase)
-            .Select(g => new
-            {
-                Name = g.Key,
-                Versions = g
-                    .Select(d => d.NewVersion)
-                    .OrderBy(v => v)
-                    .ToArray()
-            })
-            .ToArray();
+        var dependencySets = GetDependencySets(updateOperationsPerformed);
         var updatedPartTitles = dependencySets
             .Select(d => $"{d.Name} to {string.Join(", ", d.Versions.Select(v => v.ToString()))}")
             .ToArray();
         var title = $"{job.CommitMessageOptions?.Prefix}Update {string.Join("; ", updatedPartTitles)}";
+
+        // don't let the title get too long
+        if (title.Length > MaxTitleLength && updatedPartTitles.Length >= 3)
+        {
+            title = $"{job.CommitMessageOptions?.Prefix}Update {dependencySets[0].Name} and {dependencySets.Length - 1} other dependencies";
+        }
+
         return title;
     }
 
     public static string GetPullRequestCommitMessage(Job job, ImmutableArray<UpdateOperationBase> updateOperationsPerformed, string? dependencyGroupName)
     {
-        return GetPullRequestTitle(job, updateOperationsPerformed, dependencyGroupName);
+        // updating a single dependency looks like
+        //   Update Some.Package to 1.2.3
+        // if multiple packages are updated, result looks like:
+        //   Update:
+        //   - Package.A to 1.0.0
+        //   - Package.B to 2.0.0
+        var dependencySets = GetDependencySets(updateOperationsPerformed);
+        if (dependencySets.Length == 1)
+        {
+            var depName = dependencySets[0].Name;
+            var depVersions = dependencySets[0].Versions.Select(v => v.ToString());
+            return $"Update {dependencySets[0].Name} to {string.Join(", ", depVersions)}";
+        }
+
+        var updatedParts = dependencySets
+            .Select(d => $"- {d.Name} to {string.Join(", ", d.Versions.Select(v => v.ToString()))}")
+            .ToArray();
+        var message = string.Join("\n", ["Update:", .. updatedParts]);
+        return message;
+    }
+
+    private static (string Name, NuGetVersion[] Versions)[] GetDependencySets(ImmutableArray<UpdateOperationBase> updateOperationsPerformed)
+    {
+        var dependencySets = updateOperationsPerformed
+            .GroupBy(d => d.DependencyName, StringComparer.OrdinalIgnoreCase)
+            .OrderBy(g => g.Key, StringComparer.OrdinalIgnoreCase)
+            .Select(g =>
+            {
+                var name = g.Key;
+                var versions = g
+                    .Select(d => d.NewVersion)
+                    .OrderBy(v => v)
+                    .ToArray();
+                return (name, versions);
+            })
+            .ToArray();
+        return dependencySets;
     }
 
     public static string GetPullRequestBody(Job job, ImmutableArray<UpdateOperationBase> updateOperationsPerformed, string? dependencyGroupName)

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunWorker.cs

@@ -113,7 +113,16 @@ public class RunWorker
         _logger.Info("Discovery JSON content:");
         _logger.Info(JsonSerializer.Serialize(discoveryResult, DiscoveryWorker.SerializerOptions));
 
-        // TODO: report errors
+        if (discoveryResult.Error is not null)
+        {
+            // this is unrecoverable
+            await _apiHandler.RecordUpdateJobError(discoveryResult.Error);
+            return new()
+            {
+                Base64DependencyFiles = [],
+                BaseCommitSha = baseCommitSha,
+            };
+        }
 
         // report dependencies
         var discoveredUpdatedDependencies = GetUpdatedDependencyListFromDiscovery(discoveryResult, repoContentsPath.FullName);
@@ -201,7 +210,15 @@ public class RunWorker
 
             var dependencyInfo = GetDependencyInfo(job, dependency);
             var analysisResult = await _analyzeWorker.RunAsync(repoContentsPath.FullName, discoveryResult, dependencyInfo);
-            // TODO: log analysisResult
+            _logger.Info("Analysis content:");
+            _logger.Info(JsonSerializer.Serialize(analysisResult, AnalyzeWorker.SerializerOptions));
+
+            if (analysisResult.Error is not null)
+            {
+                await _apiHandler.RecordUpdateJobError(analysisResult.Error);
+                continue;
+            }
+
             if (analysisResult.CanUpdate)
             {
                 if (!job.UpdatingAPullRequest)
@@ -240,8 +257,11 @@ public class RunWorker
                 };
 
                 var updateResult = await _updaterWorker.RunAsync(repoContentsPath.FullName, updateOperation.ProjectPath, dependency.Name, dependency.Version!, analysisResult.UpdatedVersion, isTransitive: dependency.IsTransitive);
-                // TODO: need to report if anything was actually updated
-                if (updateResult.Error is null)
+                if (updateResult.Error is not null)
+                {
+                    await _apiHandler.RecordUpdateJobError(updateResult.Error);
+                }
+                else
                 {
                     actualUpdatedDependencies.Add(updatedDependency);
                 }
@@ -365,10 +385,15 @@ public class RunWorker
 
     private async Task SendApiMessage(MessageBase? message)
     {
+        if (message is null)
+        {
+            return;
+        }
+
+        var report = message.GetReport();
+        _logger.Info(report);
         switch (message)
         {
-            case null:
-                break;
             case JobErrorBase error:
                 await _apiHandler.RecordUpdateJobError(error);
                 break;

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/UpdateOperationBase.cs

@@ -29,8 +29,7 @@ public abstract record UpdateOperationBase
             return string.Empty;
         }
 
-        var separator = "\n    ";
-        var report = $"Performed the following updates:{separator}{string.Join(separator, updateMessages.Select(m => $"- {m}"))}";
+        var report = $"Performed the following updates:\n{string.Join("\n", updateMessages.Select(m => $"- {m}"))}";
         return report;
     }
 

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

@@ -465,11 +465,8 @@ public class PackageManager
                             NuGetVersion latestVersion = versions.Where(v => !v.IsPrerelease).Max();
 
                             // Loop from the current version to the latest version, use next patch as a limit (unless there's a limit) so it doesn't look for versions that don't exist
-                            for (NuGetVersion version = currentVersionParent; version <= latestVersion; version = NextPatch(version, versions))
+                            for (NuGetVersion? version = currentVersionParent; version is not null && version <= latestVersion; version = NextPatch(version, versions))
                             {
-                                string parentVersion = version.ToString();
-                                parent.NewVersion = parentVersion;
-
                                 // Check if the parent needs to be updated since the child isn't in the existing package list  and the parent can update to a newer version to remove the dependency
                                 List<PackageToUpdate> dependencyListParentTemp = await GetDependenciesAsync(parent, targetFramework, projectDirectory, logger);
                                 PackageToUpdate parentDependencyTemp = dependencyListParentTemp.FirstOrDefault(p => string.Compare(p.PackageName, package.PackageName, StringComparison.OrdinalIgnoreCase) == 0);
@@ -477,7 +474,7 @@ public class PackageManager
                                 // If the newer package version of the parent has the same version as the parent's previous dependency, update
                                 if (parentDependencyTemp.CurrentVersion == package.CurrentVersion)
                                 {
-                                    parent.NewVersion = parentVersion;
+                                    parent.NewVersion = version.ToString();
                                     parent.CurrentVersion = null;
                                     await UpdateVersion(existingPackages, parent, targetFramework, projectDirectory, logger);
                                     package.IsSpecific = true;
@@ -534,18 +531,10 @@ public class PackageManager
     }
 
     // Method to update a version to the next available version for a package
-    public NuGetVersion NextPatch(NuGetVersion version, IEnumerable<NuGetVersion> allVersions)
+    private static NuGetVersion? NextPatch(NuGetVersion version, IEnumerable<NuGetVersion> allVersions)
     {
-        var versions = allVersions.Where(v => v > version);
-
-        if (!versions.Any())
-        {
-            // If there are no greater versions, return current version
-            return version;
-        }
-
-        // Find smallest version in the versions
-        return versions.Min();
+        var candidateVersions = allVersions.Where(v => v > version).ToArray();
+        return candidateVersions.Min();
     }
 
     // Method to find a compatible version with the child for the parent to update to
@@ -588,18 +577,10 @@ public class PackageManager
         }
 
         // Loop from the current version to the latest version, use next patch as a limit (unless there's a limit) so it doesn't look for versions that don't exist
-        for (NuGetVersion version = CurrentVersion; version <= latestVersion; version = NextPatch(version, versions))
+        for (NuGetVersion? version = CurrentVersion; version is not null && version <= latestVersion; version = NextPatch(version, versions))
         {
             possibleParent.NewVersion = version.ToString();
 
-            NuGetVersion nextPatch = NextPatch(version, versions);
-
-            // If the next patch is the same as the CurrentVersion, then nothing is needed
-            if (nextPatch == version)
-            {
-                return nextPatch;
-            }
-
             // Check if there's compatibility with parent and dependency
             if (await IsCompatibleAsync(possibleParent, possibleDependency, targetFramework, nugetContext.CurrentDirectory, logger))
             {

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

@@ -1033,7 +1033,18 @@ internal static partial class MSBuildHelper
         var matches = patterns.Select(p => p.Match(output)).Where(m => m.Success);
         if (matches.Any())
         {
-            var packages = matches.Select(m => m.Groups["PackageName"].Value).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
+            var packages = matches.Select(m =>
+                {
+                    var packageName = m.Groups["PackageName"].Value;
+                    if (m.Groups.TryGetValue("PackageVersion", out var versionGroup))
+                    {
+                        packageName = $"{packageName}/{versionGroup.Value}";
+                    }
+
+                    return packageName;
+                })
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToArray();
             throw new DependencyNotFoundException(packages);
         }
     }

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

@@ -27,7 +27,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         {
             // this package ships with the SDK and is automatically added for F# projects but should be manually added here to make the test consistent
             // only direct package discovery finds this, though
-            expectedDependencies.Add(new Dependency("FSharp.Core", "9.0.100", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true));
+            expectedDependencies.Add(new Dependency("FSharp.Core", MockNuGetPackage.FSharpCorePackageVersion.Value, DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true));
         }
 
         var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
@@ -1559,7 +1559,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             {
                 Path = "",
                 Projects = [],
-                Error = new DependencyNotFound("Transitive.Dependency"),
+                Error = new DependencyNotFound("Transitive.Dependency/>= 4.5.6"),
             }
         );
     }

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

@@ -346,6 +346,15 @@ namespace NuGetUpdater.Core.Test
             }
         });
 
+        public static readonly Lazy<string> FSharpCorePackageVersion = new(() =>
+        {
+            var fsharpPropsPath = Path.Combine(Path.GetDirectoryName(BundledVersionsPropsPath.Value)!, "FSharp", "Microsoft.FSharp.Core.NetSdk.props");
+            var fsharpPropsDocument = XDocument.Load(fsharpPropsPath);
+            var fsharpCoreVersionElement = fsharpPropsDocument.XPathSelectElement("//*[name()='FSCorePackageVersion']")!;
+            var fsharpCoreVersion = fsharpCoreVersionElement.Value;
+            return fsharpCoreVersion;
+        });
+
         private static readonly Dictionary<string, MockNuGetPackage> WellKnownPackages = new();
         public static MockNuGetPackage WellKnownReferencePackage(string packageName, string targetFramework, (string Path, byte[] Content)[]? files = null)
         {
@@ -370,7 +379,7 @@ namespace NuGetUpdater.Core.Test
                 }
 
                 string expectedVersion = matchingFrameworkElement.Attribute("TargetingPackVersion")!.Value;
-                return new(
+                WellKnownPackages[key] = new MockNuGetPackage(
                     $"{packageName}.Ref",
                     expectedVersion,
                     AdditionalMetadata:
@@ -440,6 +449,33 @@ namespace NuGetUpdater.Core.Test
             return WellKnownPackages[key];
         }
 
+        public static MockNuGetPackage WellKnownWindowsSdkRefPackage(string windowsSdkVersion)
+        {
+            var packageName = "Microsoft.Windows.SDK.NET.Ref";
+            var key = $"{packageName}/{windowsSdkVersion}";
+            if (!WellKnownPackages.ContainsKey(key))
+            {
+                var propsDocument = XDocument.Load(BundledVersionsPropsPath.Value);
+                var sdkTpmElement = propsDocument.XPathSelectElement($"/Project/ItemGroup/WindowsSdkSupportedTargetPlatformVersion[@Include='{windowsSdkVersion}']")!;
+                var packageVersion = sdkTpmElement.Attribute("WindowsSdkPackageVersion")!.Value!;
+                var package = new MockNuGetPackage(packageName, packageVersion, Files: [
+                    ("data/FrameworkList.xml", Encoding.UTF8.GetBytes("""
+                        <FileList Name="Windows SDK .NET 6.0">
+                          <!-- contents omitted -->
+                        </FileList>
+                        """)),
+                    ("data/RuntimeList.xml", Encoding.UTF8.GetBytes("""
+                        <FileList Name="Windows SDK .NET 6.0" TargetFrameworkIdentifier=".NETCoreApp" TargetFrameworkVersion="6.0" FrameworkName="Microsoft.Windows.SDK.NET.Ref">
+                          <!-- contents omitted -->
+                        </FileList>
+                        """))
+                ]);
+                WellKnownPackages[key] = package;
+            }
+
+            return WellKnownPackages[key];
+        }
+
         public static MockNuGetPackage[] CommonPackages { get; } =
         [
             CreateSimplePackage("NETStandard.Library", "2.0.3", "netstandard2.0"),
@@ -456,7 +492,6 @@ namespace NuGetUpdater.Core.Test
             WellKnownReferencePackage("Microsoft.WindowsDesktop.App", "net7.0"),
             WellKnownReferencePackage("Microsoft.WindowsDesktop.App", "net8.0"),
             WellKnownReferencePackage("Microsoft.WindowsDesktop.App", "net9.0"),
-            WellKnownHostPackage("Microsoft.NETCore.App", "net8.0"),
         ];
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/NuGetUpdater.Core.Test.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>