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

Add a directory-delete helper.

Browse source 
This seems to be needed on Windows to delete temporary staging files correctly.
This commit is contained in:
Eric Mellino 2016-03-15 14:06:54 -07:00
parent ffedcb315f
commit 23e024c463
4 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/dotnet-cli-build/MsiTargets.cs
View file

@ -112,9 +112,8 @@ namespace Microsoft.DotNet.Cli.Build
if (Directory.Exists(wixObjRoot)) if (Directory.Exists(wixObjRoot))
{ {
Directory.Delete(wixObjRoot, true); Utils.DeleteDirectory(wixObjRoot);
} }
Directory.CreateDirectory(wixObjRoot); Directory.CreateDirectory(wixObjRoot);
Cmd("powershell", "-NoProfile", "-NoLogo", Cmd("powershell", "-NoProfile", "-NoLogo",
@ -137,9 +136,8 @@ namespace Microsoft.DotNet.Cli.Build
if (Directory.Exists(wixObjRoot)) if (Directory.Exists(wixObjRoot))
{ {
Directory.Delete(wixObjRoot, true); Utils.DeleteDirectory(wixObjRoot);
} }
Directory.CreateDirectory(wixObjRoot); Directory.CreateDirectory(wixObjRoot);
Cmd("powershell", "-NoProfile", "-NoLogo", Cmd("powershell", "-NoProfile", "-NoLogo",

10
scripts/dotnet-cli-build/PackageTargets.cs
View file

@ -57,16 +57,8 @@ namespace Microsoft.DotNet.Cli.Build
if (Directory.Exists(cliSdkRoot)) if (Directory.Exists(cliSdkRoot))
{ {
string[] files = Directory.GetFiles(cliSdkRoot, "*", SearchOption.AllDirectories); Utils.DeleteDirectory(cliSdkRoot);
foreach (string file in files)
{
File.SetAttributes(file, FileAttributes.Normal);
File.Delete(file);
}
Directory.Delete(cliSdkRoot, true);
} }
Directory.CreateDirectory(cliSdk); Directory.CreateDirectory(cliSdk);
var binPath = Path.Combine(Dirs.Stage2, "bin"); var binPath = Path.Combine(Dirs.Stage2, "bin");

6
scripts/dotnet-cli-build/SharedFrameworkTargets.cs
View file

@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Cli.Build
if (Directory.Exists(SharedFrameworkPublishRoot)) if (Directory.Exists(SharedFrameworkPublishRoot))
{ {
Directory.Delete(SharedFrameworkPublishRoot, true); Utils.DeleteDirectory(SharedFrameworkPublishRoot);
} }
// We publish to a sub folder of the PublishRoot so tools like heat and zip can generate folder structures easier. // We publish to a sub folder of the PublishRoot so tools like heat and zip can generate folder structures easier.
@ -113,11 +113,11 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult PublishSharedHost(BuildTargetContext c) public static BuildTargetResult PublishSharedHost(BuildTargetContext c)
{ {
string SharedHostPublishRoot = Path.Combine(Dirs.Output, "obj", "sharedhost"); string SharedHostPublishRoot = Path.Combine(Dirs.Output, "obj", "sharedhost");
if (Directory.Exists(SharedHostPublishRoot)) if (Directory.Exists(SharedHostPublishRoot))
{ {
Directory.Delete(SharedHostPublishRoot); Utils.DeleteDirectory(SharedHostPublishRoot);
} }
Directory.CreateDirectory(SharedHostPublishRoot); Directory.CreateDirectory(SharedHostPublishRoot);
// corehost will be renamed to dotnet at some point and then this can be removed. // corehost will be renamed to dotnet at some point and then this can be removed.

15
scripts/dotnet-cli-build/Utils/Utils.cs
View file

@ -85,5 +85,20 @@ namespace Microsoft.DotNet.Cli.Build
b[x] = b[y]; b[x] = b[y];
b[y] = t; b[y] = t;
} }
public static void DeleteDirectory(string path)
{
if (Directory.Exists(path))
{
string[] files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
foreach (string file in files)
{
File.SetAttributes(file, FileAttributes.Normal);
File.Delete(file);
}
Directory.Delete(path, true);
}
}
} }
} }