From 1fa93166f7e9b17fc23534f6b1d4d7a565d34bc3 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Fri, 21 Apr 2023 00:35:15 +0000
Subject: [PATCH] Resolve roslyn-analyzers patch conflict

---
 ...iminate-pre-built-assets-during-source-build-for-r.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
index 37152b13a..e86f6d864 100644
--- a/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
+++ b/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
@@ -94,7 +94,7 @@ index 114e30a43..e38f8549f 100644
  
      <!-- Avoid ID conflicts with the package project. -->
      <PackageId>*$(MSBuildProjectFile)*</PackageId>
--    <MicrosoftCodeAnalysisVersion>3.9.0</MicrosoftCodeAnalysisVersion>
+-    <MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion>
    </PropertyGroup>
  
    <ItemGroup>
@@ -106,7 +106,7 @@ index a44df8a50..cba084cd5 100644
  
      <!-- Avoid ID conflicts with the package project. -->
      <PackageId>*$(MSBuildProjectFile)*</PackageId>
--    <MicrosoftCodeAnalysisVersion>3.9.0</MicrosoftCodeAnalysisVersion>
+-    <MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion>
    </PropertyGroup>
  
    <ItemGroup>
@@ -118,7 +118,7 @@ index 46a4fca6b..c9fa15584 100644
  
      <!-- Avoid ID conflicts with the package project. -->
      <PackageId>*$(MSBuildProjectFile)*</PackageId>
--    <MicrosoftCodeAnalysisVersion>3.9.0</MicrosoftCodeAnalysisVersion>
+-    <MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion>
    </PropertyGroup>
  
    <ItemGroup>