From 0f34d1309858e8dced9688d7a49ba5c33b405247 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed, 28 Feb 2018 13:47:21 -0600
Subject: [PATCH] System.Runtime.Intrinsics for .NET Core 2.1

- Remove System.Runtime.Intrinsics from Microsoft.NETCore.App.
- Rename to System.Runtime.Intrinsics.Experimental
- Create a standalone nupkg.
---
 .../packageIndex.json                            |  6 ++----
 pkg/descriptions.json                            |  8 ++++++++
 .../System.Runtime.Intrinsics.Experimental.sln}  | 16 ++++++++++++----
 .../dir.props                                    |  5 +++--
 ...ystem.Runtime.Intrinsics.Experimental.pkgproj | 11 +++++++++++
 .../ref/Configurations.props                     |  0
 ...ystem.Runtime.Intrinsics.Experimental.csproj} |  0
 .../ref/System.Runtime.Intrinsics.cs             |  0
 .../src/Configurations.props                     |  0
 ...ystem.Runtime.Intrinsics.Experimental.csproj} |  2 +-
 10 files changed, 37 insertions(+), 11 deletions(-)
 rename src/{System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln => System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln} (73%)
 rename src/{System.Runtime.Intrinsics => System.Runtime.Intrinsics.Experimental}/dir.props (66%)
 create mode 100644 src/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj
 rename src/{System.Runtime.Intrinsics => System.Runtime.Intrinsics.Experimental}/ref/Configurations.props (100%)
 rename src/{System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj => System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj} (100%)
 rename src/{System.Runtime.Intrinsics => System.Runtime.Intrinsics.Experimental}/ref/System.Runtime.Intrinsics.cs (100%)
 rename src/{System.Runtime.Intrinsics => System.Runtime.Intrinsics.Experimental}/src/Configurations.props (100%)
 rename src/{System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj => System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj} (93%)

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 8549c8b6e33f..a2ae9834de38 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -3711,10 +3711,8 @@
         "4.0.2.0": "4.3.0"
       }
     },
-    "System.Runtime.Intrinsics": {
-      "InboxOn": {
-        "netcoreapp2.1": "4.0.0.0"
-      },
+    "System.Runtime.Intrinsics.Experimental": {
+      "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0"
       }
diff --git a/pkg/descriptions.json b/pkg/descriptions.json
index 3345d8958ec2..4232fbf7637f 100644
--- a/pkg/descriptions.json
+++ b/pkg/descriptions.json
@@ -1509,6 +1509,14 @@
       "System.Runtime.InteropServices.WindowsRuntime.ReturnValueNameAttribute"
     ]
   },
+  {
+    "Name": "System.Runtime.Intrinsics.Experimental",
+    "Description": "Provides APIs to processor specific instructions.",
+    "CommonTypes": [
+        "System.Runtime.Intrinsics.Vector128<>",
+        "System.Runtime.Intrinsics.Vector256<>"
+    ]
+  },
   {
     "Name": "System.Runtime.Loader",
     "Description": "Provides the System.Runtime.Loader.AssemblyLoadContext class, which provides members for loading assemblies.",
diff --git a/src/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln b/src/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln
similarity index 73%
rename from src/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
rename to src/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln
index 16efecee03c6..9aad5a5d4995 100644
--- a/src/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
+++ b/src/System.Runtime.Intrinsics.Experimental/System.Runtime.Intrinsics.Experimental.sln
@@ -1,18 +1,23 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27419.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics", "src\System.Runtime.Intrinsics.csproj", "{543FBFE5-E9E4-4631-8242-911A707FE818}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics.Experimental", "src\System.Runtime.Intrinsics.Experimental.csproj", "{543FBFE5-E9E4-4631-8242-911A707FE818}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4074AF8C-8C65-486C-960E-F45DAAB0BE0D} = {4074AF8C-8C65-486C-960E-F45DAAB0BE0D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics", "ref\System.Runtime.Intrinsics.csproj", "{4074AF8C-8C65-486C-960E-F45DAAB0BE0D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Intrinsics.Experimental", "ref\System.Runtime.Intrinsics.Experimental.csproj", "{4074AF8C-8C65-486C-960E-F45DAAB0BE0D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{6058EE7C-A836-4129-877A-2F942E5111DE}"
+	ProjectSection(SolutionItems) = preProject
+		pkg\System.Runtime.Intrinsics.Experimental.pkgproj = pkg\System.Runtime.Intrinsics.Experimental.pkgproj
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,4 +40,7 @@ Global
 		{543FBFE5-E9E4-4631-8242-911A707FE818} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
 		{4074AF8C-8C65-486C-960E-F45DAAB0BE0D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1990CACA-F006-4762-9070-E9D0ABD7AE7D}
+	EndGlobalSection
 EndGlobal
diff --git a/src/System.Runtime.Intrinsics/dir.props b/src/System.Runtime.Intrinsics.Experimental/dir.props
similarity index 66%
rename from src/System.Runtime.Intrinsics/dir.props
rename to src/System.Runtime.Intrinsics.Experimental/dir.props
index 37b9ee82d7b8..fbbc9a2ce3fa 100644
--- a/src/System.Runtime.Intrinsics/dir.props
+++ b/src/System.Runtime.Intrinsics.Experimental/dir.props
@@ -3,7 +3,8 @@
   <Import Project="..\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <IsNETCoreApp>true</IsNETCoreApp>
     <AssemblyKey>Open</AssemblyKey>
+    <!-- DO NOT ship this as stable. It contains preview-only APIs that will be stable in a future version. -->
+    <BlockStable>true</BlockStable>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj b/src/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj
new file mode 100644
index 000000000000..b8ebbcce2d33
--- /dev/null
+++ b/src/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\ref\System.Runtime.Intrinsics.Experimental.csproj">
+      <SupportedFramework>netcoreapp2.1</SupportedFramework>
+    </ProjectReference>
+    <ProjectReference Include="..\src\System.Runtime.Intrinsics.Experimental.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>
diff --git a/src/System.Runtime.Intrinsics/ref/Configurations.props b/src/System.Runtime.Intrinsics.Experimental/ref/Configurations.props
similarity index 100%
rename from src/System.Runtime.Intrinsics/ref/Configurations.props
rename to src/System.Runtime.Intrinsics.Experimental/ref/Configurations.props
diff --git a/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj b/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj
similarity index 100%
rename from src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj
rename to src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.Experimental.csproj
diff --git a/src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.cs b/src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.cs
similarity index 100%
rename from src/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.cs
rename to src/System.Runtime.Intrinsics.Experimental/ref/System.Runtime.Intrinsics.cs
diff --git a/src/System.Runtime.Intrinsics/src/Configurations.props b/src/System.Runtime.Intrinsics.Experimental/src/Configurations.props
similarity index 100%
rename from src/System.Runtime.Intrinsics/src/Configurations.props
rename to src/System.Runtime.Intrinsics.Experimental/src/Configurations.props
diff --git a/src/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj b/src/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj
similarity index 93%
rename from src/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj
rename to src/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj
index 548805ab48ac..273ed0730870 100644
--- a/src/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj
+++ b/src/System.Runtime.Intrinsics.Experimental/src/System.Runtime.Intrinsics.Experimental.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <AssemblyName>System.Runtime.Intrinsics</AssemblyName>
+    <AssemblyName>System.Runtime.Intrinsics.Experimental</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <ProjectGuid>{543FBFE5-E9E4-4631-8242-911A707FE818}</ProjectGuid>
   </PropertyGroup>