Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use enum instead of string to represent OS

Browse Source
This commit is contained in:
Caelan Sayler
2022-12-14 16:01:45 +00:00
parent a07b564485
commit 82e1faf92d
5 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Squirrel.CommandLine/SquirrelHost.cs
View File

@@ -35,7 +35,7 @@ namespace Squirrel.CommandLine
ParseResult parseResult = platformRootCommand.Parse(args);
string xplat = parseResult.GetValueForOption(TargetRuntime) ?? SquirrelRuntimeInfo.SystemOsName;
string xplat = parseResult.GetValueForOption(TargetRuntime) ?? SquirrelRuntimeInfo.SystemOs.GetOsShortName();
bool verbose = parseResult.GetValueForOption(VerboseOption);
if (parseResult.GetValueForOption(AddSearchPathOption) is { } searchPath) {
foreach (var v in searchPath) {

10
src/Squirrel/AppDesc.cs
View File

@@ -26,7 +26,7 @@ namespace Squirrel
if (SquirrelRuntimeInfo.IsOSX)
return new AppDescOsx();
throw new NotSupportedException($"OS platform '{SquirrelRuntimeInfo.SystemOsName}' is not supported.");
throw new NotSupportedException($"OS platform '{SquirrelRuntimeInfo.SystemOs.GetOsLongName()}' is not supported.");
}
/// <summary>
@@ -88,9 +88,9 @@ namespace Squirrel
internal List<(string PackagePath, SemanticVersion PackageVersion, bool IsDelta)> GetLocalPackages()
{
var query = from x in Directory.EnumerateFiles(PackagesDir, "*.nupkg")
let re = ReleaseEntry.ParseEntryFileName(x)
where re.Version != null
select (x, re.Version, re.IsDelta);
let re = ReleaseEntry.ParseEntryFileName(x)
where re.Version != null
select (x, re.Version, re.IsDelta);
return query.ToList();
}
@@ -262,7 +262,7 @@ namespace Squirrel
/// <inheritdoc />
public override bool IsUpdateExe { get; }
/// <summary> True if Update.exe is currently performing first app install. </summary>
public bool IsInstalling { get; }

14
src/Squirrel/RuntimeInfo.cs
View File

@@ -230,15 +230,15 @@ namespace Squirrel
// TODO use IsWindowsVersionOrGreater function to verify it can be installed on this machine
// arm64 windows supports everything
if (SquirrelRuntimeInfo.SystemArchitecture == RuntimeCpu.arm64)
if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.arm64)
return Task.FromResult(true);
// if the desired architecture is same as system
if (SquirrelRuntimeInfo.SystemArchitecture == CpuArchitecture)
if (SquirrelRuntimeInfo.SystemArch == CpuArchitecture)
return Task.FromResult(true);
// x64 also supports x86
if (SquirrelRuntimeInfo.SystemArchitecture == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86)
if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86)
return Task.FromResult(true);
return Task.FromResult(false);
@@ -263,7 +263,7 @@ namespace Squirrel
[SupportedOSPlatform("windows")]
private static string GetDotnetBaseDir(RuntimeCpu runtime)
{
var system = SquirrelRuntimeInfo.SystemArchitecture;
var system = SquirrelRuntimeInfo.SystemArch;
var pf86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
if (runtime == RuntimeCpu.x86)
@@ -474,15 +474,15 @@ namespace Squirrel
// TODO use IsWindowsVersionOrGreater function to verify it can be installed on this machine
// arm64 windows supports everything
if (SquirrelRuntimeInfo.SystemArchitecture == RuntimeCpu.arm64)
if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.arm64)
return Task.FromResult(true);
// if the desired architecture is same as system
if (SquirrelRuntimeInfo.SystemArchitecture == CpuArchitecture)
if (SquirrelRuntimeInfo.SystemArch == CpuArchitecture)
return Task.FromResult(true);
// x64 also supports x86
if (SquirrelRuntimeInfo.SystemArchitecture == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86)
if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86)
return Task.FromResult(true);
return Task.FromResult(false);

9
src/Squirrel/Sources/SimpleWebSource.cs
View File

@@ -38,12 +38,13 @@ namespace Squirrel.Sources
var args = new Dictionary<string, string>();
if (SquirrelRuntimeInfo.SystemArchitecture != RuntimeCpu.Unknown) {
args.Add("arch", SquirrelRuntimeInfo.SystemArchitecture.ToString());
if (SquirrelRuntimeInfo.SystemArch != RuntimeCpu.Unknown) {
args.Add("arch", SquirrelRuntimeInfo.SystemArch.ToString());
}
if (SquirrelRuntimeInfo.SystemOsName != null) {
args.Add("os", SquirrelRuntimeInfo.SystemOsName);
if (SquirrelRuntimeInfo.SystemOs != RuntimeOs.Unknown) {
args.Add("os", SquirrelRuntimeInfo.SystemOs.GetOsShortName());
args.Add("rid", SquirrelRuntimeInfo.SystemRid);
}
if (latestLocalRelease != null) {

80
src/Squirrel/SquirrelRuntimeInfo.cs
View File

@@ -4,7 +4,6 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
using NuGet.Versioning;
using Squirrel.SimpleSplat;
#if !NETFRAMEWORK
using InteropArchitecture = System.Runtime.InteropServices.Architecture;
@@ -56,6 +55,22 @@ namespace Squirrel
arm64 = 0xAA64,
}
/// <summary> The Runtime OS </summary>
public enum RuntimeOs
{
/// <summary> Unknown or unsupported </summary>
Unknown = 0,
/// <summary> Windows </summary>
Windows = 1,
/// <summary> Linux </summary>
Linux = 2,
/// <summary> OSX </summary>
OSX = 3,
}
/// <summary>
/// Convenience class which provides runtime information about the current executing process,
/// in a way that is safe in older and newer versions of the framework.
@@ -81,22 +96,25 @@ namespace Squirrel
public static bool IsSingleFile { get; }
/// <summary> The current machine architecture, ignoring the current process / pe architecture. </summary>
public static RuntimeCpu SystemArchitecture { get; private set; }
public static RuntimeCpu SystemArch { get; private set; }
/// <summary> The name of the current OS - eg. 'windows', 'linux', or 'osx'. </summary>
public static string SystemOsName { get; private set; }
public static RuntimeOs SystemOs { get; private set; }
/// <summary> The current system RID. </summary>
public static string SystemRid => $"{SystemOs.GetOsShortName()}-{SystemArch}";
/// <summary> True if executing on a Windows platform. </summary>
[SupportedOSPlatformGuard("windows")]
public static bool IsWindows => SystemOsName == "windows";
public static bool IsWindows => SystemOs == RuntimeOs.Windows;
/// <summary> True if executing on a Linux platform. </summary>
[SupportedOSPlatformGuard("linux")]
public static bool IsLinux => SystemOsName == "linux";
public static bool IsLinux => SystemOs == RuntimeOs.Linux;
/// <summary> True if executing on a MacOS / OSX platform. </summary>
[SupportedOSPlatformGuard("osx")]
public static bool IsOSX => SystemOsName == "osx";
public static bool IsOSX => SystemOs == RuntimeOs.OSX;
/// <summary> The <see cref="StringComparer"/> that should be used when comparing local file-system paths. </summary>
public static StringComparer PathStringComparer =>
@@ -106,8 +124,6 @@ namespace Squirrel
public static StringComparison PathStringComparison =>
IsWindows ? StringComparison.InvariantCultureIgnoreCase : StringComparison.InvariantCulture;
private static IFullLogger Log => SquirrelLocator.Current.GetService<ILogManager>().GetLogger(typeof(SquirrelRuntimeInfo));
static SquirrelRuntimeInfo()
{
EntryExePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
@@ -139,6 +155,32 @@ namespace Squirrel
#endif
}
/// <summary>
/// Returns the shortened OS name as a string, suitable for creating an RID.
/// </summary>
public static string GetOsShortName(this RuntimeOs os)
{
return os switch {
RuntimeOs.Windows => "win",
RuntimeOs.Linux => "linux",
RuntimeOs.OSX => "osx",
_ => "",
};
}
/// <summary>
/// Returns the long OS name, suitable for showing to a human.
/// </summary>
public static string GetOsLongName(this RuntimeOs os)
{
return os switch {
RuntimeOs.Windows => "Windows",
RuntimeOs.Linux => "Linux",
RuntimeOs.OSX => "OSX",
_ => "",
};
}
[DllImport("kernel32", EntryPoint = "IsWow64Process2", SetLastError = true)]
private static extern bool IsWow64Process2(IntPtr hProcess, out ushort pProcessMachine, out ushort pNativeMachine);
@@ -147,7 +189,7 @@ namespace Squirrel
private static void CheckArchitectureWindows()
{
SystemOsName = "windows";
SystemOs = RuntimeOs.Windows;
// find the actual OS architecture. We can't rely on the framework alone for this on Windows
// because Wow64 virtualisation is good enough to trick us to believing we're running natively
@@ -156,14 +198,14 @@ namespace Squirrel
try {
if (IsWow64Process2(GetCurrentProcess(), out var _, out var nativeMachine)) {
if (Utility.TryParseEnumU16<RuntimeCpu>(nativeMachine, out var val)) {
SystemArchitecture = val;
SystemArch = val;
}
}
} catch {
// don't care if this function is missing
}
if (SystemArchitecture != RuntimeCpu.Unknown) {
if (SystemArch != RuntimeCpu.Unknown) {
return;
}
@@ -175,20 +217,20 @@ namespace Squirrel
if (!String.IsNullOrEmpty(pf64compat)) {
switch (pf64compat) {
case "ARM64":
SystemArchitecture = RuntimeCpu.arm64;
SystemArch = RuntimeCpu.arm64;
break;
case "AMD64":
SystemArchitecture = RuntimeCpu.x64;
SystemArch = RuntimeCpu.x64;
break;
}
}
if (SystemArchitecture != RuntimeCpu.Unknown) {
if (SystemArch != RuntimeCpu.Unknown) {
return;
}
#if NETFRAMEWORK
SystemArchitecture = Environment.Is64BitOperatingSystem ? RuntimeCpu.x64 : RuntimeCpu.x86;
SystemArch = Environment.Is64BitOperatingSystem ? RuntimeCpu.x64 : RuntimeCpu.x86;
#else
CheckArchitectureOther();
#endif
@@ -198,14 +240,14 @@ namespace Squirrel
private static void CheckArchitectureOther()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
SystemOsName = "windows";
SystemOs = RuntimeOs.Windows;
} else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) {
SystemOsName = "linux";
SystemOs = RuntimeOs.Linux;
} else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
SystemOsName = "osx";
SystemOs = RuntimeOs.OSX;
}
SystemArchitecture = RuntimeInformation.OSArchitecture switch {
SystemArch = RuntimeInformation.OSArchitecture switch {
InteropArchitecture.X86 => RuntimeCpu.x86,
InteropArchitecture.X64 => RuntimeCpu.x64,
InteropArchitecture.Arm64 => RuntimeCpu.arm64,