Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.25057.1

src/SourceBuild/content/eng/Version.Details.xml

@@ -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>

src/SourceBuild/content/eng/Versions.props

@@ -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>

src/SourceBuild/content/global.json

@@ -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"
   }
 }

src/SourceBuild/patches/razor/0001-Remove-unused-fields.patch

@@ -0,0 +1,45 @@
+From faa695199c8b8886c0d923f25a57c9728afeafbf Mon Sep 17 00:00:00 2001
+From: Matt Thalman <[email protected]>
+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;

src/SourceBuild/patches/razor/0002-Remove-unused-field-in-RazorContentTypeChangeListener.patch

@@ -0,0 +1,63 @@
+From 1d6f0ce17c97fcf541b5f45b000b4f54356e8f25 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <[email protected]>
+Date: Tue, 7 Jan 2025 18:28:41 -0600
+Subject: [PATCH] Remove unused field in RazorContentTypeChangeListener
+
+Backport: https://github.com/dotnet/razor/pull/11361
+---
+ .../LanguageClient/RazorContentTypeChangeListener.cs      | 8 --------
+ .../LanguageClient/RazorContentTypeChangeListenerTest.cs  | 1 -
+ 2 files changed, 9 deletions(-)
+
+diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs
+index dcc90c5787..13fb4b0696 100644
+--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs
++++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs
+@@ -18,7 +18,6 @@ internal class RazorContentTypeChangeListener : ITextBufferContentTypeListener
+     private readonly TrackingLSPDocumentManager _lspDocumentManager;
+     private readonly ITextDocumentFactoryService _textDocumentFactory;
+     private readonly ILspEditorFeatureDetector _lspEditorFeatureDetector;
+-    private readonly IEditorOptionsFactoryService _editorOptionsFactory;
+     private readonly IFileToContentTypeService _fileToContentTypeService;
+
+     [ImportingConstructor]
+@@ -26,7 +25,6 @@ internal class RazorContentTypeChangeListener : ITextBufferContentTypeListener
+         ITextDocumentFactoryService textDocumentFactory,
+         LSPDocumentManager lspDocumentManager,
+         ILspEditorFeatureDetector lspEditorFeatureDetector,
+-        IEditorOptionsFactoryService editorOptionsFactory,
+         IFileToContentTypeService fileToContentTypeService)
+     {
+         if (textDocumentFactory is null)
+@@ -44,11 +42,6 @@ internal class RazorContentTypeChangeListener : ITextBufferContentTypeListener
+             throw new ArgumentNullException(nameof(lspEditorFeatureDetector));
+         }
+
+-        if (editorOptionsFactory is null)
+-        {
+-            throw new ArgumentNullException(nameof(editorOptionsFactory));
+-        }
+-
+         if (fileToContentTypeService is null)
+         {
+             throw new ArgumentNullException(nameof(fileToContentTypeService));
+@@ -63,7 +56,6 @@ internal class RazorContentTypeChangeListener : ITextBufferContentTypeListener
+
+         _textDocumentFactory = textDocumentFactory;
+         _lspEditorFeatureDetector = lspEditorFeatureDetector;
+-        _editorOptionsFactory = editorOptionsFactory;
+         _fileToContentTypeService = fileToContentTypeService;
+     }
+
+diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorContentTypeChangeListenerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorContentTypeChangeListenerTest.cs
+index d01ea46d5c..d6afae6491 100644
+--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorContentTypeChangeListenerTest.cs
++++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorContentTypeChangeListenerTest.cs
+@@ -226,7 +226,6 @@ public class RazorContentTypeChangeListenerTest : ToolingTestBase
+             textDocumentFactory,
+             lspDocumentManager,
+             lspEditorFeatureDetector,
+-            Mock.Of<IEditorOptionsFactoryService>(s => s.GetOptions(It.IsAny<ITextBuffer>()) == Mock.Of<IEditorOptions>(MockBehavior.Strict), MockBehavior.Strict),
+             fileToContentTypeService);
+
+         return listener;

src/SourceBuild/patches/razor/0003-Remove-unnecessary-using.patch

@@ -0,0 +1,23 @@
+From fa8b9938dfaa72c790a1bf4a657af77ef2de5f13 Mon Sep 17 00:00:00 2001
+From: David Wengier <[email protected]>
+Date: Wed, 8 Jan 2025 12:03:12 +1100
+Subject: [PATCH] Remove using
+
+Backport: https://github.com/dotnet/razor/pull/11361
+
+---
+ .../LanguageClient/RazorContentTypeChangeListener.cs             | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs
+index 13fb4b0696..535223227b 100644
+--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs
++++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs
+@@ -5,7 +5,6 @@ using System;
+ using System.ComponentModel.Composition;
+ using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
+ using Microsoft.VisualStudio.Text;
+-using Microsoft.VisualStudio.Text.Editor;
+ using Microsoft.VisualStudio.Utilities;
+
+ namespace Microsoft.VisualStudio.Razor.LanguageClient;