From 26c57635a2fb96fd426d8855aba07791d8bc8583 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 28 Mar 2025 13:52:39 -0700
Subject: [PATCH 1/3] Use --opt-cross-module only for assemblies within the
 servicing bubble

---
 ...crosoft.CodeAnalysis.LanguageServer.csproj | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
index 8415d81213eef..865e8ba8af424 100644
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -82,6 +82,28 @@
     </PropertyGroup>
   </Target>
 
+  <Target Name="AddCrossAssemblyOptimizationSwitch"
+    Condition="'$(TargetFramework)' != 'net6.0'"
+    DependsOnTargets="ResolveProjectReferences"
+    AfterTargets="ResolveProjectReferences">
+    <!-- We used to use - -opt-cross-module:* as a switch, but inlining code
+         from the runtime led to exposing bugs in crossgen/runtime in not rejecting
+         native code when the inlined code was stale.
+         To avoid customer facing bugs in C# Dev Kit, we are now taking the more
+         conservative approach of only inlining code from assemblies in the same
+         "servicing bubble" which are defined as vs-green 'components', which we can
+         most closely approximate here by just inlining code in assemblies that come
+         from project references. -->
+    <ItemGroup>
+      <_OptCrossModuleSwitch
+        Condition="'%(_ResolvedProjectReferencePaths.ReferenceOutputAssembly)'=='true'"
+        Include="@(_ResolvedProjectReferencePaths->'--opt-cross-module:%(FileName)')" />
+    </ItemGroup>
+    <PropertyGroup>
+      <PublishReadyToRunCrossgen2ExtraArgs>$(PublishReadyToRunCrossgen2ExtraArgs);@(_OptCrossModuleSwitch)</PublishReadyToRunCrossgen2ExtraArgs>
+    </PropertyGroup>
+  </Target>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />

From 2c274aaffe906cc21712febdcc2e561387dc548b Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 28 Mar 2025 13:55:19 -0700
Subject: [PATCH 2/3] Fix up comment

---
 .../Microsoft.CodeAnalysis.LanguageServer.csproj           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
index 865e8ba8af424..ce895edc00310 100644
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -89,11 +89,10 @@
     <!-- We used to use - -opt-cross-module:* as a switch, but inlining code
          from the runtime led to exposing bugs in crossgen/runtime in not rejecting
          native code when the inlined code was stale.
-         To avoid customer facing bugs in C# Dev Kit, we are now taking the more
+         To avoid customer facing bugs in C# extension, we are now taking the more
          conservative approach of only inlining code from assemblies in the same
-         "servicing bubble" which are defined as vs-green 'components', which we can
-         most closely approximate here by just inlining code in assemblies that come
-         from project references. -->
+         "servicing bubble", which we can most closely approximate here by just
+         inlining code in assemblies that come from project references. -->
     <ItemGroup>
       <_OptCrossModuleSwitch
         Condition="'%(_ResolvedProjectReferencePaths.ReferenceOutputAssembly)'=='true'"

From 0a743691a63f21eb1afb43efb0f61513079d1d40 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 28 Mar 2025 14:37:07 -0700
Subject: [PATCH 3/3] Remove condition

---
 .../Microsoft.CodeAnalysis.LanguageServer.csproj                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
index ce895edc00310..ae21a40d1d2da 100644
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -83,7 +83,6 @@
   </Target>
 
   <Target Name="AddCrossAssemblyOptimizationSwitch"
-    Condition="'$(TargetFramework)' != 'net6.0'"
     DependsOnTargets="ResolveProjectReferences"
     AfterTargets="ResolveProjectReferences">
     <!-- We used to use - -opt-cross-module:* as a switch, but inlining code