Skip to content

A Swiss Army knife for developers.

Updated extension manager to only install binaries that fit the running OS and its architecture

Etienne Baudoux442c46b42dd8
diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionInstallationManager.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionInstallationManager.cs
index 5a3b5d0e7..78d4120d2 100644
--- a/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionInstallationManager.cs
+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionInstallationManager.cs
@@ -1,4 +1,6 @@
-using Microsoft.Extensions.Logging;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Logging;
+using NuGet.Packaging;
namespace DevToys.Blazor.BuiltInTools.ExtensionsManager;
@@ -64,7 +66,7 @@ public static class ExtensionInstallationManager
logger.LogInformation("Finished uninstalling {uninstalledExtensions} extensions in {elapsedMilliseconds}ms", uninstalledExtensions, elapsedMilliseconds);
}
- public static void ScheduleExtensionToBeUninstalled(string extensionInstallationPath)
+ internal static void ScheduleExtensionToBeUninstalled(string extensionInstallationPath)
{
if (!Directory.Exists(PreferredExtensionInstallationFolder))
{
@@ -80,4 +82,129 @@ public static class ExtensionInstallationManager
File.AppendAllLines(scheduledForUninstallFilePath, new[] { extensionInstallationPath });
logger.LogInformation("Scheduled to uninstall extension '{extensionInstallationPath}' next time the app start.", extensionInstallationPath);
}
+
+ internal static async Task<ExtensionInstallationResult> InstallExtensionAsync(SandboxedFileReader nugetPackageFile)
+ {
+ using Stream nugetPackageStream = await nugetPackageFile.GetNewAccessToFileContentAsync(CancellationToken.None);
+ using var reader = new PackageArchiveReader(nugetPackageStream);
+
+ NuspecReader nuspecReader = reader.NuspecReader;
+
+ for (int j = 0; j < ExtensionInstallationFolders.Length; j++)
+ {
+ string potentialExtensionInstallationPath = Path.Combine(ExtensionInstallationFolders[j], nuspecReader.GetId());
+ if (Directory.Exists(potentialExtensionInstallationPath))
+ {
+ // Extension is already installed.
+ return new(AlreadyInstalled: true, nuspecReader, ExtensionInstallationPath: string.Empty);
+ }
+ }
+
+ string extensionInstallationPath
+ = Path.Combine(PreferredExtensionInstallationFolder, nuspecReader.GetId());
+
+ // Unzip the extension.
+ string[] pathToExclude = GetPathToExclude().ToArray();
+ Directory.CreateDirectory(extensionInstallationPath);
+ foreach (string? packagedFile in reader.GetFiles())
+ {
+ if (!pathToExclude.Any(path => packagedFile.Contains(path, StringComparison.CurrentCultureIgnoreCase)))
+ {
+ reader.ExtractFile(packagedFile, Path.Combine(extensionInstallationPath, packagedFile), null);
+ }
+ }
+
+ return new(AlreadyInstalled: false, nuspecReader, extensionInstallationPath);
+ }
+
+ private static IEnumerable<string> GetPathToExclude()
+ {
+ if (OperatingSystem.IsWindows())
+ {
+ yield return "runtimes/osx/";
+ yield return "runtimes/osx-x86/";
+ yield return "runtimes/osx-x64/";
+ yield return "runtimes/osx-arm64/";
+ yield return "runtimes/linux/";
+ yield return "runtimes/linux-x86/";
+ yield return "runtimes/linux-x64/";
+ yield return "runtimes/linux-arm64/";
+ switch (RuntimeInformation.ProcessArchitecture)
+ {
+ case Architecture.X86:
+ yield return "runtimes/win-x64/";
+ yield return "runtimes/win-arm64/";
+ break;
+ case Architecture.X64:
+ yield return "runtimes/win-x86/";
+ yield return "runtimes/win-arm64/";
+ break;
+ case Architecture.Arm:
+ case Architecture.Arm64:
+ yield return "runtimes/win-x86/";
+ yield return "runtimes/win-x64/";
+ break;
+ default:
+ break;
+ }
+ }
+ else if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())
+ {
+ yield return "runtimes/osx/";
+ yield return "runtimes/osx-x86/";
+ yield return "runtimes/osx-x64/";
+ yield return "runtimes/osx-arm64/";
+ yield return "runtimes/win/";
+ yield return "runtimes/win-x86/";
+ yield return "runtimes/win-x64/";
+ yield return "runtimes/win-arm64/";
+ switch (RuntimeInformation.ProcessArchitecture)
+ {
+ case Architecture.X86:
+ yield return "runtimes/linux-x64/";
+ yield return "runtimes/linux-arm64/";
+ break;
+ case Architecture.X64:
+ yield return "runtimes/linux-x86/";
+ yield return "runtimes/linux-arm64/";
+ break;
+ case Architecture.Arm:
+ case Architecture.Arm64:
+ yield return "runtimes/linux-x86/";
+ yield return "runtimes/linux-x64/";
+ break;
+ default:
+ break;
+ }
+ }
+ else
+ {
+ yield return "runtimes/linux/";
+ yield return "runtimes/linux-x86/";
+ yield return "runtimes/linux-x64/";
+ yield return "runtimes/linux-arm64/";
+ yield return "runtimes/win/";
+ yield return "runtimes/win-x86/";
+ yield return "runtimes/win-x64/";
+ yield return "runtimes/win-arm64/";
+ switch (RuntimeInformation.ProcessArchitecture)
+ {
+ case Architecture.X86:
+ yield return "runtimes/osx-x64/";
+ yield return "runtimes/osx-arm64/";
+ break;
+ case Architecture.X64:
+ yield return "runtimes/osx-x86/";
+ yield return "runtimes/osx-arm64/";
+ break;
+ case Architecture.Arm:
+ case Architecture.Arm64:
+ yield return "runtimes/osx-x86/";
+ yield return "runtimes/osx-x64/";
+ break;
+ default:
+ break;
+ }
+ }
+ }
}
diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionInstallationResult.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionInstallationResult.cs
new file mode 100644
index 000000000..57181ce61
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionInstallationResult.cs
@@ -0,0 +1,7 @@
+using NuGet.Packaging;
+
+namespace DevToys.Blazor.BuiltInTools.ExtensionsManager;
+
+internal record ExtensionInstallationResult(bool AlreadyInstalled, NuspecReader NuspecReader, string ExtensionInstallationPath)
+{
+}
diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.cs
index 47ae6315d..d5fbb0fc8 100644
--- a/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.cs
+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.cs
@@ -147,34 +147,16 @@ internal sealed class ExtensionsManagerGuiTool : IGuiTool
for (int i = 0; i < nugetPackages.Length; i++)
{
- using SandboxedFileReader nugetPackage = nugetPackages[i];
- using Stream nugetPackageStream = await nugetPackage.GetNewAccessToFileContentAsync(CancellationToken.None);
- using var reader = new PackageArchiveReader(nugetPackageStream);
+ ExtensionInstallationResult result = await ExtensionInstallationManager.InstallExtensionAsync(nugetPackages[i]);
- NuspecReader nuspec = reader.NuspecReader;
-
- for (int j = 0; j < ExtensionInstallationManager.ExtensionInstallationFolders.Length; j++)
- {
- string potentialExtensionInstallationPath = Path.Combine(ExtensionInstallationManager.ExtensionInstallationFolders[j], nuspec.GetId());
- if (Directory.Exists(potentialExtensionInstallationPath))
- {
- // Extension is already installed.
- await ShowExtensionAlreadyInstalledMessageBoxAsync(nuspec.GetTitle());
- return;
- }
- }
-
- string extensionInstallationPath
- = Path.Combine(ExtensionInstallationManager.PreferredExtensionInstallationFolder, nuspec.GetId());
-
- // Unzip the extension.
- Directory.CreateDirectory(extensionInstallationPath);
- foreach (string? packagedFile in reader.GetFiles())
+ if (result.AlreadyInstalled)
{
- reader.ExtractFile(packagedFile, Path.Combine(extensionInstallationPath, packagedFile), null);
+ // Extension is already installed.
+ await ShowExtensionAlreadyInstalledMessageBoxAsync(result.NuspecReader.GetTitle());
+ return;
}
- _extensionList.Items.Add(CreateExtensionListItem(nuspec, extensionInstallationPath));
+ _extensionList.Items.Add(CreateExtensionListItem(result.NuspecReader, result.ExtensionInstallationPath));
_restartRequiredInfoBar.Open();
}