mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

R: rename EnsureDirectory to EnsureDirectoryExists and similar

Browse source
This commit is contained in:
jonsequitur 2016-12-20 16:03:00 -08:00
parent 35e3625d4b
commit 9b28fbecd6
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Microsoft.DotNet.Cli.Utils/PathUtility.cs
View file

@ -73,14 +73,14 @@ namespace Microsoft.DotNet.Tools.Common
return path;
}
public static void EnsureParentDirectory(string filePath)
public static void EnsureParentDirectoryExists(string filePath)
{
string directory = Path.GetDirectoryName(filePath);
EnsureDirectory(directory);
EnsureDirectoryExists(directory);
}
public static void EnsureDirectory(string directoryPath)
public static void EnsureDirectoryExists(string directoryPath)
{
if (!Directory.Exists(directoryPath))
{

6
src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/PathUtility.cs
View file

@ -51,14 +51,14 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Utilities
return path + trailingCharacter;
}
public static void EnsureParentDirectory(string filePath)
public static void EnsureParentDirectoryExists(string filePath)
{
string directory = Path.GetDirectoryName(filePath);
EnsureDirectory(directory);
EnsureDirectoryExists(directory);
}
public static void EnsureDirectory(string directoryPath)
public static void EnsureDirectoryExists(string directoryPath)
{
if (!Directory.Exists(directoryPath))
{

6
src/Microsoft.DotNet.ProjectJsonMigration/MigrationBackupPlan.cs
View file

@ -70,14 +70,14 @@ namespace Microsoft.DotNet.ProjectJsonMigration
{
if (globalJson.Exists)
{
PathUtility.EnsureDirectory(RootBackupDirectory.FullName);
PathUtility.EnsureDirectoryExists(RootBackupDirectory.FullName);
globalJson.MoveTo(Path.Combine(
ProjectBackupDirectory.Parent.FullName,
globalJson.Name));
}
PathUtility.EnsureDirectory(ProjectBackupDirectory.FullName);
PathUtility.EnsureDirectoryExists(ProjectBackupDirectory.FullName);
foreach (var file in FilesToMove)
{
@ -87,4 +87,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration
}
}
}
}
}

2
src/Microsoft.DotNet.TestFramework/TestAssetInstance.cs
View file

@ -102,7 +102,7 @@ namespace Microsoft.DotNet.TestFramework
var newFile = new FileInfo(newPath);
PathUtility.EnsureDirectory(newFile.Directory.FullName);
PathUtility.EnsureDirectoryExists(newFile.Directory.FullName);
file.CopyTo(newPath);
}

4
src/Microsoft.DotNet.TestFramework/TestDirectory.cs
View file

@ -20,12 +20,12 @@ namespace Microsoft.DotNet.TestFramework
Path = path;
EnsureExistsAndEmpty(Path);
EnsureDirectoryAndBackupDirectoryExistAndAreEmpty(Path);
}
public string Path { get; private set; }
private static void EnsureExistsAndEmpty(string path)
private static void EnsureDirectoryAndBackupDirectoryExistAndAreEmpty(string path)
{
var testDirectory = new DirectoryInfo(path);

6
src/dotnet/MulticoreJitActivator.cs
View file

@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Cli
{
var profileOptimizationRootPath = new MulticoreJitProfilePathCalculator().MulticoreJitProfilePath;
if (!TryEnsureDirectory(profileOptimizationRootPath))
if (!TryEnsureDirectoryExists(profileOptimizationRootPath))
{
return;
}
@ -43,11 +43,11 @@ namespace Microsoft.DotNet.Cli
AssemblyLoadContext.Default.StartProfileOptimization("dotnet");
}
private bool TryEnsureDirectory(string directoryPath)
private bool TryEnsureDirectoryExists(string directoryPath)
{
try
{
PathUtility.EnsureDirectory(directoryPath);
PathUtility.EnsureDirectoryExists(directoryPath);
return true;
}