From 37211c0c9b88d8439c4879c5697b098c3db951c7 Mon Sep 17 00:00:00 2001
From: Mihai Codoban <micodoba@microsoft.com>
Date: Thu, 19 May 2016 18:12:54 -0700
Subject: [PATCH] Revert --infer-runtimes hack

For some weird reason beyond my Nuget comprehension it works now.
---
 BootStrapMSBuild.proj                    |  2 +-
 dir.props                                |  2 ++
 targets/DeployDependencies.proj          |  2 +-
 targets/runtimeDependencies/project.json | 22 ++++++++++++++++------
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/BootStrapMSBuild.proj b/BootStrapMSBuild.proj
index 272a07136d4..60cf649b3f8 100644
--- a/BootStrapMSBuild.proj
+++ b/BootStrapMSBuild.proj
@@ -13,7 +13,7 @@
     />
 
     <MSBuild Projects="$(RepoRoot)\targets\BootStrapFullFrameworkMSBuild.proj"
-             Condition="'$(NetCoreBuild)' == '' And '$(MonoBuild)' == ''"
+             Condition="'$(FullFrameworkBuild)' == 'true'"
     />
   </Target>
 </Project>
diff --git a/dir.props b/dir.props
index acafc9eb24b..c5eb990e5f7 100644
--- a/dir.props
+++ b/dir.props
@@ -108,6 +108,7 @@
     <DebugType Condition="'$(DebugType)' == ''">full</DebugType>
     <MsbuildDebugger>true</MsbuildDebugger>
     <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+    <FullFrameworkBuild>true</FullFrameworkBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug-MONO'">
     <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
@@ -121,6 +122,7 @@
     <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
     <DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType>
     <MsbuildDebugger>true</MsbuildDebugger>
+    <FullFrameworkBuild>true</FullFrameworkBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Release-MONO'">
     <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
diff --git a/targets/DeployDependencies.proj b/targets/DeployDependencies.proj
index a19168939f3..678ae175ac9 100644
--- a/targets/DeployDependencies.proj
+++ b/targets/DeployDependencies.proj
@@ -85,7 +85,7 @@
     <RuntimeProjectJson>$(MSBuildThisFileDirectory)runtimeDependencies\project.json</RuntimeProjectJson>
     <RuntimeProjectLockJson>$(MSBuildThisFileDirectory)runtimeDependencies\project.lock.json</RuntimeProjectLockJson>
 
-    <RestoreRuntimePackagesCommand>$(DnuRestoreCommand) --infer-runtimes "$(RuntimeProjectJson)"</RestoreRuntimePackagesCommand>
+    <RestoreRuntimePackagesCommand>$(DnuRestoreCommand) "$(RuntimeProjectJson)"</RestoreRuntimePackagesCommand>
 
     <NuGetRuntimeIdentifier>$(RuntimeSystem)-$(RuntimeArchitecture)</NuGetRuntimeIdentifier>
   </PropertyGroup>
diff --git a/targets/runtimeDependencies/project.json b/targets/runtimeDependencies/project.json
index f4f5548efe6..ff926363972 100644
--- a/targets/runtimeDependencies/project.json
+++ b/targets/runtimeDependencies/project.json
@@ -1,4 +1,10 @@
 {
+  "runtimes": {
+    "win7-x86": {},
+    "win7-x64": {},
+    "osx.10.10-x64": {},
+    "ubuntu.14.04-x64": {}
+  },
   "dependencies": {
     "xunit": "2.1.0",
     "xunit.netcore.extensions": "1.0.0-prerelease-00410-02"
@@ -6,9 +12,9 @@
   "frameworks": {
     "net46": {
       "dependencies": {
-         "xunit.runner.visualstudio": "2.1.0",
-         "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24109-00",
-         "System.Threading.Tasks.Dataflow": "4.5.26-rc3-24109-00"
+        "xunit.runner.visualstudio": "2.1.0",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24109-00",
+        "System.Threading.Tasks.Dataflow": "4.5.26-rc3-24109-00"
       }
     },
     "netcoreapp1.0": {
@@ -46,11 +52,15 @@
         "Microsoft.Net.Compilers.NetCore": "1.2.0-beta1-20160122-02",
         "Microsoft.Net.Compilers.Targets.NetCore": "0.1.4-dev",
         "Microsoft.Portable.Targets": "0.1.1-dev",
-        "Microsoft.Win32.Primitives":  "4.0.1-rc3-24109-00",
+        "Microsoft.Win32.Primitives": "4.0.1-rc3-24109-00",
         "Newtonsoft.Json": "8.0.3",
         "xunit.console.netcore": "1.0.2-prerelease-00410-02"
       },
-      "imports": [ "portable-net451+win81", "dnxcore50", "netstandard1.6" ]
+      "imports": [
+        "portable-net451+win81",
+        "dnxcore50",
+        "netstandard1.6"
+      ]
     }
   }
-}
+}
\ No newline at end of file