From 85432109b4c9991cc9ea48fbb88c8fe39d58e9ee Mon Sep 17 00:00:00 2001 From: Slivo-fr Date: Thu, 11 Nov 2021 15:48:07 +0100 Subject: [PATCH 1/2] fix TLS --- Elinor/Elinor reloaded.csproj | 9 ++++++--- Elinor/Properties/AssemblyInfo.cs | 4 ++-- Elinor/Properties/Resources.Designer.cs | 26 ++++++++++++------------- Elinor/Properties/Settings.Designer.cs | 4 ++-- Elinor/Updates.cs | 3 +++ Elinor/app.config | 12 ++++++------ Elinor/currentVersion.xml | 2 +- Setup/Setup.vdproj | 8 ++++---- 8 files changed, 37 insertions(+), 31 deletions(-) diff --git a/Elinor/Elinor reloaded.csproj b/Elinor/Elinor reloaded.csproj index 28ba21f..49a84ad 100644 --- a/Elinor/Elinor reloaded.csproj +++ b/Elinor/Elinor reloaded.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,8 +10,9 @@ Properties Elinor Elinor - v4.0 - Client + v4.7.2 + + 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -46,6 +47,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -55,6 +57,7 @@ TRACE prompt 4 + false mainicon.ico diff --git a/Elinor/Properties/AssemblyInfo.cs b/Elinor/Properties/AssemblyInfo.cs index fd418e0..39d1d63 100644 --- a/Elinor/Properties/AssemblyInfo.cs +++ b/Elinor/Properties/AssemblyInfo.cs @@ -49,5 +49,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("1.9.1.0")] -[assembly: AssemblyFileVersion("1.9.1.0")] +[assembly: AssemblyVersion("1.10.0.0")] +[assembly: AssemblyFileVersion("1.10.0.0")] diff --git a/Elinor/Properties/Resources.Designer.cs b/Elinor/Properties/Resources.Designer.cs index c5e4ebc..85c832d 100644 --- a/Elinor/Properties/Resources.Designer.cs +++ b/Elinor/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.269 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace Elinor.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder + // à l'aide d'un outil, tel que ResGen ou Visual Studio. + // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen + // avec l'option /str ou régénérez votre projet VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Remplace la propriété CurrentUICulture du thread actuel pour toutes + /// les recherches de ressources à l'aide de cette classe de ressource fortement typée. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Elinor/Properties/Settings.Designer.cs b/Elinor/Properties/Settings.Designer.cs index 76b600a..e4eab97 100644 --- a/Elinor/Properties/Settings.Designer.cs +++ b/Elinor/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Ce code a été généré par un outil. -// Version du runtime :4.0.30319.1008 +// Version du runtime :4.0.30319.42000 // // Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si // le code est régénéré. @@ -12,7 +12,7 @@ namespace Elinor.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Elinor/Updates.cs b/Elinor/Updates.cs index cee3fc2..da0b7c5 100644 --- a/Elinor/Updates.cs +++ b/Elinor/Updates.cs @@ -54,6 +54,9 @@ public static void CheckForUpdates() var fvi = FileVersionInfo.GetVersionInfo(assembly.Location); var currentVersion = new Version(fvi.ProductVersion); + Console.WriteLine(currentVersion); + Console.WriteLine(newVersion); + if (newVersion > currentVersion) { // TODO: Manage new version check diff --git a/Elinor/app.config b/Elinor/app.config index 82cc94a..9f224d9 100644 --- a/Elinor/app.config +++ b/Elinor/app.config @@ -1,14 +1,14 @@ - + - -
+ +
- + True @@ -23,8 +23,8 @@ False - + - \ No newline at end of file + diff --git a/Elinor/currentVersion.xml b/Elinor/currentVersion.xml index eeeda0c..c8230a8 100644 --- a/Elinor/currentVersion.xml +++ b/Elinor/currentVersion.xml @@ -1,6 +1,6 @@ - 1.9.1.0 + 1.10.0.0 https://github.com/Slivo-fr/elinor-reloaded/releases diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj index 53cfce4..65fd110 100644 --- a/Setup/Setup.vdproj +++ b/Setup/Setup.vdproj @@ -266,15 +266,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Elinor reloaded" - "ProductCode" = "8:{3A711BAF-BA14-4929-AC7D-CBD15777E4B5}" - "PackageCode" = "8:{A561632F-BA0E-4348-93D6-5BC9F115D9E6}" + "ProductCode" = "8:{DE8E1C55-71C7-4745-AEC1-C1D95C3F8801}" + "PackageCode" = "8:{96889B37-4514-4ECE-B44D-1D5503213283}" "UpgradeCode" = "8:{F54F50ED-FDA6-4419-B476-E665ADA1FCBC}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.9.1" + "ProductVersion" = "8:1.10.0" "Manufacturer" = "8:Slivo" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -849,7 +849,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_03585DC2BD1048A19B1FB7CB5F6533F2" { - "SourcePath" = "8:..\\Elinor\\obj\\x86\\Release\\Elinor.exe" + "SourcePath" = "8:..\\Elinor\\obj\\x86\\Debug\\Elinor.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1022C19006BB4A9C811CB9D8739B72B3" From b5110d22ab9854f8b46a0d5e32cef86624e13b09 Mon Sep 17 00:00:00 2001 From: Slivo-fr Date: Thu, 11 Nov 2021 15:50:06 +0100 Subject: [PATCH 2/2] remove debug logs --- Elinor/Updates.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Elinor/Updates.cs b/Elinor/Updates.cs index da0b7c5..cee3fc2 100644 --- a/Elinor/Updates.cs +++ b/Elinor/Updates.cs @@ -54,9 +54,6 @@ public static void CheckForUpdates() var fvi = FileVersionInfo.GetVersionInfo(assembly.Location); var currentVersion = new Version(fvi.ProductVersion); - Console.WriteLine(currentVersion); - Console.WriteLine(newVersion); - if (newVersion > currentVersion) { // TODO: Manage new version check