From 5de082e68781ea67ede797b0afca6ba1b05ac0f0 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 4 Nov 2016 10:18:46 -0700 Subject: [PATCH] Upgrade Microsoft.DotNet.Cli.Utils from preview2 to preview3 --- src/Microsoft.DotNet.Watcher.Tools/project.json | 2 +- src/Microsoft.Extensions.SecretManager.Tools/project.json | 2 +- .../Scenario/ProjectToolScenario.cs | 5 ++--- .../project.json | 1 + test/Microsoft.DotNet.Watcher.Tools.Tests/project.json | 1 + .../project.json | 1 + 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.DotNet.Watcher.Tools/project.json b/src/Microsoft.DotNet.Watcher.Tools/project.json index 742e7e484c..6306ce1285 100644 --- a/src/Microsoft.DotNet.Watcher.Tools/project.json +++ b/src/Microsoft.DotNet.Watcher.Tools/project.json @@ -32,7 +32,7 @@ ] }, "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-003121", + "Microsoft.DotNet.Cli.Utils": "1.0.0-preview3-004050", "Microsoft.Extensions.Logging": "1.0.0", "Microsoft.Extensions.Logging.Console": "1.0.0", "Microsoft.Extensions.Process.Sources": { diff --git a/src/Microsoft.Extensions.SecretManager.Tools/project.json b/src/Microsoft.Extensions.SecretManager.Tools/project.json index d7a2e799bf..cec16d5840 100644 --- a/src/Microsoft.Extensions.SecretManager.Tools/project.json +++ b/src/Microsoft.Extensions.SecretManager.Tools/project.json @@ -38,7 +38,7 @@ ] }, "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-003121", + "Microsoft.DotNet.Cli.Utils": "1.0.0-preview3-004050", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", "Microsoft.Extensions.Logging": "1.0.0", "Microsoft.NETCore.App": { diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs index a8ce555257..ff124a8703 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs @@ -9,7 +9,6 @@ using System.Linq; using System.Reflection; using System.Threading; using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.ProjectModel; using Xunit.Abstractions; namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests @@ -98,10 +97,10 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests args.Add("exec"); args.Add("--depsfile"); - args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + FileNameSuffixes.DepsJson)); + args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + ".deps.json")); args.Add("--runtimeconfig"); - args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + FileNameSuffixes.RuntimeConfigJson)); + args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + ".runtimeconfig.json")); args.Add(Path.Combine(AppContext.BaseDirectory, "dotnet-watch.dll")); diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json index 39e6e6ce55..645d6f7de4 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json @@ -11,6 +11,7 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-preview2-build1029", + "Microsoft.DotNet.InternalAbstractions": "1.0.0", "Microsoft.AspNetCore.Testing": "1.0.0", "Microsoft.DotNet.Watcher.Tools": "1.0.0-*", "Microsoft.Extensions.Process.Sources": { diff --git a/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json b/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json index fd2d9874aa..b40ce98d3a 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json +++ b/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json @@ -6,6 +6,7 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-preview2-build1029", + "Microsoft.DotNet.InternalAbstractions": "1.0.0", "Microsoft.DotNet.Watcher.Tools": "1.0.0-*", "xunit": "2.2.0-beta3-build3402" }, diff --git a/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json b/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json index 515a64c422..b93fb60245 100644 --- a/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json +++ b/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-preview2-build1029", + "Microsoft.DotNet.InternalAbstractions": "1.0.0", "Microsoft.Extensions.SecretManager.Tools": "1.0.0-*", "xunit": "2.2.0-beta3-build3402" },