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 @@ - - - - - - - - - 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": { 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, }; 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; } }