Remove S.R.CS.Unsafe and Intrinsify Unsafe (#64861)

* private assemblies moved from Internal to System Runtime.CompilerServices

* reformat existing unsafe vm intrinsics

* implement Copy, CopyBlock, CopyBlockUnaligned, InitBlock, InitBlockUnaligned, Unbox, Add, Subtract, SubtractByteOffset

* remove System.Runtime.CompilerServices.Unsafe il project and replace with forward only cs project

* change all ilproj references to csproj

* remove nativeaot Unsafe

* add conditional package reference for S.R.CS.Unsafe on netcoreapp 6.0

* regenerate solutions

* mono interp

* [mono][interp] Implement Copy and Unbox intrinsics

* [mono][jit] Implement Copy and Unbox intrinsics

Co-authored-by: Vlad Brezae <brezaevlad@gmail.com>

4 files changed, 1 insertions, 18 deletions

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a2956685387..47d0d7b6a01 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -230,10 +230,6 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>6e05d78deba320a54ef10a265c6025bbb686efe6</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22113.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>6e05d78deba320a54ef10a265c6025bbb686efe6</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22115.2">
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>6e11d057a88b3fb403bfbb90317518c94e3e84a7</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 2c0993b6f3a..2c8f5d3aad6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -125,7 +125,7 @@
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemServiceModelPrimitivesVersion>4.9.0</SystemServiceModelPrimitivesVersion>
     <SystemTextJsonVersion>7.0.0-preview.2.22113.2</SystemTextJsonVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-preview.2.22113.2</SystemRuntimeCompilerServicesUnsafeVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>7.0.0-preview.2.22113.2</runtimenativeSystemIOPortsVersion>
diff --git a/eng/generators.targets b/eng/generators.targets
index 843842937ef..d73019014a8 100644
--- a/eng/generators.targets
+++ b/eng/generators.targets
@@ -57,9 +57,6 @@
                           '$(MSBuildProjectName)' == 'System.Private.CoreLib'
                           or '$(EnableDllImportGenerator)' == 'true'
                           or ('@(Reference)' != ''
-                            and (@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.CompilerServices.Unsafe'))
-                              or ('@(ProjectReference)' != ''
-                                and @(ProjectReference->AnyHaveMetadataValue('Identity', $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'System.Runtime.CompilerServices.Unsafe', 'src', 'System.Runtime.CompilerServices.Unsafe.ilproj'))))))
                             and @(Reference->AnyHaveMetadataValue('Identity', 'System.Memory')))
                           or ('@(ProjectReference)' != ''
                             and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))))" Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\ArrayMarshaller.cs" />
@@ -77,13 +74,6 @@
     <PropertyGroup>
         <DllImportGenerator_UseMarshalType>true</DllImportGenerator_UseMarshalType>
     </PropertyGroup>
-    <!-- Projects that directly reference System.Private.CoreLib are typically low level enough that they don't reference
-         System.Runtime.CompilerServices.Unsafe, so we use the Unsafe type defined in CoreLib (Internal.Runtime.CompilerServices.Unsafe) for these projects. -->
-    <PropertyGroup Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib' or
-                              ('@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)')))">
-        <DllImportGenerator_UseInternalUnsafeType>true</DllImportGenerator_UseInternalUnsafeType>
-        <DefineConstants>$(DefineConstants);DLLIMPORTGENERATOR_INTERNALUNSAFE</DefineConstants>
-    </PropertyGroup>
   </Target>
 
   <Import Project="$(LibrariesProjectRoot)System.Runtime.InteropServices/gen/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props" />
diff --git a/eng/slngen.targets b/eng/slngen.targets
index 4b68c388938..47905f85fed 100644
--- a/eng/slngen.targets
+++ b/eng/slngen.targets
@@ -10,7 +10,4 @@
          Include the reference project in the solution file if it targets more than just NetCoreAppCurrent as other frameworks like .NETFramework, .NETStandard or older .NETCoreApp ones require it. -->
     <IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' != '$(SlnGenMainProject)' and '$(TargetFramework)' == '$(NetCoreAppCurrent)' and ('$(TargetFrameworks)' == '' or '$(TargetFrameworks)' == '$(NetCoreAppCurrent)')">false</IncludeInSolutionFile>
   </PropertyGroup>
-  <ItemGroup>
-    <SlnGenCustomProjectTypeGuid Include=".ilproj" ProjectTypeGuid="{9A19103F-16F7-4668-BE54-9A1E7A4F7556}" />
-  </ItemGroup>
 </Project>