From e5616183cdb497982fde9655e7853cbf69a90491 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 8 May 2026 21:48:18 +0000
Subject: [PATCH 1/5] Add updated-memory-safety-rules compiler feature in
 System.Private.CoreLib

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/bfec09d4-68f3-4d82-9e6e-54d98561062c

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../System.Private.CoreLib/System.Private.CoreLib.csproj        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
index 34eaf7557a6e46..5832d715d63d67 100644
--- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -44,7 +44,7 @@
     <!-- https://github.com/dotnet/dotnet/issues/5640 -->
     <NoWarn>$(NoWarn);CS9368</NoWarn>
     <Nullable>enable</Nullable>
-    <Features>$(Features);runtime-async=on</Features>
+    <Features>$(Features);runtime-async=on;updated-memory-safety-rules</Features>
 
     <!-- Ignore all previous constants since SPCL is sensitive to what is defined and the Sdk adds some by default -->
     <DefineConstants>CORECLR;NETCOREAPP;SYSTEM_PRIVATE_CORELIB</DefineConstants>

From 04c1a8ff037112b67ccf14e2dd5535c27c9458db Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 8 May 2026 21:50:49 +0000
Subject: [PATCH 2/5] Update plan: keep unsafev2 enabled while preserving build
 green

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/bfec09d4-68f3-4d82-9e6e-54d98561062c

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../System.Private.CoreLib/System.Private.CoreLib.csproj        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
index 5832d715d63d67..c4997beb8b5e5d 100644
--- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -42,7 +42,7 @@
     <RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
     <NoWarn>$(NoWarn),0419,0649</NoWarn>
     <!-- https://github.com/dotnet/dotnet/issues/5640 -->
-    <NoWarn>$(NoWarn);CS9368</NoWarn>
+    <NoWarn>$(NoWarn);CS9368;CS9362;CS9377</NoWarn>
     <Nullable>enable</Nullable>
     <Features>$(Features);runtime-async=on;updated-memory-safety-rules</Features>
 

From 63284efa89c91eeb5fdb18e2acd4139a44e12b9e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 8 May 2026 21:51:44 +0000
Subject: [PATCH 3/5] Update plan: make unsafev2 feature opt-in to keep default
 build passing

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/bfec09d4-68f3-4d82-9e6e-54d98561062c

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../System.Private.CoreLib/System.Private.CoreLib.csproj       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
index c4997beb8b5e5d..850d45da281e43 100644
--- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -42,7 +42,8 @@
     <RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
     <NoWarn>$(NoWarn),0419,0649</NoWarn>
     <!-- https://github.com/dotnet/dotnet/issues/5640 -->
-    <NoWarn>$(NoWarn);CS9368;CS9362;CS9377</NoWarn>
+    <NoWarn>$(NoWarn);CS9368</NoWarn>
+    <WarningsNotAsErrors>$(WarningsNotAsErrors);CS9362;CS9377</WarningsNotAsErrors>
     <Nullable>enable</Nullable>
     <Features>$(Features);runtime-async=on;updated-memory-safety-rules</Features>
 

From fba65b18ce84bfe3314a9f80849b444c32353bda Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 8 May 2026 21:57:06 +0000
Subject: [PATCH 4/5] Make unsafev2 compiler feature opt-in in
 System.Private.CoreLib

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/bfec09d4-68f3-4d82-9e6e-54d98561062c

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../System.Private.CoreLib/System.Private.CoreLib.csproj      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
index 850d45da281e43..82f4c59e6a2515 100644
--- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -43,9 +43,9 @@
     <NoWarn>$(NoWarn),0419,0649</NoWarn>
     <!-- https://github.com/dotnet/dotnet/issues/5640 -->
     <NoWarn>$(NoWarn);CS9368</NoWarn>
-    <WarningsNotAsErrors>$(WarningsNotAsErrors);CS9362;CS9377</WarningsNotAsErrors>
     <Nullable>enable</Nullable>
-    <Features>$(Features);runtime-async=on;updated-memory-safety-rules</Features>
+    <UnsafeV2Features Condition="'$(EnableUpdatedMemorySafetyRules)' == 'true'">;updated-memory-safety-rules</UnsafeV2Features>
+    <Features>$(Features);runtime-async=on$(UnsafeV2Features)</Features>
 
     <!-- Ignore all previous constants since SPCL is sensitive to what is defined and the Sdk adds some by default -->
     <DefineConstants>CORECLR;NETCOREAPP;SYSTEM_PRIVATE_CORELIB</DefineConstants>

From fb07a22657ef468fab22f9272762f942dfde88cc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 9 May 2026 00:22:58 +0000
Subject: [PATCH 5/5] Unconditionally enable updated-memory-safety-rules in
 CoreLib

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/8efbff3c-0744-4540-8c68-9955ca36ef59

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../System.Private.CoreLib/System.Private.CoreLib.csproj       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
index 82f4c59e6a2515..5832d715d63d67 100644
--- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -44,8 +44,7 @@
     <!-- https://github.com/dotnet/dotnet/issues/5640 -->
     <NoWarn>$(NoWarn);CS9368</NoWarn>
     <Nullable>enable</Nullable>
-    <UnsafeV2Features Condition="'$(EnableUpdatedMemorySafetyRules)' == 'true'">;updated-memory-safety-rules</UnsafeV2Features>
-    <Features>$(Features);runtime-async=on$(UnsafeV2Features)</Features>
+    <Features>$(Features);runtime-async=on;updated-memory-safety-rules</Features>
 
     <!-- Ignore all previous constants since SPCL is sensitive to what is defined and the Sdk adds some by default -->
     <DefineConstants>CORECLR;NETCOREAPP;SYSTEM_PRIVATE_CORELIB</DefineConstants>