From fbdfced06f7a1e751217c4a8eb17192871593a33 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Mon, 12 Sep 2022 09:50:31 -0700
Subject: [PATCH 1/2] Target only net7.0 during source-build Port of #75168 to
 main.

* Target net7.0 in additional projects

* Update compatibility suppressions

* Only target net7.0 for source-build

* Disable package validation for source-build

* Revert compatibility suppression changes

* Use NetCoreAppCurrent instead of hardcoding net7.0

* Revert mono Apple TFM change

* Remove unnecessary LangVersion
---
 Directory.Build.props                                           | 1 +
 eng/SourceBuild.props                                           | 1 +
 .../tools/GenerateRegexCasingTable.csproj                       | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3e76022487983d..7f87e8d1bc811c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -53,6 +53,7 @@
     <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
     <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
     <NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
+    <NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
 
     <NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
     <NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index ebf8e683ed0cef..1dfe97fe1ca605 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -48,6 +48,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:EnablePackageValidation=false</InnerBuildArgs>
     </PropertyGroup>
   </Target>
 
diff --git a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
index 173f2557d23c35..295f474f653231 100644
--- a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
       <OutputType>Exe</OutputType>
       <TargetFramework>net7.0</TargetFramework>
+      <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+      <LangVersion>latest</LangVersion>
       <Nullable>enable</Nullable>
   </PropertyGroup>
 

From 713318f86ff190caa85b39ce5a4bf3f938c65af4 Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Tue, 18 Oct 2022 14:39:15 -0500
Subject: [PATCH 2/2] Address code review comments.

---
 .../tools/GenerateRegexCasingTable.csproj                       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
index 295f474f653231..173f2557d23c35 100644
--- a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
       <OutputType>Exe</OutputType>
       <TargetFramework>net7.0</TargetFramework>
-      <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
-      <LangVersion>latest</LangVersion>
       <Nullable>enable</Nullable>
   </PropertyGroup>