From 1631252c8837a01a5eca3939213fbbce975deddb Mon Sep 17 00:00:00 2001 From: CSiCoAlm Date: Thu, 30 Jun 2022 10:03:39 +0200 Subject: [PATCH] VS2022 Compilazione con Visual Studio 2022 e passaggio al framework 4.8 --- Src/A69WD/A69WD.csproj | 2 +- Src/A69WD/General/Cfg.cs | 10 ++++++++- Src/A69WD/Properties/Resources.Designer.cs | 26 +++++++++++----------- Src/A69WD/Properties/Settings.Designer.cs | 10 ++++----- Src/A69WD/Settings.cfg | 2 +- Src/A69WD/app.config | 2 +- 6 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Src/A69WD/A69WD.csproj b/Src/A69WD/A69WD.csproj index 806a55d..5064461 100644 --- a/Src/A69WD/A69WD.csproj +++ b/Src/A69WD/A69WD.csproj @@ -9,7 +9,7 @@ Properties A69WD A69WD - v4.5 + v4.8 512 diff --git a/Src/A69WD/General/Cfg.cs b/Src/A69WD/General/Cfg.cs index b606ed3..3b46099 100644 --- a/Src/A69WD/General/Cfg.cs +++ b/Src/A69WD/General/Cfg.cs @@ -22,9 +22,15 @@ namespace A69WD { public static Cfg Settings { get { - if (settings == null) { + //if (settings == null) { + // settings = new Cfg(); + // settings.Deserialize(); + //} + //return settings; + if (val == 0) { settings = new Cfg(); settings.Deserialize(); + val++; } return settings; } @@ -33,6 +39,8 @@ namespace A69WD { [NonSerialized] private static Cfg settings = null; [NonSerialized] + private static int val = 0; + [NonSerialized] private string SettingsFilePath = "Settings.cfg"; diff --git a/Src/A69WD/Properties/Resources.Designer.cs b/Src/A69WD/Properties/Resources.Designer.cs index 62aa2b5..0e157b1 100644 --- a/Src/A69WD/Properties/Resources.Designer.cs +++ b/Src/A69WD/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se -// il codice viene rigenerato. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace A69WD.Properties { /// - /// Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Questa classe è stata generata automaticamente dalla classe StronglyTypedResourceBuilder. - // tramite uno strumento quale ResGen o Visual Studio. - // Per aggiungere o rimuovere un membro, modificare il file con estensione ResX ed eseguire nuovamente ResGen - // con l'opzione /str oppure ricompilare il progetto VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // 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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ namespace A69WD.Properties { } /// - /// Restituisce l'istanza di ResourceManager nella cache utilizzata da questa classe. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace A69WD.Properties { } /// - /// Esegue l'override della proprietà CurrentUICulture del thread corrente per tutte le - /// ricerche di risorse eseguite utilizzando questa classe di risorse fortemente tipizzata. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Src/A69WD/Properties/Settings.Designer.cs b/Src/A69WD/Properties/Settings.Designer.cs index ffdc2f2..2750dce 100644 --- a/Src/A69WD/Properties/Settings.Designer.cs +++ b/Src/A69WD/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se -// il codice viene rigenerato. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace A69WD.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.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/Src/A69WD/Settings.cfg b/Src/A69WD/Settings.cfg index 3ac382f..a601756 100644 --- a/Src/A69WD/Settings.cfg +++ b/Src/A69WD/Settings.cfg @@ -4,7 +4,7 @@ - D:\Project\Private\Prj\MyTools\A69WD\Test + C:\VM_Shared\Prj\C#\A69WD\Test A69DB.db diff --git a/Src/A69WD/app.config b/Src/A69WD/app.config index 801c873..2c0f559 100644 --- a/Src/A69WD/app.config +++ b/Src/A69WD/app.config @@ -1,3 +1,3 @@ - +