From f358447a3d3343cc759cff2b8dc9058b2a659d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Wed, 2 Apr 2025 13:43:36 -0700
Subject: [PATCH 1/4] Fix S.R.CS.Unsafe AssemblYVersion and move properties to
 Versioning.props

---
 .../Versioning.props                                       | 5 ++++-
 .../src/System.Runtime.CompilerServices.Unsafe.ilproj      | 7 -------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/System.Runtime.CompilerServices.Unsafe/Versioning.props b/src/System.Runtime.CompilerServices.Unsafe/Versioning.props
index 870f86ed0..a0491c419 100644
--- a/src/System.Runtime.CompilerServices.Unsafe/Versioning.props
+++ b/src/System.Runtime.CompilerServices.Unsafe/Versioning.props
@@ -1,9 +1,12 @@
 <Project>
 
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <IsPackable>true</IsPackable>
     <VersionPrefix>6.1.1</VersionPrefix>
     <VersionPrefix Condition="'$(IsPackable)' == 'true'">6.1.2</VersionPrefix>
+    <AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.2.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(IsPackable)' == 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.3.0</AssemblyVersion>
+    <PackageValidationBaselineVersion>6.1.1</PackageValidationBaselineVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
index 941253335..b3623408b 100644
--- a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
+++ b/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
@@ -18,13 +18,6 @@
   <!-- VersionPrefix and IsPackable are defined in the parent folder's Versioning.props file. -->
   <Import Project="..\Versioning.props" />
 
-  <!-- Package servicing properties -->
-  <PropertyGroup>
-    <AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.1.0</AssemblyVersion>
-    <AssemblyVersion Condition="'$(IsPackable)' == 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">6.0.2.0</AssemblyVersion>
-    <PackageValidationBaselineVersion>6.1.0</PackageValidationBaselineVersion>
-  </PropertyGroup>
-  
   <PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp' and '$(IsPlaceholderTargetFramework)' != 'true'">
     <ExtraMacros>#define netcoreapp</ExtraMacros>
     <CoreAssembly>System.Runtime</CoreAssembly>

From 07fee0ad4260afe02f8d1d6a5303e645d4fb8c28 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 3 Apr 2025 08:08:28 -0700
Subject: [PATCH 2/4] Enable additional packages which depend on S.R.CS.Unsafe

---
 src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj          | 2 +-
 src/System.Memory/src/System.Memory.csproj                      | 2 +-
 .../src/System.Net.WebSockets.WebSocketProtocol.csproj          | 2 +-
 .../src/System.Threading.Tasks.Extensions.csproj                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
index 6f9171805..3f81406bd 100644
--- a/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
+++ b/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
@@ -13,7 +13,7 @@
 
   <!-- Package servicing properties -->
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <IsPackable>true</IsPackable>
     <VersionPrefix>6.1.2</VersionPrefix>
     <VersionPrefix Condition="'$(IsPackable)' == 'true'">6.1.3</VersionPrefix>
     <PackageValidationBaselineVersion>6.1.2</PackageValidationBaselineVersion>
diff --git a/src/System.Memory/src/System.Memory.csproj b/src/System.Memory/src/System.Memory.csproj
index 676b11809..01777a6c9 100644
--- a/src/System.Memory/src/System.Memory.csproj
+++ b/src/System.Memory/src/System.Memory.csproj
@@ -11,7 +11,7 @@
 
   <!-- Package servicing properties -->
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <IsPackable>true</IsPackable>
     <VersionPrefix>4.6.2</VersionPrefix>
     <VersionPrefix Condition="'$(IsPackable)' == 'true'">4.6.3</VersionPrefix>
     <AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">4.0.4.0</AssemblyVersion>
diff --git a/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj b/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
index 65f6e5e80..333be3b51 100644
--- a/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
+++ b/src/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
@@ -9,7 +9,7 @@
 
   <!-- Package servicing properties -->
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <IsPackable>true</IsPackable>
     <VersionPrefix>5.1.2</VersionPrefix>
     <VersionPrefix Condition="'$(IsPackable)' == 'true'">5.1.3</VersionPrefix>
     <PackageValidationBaselineVersion>5.1.2</PackageValidationBaselineVersion>
diff --git a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
index c9bb99613..83a7bd900 100644
--- a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
+++ b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
@@ -10,7 +10,7 @@
 
   <!-- Package servicing properties -->
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <IsPackable>true</IsPackable>
     <VersionPrefix>4.6.2</VersionPrefix>
     <VersionPrefix Condition="'$(IsPackable)' == 'true'">4.6.3</VersionPrefix>
     <AssemblyVersion Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">4.2.3.0</AssemblyVersion>

From 057876724911e98c78e034bdba0e6bc73a0e32b1 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 3 Apr 2025 17:27:37 +0200
Subject: [PATCH 3/4] Reset IsPackable to false

---
 .../ver/Versioning.csproj                                     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj b/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj
index 6732e26c2..9323db851 100644
--- a/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj
+++ b/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj
@@ -8,4 +8,8 @@
 
   <Import Project="..\Versioning.props" />
 
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
 </Project>

From b7e1f77af04450b01c4e6e122f2997410dd54818 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 3 Apr 2025 17:29:58 +0200
Subject: [PATCH 4/4] Revert commit

---
 .../ver/Versioning.csproj                                     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj b/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj
index 9323db851..6732e26c2 100644
--- a/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj
+++ b/src/System.Runtime.CompilerServices.Unsafe/ver/Versioning.csproj
@@ -8,8 +8,4 @@
 
   <Import Project="..\Versioning.props" />
 
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
 </Project>