From 7b563d9c96aac4d2022305a7bab2f9b77e631a63 Mon Sep 17 00:00:00 2001 From: "Scott W. Vincent" Date: Sun, 5 Feb 2023 17:56:31 -0500 Subject: [PATCH] Updated to .NET Framework 4.8 --- PcMeterSln/MutexManager/MutexManager.csproj | 9 ++-- PcMeterSln/PcMeter/PcMeter.csproj | 10 ++-- .../PcMeter/Properties/Resources.Designer.cs | 46 ++++++++----------- .../PcMeter/Properties/Settings.Designer.cs | 2 +- PcMeterSln/PcMeter/app.config | 8 ++-- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/PcMeterSln/MutexManager/MutexManager.csproj b/PcMeterSln/MutexManager/MutexManager.csproj index e1b3483..23741a1 100644 --- a/PcMeterSln/MutexManager/MutexManager.csproj +++ b/PcMeterSln/MutexManager/MutexManager.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,9 +10,10 @@ Properties MutexManager MutexManager - v4.0 + v4.8 512 - Client + + true @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +32,7 @@ TRACE prompt 4 + false diff --git a/PcMeterSln/PcMeter/PcMeter.csproj b/PcMeterSln/PcMeter/PcMeter.csproj index 77d6a03..b5a8b9d 100644 --- a/PcMeterSln/PcMeter/PcMeter.csproj +++ b/PcMeterSln/PcMeter/PcMeter.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,8 +10,9 @@ Properties PcMeter PcMeter - v4.0 - Client + v4.8 + + 512 http://localhost/PcMeter/ true @@ -38,6 +39,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -47,6 +49,7 @@ TRACE prompt 4 + false pcmeter.ico @@ -95,6 +98,7 @@ True Resources.resx + True diff --git a/PcMeterSln/PcMeter/Properties/Resources.Designer.cs b/PcMeterSln/PcMeter/Properties/Resources.Designer.cs index 3a33841..f5cff34 100644 --- a/PcMeterSln/PcMeter/Properties/Resources.Designer.cs +++ b/PcMeterSln/PcMeter/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.269 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace PcMeter.Properties -{ - - +namespace PcMeter.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace PcMeter.Properties // 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")] + [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 - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// 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 - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PcMeter.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// 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 - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/PcMeterSln/PcMeter/Properties/Settings.Designer.cs b/PcMeterSln/PcMeter/Properties/Settings.Designer.cs index 8b5dbcc..47d5892 100644 --- a/PcMeterSln/PcMeter/Properties/Settings.Designer.cs +++ b/PcMeterSln/PcMeter/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace PcMeter.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", "17.4.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/PcMeterSln/PcMeter/app.config b/PcMeterSln/PcMeter/app.config index c04167c..1407784 100644 --- a/PcMeterSln/PcMeter/app.config +++ b/PcMeterSln/PcMeter/app.config @@ -1,8 +1,8 @@ - + - -
+ +
@@ -12,4 +12,4 @@ - \ No newline at end of file +