dependabot-nuget 0.376.0 → 0.377.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec437941cf1fdddecec2994f2ae13da254ea4b8aac55f544c18d87e81c9eeddb
-  data.tar.gz: 2dcfcb2856a9decf3f82e63ebe0e91cbaeb68be4b45d6445217473d64d408fd2
+  metadata.gz: dba41e8227fe7c18846434db95b9617fc1d2963428f7851f4c248fbfaaca1b73
+  data.tar.gz: 13a02dcb2133bf1a36b1f0ba183153414f9f6fbefa88ed9d7173ba38e7296c77
 SHA512:
-  metadata.gz: 1ec56d9fd7164bbd809a1d217dd891b6f57186b67af47a0279381c68f5d013e7917956629db1f0d2ecf81e5012c24b87668fa979e1ca186811db21ba28271534
-  data.tar.gz: 36b654040a7e8932ab1105bf967c8c34aa97fa9a2fb2c07bf1b889a662f30ef85da95229e2403f62c741e49998e898d76d0f0727868b3df5c64dd2e741af0eed
+  metadata.gz: 9268758aa477319ed85dbc93b5d61dba568038933349982d7e4da93964d9cf7747ff321cabbb9c6eb6ee5fd49d91d5553a57fc7766b1cde71359abd7aa8095ce
+  data.tar.gz: f10921ba0a2941b69c847abf8bceafc1606e5ce19f9056fa1434167fce882d122d0245056424c25fcd03a4f260f1dbf1722536a96166356338a2e4c03bc82db4

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

@@ -17,7 +17,7 @@
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.3" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
     <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
@@ -25,9 +25,9 @@
     <PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.17" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="NuGet.Core" Version="2.14.0" Aliases="CoreV2" />
-    <PackageVersion Include="OpenTelemetry" Version="1.12.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
     <PackageVersion Include="Semver" Version="3.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.3" />
     <PackageVersion Include="System.ComponentModel.Composition" Version="10.0.3" />

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/SupportedFrameworks.cs

@@ -23,6 +23,7 @@ namespace NuGetGallery.Frameworks
         public static readonly Version Version8 = new Version(8, 0, 0, 0);
         public static readonly Version Version9 = new Version(9, 0, 0, 0);
         public static readonly Version Version10 = new Version(10, 0, 0, 0);
+        public static readonly Version Version11 = new Version(11, 0, 0, 0);
 
         public static readonly NuGetFramework MonoAndroid = new NuGetFramework(FrameworkIdentifiers.MonoAndroid, EmptyVersion);
         public static readonly NuGetFramework MonoTouch = new NuGetFramework(FrameworkIdentifiers.MonoTouch, EmptyVersion);
@@ -73,6 +74,8 @@ namespace NuGetGallery.Frameworks
         public static readonly NuGetFramework Net100TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version10, "tvos", EmptyVersion);
         public static readonly NuGetFramework Net100Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version10, "windows", EmptyVersion);
 
+        public static readonly NuGetFramework Net110 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version11);
+
         public static readonly NuGetFramework NetCore = new NuGetFramework(FrameworkIdentifiers.NetCore, EmptyVersion);
         public static readonly NuGetFramework NetMf = new NuGetFramework(FrameworkIdentifiers.NetMicro, EmptyVersion);
         public static readonly NuGetFramework UAP = new NuGetFramework(FrameworkIdentifiers.UAP, EmptyVersion);
@@ -103,6 +106,7 @@ namespace NuGetGallery.Frameworks
                 Net80, Net80Android, Net80Browser, Net80Ios, Net80MacCatalyst, Net80MacOs, Net80TvOs, Net80Windows, Net80Windows7,
                 Net90, Net90Android, Net90Browser, Net90Ios, Net90MacCatalyst, Net90MacOs, Net90TvOs, Net90Windows, Net90Windows7,
                 Net100, Net100Android, Net100Browser, Net100Ios, Net100MacCatalyst, Net100MacOs, Net100TvOs, Net100Windows, Net100Windows7,
+                Net110,
                 NetCore, NetCore45, NetCore451,
                 NetCoreApp10, NetCoreApp11, NetCoreApp20, NetCoreApp21, NetCoreApp22, NetCoreApp30, NetCoreApp31,
                 NetMf,

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/FileWriters/XmlFileWriter.cs

@@ -201,32 +201,24 @@ public class XmlFileWriter : IFileWriter
                     var lastPriorElement = elementsBeforeNew.LastOrDefault();
                     if (lastPriorElement is not null)
                     {
-                        // find line number of last prior element
-                        // find the offset of the first token on each newline
-                        var firstOffsetForLine = new List<int>();
-                        foreach (var tr in filesAndContents[projectRelativePath].DescendantTrivia(descendIntoChildren: _ => true, descendIntoTrivia: true))
+                        // find line indent of the prior element and mimic it
+                        var lastPriorElementIndent = string.Empty;
+                        for (int i = elementsBeforeNew.Length - 1; i >= 0; i--)
                         {
-                            if (tr.Kind == SyntaxKind.EndOfLineTrivia)
+                            var elementIndent = elementsBeforeNew[i].GetLeadingTrivia().ToFullString();
+                            var lastNewlineIndex = elementIndent.LastIndexOf('\n');
+                            if (lastNewlineIndex < 0)
                             {
-                                firstOffsetForLine.Add(tr.SpanStart);
+                                // prior element is on the same line as its prior sibling so keep walking backwards
+                                continue;
                             }
 
-                            if (tr.SpanStart >= lastPriorElement.SpanStart)
-                            {
-                                break;
-                            }
+                            var elementLineIndent = elementIndent[(lastNewlineIndex + 1)..];
+                            lastPriorElementIndent = elementLineIndent;
+                            break;
                         }
 
-                        var lastPriorElementLineNumber = firstOffsetForLine.Count(o => o < lastPriorElement.SpanStart);
-                        var lastElementAtStartOfLine = lastPriorElement.Parent.ChildNodes
-                            .First(n => firstOffsetForLine.Count(o => o < n.SpanStart) >= lastPriorElementLineNumber);
-                        var trivia = lastElementAtStartOfLine.GetLeadingTrivia().ToList();
-                        var priorEolIndex = trivia.FindLastIndex(t => t.Kind == SyntaxKind.EndOfLineTrivia);
-                        var indentTrivia = trivia
-                            .Skip(priorEolIndex + 1)
-                            .Select(t => SyntaxFactory.WhitespaceTrivia(t.ToFullString()))
-                            .ToArray();
-                        var newTrivia = new SyntaxTriviaList([SyntaxFactory.EndOfLineTrivia("\n"), .. indentTrivia]);
+                        var newTrivia = new SyntaxTriviaList([SyntaxFactory.EndOfLineTrivia("\n"), SyntaxFactory.WhitespaceTrivia(lastPriorElementIndent)]);
                         newElement = (IXmlElementSyntax)newElement.AsNode.WithLeadingTrivia(newTrivia);
                         var replacementParent = lastPriorElement.Parent.InsertNodesAfter(lastPriorElement, [newElement.AsNode]);
                         var actualReplacementParent = ReplaceNode(projectRelativePath, lastPriorElement.Parent, replacementParent);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/FrameworkChecker/CompatibilityCheckerFacts.cs

@@ -7,6 +7,8 @@ namespace NuGetUpdater.Core.Test.FrameworkChecker;
 public class CompatibilityCheckerFacts
 {
     [Theory]
+    [InlineData("net11.0", "net11.0")]
+    [InlineData("net11.0", "net10.0")]
     [InlineData("net10.0", "net10.0")]
     [InlineData("net10.0", "net9.0")]
     [InlineData("net9.0", "net9.0")]

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/XmlFileWriterTests.cs

@@ -1747,6 +1747,85 @@ public class XmlFileWriterTests : FileWriterTestsBase
         );
     }
 
+    [Fact]
+    public async Task FormattingIsPreserved_InMiddleOfItemGroup_HonorsIndentation()
+    {
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net10.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Package.A" Version="2.0.0" />
+                        <PackageReference Include="Package.B" Version="2.0.0" />
+                        <PackageReference Include="Package.D" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: ["Package.C/1.0.0"],
+            requiredDependencyStrings: ["Package.C/1.1.0"],
+            expectedFiles: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net10.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Package.A" Version="2.0.0" />
+                        <PackageReference Include="Package.B" Version="2.0.0" />
+                        <PackageReference Include="Package.C" Version="1.1.0" />
+                        <PackageReference Include="Package.D" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ]
+        );
+    }
+
+    [Fact]
+    public async Task FormattingIsPreserved_InMiddleOfItemGroup_HonorsIndentation_EvenWithWhitespaceOnlyLine()
+    {
+        // note that the blank line after Package.A isn't actually blank; it has two leading spaces
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net10.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Package.A" Version="2.0.0" />
+                          
+                        <PackageReference Include="Package.B" Version="2.0.0" />
+                        <PackageReference Include="Package.D" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: ["Package.C/1.0.0"],
+            requiredDependencyStrings: ["Package.C/1.1.0"],
+            expectedFiles: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net10.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Package.A" Version="2.0.0" />
+                          
+                        <PackageReference Include="Package.B" Version="2.0.0" />
+                        <PackageReference Include="Package.C" Version="1.1.0" />
+                        <PackageReference Include="Package.D" Version="2.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ]
+        );
+    }
+
     [Fact]
     public async Task UpdateOfSdkManagedPackageCanOccurDespiteVersionReplacements()
     {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.376.0
+  version: 0.377.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.376.0
+        version: 0.377.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.376.0
+        version: 0.377.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -556,7 +556,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.376.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.377.0
 rdoc_options: []
 require_paths:
 - lib