Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Core.ExtensionCache
{
using WixToolset.Data;

internal static class ExtensionCacheInformations
{
public static Message RemovedExtension(string extensionFolder)
{
return Message(null, Ids.RemovedExtension, "Removed extension folder {0}", extensionFolder);
}


private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
{
return new Message(sourceLineNumber, MessageLevel.Information, (int)id, format, args);
}

public enum Ids
{
RemovedExtension = 6200,
} // see message range from ExtensionCacheWarnings
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,14 @@ public Task<bool> RemoveAsync(bool global, string extension, CancellationToken c
{
cancellationToken.ThrowIfCancellationRequested();

Directory.Delete(cacheFolder, true);
this.Messaging.Write(ExtensionCacheInformations.RemovedExtension(extensionFolder));
Directory.Delete(extensionFolder, true);
return Task.FromResult(true);
}
else
{
this.Messaging.Write(ExtensionCacheWarnings.RemoveExtensionNotInstalled(extensionId, extensionVersion, extensionFolder));
}

return Task.FromResult(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ public static Message MissingExtensionPackageRootFolder(string extensionId, stri
return Message(new SourceLineNumber(extensionId), Ids.MissingExtensionPackageRootFolder, "Could not find expected package root folder {0}. Ensure {1}/{2} is compatible with WiX v{3}.", packageRootFolderName, extensionId, packageVersion, wixVersion);
}

public static Message RemoveExtensionNotInstalled(string extensionId, string packageVersion, string extensionCacheFolder)
{
return Message(new SourceLineNumber(extensionId), Ids.NotInstalledExtension, "Extension {0} with Id {1} not found in {2}.", extensionId, packageVersion, extensionCacheFolder);
}

private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
{
return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
Expand All @@ -25,6 +30,7 @@ public enum Ids
{
NugetException = 6100,
MissingExtensionPackageRootFolder = 6101,
NotInstalledExtension = 6102,
} // last available is 6499. 6500 is ExtensionCacheErrors.
}
}
Loading