dotnet · mthalman · Jan 9, 2025 · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025
@@ -2,9 +2,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24604.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25056.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
+      <Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
@@ -23,8 +23,8 @@
       of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
       are not necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.24612.1</PrivateSourceBuiltSdkVersion>
-    <PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24612.1-2</PrivateSourceBuiltArtifactsVersion>
+    <PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.25057.1</PrivateSourceBuiltSdkVersion>
+    <PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.25057.1-2</PrivateSourceBuiltArtifactsVersion>
     <PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-7</PrivateSourceBuiltPrebuiltsVersion>
     <!-- command-line-api dependencies -->
     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>

@@ -1,10 +1,10 @@
 {
   "tools": {
-    "dotnet": "10.0.100-alpha.1.24611.6"
+    "dotnet": "10.0.100-alpha.1.25056.8"
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1"
   }
 }
diff --git a/src/SourceBuild/patches/nuget-client/0001-Fix-formatting-in-GraphOperations.patch b/src/SourceBuild/patches/nuget-client/0001-Fix-formatting-in-GraphOperations.patch
@@ -0,0 +1,23 @@
+From 4172c85f6765aced2483ba6342df3b82ccc1b666 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Tue, 7 Jan 2025 13:39:07 -0600
+Subject: [PATCH] Fix formatting in GraphOperations
+
+Backport: https://github.com/NuGet/NuGet.Client/pull/6212
+---
+ .../NuGet.DependencyResolver.Core/GraphModel/GraphOperations.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/GraphOperations.cs b/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/GraphOperations.cs
+index cd5341edb..57f73ae6c 100644
+--- a/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/GraphOperations.cs
++++ b/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/GraphOperations.cs
+@@ -872,7 +872,7 @@ private static void DetectAndMarkAmbiguousCentralTransitiveDependencies<TItem>(T
+                 // Some node were marked ambiguous, thus we need another run to check if nodes previously not marked ambiguous should be marked ambiguous this time.
+                 if (!nodeMarkedAmbiguous)
+                     break;
+-            };
++            }
+         }
+
+         private static void RejectCentralTransitiveBecauseOfRejectedParents<TItem>(this GraphNode<TItem> root, Tracker<TItem> tracker, List<GraphNode<TItem>> centralTransitiveNodes)
@@ -0,0 +1,45 @@
+From faa695199c8b8886c0d923f25a57c9728afeafbf Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Tue, 7 Jan 2025 14:48:06 -0600
+Subject: [PATCH] Remove unused fields
+
+Backport: https://github.com/dotnet/razor/pull/11358
+---
+ .../Microsoft.AspNetCore.Razor.LanguageServer/LspServices.cs  | 4 +---
+ .../AutoInsert/RemoteAutoInsertService.cs                     | 1 -
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspServices.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspServices.cs
+index 43a17a0402..01bf4ada70 100644
+--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspServices.cs
++++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspServices.cs
+@@ -14,16 +14,14 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer;
+ internal class LspServices : ILspServices
+ {
+     private readonly IServiceProvider _serviceProvider;
+-    private readonly IEnumerable<IRazorStartupService> _startupServices;
+     public bool IsDisposed = false;
+
+     public LspServices(IServiceCollection serviceCollection)
+     {
+         serviceCollection.AddSingleton<ILspServices>(this);
+         _serviceProvider = serviceCollection.BuildServiceProvider();
+-
+         // Create all startup services
+-        _startupServices = _serviceProvider.GetServices<IRazorStartupService>();
++        _serviceProvider.GetServices<IRazorStartupService>();
+     }
+
+     public ImmutableArray<Type> GetRegisteredServices()
+diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/AutoInsert/RemoteAutoInsertService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/AutoInsert/RemoteAutoInsertService.cs
+index 27dcc78952..f8ab749b66 100644
+--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/AutoInsert/RemoteAutoInsertService.cs
++++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/AutoInsert/RemoteAutoInsertService.cs
+@@ -32,7 +32,6 @@ internal sealed class RemoteAutoInsertService(in ServiceArgs args)
+     }
+
+     private readonly IAutoInsertService _autoInsertService = args.ExportProvider.GetExportedValue<IAutoInsertService>();
+-    private readonly IFilePathService _filePathService = args.ExportProvider.GetExportedValue<IFilePathService>();
+     private readonly IRazorFormattingService _razorFormattingService = args.ExportProvider.GetExportedValue<IRazorFormattingService>();
+
+     protected override IDocumentPositionInfoStrategy DocumentPositionInfoStrategy => PreferHtmlInAttributeValuesDocumentPositionInfoStrategy.Instance;
diff --git a/src/SourceBuild/patches/vstest/0001-Fix-formatting-in-Runner.patch b/src/SourceBuild/patches/vstest/0001-Fix-formatting-in-Runner.patch
@@ -0,0 +1,23 @@
+From 4b3395b9d8de274f74d2540fca406944f8d0b0f3 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Tue, 7 Jan 2025 14:50:28 -0600
+Subject: [PATCH] Fix formatting in Runner
+
+Backport: https://github.com/microsoft/vstest/pull/13871
+---
+ test/Intent/Runner.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Intent/Runner.cs b/test/Intent/Runner.cs
+index cbe7706cb..fad005b98 100644
+--- a/test/Intent/Runner.cs
++++ b/test/Intent/Runner.cs
+@@ -68,7 +68,7 @@ public class Runner
+                         // When the result is a task we need to await it.
+                         // TODO: this can be improved with await, imho
+                         task.GetAwaiter().GetResult();
+-                    };
++                    }
+
+                     passed++;
+                     logger.WriteTestPassed(method, testStopwatch.Elapsed);