From 664672bc56fb23edb6c6b665d7096ce00c09988f Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 13 Feb 2023 15:54:45 +0100
Subject: [PATCH 1/2] RegularExpressions.Tests: match
 MicrosoftCodeAnalysisVersion used by RegularExpressions.Generator when
 DotNetBuildFromSource.

---
 .../FunctionalTests/System.Text.RegularExpressions.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
index 439654ac1d9dd2..5a2996b9edcf1c 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
@@ -11,7 +11,7 @@
     <IsHighAotMemoryUsageTest>true</IsHighAotMemoryUsageTest> <!-- to avoid OOMs with source generation in wasm: https://github.com/dotnet/runtime/pull/60701 -->
 
     <!-- Remove once the repo moves to a sufficiently high-enough version for file-scoped types -->
-    <MicrosoftCodeAnalysisVersion>4.4.0-1.22356.23</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion Condition="'$(DotNetBuildFromSource)' != 'true'">4.4.0-1.22356.23</MicrosoftCodeAnalysisVersion>
 
   </PropertyGroup>
   <ItemGroup>

From 06e86a782dd9e169cc98719f24aa661473b3cbbb Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 13 Feb 2023 16:27:13 +0100
Subject: [PATCH 2/2] RegularExpressions.Tests: remove pinned version for
 MicrosoftCodeAnalysis.

---
 .../System.Text.RegularExpressions.Tests.csproj                | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
index 5a2996b9edcf1c..cd7501f1f9ee92 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
@@ -10,9 +10,6 @@
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <IsHighAotMemoryUsageTest>true</IsHighAotMemoryUsageTest> <!-- to avoid OOMs with source generation in wasm: https://github.com/dotnet/runtime/pull/60701 -->
 
-    <!-- Remove once the repo moves to a sufficiently high-enough version for file-scoped types -->
-    <MicrosoftCodeAnalysisVersion Condition="'$(DotNetBuildFromSource)' != 'true'">4.4.0-1.22356.23</MicrosoftCodeAnalysisVersion>
-
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AttRegexTests.cs" />