From c122fb7268774d047b65e8b44e97461b3f706f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20H=C3=B6chtl?= Date: Tue, 28 Oct 2025 10:31:21 +0100 Subject: [PATCH 1/6] Committing pending changes before starting .NET9.0 upgrade. --- Src/Examples/ConfigurationExample/App.config | 6 +-- .../ConfigurationExample.csproj | 3 +- .../Properties/Resources.Designer.cs | 44 ++++++++----------- .../Properties/Settings.Designer.cs | 22 ++++------ .../CustomNotificationsExample/App.config | 6 +-- .../CustomNotificationsExample.csproj | 3 +- .../Properties/Resources.Designer.cs | 44 ++++++++----------- .../Properties/Settings.Designer.cs | 22 ++++------ .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../ToastNotifications.Messages.csproj | 4 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../ToastNotifications.csproj | 4 +- 14 files changed, 74 insertions(+), 92 deletions(-) diff --git a/Src/Examples/ConfigurationExample/App.config b/Src/Examples/ConfigurationExample/App.config index 88fa402..4bfa005 100644 --- a/Src/Examples/ConfigurationExample/App.config +++ b/Src/Examples/ConfigurationExample/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj index 05d7504..65657d1 100644 --- a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj +++ b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj @@ -9,11 +9,12 @@ Properties ConfigurationExample ConfigurationExample - v4.5.2 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + AnyCPU diff --git a/Src/Examples/ConfigurationExample/Properties/Resources.Designer.cs b/Src/Examples/ConfigurationExample/Properties/Resources.Designer.cs index c0287e5..adaec18 100644 --- a/Src/Examples/ConfigurationExample/Properties/Resources.Designer.cs +++ b/Src/Examples/ConfigurationExample/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace ConfigurationExample.Properties -{ - - +namespace ConfigurationExample.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace ConfigurationExample.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("ConfigurationExample.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/Src/Examples/ConfigurationExample/Properties/Settings.Designer.cs b/Src/Examples/ConfigurationExample/Properties/Settings.Designer.cs index a6a4d10..0aca381 100644 --- a/Src/Examples/ConfigurationExample/Properties/Settings.Designer.cs +++ b/Src/Examples/ConfigurationExample/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace ConfigurationExample.Properties -{ - - +namespace ConfigurationExample.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Src/Examples/CustomNotificationsExample/App.config b/Src/Examples/CustomNotificationsExample/App.config index 88fa402..4bfa005 100644 --- a/Src/Examples/CustomNotificationsExample/App.config +++ b/Src/Examples/CustomNotificationsExample/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj index 1f31fa7..a77aa20 100644 --- a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj +++ b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj @@ -8,11 +8,12 @@ WinExe CustomNotificationsExample CustomNotificationsExample - v4.5.2 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + AnyCPU diff --git a/Src/Examples/CustomNotificationsExample/Properties/Resources.Designer.cs b/Src/Examples/CustomNotificationsExample/Properties/Resources.Designer.cs index f6f52e3..d63fde0 100644 --- a/Src/Examples/CustomNotificationsExample/Properties/Resources.Designer.cs +++ b/Src/Examples/CustomNotificationsExample/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace CustomNotificationsExample.Properties -{ - - +namespace CustomNotificationsExample.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace CustomNotificationsExample.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("CustomNotificationsExample.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/Src/Examples/CustomNotificationsExample/Properties/Settings.Designer.cs b/Src/Examples/CustomNotificationsExample/Properties/Settings.Designer.cs index 8ec456b..bf1dbfe 100644 --- a/Src/Examples/CustomNotificationsExample/Properties/Settings.Designer.cs +++ b/Src/Examples/CustomNotificationsExample/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace CustomNotificationsExample.Properties -{ - - +namespace CustomNotificationsExample.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Src/ToastNotifications.Messages/Properties/Resources.Designer.cs b/Src/ToastNotifications.Messages/Properties/Resources.Designer.cs index 0ae200e..19c9954 100644 --- a/Src/ToastNotifications.Messages/Properties/Resources.Designer.cs +++ b/Src/ToastNotifications.Messages/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ToastNotifications.Messages.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 { diff --git a/Src/ToastNotifications.Messages/Properties/Settings.Designer.cs b/Src/ToastNotifications.Messages/Properties/Settings.Designer.cs index 2767f8d..7cd198f 100644 --- a/Src/ToastNotifications.Messages/Properties/Settings.Designer.cs +++ b/Src/ToastNotifications.Messages/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace ToastNotifications.Messages.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.14.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/ToastNotifications.Messages/ToastNotifications.Messages.csproj b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj index cf2fdae..bb949f9 100644 --- a/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj +++ b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj @@ -8,7 +8,7 @@ library ToastNotifications.Messages ToastNotifications.Messages - v4.0 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +31,7 @@ TRACE prompt 4 + false toast-notifications-icon.ico diff --git a/Src/ToastNotifications/Properties/Resources.Designer.cs b/Src/ToastNotifications/Properties/Resources.Designer.cs index c8ba3bd..d299a31 100644 --- a/Src/ToastNotifications/Properties/Resources.Designer.cs +++ b/Src/ToastNotifications/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ToastNotifications.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 { diff --git a/Src/ToastNotifications/Properties/Settings.Designer.cs b/Src/ToastNotifications/Properties/Settings.Designer.cs index 137f52c..210d37c 100644 --- a/Src/ToastNotifications/Properties/Settings.Designer.cs +++ b/Src/ToastNotifications/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace ToastNotifications.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.14.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/ToastNotifications/ToastNotifications.csproj b/Src/ToastNotifications/ToastNotifications.csproj index 16df514..3d34496 100644 --- a/Src/ToastNotifications/ToastNotifications.csproj +++ b/Src/ToastNotifications/ToastNotifications.csproj @@ -8,7 +8,7 @@ library ToastNotifications ToastNotifications - v4.0 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +31,7 @@ TRACE prompt 4 + false toast-notifications-icon.ico From 988d9941683bdfd598e90538da873d1faf7f1306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20H=C3=B6chtl?= Date: Tue, 28 Oct 2025 11:07:54 +0100 Subject: [PATCH 2/6] convert projects to sdk style --- .../BasicUsageExample.csproj | 110 +------------- .../ConfigurationExample.csproj | 113 +------------- .../CustomNotificationsExample.csproj | 141 +----------------- .../ToastNotifications.csproj | 132 +--------------- 4 files changed, 24 insertions(+), 472 deletions(-) diff --git a/Src/Examples/BasicUsageExample/BasicUsageExample.csproj b/Src/Examples/BasicUsageExample/BasicUsageExample.csproj index 6d13ee5..240c9e1 100644 --- a/Src/Examples/BasicUsageExample/BasicUsageExample.csproj +++ b/Src/Examples/BasicUsageExample/BasicUsageExample.csproj @@ -1,122 +1,24 @@ - - - + - Debug - AnyCPU - {D63A8852-2028-4E0E-8FF1-F95D0066843F} + net48 WinExe - Properties - BasicUsageExample - BasicUsageExample - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + true + true toast-notifications-icon.ico - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - - MainWindow.xaml - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - MSBuild:Compile - Designer - - - - - {4de2f314-b19f-423e-92d8-7d3a7d9acea2} - ToastNotifications.Messages - - - {4a8879fc-9a6e-4904-910b-5c13fa5ed5be} - ToastNotifications - + + - - \ No newline at end of file diff --git a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj index 65657d1..240c9e1 100644 --- a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj +++ b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj @@ -1,125 +1,24 @@ - - - + - Debug - AnyCPU - {F50D1BE4-2FF7-4E83-A149-104646FD6AC9} + net48 WinExe - Properties - ConfigurationExample - ConfigurationExample - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + true + true toast-notifications-icon.ico - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - - - MainWindow.xaml - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - MSBuild:Compile - Designer - - - - - {4de2f314-b19f-423e-92d8-7d3a7d9acea2} - ToastNotifications.Messages - - - {4a8879fc-9a6e-4904-910b-5c13fa5ed5be} - ToastNotifications - + + - - \ No newline at end of file diff --git a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj index a77aa20..000b011 100644 --- a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj +++ b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj @@ -1,146 +1,17 @@ - - - + - Debug - AnyCPU - {C406B971-ED9A-4633-9626-32FEDCCF9262} + net48 WinExe - CustomNotificationsExample - CustomNotificationsExample - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + true + true - - ..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll - - - - ..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - CustomInputDisplayPart.xaml - - - - - MahAppsDisplayPart.xaml - - - - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - CustomCommandDisplayPart.xaml - - - - - CustomDisplayPart.xaml - - - - MainWindow.xaml - Code - - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - + - - {4a8879fc-9a6e-4904-910b-5c13fa5ed5be} - ToastNotifications - + - - \ No newline at end of file diff --git a/Src/ToastNotifications/ToastNotifications.csproj b/Src/ToastNotifications/ToastNotifications.csproj index 3d34496..3dc6923 100644 --- a/Src/ToastNotifications/ToastNotifications.csproj +++ b/Src/ToastNotifications/ToastNotifications.csproj @@ -1,37 +1,10 @@ - - - + - Debug - AnyCPU - {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE} - library - ToastNotifications - ToastNotifications - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + net48 + Library + true + true + true toast-notifications-icon.ico @@ -46,105 +19,12 @@ ../../Build/DevCrew.ToastNotifications_TemporaryKey.snk - - - - - - - - 4.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MSBuild:Compile - Designer - - - - - - - - - - - - - NotificationsWindow.xaml - - - - - - - - - - - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - \ No newline at end of file From 0238500e96527e419257236d9c20a06bd9ba8cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20H=C3=B6chtl?= Date: Tue, 28 Oct 2025 11:08:37 +0100 Subject: [PATCH 3/6] temporarly removing dublicates in AssemblyInfo - to be solved in build pipeline --- .../Properties/AssemblyInfo.cs | 14 +-- .../Properties/AssemblyInfo.cs | 14 +-- .../Properties/AssemblyInfo.cs | 14 +-- .../packages.config | 4 - .../Properties/AssemblyInfo.cs | 14 +-- .../ToastNotifications.Messages.csproj | 118 +----------------- .../Properties/AssemblyInfo.cs | 12 +- 7 files changed, 40 insertions(+), 150 deletions(-) delete mode 100644 Src/Examples/CustomNotificationsExample/packages.config diff --git a/Src/Examples/BasicUsageExample/Properties/AssemblyInfo.cs b/Src/Examples/BasicUsageExample/Properties/AssemblyInfo.cs index e345cd1..6f72bdb 100644 --- a/Src/Examples/BasicUsageExample/Properties/AssemblyInfo.cs +++ b/Src/Examples/BasicUsageExample/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("BasicUsageExample")] +//[assembly: AssemblyTitle("BasicUsageExample")] [assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BasicUsageExample")] -[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] +//[assembly: AssemblyConfiguration("")] +//[assembly: AssemblyCompany("")] +//[assembly: AssemblyProduct("BasicUsageExample")] +//[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/Examples/ConfigurationExample/Properties/AssemblyInfo.cs b/Src/Examples/ConfigurationExample/Properties/AssemblyInfo.cs index 9ab570f..a549386 100644 --- a/Src/Examples/ConfigurationExample/Properties/AssemblyInfo.cs +++ b/Src/Examples/ConfigurationExample/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ConfigurationExample")] +//[assembly: AssemblyTitle("ConfigurationExample")] [assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ConfigurationExample")] -[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] +//[assembly: AssemblyConfiguration("")] +//[assembly: AssemblyCompany("")] +//[assembly: AssemblyProduct("ConfigurationExample")] +//[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/Examples/CustomNotificationsExample/Properties/AssemblyInfo.cs b/Src/Examples/CustomNotificationsExample/Properties/AssemblyInfo.cs index 85ddb93..14db20d 100644 --- a/Src/Examples/CustomNotificationsExample/Properties/AssemblyInfo.cs +++ b/Src/Examples/CustomNotificationsExample/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("CustomNotificationsExample")] +//[assembly: AssemblyTitle("CustomNotificationsExample")] [assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CustomNotificationsExample")] -[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2018")] +//[assembly: AssemblyConfiguration("")] +//[assembly: AssemblyCompany("")] +//[assembly: AssemblyProduct("CustomNotificationsExample")] +//[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/Examples/CustomNotificationsExample/packages.config b/Src/Examples/CustomNotificationsExample/packages.config deleted file mode 100644 index 087aea0..0000000 --- a/Src/Examples/CustomNotificationsExample/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Src/ToastNotifications.Messages/Properties/AssemblyInfo.cs b/Src/ToastNotifications.Messages/Properties/AssemblyInfo.cs index 7d550fb..a4344b6 100644 --- a/Src/ToastNotifications.Messages/Properties/AssemblyInfo.cs +++ b/Src/ToastNotifications.Messages/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ToastNotifications.Messages")] +//[assembly: AssemblyTitle("ToastNotifications.Messages")] [assembly: AssemblyDescription("Toast notifications messages for WPF")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("DevCrew.pl Rafał Łopatka")] -[assembly: AssemblyProduct("ToastNotifications.Messages")] -[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] +//[assembly: AssemblyConfiguration("")] +//[assembly: AssemblyCompany("DevCrew.pl Rafał Łopatka")] +//[assembly: AssemblyProduct("ToastNotifications.Messages")] +//[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] [assembly: AssemblyTrademark("Rafał Łopatka")] [assembly: AssemblyCulture("")] @@ -51,5 +51,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("2.5.1.0")] -[assembly: AssemblyFileVersion("2.5.1.0")] +//[assembly: AssemblyVersion("2.5.1.0")] +//[assembly: AssemblyFileVersion("2.5.1.0")] diff --git a/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj index bb949f9..a9a72ff 100644 --- a/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj +++ b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj @@ -1,37 +1,9 @@ - - - + - Debug - AnyCPU - {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2} - library - ToastNotifications.Messages - ToastNotifications.Messages - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + net48 + Library + true + true toast-notifications-icon.ico @@ -46,93 +18,15 @@ ../../Build/DevCrew.ToastNotifications_TemporaryKey.snk - - - - - - 4.0 - - - - - - - ErrorDisplayPart.xaml - - - - - InformationDisplayPart.xaml - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - SuccessDisplayPart.xaml - - - - - WarningDisplayPart.xaml - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - {4a8879fc-9a6e-4904-910b-5c13fa5ed5be} - ToastNotifications - + - \ No newline at end of file diff --git a/Src/ToastNotifications/Properties/AssemblyInfo.cs b/Src/ToastNotifications/Properties/AssemblyInfo.cs index ae17708..b9d4293 100644 --- a/Src/ToastNotifications/Properties/AssemblyInfo.cs +++ b/Src/ToastNotifications/Properties/AssemblyInfo.cs @@ -7,11 +7,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ToastNotifications")] +//[assembly: AssemblyTitle("ToastNotifications")] [assembly: AssemblyDescription("Toast notifications for WPF")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("DevCrew.pl Rafał Łopatka")] -[assembly: AssemblyProduct("ToastNotifications")] +//[assembly: AssemblyConfiguration("")] +//[assembly: AssemblyCompany("DevCrew.pl Rafał Łopatka")] +//[assembly: AssemblyProduct("ToastNotifications")] [assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] [assembly: AssemblyTrademark("Rafał Łopatka")] [assembly: AssemblyCulture("")] @@ -51,5 +51,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("2.5.1.0")] -[assembly: AssemblyFileVersion("2.5.1.0")] +//[assembly: AssemblyVersion("2.5.1.0")] +//[assembly: AssemblyFileVersion("2.5.1.0")] From dafc5ecea33c322cceeba63921353f6efe2a2206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20H=C3=B6chtl?= Date: Tue, 28 Oct 2025 11:18:16 +0100 Subject: [PATCH 4/6] use props file to define common project settings --- Src/Directory.Build.props | 5 +++++ Src/Examples/BasicUsageExample/BasicUsageExample.csproj | 1 - .../ConfigurationExample/ConfigurationExample.csproj | 1 - .../CustomNotificationsExample.csproj | 1 - .../ToastNotifications.Messages.csproj | 1 - Src/ToastNotifications/ToastNotifications.csproj | 1 - 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 Src/Directory.Build.props diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props new file mode 100644 index 0000000..3fc76f9 --- /dev/null +++ b/Src/Directory.Build.props @@ -0,0 +1,5 @@ + + + net48 + + \ No newline at end of file diff --git a/Src/Examples/BasicUsageExample/BasicUsageExample.csproj b/Src/Examples/BasicUsageExample/BasicUsageExample.csproj index 240c9e1..37d9748 100644 --- a/Src/Examples/BasicUsageExample/BasicUsageExample.csproj +++ b/Src/Examples/BasicUsageExample/BasicUsageExample.csproj @@ -1,6 +1,5 @@  - net48 WinExe true true diff --git a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj index 240c9e1..37d9748 100644 --- a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj +++ b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj @@ -1,6 +1,5 @@  - net48 WinExe true true diff --git a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj index 000b011..8ba6d28 100644 --- a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj +++ b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj @@ -1,6 +1,5 @@  - net48 WinExe true true diff --git a/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj index a9a72ff..8e338bd 100644 --- a/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj +++ b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj @@ -1,6 +1,5 @@  - net48 Library true true diff --git a/Src/ToastNotifications/ToastNotifications.csproj b/Src/ToastNotifications/ToastNotifications.csproj index 3dc6923..f697b45 100644 --- a/Src/ToastNotifications/ToastNotifications.csproj +++ b/Src/ToastNotifications/ToastNotifications.csproj @@ -1,6 +1,5 @@  - net48 Library true true From 5fc9f8f9846415962b53b54db5c52d807e9f862d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20H=C3=B6chtl?= Date: Tue, 28 Oct 2025 11:21:17 +0100 Subject: [PATCH 5/6] set target framework to net9.0-windows --- Src/Directory.Build.props | 2 +- .../DotNetCoreUsageExample/DotNetCoreUsageExample.csproj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props index 3fc76f9..f69342c 100644 --- a/Src/Directory.Build.props +++ b/Src/Directory.Build.props @@ -1,5 +1,5 @@ - net48 + net9.0-windows \ No newline at end of file diff --git a/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj b/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj index 1ea9750..8beeeb7 100644 --- a/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj +++ b/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj @@ -2,7 +2,6 @@ WinExe - netcoreapp3.0 true From 6118e056e05d68ff5c0d183581f1c1eaed1cede1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20H=C3=B6chtl?= Date: Tue, 28 Oct 2025 15:31:38 +0100 Subject: [PATCH 6/6] support additional target frameworks net462, net 472, net 481, net8.0 --- Src/Directory.Build.props | 2 +- Src/Examples/BasicUsageExample/BasicUsageExample.csproj | 1 + Src/Examples/ConfigurationExample/ConfigurationExample.csproj | 1 + .../CustomNotificationsExample.csproj | 1 + .../DotNetCoreUsageExample/DotNetCoreUsageExample.csproj | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props index f69342c..d9d87b6 100644 --- a/Src/Directory.Build.props +++ b/Src/Directory.Build.props @@ -1,5 +1,5 @@ - net9.0-windows + net462-windows;net472-windows;net481-windows;net8.0-windows;net9.0-windows \ No newline at end of file diff --git a/Src/Examples/BasicUsageExample/BasicUsageExample.csproj b/Src/Examples/BasicUsageExample/BasicUsageExample.csproj index 37d9748..3d21e3f 100644 --- a/Src/Examples/BasicUsageExample/BasicUsageExample.csproj +++ b/Src/Examples/BasicUsageExample/BasicUsageExample.csproj @@ -1,5 +1,6 @@  + net9.0-windows WinExe true true diff --git a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj index 37d9748..3d21e3f 100644 --- a/Src/Examples/ConfigurationExample/ConfigurationExample.csproj +++ b/Src/Examples/ConfigurationExample/ConfigurationExample.csproj @@ -1,5 +1,6 @@  + net9.0-windows WinExe true true diff --git a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj index 8ba6d28..9ddc3f1 100644 --- a/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj +++ b/Src/Examples/CustomNotificationsExample/CustomNotificationsExample.csproj @@ -1,5 +1,6 @@  + net9.0-windows WinExe true true diff --git a/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj b/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj index 8beeeb7..2885eba 100644 --- a/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj +++ b/Src/Examples/DotNetCoreUsageExample/DotNetCoreUsageExample.csproj @@ -1,6 +1,7 @@  + net9.0-windows WinExe true