From fc74ae4df810086e14d4c0360f6e9a1cc6057ed9 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 9 Sep 2022 19:16:44 +0000
Subject: [PATCH 1/2] Remove roslyn patch

---
 ...Microsoft.CodeAnalysis.Common-depend.patch | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch

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 581e179517fa4cdc4e12cf8755833a61296ac0f7 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 12 Sep 2022 16:48:46 +0000
Subject: [PATCH 2/2] Remove unneeded ExtraPackageVersionPropsPackageInfo from
 Roslyn source-build project

---
 src/SourceBuild/tarball/content/repos/roslyn.proj | 4 ----
 1 file changed, 4 deletions(-)

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>