Merge pull request dotnet#9 from pgavlin/sn2

Merge corefx/master into sn2.

Author: CIPop

.editorconfig

@@ -22,3 +22,9 @@ indent_size = 2
 # Xml config files
 [*.{props,targets,config,nuspec}]
 indent_size = 2
+
+# Shell scripts
+[*.sh]
+end_of_line = lf
+[*.{cmd, bat}]
+end_of_line = crlf

.gitattributes

@@ -61,3 +61,7 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+# Force bash scripts to always use lf line endings so that if a repro is accessed
+# in Unix via a file share from Windows, the scripts will work.
+*.sh text eol=lf

.gitignore

@@ -147,7 +147,6 @@ csx/
 AppPackages/
 
 # Others
-sql/
 *.Cache
 ClientBin/
 [Ss]tyle[Cc]op.*

README.md

@@ -93,6 +93,7 @@ More libraries are coming soon (the overall list of items we currently plan to m
 |<sub>**System.Linq.Queryable**<br/>[![MyGet Package](https://img.shields.io/myget/dotnet-core/v/System.Linq.Queryable.svg)](https://www.myget.org/gallery/dotnet-core)</sub>|<sub>Provides LINQ standard query operators that operate on objects that implement ```IQueryable<T>```.</sub>|
 |<sub>**System.Net.Http**<br/>[![MyGet Package](https://img.shields.io/myget/dotnet-core/v/System.Net.Http.svg)](https://www.myget.org/gallery/dotnet-core)</sub>|<sub>Provides a programming interface for modern HTTP applications, including HTTP client components that allow applications to consume web services over HTTP and HTTP components that can be used by both clients and servers for parsing HTTP headers.</sub>|
 |<sub>**System.Net.Http.WinHttpHandler**<br/>[![MyGet Package](https://img.shields.io/myget/dotnet-core/v/System.Net.Http.WinHttpHandler.svg)](https://www.myget.org/gallery/dotnet-core)</sub>|<sub>Provides a message handler for HttpClient based on the WinHTTP interface of Windows. While similar to HttpClientHandler, it provides developers more granular control over the application's HTTP communication than the HttpClientHandler.</sub>|
+|<sub>**System.Net.NameResolution**<br/>[![MyGet Package](https://img.shields.io/myget/dotnet-core/v/System.Net.NameResolution.svg)](https://www.myget.org/gallery/dotnet-core)</sub>|<sub>Provides the System.Net.Dns class, which enables developers to perform simple domain name resolution.</sub>|
 |<sub>**System.Net.Primitives**<br/>[![MyGet Package](https://img.shields.io/myget/dotnet-core/v/System.Net.Primitives.svg)](https://www.myget.org/gallery/dotnet-core)</sub>|<sub>Provides common types for network-based libraries, including System.Net.IPAddress, System.Net.IPEndPoint, and System.Net.CookieContainer.</sub>|
 |<sub>**System.Net.Requests**<br/>[![MyGet Package](https://img.shields.io/myget/dotnet-core/v/System.Net.Requests.svg)](https://www.myget.org/gallery/dotnet-core)</sub>|<sub>Provides older classes (such as HttpWebRequest and HttpWebResponse) for sending HTTP requests and receiving HTTP responses from a resource identified by a URI. _This library is available primarily for compatibility; developers should prefer the classes in the System.Net.Http package._</sub>|
 |<sub>**System.Net.WebHeaderCollection**<br/>[![MyGet Package](https://img.shields.io/myget/dotnet-core/v/System.Net.WebHeaderCollection.svg)](https://www.myget.org/gallery/dotnet-core)</sub>|<sub>Contains types that represent HTTP request and response headers. This library is used with classes such as System.Net.HttpWebRequest and System.Net.HttpWebResponse and allows developers to query/edit header names/values.</sub>|

dir.props

@@ -10,7 +10,7 @@
 
   <!-- Build Tools Versions -->
   <PropertyGroup>
-    <BuildToolsVersion>1.0.25-prerelease-00079</BuildToolsVersion>
+    <BuildToolsVersion>1.0.25-prerelease-00080</BuildToolsVersion>
     <DnxVersion>1.0.0-beta5-12101</DnxVersion>
     <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName>
     <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName>

src/.nuget/packages.Unix.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00079" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00080" />
   <package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" />
   <package id="dnx-mono" version="1.0.0-beta5-12101" />
   <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc3-20150510-01" />

src/.nuget/packages.Windows_NT.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00079" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00080" />
   <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
   <package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" />
 </packages>

src/Common/src/Internal/Cryptography/HashProviderCng.cs

@@ -33,29 +33,33 @@ public HashProviderCng(string hashAlgId, byte[] key)
 
             _hAlgorithm = Interop.BCrypt.BCryptAlgorithmCache.GetCachedBCryptAlgorithmHandle(hashAlgId, dwFlags);
 
-            SafeBCryptHashHandle hHash = null;
-            NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, key, key == null ? 0 : key.Length, BCryptCreateHashFlags.BCRYPT_HASH_REUSABLE_FLAG);
-            if (ntStatus == NTSTATUS.STATUS_INVALID_PARAMETER)
+            // Win7 won't set hHash, Win8+ will; and both will set _hHash.
+            // So keep hHash trapped in this scope to prevent (mis-)use of it.
             {
-                // If we got here, we're running on a downlevel OS (pre-Win8) that doesn't support reusable CNG hash objects. Fall back to creating a 
-                // new HASH object each time.
-                ResetHashObject();
-            }
-            else if (ntStatus != NTSTATUS.STATUS_SUCCESS)
-            {
-                throw Interop.BCrypt.CreateCryptographicException(ntStatus);
-            }
-            else
-            {
-                _hHash = hHash;
-                _reusable = true;
+                SafeBCryptHashHandle hHash = null;
+                NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, key, key == null ? 0 : key.Length, BCryptCreateHashFlags.BCRYPT_HASH_REUSABLE_FLAG);
+                if (ntStatus == NTSTATUS.STATUS_INVALID_PARAMETER)
+                {
+                    // If we got here, we're running on a downlevel OS (pre-Win8) that doesn't support reusable CNG hash objects. Fall back to creating a 
+                    // new HASH object each time.
+                    ResetHashObject();
+                }
+                else if (ntStatus != NTSTATUS.STATUS_SUCCESS)
+                {
+                    throw Interop.BCrypt.CreateCryptographicException(ntStatus);
+                }
+                else
+                {
+                    _hHash = hHash;
+                    _reusable = true;
+                }
             }
 
             unsafe
             {
                 int cbSizeOfHashSize;
                 int hashSize;
-                ntStatus = Interop.BCrypt.BCryptGetProperty(hHash, Interop.BCrypt.BCryptPropertyStrings.BCRYPT_HASH_LENGTH, &hashSize, sizeof(int), out cbSizeOfHashSize, 0);
+                NTSTATUS ntStatus = Interop.BCrypt.BCryptGetProperty(_hHash, Interop.BCrypt.BCryptPropertyStrings.BCRYPT_HASH_LENGTH, &hashSize, sizeof(int), out cbSizeOfHashSize, 0);
                 if (ntStatus != NTSTATUS.STATUS_SUCCESS)
                     throw Interop.BCrypt.CreateCryptographicException(ntStatus);
                 _hashSize = hashSize;