From e872e5f33eec791e59d93ebe8d2a3d56c6aabcd0 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 22 Sep 2022 18:41:10 +0000
Subject: [PATCH 1/4] Remove Roslyn patch for Microsoft.CodeAnalysis.Common
 dependencies

---
 .../tarball/content/repos/roslyn.proj         |  4 ---
 ...Microsoft.CodeAnalysis.Common-depend.patch | 26 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch

diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj
index 29e53696f..51efdd92e 100644
--- a/src/SourceBuild/tarball/content/repos/roslyn.proj
+++ b/src/SourceBuild/tarball/content/repos/roslyn.proj
@@ -32,10 +32,6 @@
       need to support VS.
     -->
     <ExtraPackageVersionPropsPackageInfo Include="SourceGeneratorMicrosoftCodeAnalysisVersion" Version="%24(MicrosoftCodeAnalysisCommonVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemCollectionsImmutableVersion" Version="%24(SystemCollectionsImmutableVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemReflectionMetadataVersion" Version="%24(SystemReflectionMetadataVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion" Version="%24(SystemRuntimeCompilerServicesUnsafeVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemTextEncodingCodePagesVersion" Version="%24(SystemTextEncodingCodePagesVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch
deleted file mode 100644
index 6096888d1..000000000
--- a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
-Date: Thu, 21 Oct 2021 23:15:23 +0000
-Subject: [PATCH 1/2] lift version of Microsoft.CodeAnalysis.Common
- dependencies to previously source built versions
-
-Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch
----
- .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
-index 7eae8afa275..a50822a6aeb 100644
---- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
-+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
-@@ -27,5 +27,9 @@
-     <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKindFacts.cs" Link="Grammar\SyntaxKindFacts.cs" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
- 
-     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(SourceGeneratorMicrosoftCodeAnalysisVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Collections.Immutable" Version="$(SourceBuildLiftedSystemCollectionsImmutableVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Reflection.Metadata" Version="$(SourceBuildLiftedSystemReflectionMetadataVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SourceBuildLiftedSystemTextEncodingCodePagesVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-   </ItemGroup>
- </Project>
-\ No newline at end of file

From d1a77fe17ba85cd45a105e2890c182695a5a213f Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Sat, 24 Sep 2022 01:11:18 +0000
Subject: [PATCH 2/4] Pin Microsoft.CodeAnalysis.Common to SBRP version

---
 src/SourceBuild/tarball/content/Directory.Build.props | 5 +++++
 src/SourceBuild/tarball/content/repos/roslyn.proj     | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
index 61cc6ff67..01fbc334e 100644
--- a/src/SourceBuild/tarball/content/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/Directory.Build.props
@@ -211,6 +211,11 @@
     <CliInternalBuildVersion>30000001-1</CliInternalBuildVersion>
   </PropertyGroup>
 
+  <!-- Ref-only package versions -->
+  <PropertyGroup>
+    <RefOnlyMicrosoftCodeAnalysisCommonVersion>4.0.1</RefOnlyMicrosoftCodeAnalysisCommonVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <ExtraPackageVersionPropsPackageInfo Include="DotnetCliInternalVersion" Version="3.0.100-$(CliInternalReleaseTag)-$(CliInternalBuildVersion)" />
   </ItemGroup>
diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj
index 51efdd92e..878c9c70e 100644
--- a/src/SourceBuild/tarball/content/repos/roslyn.proj
+++ b/src/SourceBuild/tarball/content/repos/roslyn.proj
@@ -28,10 +28,10 @@
          repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
          but not higher than our minimum dogfoodable Visual Studio version, or else
          the generators we build would load on the command line but not load in IDEs.
-      In source-build these don't need to be pinned and can use the source-built versions since it doesn't
-      need to support VS.
+
+      In source-build we use ref-only package from SBRP.
     -->
-    <ExtraPackageVersionPropsPackageInfo Include="SourceGeneratorMicrosoftCodeAnalysisVersion" Version="%24(MicrosoftCodeAnalysisCommonVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="SourceGeneratorMicrosoftCodeAnalysisVersion" Version="$(RefOnlyMicrosoftCodeAnalysisCommonVersion)" />
   </ItemGroup>
 
   <ItemGroup>

From f7633eb432da83a5a86c4fb2af2033adce3097b5 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 29 Sep 2022 00:03:29 +0000
Subject: [PATCH 3/4] Update Microsoft.CodeAnalysis.Common version to 4.1.0

---
 src/SourceBuild/tarball/content/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
index 01fbc334e..4ac4c2a27 100644
--- a/src/SourceBuild/tarball/content/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/Directory.Build.props
@@ -213,7 +213,7 @@
 
   <!-- Ref-only package versions -->
   <PropertyGroup>
-    <RefOnlyMicrosoftCodeAnalysisCommonVersion>4.0.1</RefOnlyMicrosoftCodeAnalysisCommonVersion>
+    <RefOnlyMicrosoftCodeAnalysisCommonVersion>4.1.0</RefOnlyMicrosoftCodeAnalysisCommonVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 04c49844d3bc1266763011f92ba1feb1d4f4d0fc Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 30 Sep 2022 16:23:36 +0000
Subject: [PATCH 4/4] Do not set property already set by Roslyn

---
 .../tarball/content/Directory.Build.props           |  5 -----
 src/SourceBuild/tarball/content/repos/roslyn.proj   | 13 -------------
 2 files changed, 18 deletions(-)

diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
index 4ac4c2a27..61cc6ff67 100644
--- a/src/SourceBuild/tarball/content/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/Directory.Build.props
@@ -211,11 +211,6 @@
     <CliInternalBuildVersion>30000001-1</CliInternalBuildVersion>
   </PropertyGroup>
 
-  <!-- Ref-only package versions -->
-  <PropertyGroup>
-    <RefOnlyMicrosoftCodeAnalysisCommonVersion>4.1.0</RefOnlyMicrosoftCodeAnalysisCommonVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <ExtraPackageVersionPropsPackageInfo Include="DotnetCliInternalVersion" Version="3.0.100-$(CliInternalReleaseTag)-$(CliInternalBuildVersion)" />
   </ItemGroup>
diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj
index 878c9c70e..bdc856b21 100644
--- a/src/SourceBuild/tarball/content/repos/roslyn.proj
+++ b/src/SourceBuild/tarball/content/repos/roslyn.proj
@@ -21,19 +21,6 @@
     <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!--
-      From roslyn Versions.props:
-        The version of Roslyn we build Source Generators against that are built in this
-         repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
-         but not higher than our minimum dogfoodable Visual Studio version, or else
-         the generators we build would load on the command line but not load in IDEs.
-
-      In source-build we use ref-only package from SBRP.
-    -->
-    <ExtraPackageVersionPropsPackageInfo Include="SourceGeneratorMicrosoftCodeAnalysisVersion" Version="$(RefOnlyMicrosoftCodeAnalysisCommonVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />