From cd9e5e2f08d96ed0d72eae5b8756b5617a3b7f6c Mon Sep 17 00:00:00 2001 From: Bryan Date: Fri, 22 Jan 2016 15:37:37 -0800 Subject: [PATCH] Make the move off of * dependencies move tests back to 23704 name changed, feedback --- .../ArgumentEscaper.cs | 2 +- .../CommandResolver.cs | 2 +- .../ArgumentForwardingTests/project.json | 2 +- .../Reflector/project.json | 2 +- test/E2E/project.json | 5 +++-- .../project.json | 4 ++-- .../project.json | 5 ++++- .../project.json | 2 +- .../project.json | 16 ++++++++-------- test/StreamForwarderTests/project.json | 2 +- test/TestProjects/TestAppWithArgs/project.json | 8 ++++---- .../TestAppWithContents/project.json | 8 ++++---- 12 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs b/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs index 562b3d702..d88e7b822 100644 --- a/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs +++ b/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs @@ -20,7 +20,7 @@ namespace Microsoft.DotNet.Cli.Utils /// /// /// - public static string EscapeAndConcatenateArgArray(IEnumerable args) + public static string EscapeAndConcatenateArgArrayForProcessStart(IEnumerable args) { return string.Join(" ", EscapeArgArray(args)); } diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs index 9b722614e..1910609bf 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs @@ -258,7 +258,7 @@ namespace Microsoft.DotNet.Cli.Utils command = args.FirstOrDefault(); args = args.Skip(1); } - var cmdEscapedArgs = ArgumentEscaper.EscapeAndConcatenateArgArrayForCmd(args); + var cmdEscapedArgs = ArgumentEscaper.EscapeAndConcatenateArgArrayForCmdProcessStart(args); if (ArgumentEscaper.ShouldSurroundWithQuotes(command)) { diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json index 81adb6fa5..2e7e05f6a 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json @@ -10,7 +10,7 @@ "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", - "xunit.netcore.extensions": "1.0.0-prerelease-*", + "xunit.netcore.extensions": "1.0.0-prerelease-00153", "xunit.runner.utility": "2.1.0", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentForwardingTests/Reflector/project.json b/test/ArgumentForwardingTests/Reflector/project.json index 432e463a9..3c07eb367 100644 --- a/test/ArgumentForwardingTests/Reflector/project.json +++ b/test/ArgumentForwardingTests/Reflector/project.json @@ -10,7 +10,7 @@ "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", - "xunit.netcore.extensions": "1.0.0-prerelease-*", + "xunit.netcore.extensions": "1.0.0-prerelease-00153", "xunit.runner.utility": "2.1.0", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/E2E/project.json b/test/E2E/project.json index d778c8714..2e7ff642e 100644 --- a/test/E2E/project.json +++ b/test/E2E/project.json @@ -5,11 +5,12 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23714", + "NETStandard.Library" : "1.0.0-rc2-23704", + "Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704", "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", - "xunit.netcore.extensions": "1.0.0-prerelease-*", + "xunit.netcore.extensions": "1.0.0-prerelease-00153", "xunit.runner.utility": "2.1.0", "Microsoft.DotNet.ProjectModel": {"target":"project"}, diff --git a/test/Microsoft.DotNet.Tools.Builder.Tests/project.json b/test/Microsoft.DotNet.Tools.Builder.Tests/project.json index 9e294c795..b16b12e9e 100644 --- a/test/Microsoft.DotNet.Tools.Builder.Tests/project.json +++ b/test/Microsoft.DotNet.Tools.Builder.Tests/project.json @@ -3,11 +3,11 @@ "dependencies": { "NETStandard.Library": "1.0.0-rc2-23704", - "Microsoft.NETCore.TestHost" : "1.0.0-*", + "Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704", "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", - "xunit.netcore.extensions": "1.0.0-prerelease-*", + "xunit.netcore.extensions": "1.0.0-prerelease-00153", "xunit.runner.utility": "2.1.0", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Tools.Compiler.Tests/project.json b/test/Microsoft.DotNet.Tools.Compiler.Tests/project.json index 9e294c795..24c188a38 100644 --- a/test/Microsoft.DotNet.Tools.Compiler.Tests/project.json +++ b/test/Microsoft.DotNet.Tools.Compiler.Tests/project.json @@ -5,9 +5,12 @@ "NETStandard.Library": "1.0.0-rc2-23704", "Microsoft.NETCore.TestHost" : "1.0.0-*", + "NETStandard.Library": "1.0.0-rc2-23704", + "Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704", + "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", - "xunit.netcore.extensions": "1.0.0-prerelease-*", + "xunit.netcore.extensions": "1.0.0-prerelease-00153", "xunit.runner.utility": "2.1.0", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Tools.Publish.Tests/project.json b/test/Microsoft.DotNet.Tools.Publish.Tests/project.json index e28caa44e..cc375a902 100644 --- a/test/Microsoft.DotNet.Tools.Publish.Tests/project.json +++ b/test/Microsoft.DotNet.Tools.Publish.Tests/project.json @@ -8,7 +8,7 @@ "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", - "xunit.netcore.extensions": "1.0.0-prerelease-*", + "xunit.netcore.extensions": "1.0.0-prerelease-00153", "xunit.runner.utility": "2.1.0", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index c6be5a6e9..a87a10cbf 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -3,14 +3,14 @@ "description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library", "dependencies": { - "System.Collections": "4.0.11-rc2-*", - "System.Collections.Immutable": "1.1.38-rc2-*", - "System.Linq": "4.0.1-rc2-*", - "System.Threading": "4.0.11-rc2-*", - "System.IO.FileSystem": "4.0.1-rc2-*", - "System.IO": "4.0.11-rc2-*", - "System.Runtime.InteropServices": "4.0.21-rc2-*", - "System.Text.RegularExpressions": "4.0.11-rc2-*", + "System.Collections": "4.0.11-rc2-23714", + "System.Collections.Immutable": "1.1.38-rc2-23714", + "System.Linq": "4.0.1-rc2-23714", + "System.Threading": "4.0.11-rc2-23714", + "System.IO.FileSystem": "4.0.1-rc2-23714", + "System.IO": "4.0.11-rc2-23714", + "System.Runtime.InteropServices": "4.0.21-rc2-23714", + "System.Text.RegularExpressions": "4.0.11-rc2-23714", "FluentAssertions": "4.0.0", "xunit": "2.1.0", diff --git a/test/StreamForwarderTests/project.json b/test/StreamForwarderTests/project.json index 80cb9ffe1..15a66122a 100644 --- a/test/StreamForwarderTests/project.json +++ b/test/StreamForwarderTests/project.json @@ -9,7 +9,7 @@ "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", - "xunit.netcore.extensions": "1.0.0-prerelease-*", + "xunit.netcore.extensions": "1.0.0-prerelease-00153", "xunit.runner.utility": "2.1.0", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/TestProjects/TestAppWithArgs/project.json b/test/TestProjects/TestAppWithArgs/project.json index 9a9e91e40..8aeb483c1 100644 --- a/test/TestProjects/TestAppWithArgs/project.json +++ b/test/TestProjects/TestAppWithArgs/project.json @@ -5,10 +5,10 @@ }, "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.1-beta-*", - "System.IO": "4.0.10-beta-*", - "System.Console": "4.0.0-beta-*", - "System.Runtime": "4.0.21-beta-*" + "Microsoft.NETCore.Runtime": "1.0.1-rc2-23714", + "System.IO": "4.0.10-rc2-23714", + "System.Console": "4.0.0-rc2-23714", + "System.Runtime": "4.0.21-rc2-23714" }, "frameworks": { diff --git a/test/TestProjects/TestAppWithContents/project.json b/test/TestProjects/TestAppWithContents/project.json index 396f90231..76d288de9 100644 --- a/test/TestProjects/TestAppWithContents/project.json +++ b/test/TestProjects/TestAppWithContents/project.json @@ -5,10 +5,10 @@ }, "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.1-beta-*", - "System.IO": "4.0.10-beta-*", - "System.Console": "4.0.0-beta-*", - "System.Runtime": "4.0.21-beta-*" + "Microsoft.NETCore.Runtime": "1.0.1-rc2-23714", + "System.IO": "4.0.10-rc2-23714", + "System.Console": "4.0.0-rc2-23714", + "System.Runtime": "4.0.21-rc2-23714" },