diff --git a/prism-logging-serilog.sln b/prism-logging-serilog.sln index 47d26ee..25ae156 100644 --- a/prism-logging-serilog.sln +++ b/prism-logging-serilog.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29201.188 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{2E38532A-A66C-498A-8FBF-4D6FE6F31ECC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrismSerilogWpfDemo", "sample\PrismSerilogWpfDemo\PrismSerilogWpfDemo.csproj", "{CB57A3B5-DDC6-48C3-B031-7216A83A2970}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrismSerilogWpfDemoNet45", "sample\net45\PrismSerilogWpfDemoNet45\PrismSerilogWpfDemoNet45.csproj", "{CB57A3B5-DDC6-48C3-B031-7216A83A2970}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A918D06F-30C4-48CA-8E75-90131BA4B8D8}" EndProject @@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2CB13D58-3 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Logging.Serilog.Tests", "test\Prism.Logging.Serilog.Tests\Prism.Logging.Serilog.Tests.csproj", "{49AF6C05-BB7C-437D-B163-813939457192}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net45", "net45", "{C8C51579-94E5-400E-914C-3616DBAEBF49}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -38,9 +40,10 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {CB57A3B5-DDC6-48C3-B031-7216A83A2970} = {2E38532A-A66C-498A-8FBF-4D6FE6F31ECC} + {CB57A3B5-DDC6-48C3-B031-7216A83A2970} = {C8C51579-94E5-400E-914C-3616DBAEBF49} {88146B27-E104-4939-99FD-70557287F877} = {A918D06F-30C4-48CA-8E75-90131BA4B8D8} {49AF6C05-BB7C-437D-B163-813939457192} = {2CB13D58-3C7B-4AAA-8ADD-F0C3CD52EEE4} + {C8C51579-94E5-400E-914C-3616DBAEBF49} = {2E38532A-A66C-498A-8FBF-4D6FE6F31ECC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7215B999-A555-49A3-ACCA-ABF01EE7C25B} diff --git a/prism-logging-serilog.sln.DotSettings b/prism-logging-serilog.sln.DotSettings index 44b944c..a8e6305 100644 --- a/prism-logging-serilog.sln.DotSettings +++ b/prism-logging-serilog.sln.DotSettings @@ -6,4 +6,5 @@ DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW - DO_NOT_SHOW \ No newline at end of file + DO_NOT_SHOW + DO_NOT_SHOW \ No newline at end of file diff --git a/sample/PrismSerilogWpfDemo/App.config b/sample/net45/PrismSerilogWpfDemoNet45/App.config similarity index 100% rename from sample/PrismSerilogWpfDemo/App.config rename to sample/net45/PrismSerilogWpfDemoNet45/App.config diff --git a/sample/PrismSerilogWpfDemo/App.xaml b/sample/net45/PrismSerilogWpfDemoNet45/App.xaml similarity index 68% rename from sample/PrismSerilogWpfDemo/App.xaml rename to sample/net45/PrismSerilogWpfDemoNet45/App.xaml index 736d824..19387f0 100644 --- a/sample/PrismSerilogWpfDemo/App.xaml +++ b/sample/net45/PrismSerilogWpfDemoNet45/App.xaml @@ -1,8 +1,8 @@ - + xmlns:local="clr-namespace:PrismSerilogWpfDemoNet45"> diff --git a/sample/PrismSerilogWpfDemo/App.xaml.cs b/sample/net45/PrismSerilogWpfDemoNet45/App.xaml.cs similarity index 92% rename from sample/PrismSerilogWpfDemo/App.xaml.cs rename to sample/net45/PrismSerilogWpfDemoNet45/App.xaml.cs index 394ac3f..c7d41ca 100644 --- a/sample/PrismSerilogWpfDemo/App.xaml.cs +++ b/sample/net45/PrismSerilogWpfDemoNet45/App.xaml.cs @@ -2,9 +2,9 @@ using System.Windows; using Prism.Ioc; using Serilog; -using PrismSerilogWpfDemo.Views; +using PrismSerilogWpfDemoNet45.Views; -namespace PrismSerilogWpfDemo +namespace PrismSerilogWpfDemoNet45 { public partial class App { diff --git a/sample/PrismSerilogWpfDemo/PrismSerilogWpfDemo.csproj b/sample/net45/PrismSerilogWpfDemoNet45/PrismSerilogWpfDemoNet45.csproj similarity index 83% rename from sample/PrismSerilogWpfDemo/PrismSerilogWpfDemo.csproj rename to sample/net45/PrismSerilogWpfDemoNet45/PrismSerilogWpfDemoNet45.csproj index 268b10c..4d92f7c 100644 --- a/sample/PrismSerilogWpfDemo/PrismSerilogWpfDemo.csproj +++ b/sample/net45/PrismSerilogWpfDemoNet45/PrismSerilogWpfDemoNet45.csproj @@ -6,8 +6,8 @@ AnyCPU {CB57A3B5-DDC6-48C3-B031-7216A83A2970} WinExe - PrismSerilogWpfDemo - PrismSerilogWpfDemo + PrismSerilogWpfDemoNet45 + PrismSerilogWpfDemoNet45 v4.5 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -35,38 +35,38 @@ - ..\..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll + ..\..\..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll - ..\..\packages\Prism.Core.7.1.0.431\lib\net45\Prism.dll + ..\..\..\packages\Prism.Core.7.1.0.431\lib\net45\Prism.dll - ..\..\packages\Prism.Unity.7.1.0.431\lib\net45\Prism.Unity.Wpf.dll + ..\..\..\packages\Prism.Unity.7.1.0.431\lib\net45\Prism.Unity.Wpf.dll - ..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\Prism.Wpf.dll + ..\..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\Prism.Wpf.dll - ..\..\packages\Serilog.2.8.0\lib\net45\Serilog.dll + ..\..\..\packages\Serilog.2.8.0\lib\net45\Serilog.dll - ..\..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll + ..\..\..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll - ..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\System.Windows.Interactivity.dll + ..\..\..\packages\Prism.Wpf.7.1.0.431\lib\net45\System.Windows.Interactivity.dll 4.0 - ..\..\packages\Unity.Abstractions.3.3.1\lib\net45\Unity.Abstractions.dll + ..\..\..\packages\Unity.Abstractions.3.3.1\lib\net45\Unity.Abstractions.dll - ..\..\packages\Unity.Container.5.8.11\lib\net45\Unity.Container.dll + ..\..\..\packages\Unity.Container.5.8.11\lib\net45\Unity.Container.dll @@ -119,7 +119,7 @@ - + {88146b27-e104-4939-99fd-70557287f877} Prism.Logging.Serilog diff --git a/sample/PrismSerilogWpfDemo/Properties/AssemblyInfo.cs b/sample/net45/PrismSerilogWpfDemoNet45/Properties/AssemblyInfo.cs similarity index 90% rename from sample/PrismSerilogWpfDemo/Properties/AssemblyInfo.cs rename to sample/net45/PrismSerilogWpfDemoNet45/Properties/AssemblyInfo.cs index b59be13..6ac9597 100644 --- a/sample/PrismSerilogWpfDemo/Properties/AssemblyInfo.cs +++ b/sample/net45/PrismSerilogWpfDemoNet45/Properties/AssemblyInfo.cs @@ -2,11 +2,11 @@ using System.Runtime.InteropServices; using System.Windows; -[assembly: AssemblyTitle("PrismSerilogWpfDemo")] +[assembly: AssemblyTitle("PrismSerilogWpfDemoNet45")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("caioproiete.net")] -[assembly: AssemblyProduct("PrismSerilogWpfDemo")] +[assembly: AssemblyProduct("PrismSerilogWpfDemoNet45")] [assembly: AssemblyCopyright("Copyright © 2019 Caio Proiete and Contributors")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/sample/PrismSerilogWpfDemo/Properties/Resources.Designer.cs b/sample/net45/PrismSerilogWpfDemoNet45/Properties/Resources.Designer.cs similarity index 98% rename from sample/PrismSerilogWpfDemo/Properties/Resources.Designer.cs rename to sample/net45/PrismSerilogWpfDemoNet45/Properties/Resources.Designer.cs index 5017cec..a05a6eb 100644 --- a/sample/PrismSerilogWpfDemo/Properties/Resources.Designer.cs +++ b/sample/net45/PrismSerilogWpfDemoNet45/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace PrismSerilogWpfDemo.Properties +namespace PrismSerilogWpfDemoNet45.Properties { diff --git a/sample/PrismSerilogWpfDemo/Properties/Resources.resx b/sample/net45/PrismSerilogWpfDemoNet45/Properties/Resources.resx similarity index 100% rename from sample/PrismSerilogWpfDemo/Properties/Resources.resx rename to sample/net45/PrismSerilogWpfDemoNet45/Properties/Resources.resx diff --git a/sample/PrismSerilogWpfDemo/Properties/Settings.Designer.cs b/sample/net45/PrismSerilogWpfDemoNet45/Properties/Settings.Designer.cs similarity index 95% rename from sample/PrismSerilogWpfDemo/Properties/Settings.Designer.cs rename to sample/net45/PrismSerilogWpfDemoNet45/Properties/Settings.Designer.cs index 3e73f3a..4c01d47 100644 --- a/sample/PrismSerilogWpfDemo/Properties/Settings.Designer.cs +++ b/sample/net45/PrismSerilogWpfDemoNet45/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace PrismSerilogWpfDemo.Properties +namespace PrismSerilogWpfDemoNet45.Properties { diff --git a/sample/PrismSerilogWpfDemo/Properties/Settings.settings b/sample/net45/PrismSerilogWpfDemoNet45/Properties/Settings.settings similarity index 100% rename from sample/PrismSerilogWpfDemo/Properties/Settings.settings rename to sample/net45/PrismSerilogWpfDemoNet45/Properties/Settings.settings diff --git a/sample/PrismSerilogWpfDemo/ViewModels/MainWindowViewModel.cs b/sample/net45/PrismSerilogWpfDemoNet45/ViewModels/MainWindowViewModel.cs similarity index 95% rename from sample/PrismSerilogWpfDemo/ViewModels/MainWindowViewModel.cs rename to sample/net45/PrismSerilogWpfDemoNet45/ViewModels/MainWindowViewModel.cs index 8c9c790..423718f 100644 --- a/sample/PrismSerilogWpfDemo/ViewModels/MainWindowViewModel.cs +++ b/sample/net45/PrismSerilogWpfDemoNet45/ViewModels/MainWindowViewModel.cs @@ -5,12 +5,12 @@ using Prism.Logging; using Prism.Mvvm; -namespace PrismSerilogWpfDemo.ViewModels +namespace PrismSerilogWpfDemoNet45.ViewModels { public class MainWindowViewModel : BindableBase { private readonly ILoggerFacade _logger; - private string _title = "Prism Serilog Demo"; + private string _title = "Prism Serilog WPF Demo (.NET 4.5)"; public MainWindowViewModel(ILoggerFacade logger) { diff --git a/sample/PrismSerilogWpfDemo/Views/MainWindow.xaml b/sample/net45/PrismSerilogWpfDemoNet45/Views/MainWindow.xaml similarity index 91% rename from sample/PrismSerilogWpfDemo/Views/MainWindow.xaml rename to sample/net45/PrismSerilogWpfDemoNet45/Views/MainWindow.xaml index 2b6a873..20a59be 100644 --- a/sample/PrismSerilogWpfDemo/Views/MainWindow.xaml +++ b/sample/net45/PrismSerilogWpfDemoNet45/Views/MainWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/sample/PrismSerilogWpfDemo/Views/MainWindow.xaml.cs b/sample/net45/PrismSerilogWpfDemoNet45/Views/MainWindow.xaml.cs similarity index 80% rename from sample/PrismSerilogWpfDemo/Views/MainWindow.xaml.cs rename to sample/net45/PrismSerilogWpfDemoNet45/Views/MainWindow.xaml.cs index c01c53b..044ea23 100644 --- a/sample/PrismSerilogWpfDemo/Views/MainWindow.xaml.cs +++ b/sample/net45/PrismSerilogWpfDemoNet45/Views/MainWindow.xaml.cs @@ -1,6 +1,6 @@ using System.Windows; -namespace PrismSerilogWpfDemo.Views +namespace PrismSerilogWpfDemoNet45.Views { public partial class MainWindow : Window { diff --git a/sample/PrismSerilogWpfDemo/packages.config b/sample/net45/PrismSerilogWpfDemoNet45/packages.config similarity index 100% rename from sample/PrismSerilogWpfDemo/packages.config rename to sample/net45/PrismSerilogWpfDemoNet45/packages.config