Default to x64 architecture

Author: InfinityGhost

OpenTabletDriver.Web.Core/Framework/DotnetCoreService.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Data.SqlTypes;
-using System.Diagnostics;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
 using OpenTabletDriver.Web.Core.Services;
 
 namespace OpenTabletDriver.Web.Core.Framework
@@ -13,12 +8,17 @@ public class DotnetCoreService : IFrameworkService
         private const string AKA_MS = @"https://aka.ms/dotnet";
         private const string CHANNEL = "current";
 
-        public string GetLatestVersionUrl(FrameworkPlatform platform, FrameworkArchetecture archetecture)
+        public string GetLatestVersionUrl(FrameworkPlatform platform, FrameworkArchitecture architecture)
         {
+            if (platform == default)
+                throw new ArgumentException("Platform cannot be default.");
+            if (architecture == default)
+                throw new ArgumentException("Architecture cannot be default.");
+
             string product = GetProduct(platform);
             string extension = GetExtension(platform);
             string os = GetNormalizedOS(platform);
-            string arch = GetNormalizedArchitecture(archetecture);
+            string arch = GetNormalizedArchitecture(architecture);
 
             switch (platform)
             {
@@ -73,13 +73,13 @@ private static string GetNormalizedOS(FrameworkPlatform platform)
             };
         }
 
-        private string GetNormalizedArchitecture(FrameworkArchetecture archetecture)
+        private string GetNormalizedArchitecture(FrameworkArchitecture architecture)
         {
-            return archetecture switch
+            return architecture switch
             {
-                FrameworkArchetecture.x64 => "x64",
-                FrameworkArchetecture.x86 => "x86",
-                FrameworkArchetecture.ARM64 => "arm64",
+                FrameworkArchitecture.x64 => "x64",
+                FrameworkArchitecture.x86 => "x86",
+                FrameworkArchitecture.ARM64 => "arm64",
                 _ => null
             };
         }

…Driver.Web.Core/FrameworkArchetecture.cs …Driver.Web.Core/FrameworkArchitecture.csOpenTabletDriver.Web.Core/FrameworkArchetecture.cs renamed to OpenTabletDriver.Web.Core/FrameworkArchitecture.cs OpenTabletDriver.Web.Core/FrameworkArchetecture.cs renamed to OpenTabletDriver.Web.Core/FrameworkArchitecture.cs

@@ -1,6 +1,6 @@
 namespace OpenTabletDriver.Web.Core
 {
-    public enum FrameworkArchetecture
+    public enum FrameworkArchitecture
     {
         Unknown = 0,
         x86 = 1 << 0,

OpenTabletDriver.Web.Core/Services/IFrameworkService.cs

@@ -1,9 +1,7 @@
-using System.Threading.Tasks;
-
 namespace OpenTabletDriver.Web.Core.Services
 {
     public interface IFrameworkService
     {
-        string GetLatestVersionUrl(FrameworkPlatform platform, FrameworkArchetecture archetecture);
+        string GetLatestVersionUrl(FrameworkPlatform platform, FrameworkArchitecture architecture);
     }
 }

OpenTabletDriver.Web/Controllers/FrameworkController.cs

@@ -1,7 +1,4 @@
-using System.Linq;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
-using Octokit;
 using OpenTabletDriver.Web.Core;
 using OpenTabletDriver.Web.Core.Services;
 
@@ -21,7 +18,7 @@ public IActionResult Index()
             string userAgentHeader = Request.Headers["User-Agent"];
             string userAgent = userAgentHeader.ToLower();
             FrameworkPlatform platform = FrameworkPlatform.Unknown;
-            FrameworkArchetecture archetecture = FrameworkArchetecture.Unknown;
+            FrameworkArchitecture architecture = FrameworkArchitecture.x64;
 
             if (userAgent.Contains("windows"))
                 platform = FrameworkPlatform.Windows;
@@ -31,13 +28,13 @@ public IActionResult Index()
                 platform = FrameworkPlatform.MacOS;
 
             if (platform == FrameworkPlatform.MacOS || userAgent.Contains("x86_64") || userAgent.Contains("x64"))
-                archetecture = FrameworkArchetecture.x64;
+                architecture = FrameworkArchitecture.x64;
             else if (userAgent.Contains("x86"))
-                archetecture = FrameworkArchetecture.x86;
+                architecture = FrameworkArchitecture.x86;
             else if (userAgent.Contains("arm64"))
-                archetecture = FrameworkArchetecture.ARM64;
+                architecture = FrameworkArchitecture.ARM64;
 
-            string url = frameworkService.GetLatestVersionUrl(platform, archetecture);
+            string url = frameworkService.GetLatestVersionUrl(platform, architecture);
             return Redirect(url);
         }
     }