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..99be3ad 100644 --- a/Src/Examples/ConfigurationExample/Properties/Resources.Designer.cs +++ b/Src/Examples/ConfigurationExample/Properties/Resources.Designer.cs @@ -1,69 +1,61 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ -namespace ConfigurationExample.Properties -{ - - +namespace ConfigurationExample.Properties { + using System; + + /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 一个强类型的资源类,用于查找本地化的字符串等。 /// - // 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")] + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen + // (以 /str 作为命令选项),或重新生成 VS 项目。 + [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. + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [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. + /// 重写当前线程的 CurrentUICulture 属性,对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [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..a186905 100644 --- a/Src/Examples/ConfigurationExample/Properties/Settings.Designer.cs +++ b/Src/Examples/ConfigurationExample/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ -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.11.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..d112ca6 100644 --- a/Src/Examples/CustomNotificationsExample/Properties/Resources.Designer.cs +++ b/Src/Examples/CustomNotificationsExample/Properties/Resources.Designer.cs @@ -1,69 +1,61 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ -namespace CustomNotificationsExample.Properties -{ - - +namespace CustomNotificationsExample.Properties { + using System; + + /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 一个强类型的资源类,用于查找本地化的字符串等。 /// - // 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")] + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen + // (以 /str 作为命令选项),或重新生成 VS 项目。 + [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. + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [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. + /// 重写当前线程的 CurrentUICulture 属性,对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [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..7270148 100644 --- a/Src/Examples/CustomNotificationsExample/Properties/Settings.Designer.cs +++ b/Src/Examples/CustomNotificationsExample/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ -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.11.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/AssemblyInfo.cs b/Src/ToastNotifications.Messages/Properties/AssemblyInfo.cs deleted file mode 100644 index 7d550fb..0000000 --- a/Src/ToastNotifications.Messages/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// 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: 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: AssemblyTrademark("Rafał Łopatka")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly:ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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")] diff --git a/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj index cf2fdae..3484061 100644 --- a/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj +++ b/Src/ToastNotifications.Messages/ToastNotifications.Messages.csproj @@ -1,35 +1,11 @@ - - - + - Debug - AnyCPU - {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2} - library - ToastNotifications.Messages - ToastNotifications.Messages - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net40-windows;net462-windows;net472-windows;net481-windows;net6.0-windows;net8.0-windows + Library + false + true + true toast-notifications-icon.ico @@ -44,93 +20,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.sln b/Src/ToastNotifications.sln index 4a52687..14487a5 100644 --- a/Src/ToastNotifications.sln +++ b/Src/ToastNotifications.sln @@ -1,7 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 +<<<<<<< Updated upstream # Visual Studio Version 16 VisualStudioVersion = 16.0.28922.388 +======= +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35431.28 +>>>>>>> Stashed changes MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicUsageExample", "Examples\BasicUsageExample\BasicUsageExample.csproj", "{D63A8852-2028-4E0E-8FF1-F95D0066843F}" EndProject @@ -15,38 +20,91 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToastNotifications.Messages EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomNotificationsExample", "Examples\CustomNotificationsExample\CustomNotificationsExample.csproj", "{C406B971-ED9A-4633-9626-32FEDCCF9262}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetCoreUsageExample", "Examples\DotNetCoreUsageExample\DotNetCoreUsageExample.csproj", "{D4D3B08E-C53F-498F-B460-88F61BBB68DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCoreUsageExample", "Examples\DotNetCoreUsageExample\DotNetCoreUsageExample.csproj", "{D4D3B08E-C53F-498F-B460-88F61BBB68DF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Debug|x64.ActiveCfg = Debug|Any CPU + {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Debug|x64.Build.0 = Debug|Any CPU {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Release|Any CPU.ActiveCfg = Release|Any CPU {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Release|Any CPU.Build.0 = Release|Any CPU + {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Release|x64.ActiveCfg = Release|Any CPU + {D63A8852-2028-4E0E-8FF1-F95D0066843F}.Release|x64.Build.0 = Release|Any CPU {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Debug|x64.ActiveCfg = Debug|Any CPU + {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Debug|x64.Build.0 = Debug|Any CPU {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Release|Any CPU.ActiveCfg = Release|Any CPU {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Release|Any CPU.Build.0 = Release|Any CPU + {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Release|x64.ActiveCfg = Release|Any CPU + {F50D1BE4-2FF7-4E83-A149-104646FD6AC9}.Release|x64.Build.0 = Release|Any CPU {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Debug|x64.ActiveCfg = Debug|Any CPU + {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Debug|x64.Build.0 = Debug|Any CPU {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Release|Any CPU.Build.0 = Release|Any CPU + {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Release|x64.ActiveCfg = Release|Any CPU + {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE}.Release|x64.Build.0 = Release|Any CPU {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Debug|x64.ActiveCfg = Debug|Any CPU + {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Debug|x64.Build.0 = Debug|Any CPU {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Release|Any CPU.Build.0 = Release|Any CPU + {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Release|x64.ActiveCfg = Release|Any CPU + {4DE2F314-B19F-423E-92D8-7D3A7D9ACEA2}.Release|x64.Build.0 = Release|Any CPU {C406B971-ED9A-4633-9626-32FEDCCF9262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C406B971-ED9A-4633-9626-32FEDCCF9262}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C406B971-ED9A-4633-9626-32FEDCCF9262}.Debug|x64.ActiveCfg = Debug|Any CPU + {C406B971-ED9A-4633-9626-32FEDCCF9262}.Debug|x64.Build.0 = Debug|Any CPU {C406B971-ED9A-4633-9626-32FEDCCF9262}.Release|Any CPU.ActiveCfg = Release|Any CPU {C406B971-ED9A-4633-9626-32FEDCCF9262}.Release|Any CPU.Build.0 = Release|Any CPU + {C406B971-ED9A-4633-9626-32FEDCCF9262}.Release|x64.ActiveCfg = Release|Any CPU + {C406B971-ED9A-4633-9626-32FEDCCF9262}.Release|x64.Build.0 = Release|Any CPU {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Debug|x64.ActiveCfg = Debug|Any CPU + {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Debug|x64.Build.0 = Debug|Any CPU {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Release|Any CPU.Build.0 = Release|Any CPU +<<<<<<< Updated upstream +======= + {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Release|x64.ActiveCfg = Release|Any CPU + {D4D3B08E-C53F-498F-B460-88F61BBB68DF}.Release|x64.Build.0 = Release|Any CPU + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Debug|Any CPU.ActiveCfg = Debug|x64 + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Debug|Any CPU.Build.0 = Debug|x64 + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Debug|x64.ActiveCfg = Debug|x64 + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Debug|x64.Build.0 = Debug|x64 + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Release|Any CPU.Build.0 = Release|Any CPU + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Release|x64.ActiveCfg = Release|x64 + {B5B84B24-ED47-465D-995A-D9F1CF847DB5}.Release|x64.Build.0 = Release|x64 + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Debug|Any CPU.ActiveCfg = Debug|x64 + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Debug|Any CPU.Build.0 = Debug|x64 + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Debug|x64.ActiveCfg = Debug|x64 + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Debug|x64.Build.0 = Debug|x64 + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Release|Any CPU.Build.0 = Release|Any CPU + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Release|x64.ActiveCfg = Release|x64 + {8BB05A4C-65D8-477B-863D-8EDAB0D297E3}.Release|x64.Build.0 = Release|x64 + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Debug|x64.ActiveCfg = Debug|Any CPU + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Debug|x64.Build.0 = Debug|Any CPU + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Release|Any CPU.Build.0 = Release|Any CPU + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Release|x64.ActiveCfg = Release|Any CPU + {1FC79CC1-DEBC-4CC9-AF91-91EF840F543B}.Release|x64.Build.0 = Release|Any CPU +>>>>>>> Stashed changes EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Src/ToastNotifications/Properties/AssemblyInfo.cs b/Src/ToastNotifications/Properties/AssemblyInfo.cs deleted file mode 100644 index ae17708..0000000 --- a/Src/ToastNotifications/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// 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: AssemblyDescription("Toast notifications for WPF")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("DevCrew.pl Rafał Łopatka")] -[assembly: AssemblyProduct("ToastNotifications")] -[assembly: AssemblyCopyright("Copyright © Rafał Łopatka 2019")] -[assembly: AssemblyTrademark("Rafał Łopatka")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly:ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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")] diff --git a/Src/ToastNotifications/ToastNotifications.csproj b/Src/ToastNotifications/ToastNotifications.csproj index 16df514..f2c8477 100644 --- a/Src/ToastNotifications/ToastNotifications.csproj +++ b/Src/ToastNotifications/ToastNotifications.csproj @@ -1,148 +1,32 @@ - - - - - Debug - AnyCPU - {4A8879FC-9A6E-4904-910B-5C13FA5ED5BE} - library - ToastNotifications - ToastNotifications - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - toast-notifications-icon.ico - - - true - - - ../../Build/DevCrew.ToastNotifications.pfx - - - ../../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 - - - - - - - - - - + + + + net40-windows;net462-windows;net472-windows;net481-windows;net6.0-windows;net8.0-windows + Library + false + true + true + true + + + toast-notifications-icon.ico + + + true + + + ../../Build/DevCrew.ToastNotifications.pfx + + + ../../Build/DevCrew.ToastNotifications_TemporaryKey.snk + + + + + + + + + + \ No newline at end of file