This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Repository navigation
Expand relative paths for CLI arguments #9892
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| using System; | ||
| using System.IO; | ||
|
|
||
| namespace Microsoft.DotNet.Cli | ||
| { | ||
| internal static class CommandDirectoryContext | ||
| { | ||
| [ThreadStatic] | ||
| private static string _basePath; | ||
|
|
||
| /// <summary> | ||
| /// Expands a path similar to Path.GetFullPath() but gives unit tests a hook to inject an overwrite to the | ||
| /// base path. | ||
| /// </summary> | ||
| /// <param name="path">A relative or absolute path specifier</param> | ||
| /// <returns>The full path to the target</returns> | ||
| public static string GetFullPath(string path) | ||
| => _basePath != null | ||
| ? Path.GetFullPath(path, _basePath) | ||
| : Path.GetFullPath(path); | ||
|
|
||
| /// <summary> | ||
| /// Meant to be used only in unit test to remove dependency on special characters in the absolute repo path | ||
| /// The overwrite will only affect the current thread. | ||
| /// </summary> | ||
| /// <param name="basePath">Directory to be used as base path instead of the current working directory.</param> | ||
| /// <param name="action">Action to be executed with the overwritten directory in place.</param> | ||
| public static void PerformActionWithBasePath(string basePath, Action action) | ||
| { | ||
| if (_basePath != null) | ||
| { | ||
| throw new InvalidOperationException( | ||
| $"Calls to {nameof(CommandDirectoryContext)}.{nameof(PerformActionWithBasePath)} cannot be nested."); | ||
| } | ||
| _basePath = basePath; | ||
| try | ||
| { | ||
| action(); | ||
| } | ||
| finally | ||
| { | ||
| _basePath = null; | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
test/Microsoft.DotNet.Tools.Tests.Utilities/TestPathUtilities.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright (c) .NET Foundation and contributors. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.IO; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| namespace Microsoft.DotNet.Tools.Tests.Utilities | ||
| { | ||
| public static class TestPathUtilities | ||
| { | ||
| public static string FormatAbsolutePath(string directoryName = null) | ||
| => Path.Combine( | ||
| RuntimeInformation.IsOSPlatform(OSPlatform.Windows) | ||
| ? "A:" | ||
| : Path.DirectorySeparatorChar.ToString(), | ||
| directoryName ?? "TestWorkDir") + Path.DirectorySeparatorChar; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.