From 90705d0c860abd5201138e9cd6a44aee79421dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Fri, 25 Mar 2016 20:01:28 +0100 Subject: [PATCH 1/5] Added logging to XamlTestApplication --- samples/XamlTestApplication/App.cs | 19 +++++++++++++++++-- .../XamlTestApplication.csproj | 4 ++++ samples/XamlTestApplicationPcl/XamlTestApp.cs | 1 - 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/samples/XamlTestApplication/App.cs b/samples/XamlTestApplication/App.cs index 463d6ecebf..01ac91299c 100644 --- a/samples/XamlTestApplication/App.cs +++ b/samples/XamlTestApplication/App.cs @@ -2,16 +2,31 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; -using Perspex; -using Perspex.Themes.Default; +using Perspex.Logging.Serilog; +using Serilog; namespace XamlTestApplication { public class App : XamlTestApp { + public App() + { + InitializeLogging(); + } + protected override void RegisterPlatform() { InitializeSubsystems((int)Environment.OSVersion.Platform); } + + private void InitializeLogging() + { +#if DEBUG + SerilogLogger.Initialize(new LoggerConfiguration() + .MinimumLevel.Warning() + .WriteTo.Trace(outputTemplate: "{Area}: {Message}") + .CreateLogger()); +#endif + } } } diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj index 94c56c07e2..38d1b8223d 100644 --- a/samples/XamlTestApplication/XamlTestApplication.csproj +++ b/samples/XamlTestApplication/XamlTestApplication.csproj @@ -127,6 +127,10 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Perspex.Layout + + {b61b66a3-b82d-4875-8001-89d3394fe0c9} + Perspex.Logging.Serilog + {6417B24E-49C2-4985-8DB2-3AB9D898EC91} Perspex.ReactiveUI diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.cs b/samples/XamlTestApplicationPcl/XamlTestApp.cs index 8f95fb199c..a4d4ac2e0e 100644 --- a/samples/XamlTestApplicationPcl/XamlTestApp.cs +++ b/samples/XamlTestApplicationPcl/XamlTestApp.cs @@ -1,6 +1,5 @@ using Perspex; using Perspex.Markup.Xaml; -using Perspex.Themes.Default; namespace XamlTestApplication { From ca31191e5af81ca0689ad9a04f79cbde637bed17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Fri, 25 Mar 2016 20:02:14 +0100 Subject: [PATCH 2/5] Changed target framework to 4.5 for ControlCatalog --- samples/ControlCatalog/App.config | 10 +++++----- samples/ControlCatalog/ControlCatalog.csproj | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/samples/ControlCatalog/App.config b/samples/ControlCatalog/App.config index 2e292d1c8a..7ef9d715f8 100644 --- a/samples/ControlCatalog/App.config +++ b/samples/ControlCatalog/App.config @@ -1,14 +1,14 @@ - + - + - - + + - \ No newline at end of file + diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index eff5a6f148..736ce5f49a 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -9,9 +9,10 @@ Properties ControlCatalog ControlCatalog - v4.6 + v4.5 512 true + AnyCPU From 17313a05ba1c67fc3b3f2212e11ff5521b97e527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Fri, 25 Mar 2016 20:02:32 +0100 Subject: [PATCH 3/5] Changed target framework to 4.5 for BindingTest --- samples/BindingTest/App.config | 6 +++--- samples/BindingTest/BindingTest.csproj | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/BindingTest/App.config b/samples/BindingTest/App.config index 8324aa6ff1..d1428ad712 100644 --- a/samples/BindingTest/App.config +++ b/samples/BindingTest/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 91d9f590da..92f8165594 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -9,9 +9,10 @@ Properties BindingTest BindingTest - v4.6 + v4.5 512 true + AnyCPU From af9e5e6336e2e02020f860f12ea4e66991d16fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Fri, 25 Mar 2016 20:02:42 +0100 Subject: [PATCH 4/5] Removed unused usings --- samples/BindingTest/App.xaml.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/BindingTest/App.xaml.cs b/samples/BindingTest/App.xaml.cs index e7ddb5ac66..5ffac249e9 100644 --- a/samples/BindingTest/App.xaml.cs +++ b/samples/BindingTest/App.xaml.cs @@ -2,11 +2,9 @@ using Perspex; using Perspex.Controls; using Perspex.Diagnostics; -using Perspex.Logging; using Perspex.Logging.Serilog; using Perspex.Markup.Xaml; using Serilog; -using Serilog.Filters; namespace BindingTest { From 87061e946d56461886351fe2981ee2046a801203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Fri, 25 Mar 2016 20:02:54 +0100 Subject: [PATCH 5/5] Fixed project dependencies --- Perspex.sln | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Perspex.sln b/Perspex.sln index 27866e90c9..5fcf58b996 100644 --- a/Perspex.sln +++ b/Perspex.sln @@ -99,6 +99,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Markup.UnitTests", "tests\Perspex.Markup.UnitTests\Perspex.Markup.UnitTests.csproj", "{8EF392D5-1416-45AA-9956-7CBBC3229E8A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BindingTest", "samples\BindingTest\BindingTest.csproj", "{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}" + ProjectSection(ProjectDependencies) = postProject + {B61B66A3-B82D-4875-8001-89D3394FE0C9} = {B61B66A3-B82D-4875-8001-89D3394FE0C9} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplicationPcl", "samples\XamlTestApplicationPcl\XamlTestApplicationPcl.csproj", "{EA113F1A-D8D7-4142-9948-353270E7EBAE}" EndProject