From 0bc7380bdb5491433015a3dc1dd17756d750900a Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Thu, 7 Apr 2016 11:51:41 -0700
Subject: [PATCH 1/4] Add netcoreapp as default tfm to run

---
 .../RunTestsApps/TestAppMultiTarget/project.json           | 7 +++++--
 src/dotnet/commands/dotnet-run/RunCommand.cs               | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
index 3819cf2cb..8649d5e6f 100644
--- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
+++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
@@ -4,10 +4,13 @@
     "emitEntryPoint": true
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "imports": "dnxcore50",
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-23931"
+        "Microsoft.NETCore.App": {
+          "version":"1.0.0-rc2-23931",
+          "type": "platform"
+        }
       }
     },
     "net451": {}
diff --git a/src/dotnet/commands/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs
index f8f051da5..2b5f9efd0 100644
--- a/src/dotnet/commands/dotnet-run/RunCommand.cs
+++ b/src/dotnet/commands/dotnet-run/RunCommand.cs
@@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Tools.Run
             {
                 var defaultFrameworks = new[]
                 {
-                    FrameworkConstants.FrameworkIdentifiers.DnxCore,
+                    FrameworkConstants.FrameworkIdentifiers.NetCoreApp,
                     FrameworkConstants.FrameworkIdentifiers.NetStandardApp,
                 };
 

From 8e23d9a6350b0293f52c43fce2061b0b91bc1751 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@andrewnurse.net>
Date: Thu, 7 Apr 2016 15:37:33 -0700
Subject: [PATCH 2/4] remove unnecessary NuGet.Config that was causing problems

---
 .../dotnet-dependency-tool-invoker/NuGet.Config          | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 TestAssets/TestPackages/dotnet-dependency-tool-invoker/NuGet.Config

diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/NuGet.Config b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/NuGet.Config
deleted file mode 100644
index e80222c1f..000000000
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/NuGet.Config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>

From c2befefd2a23c5dca7af103f31a39a84b9041e44 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Fri, 8 Apr 2016 01:55:41 -0700
Subject: [PATCH 3/4] Remove unnecessary dependency on Microsoft.Dnx.*

---
 .../dotnet-dependency-tool-invoker/project.json           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
index 50893525a..e02da4190 100644
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
+++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
@@ -15,14 +15,6 @@
       "type": "build",
       "version": "1.0.0-rc2-16453"
     },
-    "Microsoft.Dnx.Runtime.CommandParsing.Sources": {
-      "version": "1.0.0-rc2-16453",
-      "type": "build"
-    },
-    "Microsoft.Dnx.Runtime.Sources": {
-      "version": "1.0.0-rc2-16453",
-      "type": "build"
-    },
     "System.CommandLine": "0.1.0-e160323-1"
   },
   "frameworks": {

From 933c63b2d5cc08032fc35f956aeb31fc73982b86 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Fri, 8 Apr 2016 03:07:33 -0700
Subject: [PATCH 4/4] Add delay between attempts to contact the server

---
 .../NetworkUtils/NetworkHelper.cs                                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs
index 21fb22253..54abccc86 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs
@@ -29,6 +29,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
                     }
                     catch (Exception)
                     {
+                        Thread.Sleep(100);
                         return false;
                     }
                 }