Merge remote-tracking branch 'upstream/master' into from-tfs

Conflicts:
	src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
	src/System.Threading.Tasks/tests/project.lock.json

Author: stephentoub

src/Common/src/Interop/Unix/libcoreclr/Interop.OpenSemaphore.cs

@@ -140,5 +140,8 @@ public static extern IntPtr curl_slist_append(
         [DllImport(Interop.Libraries.LibCurl)]
         public static extern void curl_slist_free_all(
             IntPtr curl_slist);
+
+        [DllImport(Interop.Libraries.LibCurl)]
+        public static extern IntPtr curl_version_info(int curlVersionStamp);
     }
 }

src/Common/src/Interop/Unix/libcurl/Interop.libcurl.cs

@@ -125,6 +125,30 @@ internal static partial class CURLMSG
             internal const int CURLMSG_DONE = 1;
         }
 
+        internal static partial class CURL_VERSION_Features
+        {
+            internal const int CURL_VERSION_IPV6         = (1<<0);
+            internal const int CURL_VERSION_KERBEROS4    = (1<<1);
+            internal const int CURL_VERSION_SSL          = (1<<2);
+            internal const int CURL_VERSION_LIBZ         = (1<<3);
+            internal const int CURL_VERSION_NTLM         = (1<<4);
+            internal const int CURL_VERSION_GSSNEGOTIATE = (1<<5);
+            internal const int CURL_VERSION_DEBUG        = (1<<6);
+            internal const int CURL_VERSION_ASYNCHDNS    = (1<<7);
+            internal const int CURL_VERSION_SPNEGO       = (1<<8);
+            internal const int CURL_VERSION_LARGEFILE    = (1<<9);
+            internal const int CURL_VERSION_IDN          = (1<<10);
+            internal const int CURL_VERSION_SSPI         = (1<<11);
+            internal const int CURL_VERSION_CONV         = (1<<12);
+            internal const int CURL_VERSION_CURLDEBUG    = (1<<13);
+            internal const int CURL_VERSION_TLSAUTH_SRP  = (1<<14);
+            internal const int CURL_VERSION_NTLM_WB      = (1<<15);
+            internal const int CURL_VERSION_HTTP2        = (1<<16);
+            internal const int CURL_VERSION_GSSAPI       = (1<<17);
+            internal const int CURL_VERSION_KERBEROS5    = (1<<18);
+            internal const int CURL_VERSION_UNIX_SOCKETS = (1<<19);
+        }
+
         // Type definition of CURLMsg from multi.h
         [StructLayout(LayoutKind.Explicit)]
         internal struct CURLMsg
@@ -139,6 +163,19 @@ internal struct CURLMsg
             internal int result;
         }
 
+        // NOTE: The definition of this structure in Curl/curl.h is larger than
+        // than what is defined below. This definition is only valid for use with
+        // Marshal.PtrToStructure and not for general use in P/Invoke signatures.
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct curl_version_info_data
+        {
+            internal int age;
+            private unsafe char *version;
+            private int versionNum;
+            private unsafe char *host;
+            internal int features;
+        }
+
         public delegate int curl_socket_callback(
             IntPtr handle,
             curl_socket_t sockfd,

src/Common/src/Interop/Unix/libcurl/Interop.libcurl_types.cs

@@ -18,6 +18,10 @@ namespace System
     // e.g. for reading/writing /dev/stdin, /dev/stdout, and /dev/stderr,
     // for getting environment variables for accessing charset information for encodings, 
     // and terminfo databases / strings for manipulating the terminal.
+    // NOTE: The test class reflects over this class to run the tests due to limitations in
+    //       the test infrastructure that prevent OS-specific builds of test binaries. If you
+    //       change any of the class / struct / function names, parameters, etc then you need
+    //       to also change the test class.
     internal static class ConsolePal
     {
         public static Stream OpenStandardInput()
@@ -251,26 +255,27 @@ private struct TerminalColorInfo
             /// <summary>The cached instance.</summary>
             public static TerminalColorInfo Instance { get { return _instance.Value; } }
 
+            private TerminalColorInfo(TermInfo.Database db)
+            {
+                ForegroundFormat = db != null ? db.GetString(TermInfo.Database.SetAnsiForegroundIndex) : string.Empty;
+                BackgroundFormat = db != null ? db.GetString(TermInfo.Database.SetAnsiBackgroundIndex) : string.Empty;
+                ResetFormat = db != null ?
+                    db.GetString(TermInfo.Database.OrigPairsIndex) ??
+                    db.GetString(TermInfo.Database.OrigColorsIndex)
+                    : string.Empty;
+
+                int maxColors = db != null ? db.GetNumber(TermInfo.Database.MaxColorsIndex) : 0;
+                MaxColors = // normalize to either the full range of all ANSI colors, just the dark ones, or none
+                    maxColors >= 16 ? 16 :
+                    maxColors >= 8 ? 8 :
+                    0;
+            }
+
             /// <summary>Lazy initialization of the terminal color information.</summary>
             private static Lazy<TerminalColorInfo> _instance = new Lazy<TerminalColorInfo>(() =>
             {
-                TermInfo.Database db = TermInfo.Database.Instance;
-                TerminalColorInfo tci = new TerminalColorInfo();
-                if (db != null)
-                {
-                    tci.ForegroundFormat = db.GetString(TermInfo.Database.SetAnsiForegroundIndex);
-                    tci.BackgroundFormat = db.GetString(TermInfo.Database.SetAnsiBackgroundIndex);
-                    tci.ResetFormat =
-                        db.GetString(TermInfo.Database.OrigPairsIndex) ??
-                        db.GetString(TermInfo.Database.OrigColorsIndex);
-
-                    int maxColors = db.GetNumber(TermInfo.Database.MaxColorsIndex);
-                    tci.MaxColors = // normalize to either the full range of all ANSI colors, just the dark ones, or none
-                        maxColors >= 16 ? 16 :
-                        maxColors >= 8 ? 8 :
-                        0;
-                }
-                return tci;
+                TermInfo.Database db = TermInfo.Database.Instance; // Could be null if TERM is set to a file that doesn't exist
+                return new TerminalColorInfo(db);
             }, isThreadSafe: true);
         }
 
@@ -902,10 +907,16 @@ private static string EvaluateInternal(
                                     ~value);
                                 break;
 
-                            // Augment first two parameters by 1
+                                // Some terminfo files appear to have a fairly liberal interpretation of %i. The spec states that %i increments the first two arguments, 
+                                // but some uses occur when there's only a single argument. To make sure we accomodate these files, we increment the values 
+                                // of up to (but not requiring) two arguments.
                             case 'i':
-                                args[0] = 1 + args[0].Int32;
-                                args[1] = 1 + args[1].Int32;
+                                if (args.Length > 0)
+                                {
+                                    args[0] = 1 + args[0].Int32;
+                                    if (args.Length > 1)
+                                        args[1] = 1 + args[1].Int32;
+                                }
                                 break;
 
                             // Conditional of the form %? if-part %t then-part %e else-part %;

src/System.Console/src/System/ConsolePal.Unix.cs

@@ -26,6 +26,7 @@
     <Compile Include="Timeout.cs" />
     <Compile Include="ThreadSafety.cs" />
     <Compile Include="XunitAssemblyAttributes.cs" />
+    <Compile Include="TermInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\System.Console.csproj">