From 20b0edef4ab92075618b47cd87b7e5cddc5269ce Mon Sep 17 00:00:00 2001 From: punker76 Date: Mon, 23 Nov 2020 11:58:12 +0100 Subject: [PATCH] Update Resources --- .../NotifyIconWpf.Sample.WindowsForms.csproj | 8 ++++---- .../Properties/Resources.Designer.cs | 9 ++++++--- .../Properties/Resources.resx | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj index 5e5b7e5..6178f02 100644 --- a/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj +++ b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj @@ -1,5 +1,6 @@  + net462;net472;netcoreapp3.1;net5.0-windows WinExe app.manifest true @@ -20,15 +21,14 @@ Form1.cs - - Form1.cs - - True True Resources.resx + + Form1.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.Designer.cs b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.Designer.cs index b374121..9ee2e8a 100644 --- a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.Designer.cs +++ b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,6 +9,9 @@ //------------------------------------------------------------------------------ namespace NotifyIconWpf.Sample.WindowsForms.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -16,7 +19,7 @@ namespace NotifyIconWpf.Sample.WindowsForms.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", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -36,7 +39,7 @@ namespace NotifyIconWpf.Sample.WindowsForms.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WindowsFormsSample.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NotifyIconWpf.Sample.WindowsForms.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.resx b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.resx index d657fca..26b0ac4 100644 --- a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.resx +++ b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.resx @@ -112,13 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + - ..\icon\led.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Icon\Led.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file