From 68ef9d8c93f2ecb187850de8124316344b43d418 Mon Sep 17 00:00:00 2001
From: dotnet-bot <dotnet-bot@microsoft.com>
Date: Sat, 18 Mar 2017 02:20:44 +0000
Subject: [PATCH 1/2] Update CoreClr, CoreFx, ProjectNTfs, Standard to
 beta-25117-08, beta-25118-01, beta-25117-00, beta-25117-02, respectively

---
 dependencies.props                               | 16 ++++++++--------
 external/ilasm/project.json.template             |  6 +++---
 .../netstandard1.x/project.json.template         |  2 +-
 external/netstandard/project.json.template       |  2 +-
 external/runtime/NETNative/project.json.template |  2 +-
 external/runtime/project.json.template           |  8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index 5466e0f77370..eeca193bea44 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -17,21 +17,21 @@
        These ref versions are pulled from https://github.com/dotnet/versions.
   -->
   <PropertyGroup>
-    <CoreFxCurrentRef>8928ad83e2e5c33ce116c3b63eb94f611d72c2e2</CoreFxCurrentRef>
-    <CoreClrCurrentRef>b48a83561e6763d50668717a46130aaa94a4687e</CoreClrCurrentRef>
+    <CoreFxCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</CoreFxCurrentRef>
+    <CoreClrCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</CoreClrCurrentRef>
     <ExternalCurrentRef>3b8a99621d89ad9877f053ba8af25e0f25dcd9d8</ExternalCurrentRef>
-    <ProjectNTfsCurrentRef>63be48cacc0f8c89abc9157f7a9afc68f21f9c58</ProjectNTfsCurrentRef>
+    <ProjectNTfsCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</ProjectNTfsCurrentRef>
     <SniCurrentRef>05650e53f2aa4497f74cd6e9b053d3f69f64b0bd</SniCurrentRef>
-    <StandardCurrentRef>08ff016839d62c9455d16245524f46b16d7a1074</StandardCurrentRef>
+    <StandardCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</StandardCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>beta-25114-01</CoreFxExpectedPrerelease>
-    <CoreClrExpectedPrerelease>beta-25115-02</CoreClrExpectedPrerelease>
+    <CoreFxExpectedPrerelease>beta-25118-01</CoreFxExpectedPrerelease>
+    <CoreClrExpectedPrerelease>beta-25117-08</CoreClrExpectedPrerelease>
     <ExternalExpectedPrerelease>beta-25016-01</ExternalExpectedPrerelease>
-    <ProjectNTfsExpectedPrerelease>beta-25116-00</ProjectNTfsExpectedPrerelease>
-    <NETStandardPackageVersion>2.0.0-beta-25115-01</NETStandardPackageVersion>
+    <ProjectNTfsExpectedPrerelease>beta-25117-00</ProjectNTfsExpectedPrerelease>
+    <NETStandardPackageVersion>2.0.0-beta-25117-02</NETStandardPackageVersion>
     <NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
     <!-- Use the SNI runtime package -->
     <SniPackageVersion>4.4.0-beta-25007-02</SniPackageVersion>
diff --git a/external/ilasm/project.json.template b/external/ilasm/project.json.template
index e2bd340a0b5c..3b122ad84868 100644
--- a/external/ilasm/project.json.template
+++ b/external/ilasm/project.json.template
@@ -2,9 +2,9 @@
   "frameworks": {
     "{TFM}": {
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-01",
-        "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25115-02",
-        "Microsoft.NETCore.ILAsm": "2.0.0-beta-25115-02"
+        "Microsoft.NETCore.Platforms": "2.0.0-beta-25118-01",
+        "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25117-08",
+        "Microsoft.NETCore.ILAsm": "2.0.0-beta-25117-08"
       }
     }
   },
diff --git a/external/netstandard/netstandard1.x/project.json.template b/external/netstandard/netstandard1.x/project.json.template
index 1e54ebd425a5..9b005e52e63a 100644
--- a/external/netstandard/netstandard1.x/project.json.template
+++ b/external/netstandard/netstandard1.x/project.json.template
@@ -2,7 +2,7 @@
   "frameworks": {
     "{TFM}": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-beta-25115-01",
+        "NETStandard.Library": "2.0.0-beta-25117-02",
         "System.Diagnostics.Contracts": "4.3.0",
         "System.Diagnostics.Debug": "4.3.0",
         "System.Dynamic.Runtime": "4.3.0",
diff --git a/external/netstandard/project.json.template b/external/netstandard/project.json.template
index fa9b8298db73..19bf55f10b6f 100644
--- a/external/netstandard/project.json.template
+++ b/external/netstandard/project.json.template
@@ -2,7 +2,7 @@
   "frameworks": {
     "{TFM}": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-beta-25115-01"
+        "NETStandard.Library": "2.0.0-beta-25117-02"
       }
     }
   }
diff --git a/external/runtime/NETNative/project.json.template b/external/runtime/NETNative/project.json.template
index ae260c72f613..0eb0853fd9c0 100644
--- a/external/runtime/NETNative/project.json.template
+++ b/external/runtime/NETNative/project.json.template
@@ -2,7 +2,7 @@
   "frameworks": {
     "{TFM}": {
       "dependencies": {
-        "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-25116-00"
+        "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-25117-00"
       }
     }
   },
diff --git a/external/runtime/project.json.template b/external/runtime/project.json.template
index 165e3021a2f3..bfb3d1ba2d99 100644
--- a/external/runtime/project.json.template
+++ b/external/runtime/project.json.template
@@ -2,10 +2,10 @@
   "frameworks": {
     "{TFM}": {
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-01",
-        "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25115-02",
-        "Microsoft.NETCore.TestHost": "2.0.0-beta-25115-02",
-        "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24913-02",
+        "Microsoft.NETCore.Platforms": "2.0.0-beta-25118-01",
+        "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25117-08",
+        "Microsoft.NETCore.TestHost": "2.0.0-beta-25117-08",
+        "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-25118-01",
         "Microsoft.NETCore.DotNetHost": "1.2.0-beta-001259-00",
         "Microsoft.NETCore.DotNetHostPolicy": "1.2.0-beta-001259-00"
       }

From 8e6f7b24da98dbf299f3e5956305de7bb2bc4d77 Mon Sep 17 00:00:00 2001
From: Rahul Kumar <rahku@microsoft.com>
Date: Fri, 17 Mar 2017 22:03:55 -0700
Subject: [PATCH 2/2] fix build breaks

---
 src/Common/src/System/Diagnostics/Debug.Unix.cs  | 2 +-
 src/System.Threading/src/System.Threading.csproj | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Common/src/System/Diagnostics/Debug.Unix.cs b/src/Common/src/System/Diagnostics/Debug.Unix.cs
index cbcd411110b4..6c9ec0419a3f 100644
--- a/src/Common/src/System/Diagnostics/Debug.Unix.cs
+++ b/src/Common/src/System/Diagnostics/Debug.Unix.cs
@@ -24,7 +24,7 @@ internal sealed class UnixDebugLogger : IDebugLogger
         {
             private const string EnvVar_DebugWriteToStdErr = "COMPlus_DebugWriteToStdErr";
             private static readonly bool s_shouldWriteToStdErr = 
-                Environment.GetEnvironmentVariable(EnvVar_DebugWriteToStdErr) == "1";
+                Internal.Runtime.Augments.EnvironmentAugments.GetEnvironmentVariable(EnvVar_DebugWriteToStdErr) == "1";
 
             public void ShowAssertDialog(string stackTrace, string message, string detailMessage)
             {
diff --git a/src/System.Threading/src/System.Threading.csproj b/src/System.Threading/src/System.Threading.csproj
index 8cc8ffd2f91b..46d8d17f1ccf 100644
--- a/src/System.Threading/src/System.Threading.csproj
+++ b/src/System.Threading/src/System.Threading.csproj
@@ -39,8 +39,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" />
-    <!-- The Environment class is public in CoreCLR version of System.Private.CoreLib, however, internal in .NET Native's version -->
-    <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" Condition="'$(TargetGroup)' == 'uapaot'" />
+    <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
   </ItemGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />