From 734751ce8579729d4878a9155b3fdcaa2dbaa331 Mon Sep 17 00:00:00 2001 From: Deadpikle Date: Wed, 11 Nov 2020 17:10:50 -0500 Subject: [PATCH 1/6] Migrate sample to use PackageReference --- .../Enterwell.Clients.Wpf.Notifications.Sample.csproj | 7 ------- Enterwell.Clients.Wpf.Notifications.Sample/packages.config | 4 ---- 2 files changed, 11 deletions(-) delete mode 100644 Enterwell.Clients.Wpf.Notifications.Sample/packages.config diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj b/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj index f30ca15..c43a56d 100644 --- a/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj +++ b/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj @@ -34,14 +34,8 @@ 4 - - ..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll - - - ..\packages\MahApps.Metro.1.4.3\lib\net45\System.Windows.Interactivity.dll - @@ -91,7 +85,6 @@ ResXFileCodeGenerator Resources.Designer.cs - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/packages.config b/Enterwell.Clients.Wpf.Notifications.Sample/packages.config deleted file mode 100644 index 7777517..0000000 --- a/Enterwell.Clients.Wpf.Notifications.Sample/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From a9543750891fb287854db3cbe277c1802fca235f Mon Sep 17 00:00:00 2001 From: Deadpikle Date: Wed, 11 Nov 2020 17:14:52 -0500 Subject: [PATCH 2/6] Update to SDK style project --- ...ll.Clients.Wpf.Notifications.Sample.csproj | 5 + ...Enterwell.Clients.Wpf.Notifications.csproj | 93 ++++--------------- ...Enterwell.Clients.Wpf.Notifications.nuspec | 17 ---- .../Properties/AssemblyInfo.cs | 26 ------ 4 files changed, 23 insertions(+), 118 deletions(-) delete mode 100644 Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj b/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj index c43a56d..f52ea95 100644 --- a/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj +++ b/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj @@ -99,5 +99,10 @@ Enterwell.Clients.Wpf.Notifications + + + 1.4.3 + + \ No newline at end of file diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj index 130cdea..116739a 100644 --- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj +++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj @@ -1,94 +1,37 @@ - - - + - Debug - AnyCPU {CFA27B27-9231-4F6D-804A-C0AE33FA5237} - library - Enterwell.Clients.Wpf.Notifications - Enterwell.Clients.Wpf.Notifications - v4.5.1 - 512 + net451 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 + Enterwell.Clients.Wpf.Notifications + Enterwell d.o.o. + Enterwell.Clients.Wpf.Notifications + Enterwell WPF Notifications library + Copyright (c) Enterwell d.o.o. 2017-2018 + 1.4.2.0 + 1.4.2.0 + 1.4.2.0 + bin\$(Configuration)\ + true + Enterwell d.o.o. + https://raw.githubusercontent.com/Enterwell/Wpf.Notifications/master/LICENSE + https://github.com/Enterwell/Wpf.Notifications + Fixed messages would not dismiss + wpf notifications - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - 4.0 - + - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - \ No newline at end of file diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec deleted file mode 100644 index 49989ef..0000000 --- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://raw.githubusercontent.com/Enterwell/Wpf.Notifications/master/LICENSE - https://github.com/Enterwell/Wpf.Notifications - false - $description$ - Fixed messages would not dismiss - Copyright (c) Enterwell d.o.o. 2017-2018 - wpf notifications - - diff --git a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs index 971b935..46c1b0a 100644 --- a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs +++ b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs @@ -2,18 +2,6 @@ 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("Enterwell.Clients.Wpf.Notifications")] -[assembly: AssemblyDescription("Enterwell WPF Notifications library")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Enterwell d.o.o.")] -[assembly: AssemblyProduct("Enterwell.Clients.Wpf.Notifications")] -[assembly: AssemblyCopyright("Copyright © Enterwell d.o.o. 2017-2018")] -[assembly: AssemblyTrademark("")] -[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. @@ -37,17 +25,3 @@ //(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("1.4.2.0")] -[assembly: AssemblyFileVersion("1.4.2.0")] From e272fafd41d97bf3e717cfe6ba1386dbee97ab90 Mon Sep 17 00:00:00 2001 From: Deadpikle Date: Wed, 11 Nov 2020 17:19:11 -0500 Subject: [PATCH 3/6] Build for .NET 5 and .NET Core 3.1 --- .../Enterwell.Clients.Wpf.Notifications.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj index 116739a..cfc3989 100644 --- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj +++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj @@ -1,7 +1,7 @@  {CFA27B27-9231-4F6D-804A-C0AE33FA5237} - net451 + net5-windows;netcoreapp3.1;net451 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Enterwell.Clients.Wpf.Notifications Enterwell d.o.o. @@ -18,6 +18,7 @@ https://github.com/Enterwell/Wpf.Notifications Fixed messages would not dismiss wpf notifications + true full @@ -25,7 +26,7 @@ pdbonly - + From 7ff4b369f25348902aacfab0b9205d74040fa579 Mon Sep 17 00:00:00 2001 From: Deadpikle Date: Wed, 11 Nov 2020 17:19:27 -0500 Subject: [PATCH 4/6] Bump copyright --- .../Enterwell.Clients.Wpf.Notifications.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj index cfc3989..8a3a402 100644 --- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj +++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj @@ -7,7 +7,7 @@ Enterwell d.o.o. Enterwell.Clients.Wpf.Notifications Enterwell WPF Notifications library - Copyright (c) Enterwell d.o.o. 2017-2018 + Copyright (c) Enterwell d.o.o. 2017-2020 1.4.2.0 1.4.2.0 1.4.2.0 From 8e13ea3c00533c57526caa89cc795d9fcea1abdc Mon Sep 17 00:00:00 2001 From: Deadpikle Date: Wed, 11 Nov 2020 17:26:34 -0500 Subject: [PATCH 5/6] Add .NET 5 sample --- .../App.xaml | 19 +++ .../App.xaml.cs | 17 ++ .../AssemblyInfo.cs | 10 ++ ...ients.Wpf.Notifications.Sample.Net5.csproj | 17 ++ .../MainWindow.xaml | 96 +++++++++++ .../MainWindow.xaml.cs | 152 ++++++++++++++++++ Enterwell.Clients.Wpf.Notifications.sln | 10 +- 7 files changed, 319 insertions(+), 2 deletions(-) create mode 100644 Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml create mode 100644 Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml.cs create mode 100644 Enterwell.Clients.Wpf.Notifications.Sample.Net5/AssemblyInfo.cs create mode 100644 Enterwell.Clients.Wpf.Notifications.Sample.Net5/Enterwell.Clients.Wpf.Notifications.Sample.Net5.csproj create mode 100644 Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml create mode 100644 Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml.cs diff --git a/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml new file mode 100644 index 0000000..2127810 --- /dev/null +++ b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml @@ -0,0 +1,19 @@ + + + + + + + + + + +