v1.0.0-beta11

Bug in compiler lastest version

Author: Juan Segura

ZXBSInstaller.Log/ServiceLayer.cs

@@ -35,6 +35,10 @@ public static class ServiceLayer
         /// </summary>
         public static OperatingSystems CurrentOperatingSystem = OperatingSystems.All;
         /// <summary>
+        /// True if the computer is a Mac
+        /// </summary>
+        public static bool IsMac=false;
+        /// <summary>
         /// Used to cancel the current operation. It is set to true when the user clicks the cancel button and it is checked in all long operations to stop them if it is true.
         /// </summary>
         public static bool Cancel = false;
@@ -105,6 +109,7 @@ public static bool Initialize(
                 }
                 else if (OperatingSystem.IsMacOS())
                 {
+                    IsMac = true;
                     if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                     {
                         CurrentOperatingSystem = OperatingSystems.MacOS_arm64;
@@ -344,18 +349,39 @@ public static ExternalTool[] SetExternalTools(string json)
                     // Set latest version
                     if (GeneralConfig.OnlyStableVersions)
                     {
-                        tool.LatestVersion = tool.Versions.
-                            Where(d => d.OperatingSystem == CurrentOperatingSystem &&
-                                d.BetaNumber == 0).
-                            OrderByDescending(d => d.VersionNumber).
-                            FirstOrDefault();
+                        if (tool.Id == "zxbasic" && IsMac)
+                        {
+                            tool.LatestVersion = tool.Versions.
+                                Where(d => d.OperatingSystem == OperatingSystems.MacOS &&
+                                    d.BetaNumber == 0).
+                                OrderByDescending(d => d.VersionNumber).
+                                FirstOrDefault();
+                        }
+                        else
+                        {
+                            tool.LatestVersion = tool.Versions.
+                                Where(d => d.OperatingSystem == CurrentOperatingSystem &&
+                                    d.BetaNumber == 0).
+                                OrderByDescending(d => d.VersionNumber).
+                                FirstOrDefault();
+                        }
                     }
                     if (tool.LatestVersion == null || !GeneralConfig.OnlyStableVersions)
                     {
-                        tool.LatestVersion = tool.Versions.
-                            Where(d => d.OperatingSystem == CurrentOperatingSystem).
-                            OrderByDescending(d => d.VersionNumber).
-                            FirstOrDefault();
+                        if (tool.Id == "zxbasic" && IsMac)
+                        {
+                            tool.LatestVersion = tool.Versions.
+                                Where(d => d.OperatingSystem == OperatingSystems.MacOS).
+                                OrderByDescending(d => d.VersionNumber).
+                                FirstOrDefault();
+                        }
+                        else
+                        {
+                            tool.LatestVersion = tool.Versions.
+                                Where(d => d.OperatingSystem == CurrentOperatingSystem).
+                                OrderByDescending(d => d.VersionNumber).
+                                FirstOrDefault();
+                        }
                     }
 
                     // Path for first versions of ZXBSInstalller

ZXBSInstaller/ZXBSInstaller.csproj

@@ -6,7 +6,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
-    <Version>1.0.0.10</Version>
+    <Version>1.0.0.11</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\cancel.svg" />

ZXBSInstaller/version.txt

@@ -1 +1 @@
-1.0.0.10
+1.0.0.11