diff --git a/RZ.Bot/Properties/AssemblyInfo.cs b/RZ.Bot/Properties/AssemblyInfo.cs index 9c101ce..2157b6e 100644 --- a/RZ.Bot/Properties/AssemblyInfo.cs +++ b/RZ.Bot/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.6.*")] -[assembly: AssemblyFileVersion("1.0.6.8")] +[assembly: AssemblyFileVersion("1.0.6.9")] diff --git a/RZ.Bot/RZUpdate.cs b/RZ.Bot/RZUpdate.cs index a388524..a682c26 100644 --- a/RZ.Bot/RZUpdate.cs +++ b/RZ.Bot/RZUpdate.cs @@ -423,11 +423,12 @@ public SWUpdate(string Shortname) SW.ProductName = oGetSW.ProductName; SW.ProductVersion = oGetSW.ProductVersion; SW.Manufacturer = oGetSW.Manufacturer; + SW.Shortname = Shortname; if (SW.Architecture == null) { SW = RZRestAPI.GetSWDefinitions(oGetSW.ProductName, oGetSW.ProductVersion, oGetSW.Manufacturer).FirstOrDefault(); - + SW.Shortname = Shortname; try { if (SW.Image == null) @@ -447,6 +448,7 @@ public SWUpdate(string Shortname) if (string.IsNullOrEmpty(SW.Shortname)) return; + //Get Install-type GetInstallType(); @@ -506,9 +508,11 @@ public bool GetInstallType(bool bGetFirst = false) } catch { } } + + return false; } - return false; + return true; } private bool _Download(bool Enforce, string DLPath) @@ -834,7 +838,8 @@ public async Task Download() /// true = success public async Task Download(bool Enforce) { - bool bAutoInstall = downloadTask.AutoInstall; + return await Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID)); + /*bool bAutoInstall = downloadTask.AutoInstall; downloadTask = new DLTask() { ProductName = SW.ProductName, ProductVersion = SW.ProductVersion, Manufacturer = SW.Manufacturer, Shortname = SW.Shortname, Image = SW.Image, Files = SW.Files }; if (SW.PreRequisites.Length > 0) @@ -852,7 +857,7 @@ public async Task Download(bool Enforce) ProgressDetails += SWUpdate_ProgressDetails; bool bResult = await Task.Run(() => _Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID))).ConfigureAwait(false); - return bResult; + return bResult;*/ } public async Task Download(bool Enforce, string DLPath) diff --git a/RZ.OneGetProvider/Properties/AssemblyInfo.cs b/RZ.OneGetProvider/Properties/AssemblyInfo.cs index b8fe92d..87cc038 100644 --- a/RZ.OneGetProvider/Properties/AssemblyInfo.cs +++ b/RZ.OneGetProvider/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.8")] -[assembly: AssemblyFileVersion("1.6.2.8")] +[assembly: AssemblyVersion("1.6.2.9")] +[assembly: AssemblyFileVersion("1.6.2.9")] diff --git a/RZ.OneGetProvider/RZUpdate.cs b/RZ.OneGetProvider/RZUpdate.cs index a388524..a682c26 100644 --- a/RZ.OneGetProvider/RZUpdate.cs +++ b/RZ.OneGetProvider/RZUpdate.cs @@ -423,11 +423,12 @@ public SWUpdate(string Shortname) SW.ProductName = oGetSW.ProductName; SW.ProductVersion = oGetSW.ProductVersion; SW.Manufacturer = oGetSW.Manufacturer; + SW.Shortname = Shortname; if (SW.Architecture == null) { SW = RZRestAPI.GetSWDefinitions(oGetSW.ProductName, oGetSW.ProductVersion, oGetSW.Manufacturer).FirstOrDefault(); - + SW.Shortname = Shortname; try { if (SW.Image == null) @@ -447,6 +448,7 @@ public SWUpdate(string Shortname) if (string.IsNullOrEmpty(SW.Shortname)) return; + //Get Install-type GetInstallType(); @@ -506,9 +508,11 @@ public bool GetInstallType(bool bGetFirst = false) } catch { } } + + return false; } - return false; + return true; } private bool _Download(bool Enforce, string DLPath) @@ -834,7 +838,8 @@ public async Task Download() /// true = success public async Task Download(bool Enforce) { - bool bAutoInstall = downloadTask.AutoInstall; + return await Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID)); + /*bool bAutoInstall = downloadTask.AutoInstall; downloadTask = new DLTask() { ProductName = SW.ProductName, ProductVersion = SW.ProductVersion, Manufacturer = SW.Manufacturer, Shortname = SW.Shortname, Image = SW.Image, Files = SW.Files }; if (SW.PreRequisites.Length > 0) @@ -852,7 +857,7 @@ public async Task Download(bool Enforce) ProgressDetails += SWUpdate_ProgressDetails; bool bResult = await Task.Run(() => _Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID))).ConfigureAwait(false); - return bResult; + return bResult;*/ } public async Task Download(bool Enforce, string DLPath) diff --git a/RZUpdate/Properties/AssemblyInfo.cs b/RZUpdate/Properties/AssemblyInfo.cs index cdcaf23..80e13eb 100644 --- a/RZUpdate/Properties/AssemblyInfo.cs +++ b/RZUpdate/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.6.2.*")] -[assembly: AssemblyFileVersion("1.6.2.8")] +[assembly: AssemblyFileVersion("1.6.2.9")] diff --git a/RZUpdate/RZUpdate.cs b/RZUpdate/RZUpdate.cs index 8d107ff..a682c26 100644 --- a/RZUpdate/RZUpdate.cs +++ b/RZUpdate/RZUpdate.cs @@ -52,7 +52,7 @@ public RZUpdater(string sSWFile) SoftwareUpdate = new SWUpdate(ParseJSON(sSWFile)); } - if(!File.Exists(sSWFile)) + if (!File.Exists(sSWFile)) { SoftwareUpdate = new SWUpdate(Parse(sSWFile)); } @@ -282,7 +282,7 @@ internal static AddSoftware Parse(string sJSON) lRes.PreRequisites = lRes.PreRequisites.Where(x => !string.IsNullOrEmpty(x)).ToArray(); return lRes; } - catch(Exception ex) + catch (Exception ex) { Console.WriteLine(ex.Message); } @@ -406,7 +406,7 @@ public SWUpdate(string Shortname) try { - + SW = new AddSoftware(); //Always use local JSON-File if exists @@ -423,11 +423,12 @@ public SWUpdate(string Shortname) SW.ProductName = oGetSW.ProductName; SW.ProductVersion = oGetSW.ProductVersion; SW.Manufacturer = oGetSW.Manufacturer; + SW.Shortname = Shortname; if (SW.Architecture == null) { SW = RZRestAPI.GetSWDefinitions(oGetSW.ProductName, oGetSW.ProductVersion, oGetSW.Manufacturer).FirstOrDefault(); - + SW.Shortname = Shortname; try { if (SW.Image == null) @@ -447,6 +448,7 @@ public SWUpdate(string Shortname) if (string.IsNullOrEmpty(SW.Shortname)) return; + //Get Install-type GetInstallType(); @@ -506,9 +508,11 @@ public bool GetInstallType(bool bGetFirst = false) } catch { } } + + return false; } - return false; + return true; } private bool _Download(bool Enforce, string DLPath) @@ -834,7 +838,8 @@ public async Task Download() /// true = success public async Task Download(bool Enforce) { - bool bAutoInstall = downloadTask.AutoInstall; + return await Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID)); + /*bool bAutoInstall = downloadTask.AutoInstall; downloadTask = new DLTask() { ProductName = SW.ProductName, ProductVersion = SW.ProductVersion, Manufacturer = SW.Manufacturer, Shortname = SW.Shortname, Image = SW.Image, Files = SW.Files }; if (SW.PreRequisites.Length > 0) @@ -852,7 +857,7 @@ public async Task Download(bool Enforce) ProgressDetails += SWUpdate_ProgressDetails; bool bResult = await Task.Run(() => _Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID))).ConfigureAwait(false); - return bResult; + return bResult;*/ } public async Task Download(bool Enforce, string DLPath) @@ -1327,7 +1332,7 @@ public bool CheckIsInstalled(bool sendProgressEvent) return true; } } - catch(Exception ex) + catch (Exception ex) { Console.WriteLine(ex.Message); } diff --git a/RuckZuck_Tool/Properties/AssemblyInfo.cs b/RuckZuck_Tool/Properties/AssemblyInfo.cs index a242407..77bf3a5 100644 --- a/RuckZuck_Tool/Properties/AssemblyInfo.cs +++ b/RuckZuck_Tool/Properties/AssemblyInfo.cs @@ -52,4 +52,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.6.2.*")] -[assembly: AssemblyFileVersion("1.6.2.8")] +[assembly: AssemblyFileVersion("1.6.2.9")] diff --git a/RuckZuck_Tool/RZUpdate.cs b/RuckZuck_Tool/RZUpdate.cs index a388524..a682c26 100644 --- a/RuckZuck_Tool/RZUpdate.cs +++ b/RuckZuck_Tool/RZUpdate.cs @@ -423,11 +423,12 @@ public SWUpdate(string Shortname) SW.ProductName = oGetSW.ProductName; SW.ProductVersion = oGetSW.ProductVersion; SW.Manufacturer = oGetSW.Manufacturer; + SW.Shortname = Shortname; if (SW.Architecture == null) { SW = RZRestAPI.GetSWDefinitions(oGetSW.ProductName, oGetSW.ProductVersion, oGetSW.Manufacturer).FirstOrDefault(); - + SW.Shortname = Shortname; try { if (SW.Image == null) @@ -447,6 +448,7 @@ public SWUpdate(string Shortname) if (string.IsNullOrEmpty(SW.Shortname)) return; + //Get Install-type GetInstallType(); @@ -506,9 +508,11 @@ public bool GetInstallType(bool bGetFirst = false) } catch { } } + + return false; } - return false; + return true; } private bool _Download(bool Enforce, string DLPath) @@ -834,7 +838,8 @@ public async Task Download() /// true = success public async Task Download(bool Enforce) { - bool bAutoInstall = downloadTask.AutoInstall; + return await Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID)); + /*bool bAutoInstall = downloadTask.AutoInstall; downloadTask = new DLTask() { ProductName = SW.ProductName, ProductVersion = SW.ProductVersion, Manufacturer = SW.Manufacturer, Shortname = SW.Shortname, Image = SW.Image, Files = SW.Files }; if (SW.PreRequisites.Length > 0) @@ -852,7 +857,7 @@ public async Task Download(bool Enforce) ProgressDetails += SWUpdate_ProgressDetails; bool bResult = await Task.Run(() => _Download(Enforce, Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), SW.ContentID))).ConfigureAwait(false); - return bResult; + return bResult;*/ } public async Task Download(bool Enforce, string DLPath)