Snap for 18.3

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

.devcontainer/devcontainer.json

@@ -39,7 +39,7 @@
         "omnisharp.useModernNet": true,
         "omnisharp.enableAsyncCompletion": true,
         // ms-dotnettools.csdevkit settings
-        "dotnet.defaultSolution": "Razor.sln",
+        "dotnet.defaultSolution": "Razor.slnx",
         // ms-vscode.powershell settings
         "powershell.promptToUpdatePowerShell": false,
         "powershell.integratedConsole.showOnStartup": false,

.github/copilot-instructions.md

@@ -46,6 +46,7 @@ Razor documents contain multiple languages:
 - Prefer raw string literals over verbatim strings
 - Ideally we test the end user scenario, not implementation details
 - Consider cross-platform compatibility by testing path handling and case sensitivity where applicable
+- For tooling, "Cohosting" is the new architecture we're moving towards, so always create tests in the src\Razor\test\Microsoft.VisualStudioCode.RazorExtension.Test project
 
 ### Architecture Considerations
 
@@ -57,7 +58,7 @@ Razor documents contain multiple languages:
 ## Build and Development
 
 ### Prerequisites
-- .NET 8.0+ SDK (latest version specified in `global.json`)
+- .NET 9.0+ SDK (latest version specified in `global.json`)
 - Visual Studio 2026 (Windows) or VS Code with C# extension (Windows, macOS or Linux)
 - PowerShell (for Windows build scripts)
 

.gitignore

@@ -17,7 +17,6 @@
 artifacts/
 [Dd]ebug/
 [Rr]elease/
-x64/
 x86/ !eng/common/cross/x86/
 [Bb]in/
 [Oo]bj/

Directory.Build.props

@@ -40,8 +40,11 @@
     <!-- Embed source files that are not tracked by the source control manager in the PDB. -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
-    <!-- Working around https://github.com/dotnet/sdk/issues/24747 -->
-    <NoWarn>$(NoWarn);NU1505</NoWarn>
+    <!--
+      NU1505: Working around https://github.com/dotnet/sdk/issues/24747
+      NETSDK1233: Working around https://github.com/dotnet/sdk/issues/51678 until we move our Windows CI to VS2026 images.
+    -->
+    <NoWarn>$(NoWarn);NU1505;NETSDK1233</NoWarn>
 
     <!-- Working around https://github.com/microsoft/msbuild/pull/4764 -->
     <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
@@ -51,10 +54,20 @@
 
     <NetFxVS>net472</NetFxVS>
     <NetVS>net8.0</NetVS>
-    <NetVSCode>net9.0</NetVSCode>
+    <NetVSCode>net10.0</NetVSCode>
     <NetVSAndVSCode>$(NetVS);$(NetVSCode)</NetVSAndVSCode>
   </PropertyGroup>
 
+  <PropertyGroup Label="VSIX Settings">
+    <RazorVSSDKTargetPlatformRegRootSuffix>RoslynDev</RazorVSSDKTargetPlatformRegRootSuffix>
+    <RazorExtensionInstallationRoot>CommonExtensions</RazorExtensionInstallationRoot>
+    <!-- Base folder for Razor Language Services content inside CommonExtensions -->
+    <RazorExtensionInstallationFolderBase>Microsoft\RazorLanguageServices</RazorExtensionInstallationFolderBase>
+    <!-- Sub-folder used by ServiceHub core components -->
+    <RazorServiceHubCoreSubFolder>ServiceHubCore</RazorServiceHubCoreSubFolder>
+    <RazorVisualStudioInsertionComponent>Microsoft.VisualStudio.RazorExtension</RazorVisualStudioInsertionComponent>
+  </PropertyGroup>
+
   <!--
     There are effectively three modes that are needed for our source build TFMs and this is where
     we calculate them

Directory.Packages.props

@@ -6,17 +6,16 @@
   -->
   <PropertyGroup>
     <_MicrosoftWebToolsPackageVersion>17.11.11-preview-0001</_MicrosoftWebToolsPackageVersion>
-    <_MicrosoftVisualStudioShellPackagesVersion>18.0.2101-preview.1</_MicrosoftVisualStudioShellPackagesVersion>
-    <_MicrosoftVisualStudioPackagesVersion>18.0.332-preview</_MicrosoftVisualStudioPackagesVersion>
+    <_MicrosoftVisualStudioShellPackagesVersion>18.0.2188-preview.1</_MicrosoftVisualStudioShellPackagesVersion>
+    <_MicrosoftVisualStudioPackagesVersion>18.0.404-preview</_MicrosoftVisualStudioPackagesVersion>
     <_VisualStudioLanguageServerProtocolVersion>17.12.1-preview</_VisualStudioLanguageServerProtocolVersion>
     <_MicrosoftExtensionsPackageVersion>9.0.0</_MicrosoftExtensionsPackageVersion>
     <_BasicReferenceAssembliesVersion>1.7.2</_BasicReferenceAssembliesVersion>
     <_BenchmarkDotNetPackageVersion>0.13.5.2136</_BenchmarkDotNetPackageVersion>
-    <_MicrosoftVisualStudioExtensibilityTestingVersion>0.1.785-beta</_MicrosoftVisualStudioExtensibilityTestingVersion>
-    <_RoslynDiagnosticAnalyzersPackageVersion>3.11.0-beta1.24508.2</_RoslynDiagnosticAnalyzersPackageVersion>
+    <_MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</_MicrosoftVisualStudioExtensibilityTestingVersion>
     <_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</_MicrosoftVisualStudioLanguageServicesPackageVersion>
     <_XunitPackageVersion>2.9.2</_XunitPackageVersion>
-    <_MicrosoftBuildPackageVersion>17.15.0-preview-25353-11</_MicrosoftBuildPackageVersion>
+    <_MicrosoftBuildPackageVersion>17.15.0-preview-25357-08</_MicrosoftBuildPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -87,7 +86,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Implementation" Version="$(_MicrosoftVisualStudioPackagesVersion)" NoWarn="NU1701" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.15.20-alpha" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.15.22-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
     <PackageVersion Include="Microsoft.VisualStudio.Web" Version="16.10.0-preview-1-31008-014" />
     <PackageVersion Include="Microsoft.WebTools.Languages.Html" Version="$(_MicrosoftWebToolsPackageVersion)" />
@@ -101,7 +100,7 @@
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.12.87" />
     <PackageVersion Include="NuGet.VisualStudio" Version="17.9.1" />
-    <PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(_RoslynDiagnosticAnalyzersPackageVersion)" />
+    <PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(RoslynDiagnosticsAnalyzersPackageVersion)" />
     <PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />

NuGet.config

@@ -56,6 +56,7 @@
       <package pattern="nuget.projectmodel" />
       <package pattern="nuget.protocol" />
       <package pattern="nuget.versioning" />
+      <package pattern="roslyn.diagnostics.analyzers" />
     </packageSource>
     <packageSource key="dotnet6-transport">
       <package pattern="microsoft.net.sdk.razor" />

Razor.Slim.slnf

@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "Razor.sln",
+    "path": "Razor.slnx",
     "projects": [
       "src\\Analyzers\\Razor.Diagnostics.Analyzers.Test\\Razor.Diagnostics.Analyzers.Test.csproj",
       "src\\Analyzers\\Razor.Diagnostics.Analyzers\\Razor.Diagnostics.Analyzers.csproj",
@@ -20,13 +20,11 @@
       "src\\Compiler\\tools\\Microsoft.CodeAnalysis.Razor.Tooling.Internal\\Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj",
       "src\\Razor\\src\\Microsoft.CodeAnalysis.Razor.Workspaces\\Microsoft.CodeAnalysis.Razor.Workspaces.csproj",
       "src\\Razor\\src\\Microsoft.CodeAnalysis.Remote.Razor\\Microsoft.CodeAnalysis.Remote.Razor.csproj",
-      "src\\Razor\\src\\Microsoft.VisualStudio.DevKit.Razor\\Microsoft.VisualStudio.DevKit.Razor.csproj",
       "src\\Razor\\src\\Microsoft.VisualStudio.LanguageServer.ContainedLanguage\\Microsoft.VisualStudio.LanguageServer.ContainedLanguage.csproj",
       "src\\Razor\\src\\Microsoft.VisualStudio.LanguageServices.Razor\\Microsoft.VisualStudio.LanguageServices.Razor.csproj",
       "src\\Razor\\src\\Microsoft.VisualStudio.RazorExtension\\Microsoft.VisualStudio.RazorExtension.csproj",
       "src\\Razor\\src\\Microsoft.VisualStudioCode.RazorExtension\\Microsoft.VisualStudioCode.RazorExtension.csproj",
       "src\\Razor\\src\\Microsoft.AspNetCore.Razor.LanguageServer\\Microsoft.AspNetCore.Razor.LanguageServer.csproj",
-      "src\\Razor\\src\\rzls\\rzls.csproj",
       "src\\Razor\\test\\Microsoft.AspNetCore.Razor.Test.Common.Tooling\\Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj",
       "src\\Razor\\test\\Microsoft.AspNetCore.Razor.LanguageServer.Test\\Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj",
       "src\\Razor\\test\\Microsoft.CodeAnalysis.Razor.Workspaces.Test\\Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj",