From 10c0c787dd70f15c5854fed8708bd25e9c6fd479 Mon Sep 17 00:00:00 2001
From: Mihai Codoban <micodoba@microsoft.com>
Date: Mon, 30 Nov 2015 17:19:11 -0800
Subject: [PATCH] Upgrade DNU with nightly build version

rc1-final did not work with OSX.
Switched to a nightly build version instead.
---
 NuGet.Config                   |  1 +
 dir.props                      | 12 +-----------
 src/.nuget/packages.OSX.config |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index bd18297b..7e1cfd5c 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -14,6 +14,7 @@
     <add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" />
     <add key="myget.org dotnet-corefxtestdata" value="https://www.myget.org/F/dotnet-corefxtestdata/" />
     <add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/" />
+    <add key="myget.org aspnet vnext" value="https://www.myget.org/F/aspnetvnext/api/v3/index.json" />
     <add key="nuget.org v2" value="https://nuget.org/api/v2/" />
   </packageSources>
 </configuration>
diff --git a/dir.props b/dir.props
index 85a6d6e3..aefbae98 100644
--- a/dir.props
+++ b/dir.props
@@ -36,7 +36,7 @@
     <DnxDir Condition="'$(OsEnvironment)'=='Unix'">dnx-coreclr-linux-x64</DnxDir>
     <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta8</DnxVersion>
     <DnxDir Condition="'$(OsEnvironment)'=='OSX'">dnx-coreclr-darwin-x64</DnxDir>
-    <DnxVersion Condition="'$(OsEnvironment)'=='OSX'">1.0.0-rc1-final</DnxVersion>
+    <DnxVersion Condition="'$(OsEnvironment)'=='OSX'">1.0.0-rc2-16177</DnxVersion>
 
     <!-- Output directories -->
     <BinDir>$(RepoRoot)bin$([System.IO.Path]::DirectorySeparatorChar)</BinDir>
@@ -51,16 +51,6 @@
     <DnuToolDir Condition="'$(OsEnvironment)'!='Windows_NT'">$([System.IO.Path]::Combine($(PackagesDir), "$(DnxDir).$(DnxVersion)"))</DnuToolDir>
     <DnuToolPath Condition="'$(OsEnvironment)'=='Windows_NT'">$([System.IO.Path]::Combine($(DnuToolDir), "bin", "dnu.cmd"))</DnuToolPath>
     <DnuToolPath Condition="'$(OsEnvironment)'!='Windows_NT'">$([System.IO.Path]::Combine($(DnuToolDir), "bin", "dnu"))</DnuToolPath>
-    <!-- The DNU package from Nuget does not work on OSX. Using system installed one-->
-    <!-- dnu `dash``dash`version returns:
-          Microsoft .NET Development Utility
-            Version:      1.0.0-rc2-16128
-            Type:         Mono
-            Architecture: x64
-            OS Name:      Darwin
-            OS Version:   10.11
-            Runtime Id:   osx.10.11-x64 -->
-    <DnuToolPath Condition="'$(OsEnvironment)'=='OSX'">dnu</DnuToolPath>
 
   </PropertyGroup>
 
diff --git a/src/.nuget/packages.OSX.config b/src/.nuget/packages.OSX.config
index 500d060e..f3c7f0e2 100644
--- a/src/.nuget/packages.OSX.config
+++ b/src/.nuget/packages.OSX.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="dnx-coreclr-darwin-x64" version="1.0.0-rc1-final" />
+  <package id="dnx-coreclr-darwin-x64" version="1.0.0-rc2-16177" />
 </packages>