Add ValueTuple to .NET Standard 2.0

apicompat/netstandard1x/project.json

@@ -98,6 +98,7 @@
 "System.Threading.Thread": "4.3.0",
 "System.Threading.ThreadPool": "4.3.0",
 "System.Threading.Timer": "4.3.0",
+"System.ValueTuple": "4.3.0",
 "System.Xml.ReaderWriter": "4.3.0",
 "System.Xml.XDocument": "4.3.0",
 "System.Xml.XmlDocument": "4.3.0",

netstandard/pkg/shims/dir.targets

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <AssemblyOriginatorKeyFile Condition="'$(UseOpenKey)' == 'true'">$(ToolsDir)Open.snk</AssemblyOriginatorKeyFile>
     <AssemblyOriginatorKeyFile Condition="'$(UseECMAKey)' == 'true'">$(ToolsDir)ECMA.snk</AssemblyOriginatorKeyFile>
     <AssemblyOriginatorKeyFile Condition="'$(UseMSFTKey)' == 'true'">$(ToolsDir)MSFT.snk</AssemblyOriginatorKeyFile>
     <AssemblyOriginatorKeyFile Condition="'$(UseWinFxKey)' == 'true'">$(ProjectDir)platforms/winfx.pub</AssemblyOriginatorKeyFile>

netstandard/pkg/shims/generateshims.ps1

@@ -58,6 +58,10 @@ foreach ($shim in $shimList)
     {
         $token = "UseECMAKey";
     }
+    elseif ($asmToken -eq "cc")
+    {
+        $token = "UseOpenKey";
+    }
     elseif ($asmToken -eq "31")
     {
         $token = "UseWinFxKey";

netstandard/pkg/shims/netstandard/System.ValueTuple.Forwards.cs

@@ -0,0 +1,11 @@
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.TupleExtensions))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,,>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,,,>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.TupleElementNamesAttribute))]

netstandard/pkg/shims/netstandard/System.ValueTuple.csproj

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <AssemblyName>System.ValueTuple</AssemblyName>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <UseOpenKey>true</UseOpenKey>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="System.ValueTuple.Forwards.cs" />
+    <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>

netstandard/ref/netstandard.csproj

@@ -31,6 +31,7 @@
     <Compile Include="System.Numerics.cs" />
     <Compile Include="System.Runtime.Serialization.cs" />
     <Compile Include="System.Transactions.cs" />
+    <Compile Include="System.ValueTuple.cs" />
     <Compile Include="System.Web.cs" />
     <Compile Include="System.Xml.cs" />
     <Compile Include="System.Xml.Linq.cs" />

netstandard/src/ApiCompatBaseline.net461.txt

@@ -2,6 +2,16 @@ Compat issues with assembly netstandard:
 MembersMustExist : Member 'System.AppContext.GetData(System.String)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.AppContext.TargetFrameworkName.get()' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.StringNormalizationExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Data.Common.DbColumn' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Data.Common.DbDataReaderExtensions' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Data.Common.IDbColumnSchemaGenerator' does not exist in the implementation but it does exist in the contract.
@@ -31,6 +41,7 @@ MembersMustExist : Member 'System.Net.Http.HttpClientHandler.SslProtocols.set(Sy
 TypesMustExist : Type 'System.Net.Sockets.SocketReceiveFromResult' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Net.Sockets.SocketReceiveMessageFromResult' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Net.Sockets.SocketTaskExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Runtime.Serialization.DataContractSerializerExtensions' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Runtime.Serialization.ISerializationSurrogateProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.SecureStringMarshal' does not exist in the implementation but it does exist in the contract.
@@ -51,4 +62,4 @@ MembersMustExist : Member 'System.Text.RegularExpressions.Regex.Caps.set(System.
 TypesMustExist : Type 'System.Threading.PreAllocatedOverlapped' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Threading.ThreadPoolBoundHandle' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Xml.XPath.XDocumentExtensions' does not exist in the implementation but it does exist in the contract.
-Total Issues: 52
+Total Issues: 63

netstandard/src/ApiCompatBaseline.xamarin.android.txt

@@ -1,5 +1,16 @@
 Compat issues with assembly netstandard:
+TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA256CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA384CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA512CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
-Total Issues: 3
+Total Issues: 14

netstandard/src/ApiCompatBaseline.xamarin.ios.txt

@@ -1,5 +1,16 @@
 Compat issues with assembly netstandard:
+TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA256CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA384CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA512CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
-Total Issues: 3
+Total Issues: 14

netstandard/src/ApiCompatBaseline.xamarin.mac.txt

@@ -1,5 +1,16 @@
 Compat issues with assembly netstandard:
+TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA256CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA384CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA512CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
-Total Issues: 3
+Total Issues: 14

netstandard/src/ApiCompatBaseline.xamarin.tvos.txt

@@ -1,5 +1,16 @@
 Compat issues with assembly netstandard:
+TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA256CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA384CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA512CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
-Total Issues: 3
+Total Issues: 14

netstandard/src/ApiCompatBaseline.xamarin.watchos.txt

@@ -1,5 +1,16 @@
 Compat issues with assembly netstandard:
+TypesMustExist : Type 'System.TupleExtensions' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Runtime.CompilerServices.TupleElementNamesAttribute' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA256CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA384CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.SHA512CryptoServiceProvider' does not exist in the implementation but it does exist in the contract.
-Total Issues: 3
+Total Issues: 14

netstandard/src/GenApi.exclude.net461.txt

@@ -21,4 +21,16 @@ T:System.Security.Cryptography.IncrementalHash
 T:System.Security.Cryptography.TripleDESCng
 T:System.Threading.PreAllocatedOverlapped
 T:System.Threading.ThreadPoolBoundHandle
-T:System.Xml.XPath.XDocumentExtensions
+T:System.Xml.XPath.XDocumentExtensions
+T:System.TupleExtensions
+T:System.ValueTuple
+T:System.ValueTuple`1
+T:System.ValueTuple`1
+T:System.ValueTuple`2
+T:System.ValueTuple`3
+T:System.ValueTuple`4
+T:System.ValueTuple`5
+T:System.ValueTuple`6
+T:System.ValueTuple`7
+T:System.ValueTuple`8
+T:System.Runtime.CompilerServices.TupleElementNamesAttribute

netstandard/src/GenApi.exclude.xamarin.android.txt

@@ -1,3 +1,15 @@
 T:System.Security.Cryptography.SHA256CryptoServiceProvider
 T:System.Security.Cryptography.SHA384CryptoServiceProvider
-T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.TupleExtensions
+T:System.ValueTuple
+T:System.ValueTuple`1
+T:System.ValueTuple`1
+T:System.ValueTuple`2
+T:System.ValueTuple`3
+T:System.ValueTuple`4
+T:System.ValueTuple`5
+T:System.ValueTuple`6
+T:System.ValueTuple`7
+T:System.ValueTuple`8
+T:System.Runtime.CompilerServices.TupleElementNamesAttribute

netstandard/src/GenApi.exclude.xamarin.ios.txt

@@ -1,3 +1,15 @@
 T:System.Security.Cryptography.SHA256CryptoServiceProvider
 T:System.Security.Cryptography.SHA384CryptoServiceProvider
-T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.TupleExtensions
+T:System.ValueTuple
+T:System.ValueTuple`1
+T:System.ValueTuple`1
+T:System.ValueTuple`2
+T:System.ValueTuple`3
+T:System.ValueTuple`4
+T:System.ValueTuple`5
+T:System.ValueTuple`6
+T:System.ValueTuple`7
+T:System.ValueTuple`8
+T:System.Runtime.CompilerServices.TupleElementNamesAttribute

netstandard/src/GenApi.exclude.xamarin.mac.txt

@@ -1,3 +1,15 @@
 T:System.Security.Cryptography.SHA256CryptoServiceProvider
 T:System.Security.Cryptography.SHA384CryptoServiceProvider
-T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.TupleExtensions
+T:System.ValueTuple
+T:System.ValueTuple`1
+T:System.ValueTuple`1
+T:System.ValueTuple`2
+T:System.ValueTuple`3
+T:System.ValueTuple`4
+T:System.ValueTuple`5
+T:System.ValueTuple`6
+T:System.ValueTuple`7
+T:System.ValueTuple`8
+T:System.Runtime.CompilerServices.TupleElementNamesAttribute

netstandard/src/GenApi.exclude.xamarin.tvos.txt

@@ -1,3 +1,15 @@
 T:System.Security.Cryptography.SHA256CryptoServiceProvider
 T:System.Security.Cryptography.SHA384CryptoServiceProvider
-T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.Security.Cryptography.SHA512CryptoServiceProvider
+T:System.TupleExtensions
+T:System.ValueTuple
+T:System.ValueTuple`1
+T:System.ValueTuple`1
+T:System.ValueTuple`2
+T:System.ValueTuple`3
+T:System.ValueTuple`4
+T:System.ValueTuple`5
+T:System.ValueTuple`6
+T:System.ValueTuple`7
+T:System.ValueTuple`8
+T:System.Runtime.CompilerServices.TupleElementNamesAttribute