dotnet · chsienki · Oct 30, 2025 · Oct 23, 2025 · Oct 23, 2025 · Oct 24, 2025
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@
 artifacts/
 [Dd]ebug/
 [Rr]elease/
-x64/
 x86/ !eng/common/cross/x86/
 [Bb]in/
 [Oo]bj/

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -55,6 +55,16 @@
     <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

diff --git a/Razor.sln b/Razor.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.10919.115 main
+VisualStudioVersion = 18.0.10919.115
 MinimumVisualStudioVersion = 16.0.0.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.RazorExtension", "src\Razor\src\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj", "{BCF712D4-329A-4C7A-8292-9EFC864B2ABA}"
 EndProject
@@ -40,8 +40,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Lang
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Remote.Razor.Test", "src\Razor\test\Microsoft.CodeAnalysis.Remote.Razor.Test\Microsoft.CodeAnalysis.Remote.Razor.Test.csproj", "{39233703-B752-43AC-AD86-E9D3E61B4AD9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Remote.Razor.CoreComponents", "src\Razor\src\Microsoft.CodeAnalysis.Remote.Razor.CoreComponents\Microsoft.CodeAnalysis.Remote.Razor.CoreComponents.csproj", "{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4CAC99E0-6ECE-4264-96C3-AF4EEE7BC9D1}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -146,6 +144,10 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.Razo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.Test.Common.Cohosting", "src\Razor\test\Microsoft.AspNetCore.Razor.Test.Common.Cohosting\Microsoft.AspNetCore.Razor.Test.Common.Cohosting.csproj", "{8586B5E5-6AE9-35C5-01FA-0A02D6D5B2B5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.Remote.Razor.CoreComponents.x64", "src\Razor\src\Microsoft.CodeAnalysis.Remote.Razor.CoreComponents\x64\Microsoft.CodeAnalysis.Remote.Razor.CoreComponents.x64.csproj", "{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.Remote.Razor.CoreComponents.arm64", "src\Razor\src\Microsoft.CodeAnalysis.Remote.Razor.CoreComponents\arm64\Microsoft.CodeAnalysis.Remote.Razor.CoreComponents.arm64.csproj", "{F748E430-BFFE-93CF-8BD6-B89306AB7B77}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -266,14 +268,6 @@ Global
 		{39233703-B752-43AC-AD86-E9D3E61B4AD9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39233703-B752-43AC-AD86-E9D3E61B4AD9}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
 		{39233703-B752-43AC-AD86-E9D3E61B4AD9}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
 		{8CEC0991-259F-4313-B3EF-E398F2B40E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CEC0991-259F-4313-B3EF-E398F2B40E61}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CEC0991-259F-4313-B3EF-E398F2B40E61}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
@@ -538,12 +532,29 @@ Global
 		{8586B5E5-6AE9-35C5-01FA-0A02D6D5B2B5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8586B5E5-6AE9-35C5-01FA-0A02D6D5B2B5}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
 		{8586B5E5-6AE9-35C5-01FA-0A02D6D5B2B5}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{BCF712D4-329A-4C7A-8292-9EFC864B2ABA} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
+		{92463391-81BE-462B-AC3C-78C6C760741F} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{0F265874-C592-448B-BC4F-3430AB03E0DC} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
@@ -557,7 +568,6 @@ Global
 		{0D6FD2CD-3C0A-452B-AC12-DE6301C287AC} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{0FC409AF-B92B-42D0-9096-1F20360D2672} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{39233703-B752-43AC-AD86-E9D3E61B4AD9} = {92463391-81BE-462B-AC3C-78C6C760741F}
-		{17C4A6DF-3AA5-43FE-8A0E-53DF14340446} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{8CEC0991-259F-4313-B3EF-E398F2B40E61} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{87D808DC-5C9D-4D72-A9B7-C828A8DC09FA} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{0C7CB1C1-6CA3-42A1-AE3A-71A4DF581AC3} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
@@ -601,6 +611,8 @@ Global
 		{E102632D-EC30-474F-B2EB-6EB07ED45F27} = {440580F4-D746-49BB-AE8E-9F898483EA75}
 		{6778F3D4-C6C2-4882-9F86-54FCD44B078A} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{8586B5E5-6AE9-35C5-01FA-0A02D6D5B2B5} = {92463391-81BE-462B-AC3C-78C6C760741F}
+		{0B4CBFB8-DD7B-FC51-8CB7-7946DEACEB8B} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
+		{F748E430-BFFE-93CF-8BD6-B89306AB7B77} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}

@@ -1,4 +1,4 @@
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
   <!-- Opt-in arcade features -->
   <PropertyGroup>

@@ -0,0 +1,51 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFramework>$(NetVS)</TargetFramework>
+    <OutputType>library</OutputType>
+    <IsShipping>false</IsShipping>
+  </PropertyGroup>
+
+  <!-- VSIX properties -->
+  <PropertyGroup>
+
+    <IsVsixProject>true</IsVsixProject>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <DeployExtension>false</DeployExtension>
+
+    <SetupProductArch>$(ComponentArchitecture)</SetupProductArch>
+    <IsProductComponent>true</IsProductComponent>
+
+    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+
+    <VSSDKTargetPlatformRegRootSuffix>$(RazorVSSDKTargetPlatformRegRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
+    <ExtensionInstallationRoot>$(RazorExtensionInstallationRoot)</ExtensionInstallationRoot>
+    <ExtensionInstallationFolder>$(RazorExtensionInstallationFolderBase)\$(RazorServiceHubCoreSubFolder)</ExtensionInstallationFolder>
+    <VisualStudioInsertionComponent>$(RazorVisualStudioInsertionComponent)</VisualStudioInsertionComponent>
+
+    <!-- Only create the VSIX for official builds. In dev builds we reference the bits directly in the razor extension -->
+    <CreateVsixContainer>false</CreateVsixContainer>
+    <CreateVsixContainer Condition="'$(OfficialBuildId)' != ''">true</CreateVsixContainer>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.CodeAnalysis.Remote.Razor\Microsoft.CodeAnalysis.Remote.Razor.csproj">
+
+      <!-- Don't directly reference the project -->
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+
+      <!-- Instead call this target to get a list of what should be included when we build as a VSIX -->
+      <IncludeOutputGroupsInVSIX>PublishProjectOutputGroup</IncludeOutputGroupsInVSIX>
+
+      <!-- Ensure we consume the right components for our architecture and RID -->
+      <AdditionalProperties>RuntimeIdentifier=win-$(ComponentArchitecture);TargetFramework=$(NetVS)</AdditionalProperties>
+
+      <!-- Do not NGEN at install time. They are R2R compiled as part of the build instead -->
+      <Ngen>false</Ngen>
+    </ProjectReference>
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ComponentArchitecture>arm64</ComponentArchitecture>    
+  </PropertyGroup>
+
+  <Import Project="../CoreComponents.props"/>
+
+</Project>
+
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+    <Metadata>
+        <Identity Id="Microsoft.VisualStudio.RazorExtension.ServiceHub.arm64" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
+        <DisplayName>Razor Service Hub Components</DisplayName>
+        <Description xml:space="preserve">Razor Service Hub Components (arm64)</Description>
+
+        <!-- This is needed to mark this extension as cloud compliant. -->
+        <AllowClientRole>true</AllowClientRole>
+    </Metadata>
+    <Installation AllUsers="true" Experimental="true">
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,)">
+
+            <!-- https://github.com/dotnet/razor/issues/12411
+
+                 Our current build tools don't support arm64. Use a valid arch (amd64) to pass VSIX checks in the tools.
+                 VS doesn't seem to check this anyway so its fine. 
+            -->
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+    </Installation>
+
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+
+</PackageManifest>
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ComponentArchitecture>x64</ComponentArchitecture>    
+  </PropertyGroup>
+
+  <Import Project="../CoreComponents.props"/>
+
+</Project>
+
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="Microsoft.VisualStudio.RazorExtension.ServiceHub.x64" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
+    <DisplayName>Razor Service Hub Components</DisplayName>
+    <Description xml:space="preserve">Razor Service Hub Components (x64)</Description>
+
+    <!-- This is needed to mark this extension as cloud compliant. -->
+    <AllowClientRole>true</AllowClientRole>
+  </Metadata>
+  <Installation AllUsers="true" Experimental="true">
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,)">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+  </Installation>
+
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
+
+</PackageManifest>
@@ -17,6 +17,9 @@
 
     <!-- Don't warn about restoring ServiceHub assets for .NET Framework when we're compiling against netstandard2.0 -->
     <NoWarn>$(NoWarn);NU1701</NoWarn>
+
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
@@ -70,4 +73,25 @@
     <Using Include="$(ProjectName).Resources" />
   </ItemGroup>
 
+  <!-- Special target only consumed at VSIX creation time -->
+
+  <Target Name="PublishProjectOutputGroup" DependsOnTargets="Publish" Returns="@(_PublishedFiles)">
+    <ItemGroup>
+      <!-- Need to include and then update items (https://github.com/microsoft/msbuild/issues/1053) -->
+
+      <_ExcludedFiles Include="$(PublishDir)**\Microsoft.CodeAnalysis.Remote.Razor.CoreComponents.*" />
+
+      <_PublishedFiles Include="$(PublishDir)**\Microsoft.CodeAnalysis.Razor.*" />
+      <_PublishedFiles Include="$(PublishDir)**\Microsoft.CodeAnalysis.Remote.Razor.*" Exclude="@(_ExcludedFiles)"/>
+      <_PublishedFiles Include="$(PublishDir)**\Microsoft.AspNetCore.*" />
+      <_PublishedFiles Include="$(PublishDir)**\Microsoft.Extensions.ObjectPool.dll" />
+
+      <_PublishedFiles Remove="@(_PublishedFiles)" Condition="'%(Extension)' == '.pdb'" />
+      <_PublishedFiles Remove="@(_PublishedFiles)" Condition="'%(Extension)' == '.xml'" />
+
+      <!-- Set TargetPath -->
+      <_PublishedFiles Update="@(_PublishedFiles)" TargetPath="%(RecursiveDir)%(Filename)%(Extension)" />
+    </ItemGroup>
+  </Target>
+
 </Project>