Merge branch 'atenuggets'

* atenuggets:
  handle missing releases, comparing batches to all cached versions (since releases api is not in order)
  alpha release notes for 2023.3 and later fixes #31
  add full installer exe download option to DownloadInBrowser(), add await for extract urls (got stuck otherwise),
  fix converter issue (in design time),
  test build without nugets (system.text.json and others) ref #170

Author: unitycoder

UnityLauncherPro/App.config

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
-    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
+    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false" />
   </runtime>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="UnityLauncherPro.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="UnityLauncherPro.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
     <userSettings>
         <UnityLauncherPro.Properties.Settings>
@@ -44,10 +44,10 @@
                 <value>False</value>
             </setting>
             <setting name="preferredVersion" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="newProjectsRoot" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="askNameForQuickProject" serializeAs="String">
                 <value>True</value>
@@ -62,7 +62,7 @@
                 <value>False</value>
             </setting>
             <setting name="webglBuildPath" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="useCustomTheme" serializeAs="String">
                 <value>False</value>
@@ -95,10 +95,10 @@
                 <value>0</value>
             </setting>
             <setting name="templatePackagesFolder" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="newProjectPlatform" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="searchProjectPathAlso" serializeAs="String">
                 <value>False</value>
@@ -107,7 +107,7 @@
                 <value>False</value>
             </setting>
             <setting name="shortcutBatchFileFolder" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="rootFolders" serializeAs="Xml">
                 <value>
@@ -127,7 +127,7 @@
             </setting>
             <setting name="projectPaths" serializeAs="Xml">
                 <value>
-                    <ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+                    <ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
                 </value>
             </setting>
             <setting name="override40ProjectCount" serializeAs="String">

UnityLauncherPro/Converters/ReleaseDateConverter.cs

@@ -1,29 +1,49 @@
 using System;
 using System.Globalization;
+using System.Windows;
 using System.Windows.Data;
 
 namespace UnityLauncherPro.Converters
 {
-    [ValueConversion(typeof(DateTime), typeof(String))]
+    [ValueConversion(typeof(DateTime), typeof(string))]
     public class ReleaseDateConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value == null) return null;
-            DateTime date = (DateTime)value;
+            if (value == null || !(value is DateTime date))
+            {
+                return DependencyProperty.UnsetValue;
+            }
 
-            // get first part of string until space character (updates only contain mm/dd/yyyy)
-            string dateStrTrimmed = MainWindow.currentDateFormat;
-            if (dateStrTrimmed.IndexOf(' ') > -1) dateStrTrimmed = dateStrTrimmed.Split(' ')[0];
+            // Use a default date format if currentDateFormat is null or empty
+            string dateStrTrimmed = MainWindow.currentDateFormat ?? "MM/dd/yyyy";
 
-            return MainWindow.useHumanFriendlyDateFormat ? Tools.GetElapsedTime(date) : date.ToString(dateStrTrimmed);
+            // If the format includes time, use only the date portion
+            if (dateStrTrimmed.Contains(" "))
+            {
+                dateStrTrimmed = dateStrTrimmed.Split(' ')[0];
+            }
+
+            // Return a human-friendly format if enabled; otherwise, format based on dateStrTrimmed
+            return MainWindow.useHumanFriendlyDateFormat
+                ? Tools.GetElapsedTime(date)
+                : date.ToString(dateStrTrimmed, culture);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            // not used ?
-            return DateTime.ParseExact((string)value, MainWindow.currentDateFormat, culture);
-        }
+            if (value == null || string.IsNullOrWhiteSpace(value.ToString()))
+            {
+                return DependencyProperty.UnsetValue;
+            }
 
+            // Attempt to parse back to DateTime using the specified format
+            if (DateTime.TryParseExact((string)value, MainWindow.currentDateFormat ?? "MM/dd/yyyy", culture, DateTimeStyles.None, out DateTime parsedDate))
+            {
+                return parsedDate;
+            }
+
+            return DependencyProperty.UnsetValue;
+        }
     }
 }

UnityLauncherPro/Data/UnityVersion.cs

@@ -1,35 +1,56 @@
 using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
+using System.Collections.Generic;
 
 namespace UnityLauncherPro
 {
     public class UnityVersion
     {
-        [JsonPropertyName("version")]
         public string Version { get; set; }
-        [JsonPropertyName("stream")]
-        [JsonConverter(typeof(UnityVersionStreamConverter))]
         public UnityVersionStream Stream { get; set; }
-        [JsonPropertyName("releaseDate")]
         public DateTime ReleaseDate { get; set; }
-    }
-    
-    public class UnityVersionStreamConverter : JsonConverter<UnityVersionStream>
-    {
-        public override UnityVersionStream Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+
+        public static UnityVersion FromJson(string json)
         {
-            string streamString = reader.GetString();
-            if (Enum.TryParse<UnityVersionStream>(streamString, true, out var result))
+            var values = ParseJsonToDictionary(json);
+
+            return new UnityVersion
             {
-                return result;
+                Version = values.ContainsKey("version") ? values["version"] : null,
+                Stream = ParseStream(values.ContainsKey("stream") ? values["stream"] : null),
+                ReleaseDate = DateTime.TryParse(values.ContainsKey("releaseDate") ? values["releaseDate"] : null, out var date)
+                    ? date
+                    : default
+            };
+        }
+
+        public string ToJson()
+        {
+            return $"{{ \"version\": \"{Version}\", \"stream\": \"{Stream}\", \"releaseDate\": \"{ReleaseDate:yyyy-MM-ddTHH:mm:ss}\" }}";
+        }
+
+        private static Dictionary<string, string> ParseJsonToDictionary(string json)
+        {
+            var result = new Dictionary<string, string>();
+            json = json.Trim(new char[] { '{', '}', ' ' });
+            var keyValuePairs = json.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach (var pair in keyValuePairs)
+            {
+                var keyValue = pair.Split(new[] { ':' }, 2);
+                if (keyValue.Length == 2)
+                {
+                    var key = keyValue[0].Trim(new char[] { ' ', '"' });
+                    var value = keyValue[1].Trim(new char[] { ' ', '"' });
+                    result[key] = value;
+                }
             }
-            throw new JsonException($"Unable to convert \"{streamString}\" to UnityVersionStream");
+
+            return result;
         }
 
-        public override void Write(Utf8JsonWriter writer, UnityVersionStream value, JsonSerializerOptions options)
+        private static UnityVersionStream ParseStream(string stream)
         {
-            writer.WriteStringValue(value.ToString().ToUpper());
+            return Enum.TryParse(stream, true, out UnityVersionStream result) ? result : UnityVersionStream.Tech;
         }
     }
-}
+}

UnityLauncherPro/Data/UnityVersionResponse.cs

@@ -1,17 +1,12 @@
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
 namespace UnityLauncherPro
 {
     public class UnityVersionResponse
     {
-        [JsonPropertyName("offset")]
         public int Offset { get; set; }
-        [JsonPropertyName("limit")]
         public int Limit { get; set; }
-        [JsonPropertyName("total")]
         public int Total { get; set; }
-        [JsonPropertyName("results")]
         public List<UnityVersion> Results { get; set; }
     }
 }

UnityLauncherPro/Data/UnityVersionStream.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Collections.Generic;
+
 namespace UnityLauncherPro
 {
     public enum UnityVersionStream
@@ -7,4 +10,37 @@ public enum UnityVersionStream
         LTS,
         Tech
     }
+
+    public class UnityVersionJSON
+    {
+        public string Version { get; set; }
+        public DateTime ReleaseDate { get; set; }
+        public UnityVersionStream Stream { get; set; }
+        public List<Download> Downloads { get; set; }
+        public string ShortRevision { get; set; }
+    }
+
+    public class Download
+    {
+        public string Url { get; set; }
+        public string Type { get; set; }
+        public string Platform { get; set; }
+        public string Architecture { get; set; }
+        public DownloadSize DownloadSize { get; set; }
+        public List<Module> Modules { get; set; }
+    }
+
+    public class DownloadSize
+    {
+        public long Value { get; set; }
+        public string Unit { get; set; }
+    }
+
+    public class Module
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public string Url { get; set; }
+    }
 }