From 79a1c2c82495873fcdaa50263d349313d7cdaaa9 Mon Sep 17 00:00:00 2001
From: Hovsep Mkrtchyan <hovsepm@microsoft.com>
Date: Thu, 19 May 2016 18:31:37 -0700
Subject: [PATCH] Fixed test project build failure in VS2015

---
 AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json  | 6 +++++-
 AutoRest/Generators/CSharp/CSharp.Tests/project.json        | 6 +++++-
 .../Microsoft.Rest.ClientRuntime.Azure.Tests/project.json   | 6 +++++-
 .../CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json  | 6 +++++-
 build.proj                                                  | 2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
index 5afa221088b67..dfe12d747c247 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
@@ -24,7 +24,11 @@
   },
 
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0-rc2-3002702",
+    "Microsoft.NETCore.App": { 
+      "type": "platform", 
+      "version": "1.0.0-rc2-*" 
+    }, 
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "CSharp.Tests": "2.0.0",
     "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)",
     "xunit": "2.1.0",
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/project.json b/AutoRest/Generators/CSharp/CSharp.Tests/project.json
index 2c6310fce7827..b3e581cfb007b 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/project.json
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/project.json
@@ -23,7 +23,11 @@
     }
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0-rc2-3002702",
+    "Microsoft.NETCore.App": { 
+      "type": "platform", 
+      "version": "1.0.0-rc2-*" 
+    }, 
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)",
     "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json
index bdc1a407abd0e..3a4bd75d7e94e 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json
@@ -17,7 +17,11 @@
     }
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0-rc2-3002702",
+    "Microsoft.NETCore.App": { 
+      "type": "platform", 
+      "version": "1.0.0-rc2-*" 
+    }, 
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)",
     "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)",
     "xunit": "2.1.0",
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json
index bdc1a407abd0e..3a4bd75d7e94e 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json
@@ -17,7 +17,11 @@
     }
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0-rc2-3002702",
+    "Microsoft.NETCore.App": { 
+      "type": "platform", 
+      "version": "1.0.0-rc2-*" 
+    }, 
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)",
     "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)",
     "xunit": "2.1.0",
diff --git a/build.proj b/build.proj
index 3aa6cf163bdbc..5a2cb40273264 100644
--- a/build.proj
+++ b/build.proj
@@ -241,7 +241,7 @@
 
   <Target Name="RestoreNugetPackages">
     <Exec Command="dotnet restore %(NetCoreLibraries.FullPath)" ContinueOnError="false"/>
-    <Exec Command="dotnet restore --infer-runtimes %(NetCoreTestLibraries.FullPath)" ContinueOnError="false"/>
+    <Exec Command="dotnet restore %(NetCoreTestLibraries.FullPath)" ContinueOnError="false"/>
     <Exec Command="$(NuGetCommand) install xunit.runner.console -Version 2.1.0 -OutputDirectory $(LibraryRoot)packages" ContinueOnError="false"/>
     <Exec Command="$(NuGetCommand) restore $(CodeGeneratorSolution)" ContinueOnError="false" Condition=" '$(Scope)' == 'all' or '$(Scope)' == 'CodeGenerator'" />
   </Target>