From a9bc4070a803b679a873747c9a703052cb051a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 23 Jan 2025 14:43:10 -0800
Subject: [PATCH 1/2] Add Microsoft.CodeAnalysis.Workspaces.Common dependency
 for upcoming GenApi and ApiDiff changes.

---
 eng/Version.Details.xml                    | 4 ++++
 eng/Versions.props                         | 1 +
 src/Compatibility/Directory.Packages.props | 1 +
 3 files changed, 6 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index da507659a16f..fde8e1ef8fa8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -131,6 +131,10 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-1.25064.9">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-1.25064.9">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3f3527ac5671..76e852c3fc27 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -219,6 +219,7 @@
     <MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-1.25064.9</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-1.25064.9</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
     <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-1.25064.9</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-1.25064.9</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
     <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-1.25064.9</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
     <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-1.25064.9</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
   </PropertyGroup>
diff --git a/src/Compatibility/Directory.Packages.props b/src/Compatibility/Directory.Packages.props
index 3a07bbe661c3..76f0cff56e8e 100644
--- a/src/Compatibility/Directory.Packages.props
+++ b/src/Compatibility/Directory.Packages.props
@@ -6,6 +6,7 @@
     <!-- We pin the code analysis version when not in source build as we need to support running on older
          SDKs when the OOB package is used. -->
     <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file

From 4cad677a6b36ea335e61374ff81b53e9770b6d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 23 Jan 2025 14:59:08 -0800
Subject: [PATCH 2/2] Move PackageVersion outside of condition.

---
 src/Compatibility/Directory.Packages.props | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Compatibility/Directory.Packages.props b/src/Compatibility/Directory.Packages.props
index 76f0cff56e8e..9898fda73ffd 100644
--- a/src/Compatibility/Directory.Packages.props
+++ b/src/Compatibility/Directory.Packages.props
@@ -6,7 +6,10 @@
     <!-- We pin the code analysis version when not in source build as we need to support running on older
          SDKs when the OOB package is used. -->
     <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>