From 377472440fba19b8495ed9a8cead336a0a8806bc Mon Sep 17 00:00:00 2001 From: Scott Date: Wed, 6 Sep 2023 08:39:19 +0100 Subject: [PATCH] Fix issue with mising package in autoinstall (non nav only) --- Launcher/Properties/AssemblyInfo.cs | 6 +++--- Syn3Updater/Languages/es.json | 4 ++-- Syn3Updater/Properties/AssemblyInfo.cs | 6 +++--- Syn3Updater/Services/DownloadViewModelService.cs | 13 +++++++------ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Launcher/Properties/AssemblyInfo.cs b/Launcher/Properties/AssemblyInfo.cs index 8ed2574..ff47cfe 100644 --- a/Launcher/Properties/AssemblyInfo.cs +++ b/Launcher/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("CyanLabs")] [assembly: AssemblyProduct("Launcher")] -[assembly: AssemblyCopyright("Copyright © CyanLabs 2022")] +[assembly: AssemblyCopyright("Copyright © CyanLabs 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -37,5 +37,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.1.0")] -[assembly: AssemblyFileVersion("2.12.1.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.12.2.0")] +[assembly: AssemblyFileVersion("2.12.2.0")] \ No newline at end of file diff --git a/Syn3Updater/Languages/es.json b/Syn3Updater/Languages/es.json index 9b4c094..59660ec 100644 --- a/Syn3Updater/Languages/es.json +++ b/Syn3Updater/Languages/es.json @@ -74,11 +74,11 @@ "MessageBox.LogUtilityInvalidFile": "El archivo XML que ha seleccionado no pudo ser leído, por favor asegúrese que sea el archivo correcto. Si está seguro que es el archivo correcto por favor contacte a CyanLabs a través del foro o servidor Discord para poder investigar.", "Utility.GracenotesRemovalTitle": "Crear USB para Remover GRACENOTES", "Utility.GracenotesRemovalDesc": "Use ésta función para crear un USB para forzar la remoción de GRACENOTES de su sistema.", - "Utility.GracenotesButton": "Preparar Unidad USB", + "Utility.GracenotesButton": "Preparar USB", "MessageBox.GenericUtilityComplete": "La preparación del USB ha sido completada exitosamente!\n\nRemueva el USB de su computadora e insértelo en su vehículo, asegúrese que el motor esté en marcha y espere unos momentos hasta recibir \"Instalación Completa\"", "Utility.VoiceShrinkerTitle": "Crear USB para paquete pequeño de VOICE", "Utility.VoiceShrinkerDesc": "Use ésta función si después de remover GRACENOTES todavía tiene problemas MEM_ERR's", - "Utility.DowngradeTitle": "Crear Unidad USB de Downgrade", + "Utility.DowngradeTitle": "Crear USB de Downgrade", "Utility.DowngradeDesc": "Use ésta función si después de remover GRACENOTES y encoger el paquete de voz aún recibe errores MEM_ERR", "Utility.TroubleshootTitle": "Pasos para solucionar problemas", "Utility.TroubleshootDesc": "Use las siguientes funciones para solucionar varios errores MEM_ERR que pueda recibir.", diff --git a/Syn3Updater/Properties/AssemblyInfo.cs b/Syn3Updater/Properties/AssemblyInfo.cs index 472443b..e634b93 100644 --- a/Syn3Updater/Properties/AssemblyInfo.cs +++ b/Syn3Updater/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("CyanLabs")] [assembly: AssemblyProduct("Syn3Updater")] -[assembly: AssemblyCopyright("Copyright © CyanLabs 2022")] +[assembly: AssemblyCopyright("Copyright © CyanLabs 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -46,5 +46,5 @@ // You can specify all the values or you can default the Build a nd Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.1.0")] -[assembly: AssemblyFileVersion("2.12.1.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.12.2.0")] +[assembly: AssemblyFileVersion("2.12.2.0")] \ No newline at end of file diff --git a/Syn3Updater/Services/DownloadViewModelService.cs b/Syn3Updater/Services/DownloadViewModelService.cs index c7eb817..d072053 100644 --- a/Syn3Updater/Services/DownloadViewModelService.cs +++ b/Syn3Updater/Services/DownloadViewModelService.cs @@ -70,17 +70,18 @@ public static StringBuilder CreateAutoInstallFile(string selectedRelease, string { autoinstalllst.Append($@"[SYNCGen3.0_ALL_PRODUCT]{Environment.NewLine}"); - int itemstart = 0; + int currentitem = 1; if (AppMan.App.Action != "logutility" && AppMan.App.Action != "logutilitymy20" && AppMan.App.Action != "gracenotesremoval" && AppMan.App.Action != "voiceshrinker" && AppMan.App.Action != "downgrade") { - autoinstalllst.Append($@"Item1 = RWDataCleaner TOOL - {Api.RWDataCleaner.FileName}\rOpen1 = SyncMyRide\{Api.RWDataCleaner.FileName}\r").Replace(@"\r", Environment.NewLine); - itemstart = 1; - } + autoinstalllst.Append($@"Item{currentitem} = RWDataCleaner TOOL - {Api.RWDataCleaner.FileName}\rOpen{currentitem}= SyncMyRide\{Api.RWDataCleaner.FileName}\r").Replace(@"\r", Environment.NewLine); + currentitem = 2; + } - for (int i = itemstart; i < ivsuList.Count; i++) + for (int i = 0; i < ivsuList.Count; i++) { SModel.Ivsu item = ivsuList[i]; - autoinstalllst.Append($@"Item{i + 1} = {item.Type} - {item.FileName}\rOpen{i + 1} = SyncMyRide\{item.FileName}\r").Replace(@"\r", Environment.NewLine); + autoinstalllst.Append($@"Item{currentitem} = {item.Type} - {item.FileName}\rOpen{currentitem} = SyncMyRide\{item.FileName}\r").Replace(@"\r", Environment.NewLine); + currentitem = currentitem + 1; } autoinstalllst.Append("Options = AutoInstall").Append(Environment.NewLine);