diff --git a/BuildNativeUWP.ps1 b/BuildNativeUWP.ps1 new file mode 100644 index 000000000..dc6e4dd52 --- /dev/null +++ b/BuildNativeUWP.ps1 @@ -0,0 +1,17 @@ +param( + [String] $customLogger = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll", + [String] $proj = "test/Serilog.UWP" +) + +echo "build: running .NET Native toolchain for UWP test project" + +$msbuild = $(cmd /c where /R 'C:\Program Files (x86)\Microsoft Visual Studio\2017' msbuild.exe | select -First 1) + +if ($customLogger) { + & $msbuild $proj /logger:"$customLogger" /verbosity:minimal /t:Restore + & $msbuild $proj /logger:"$customLogger" /verbosity:minimal /t:Build /p:Configuration=Release +} +else { + & $msbuild $proj /verbosity:minimal /t:Restore + & $msbuild $proj /verbosity:minimal /t:Build /p:Configuration=Release +} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..79eade51d --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 7df8c2fe4..bb39b7d02 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ configuration: Release test: off build_script: - ps: ./Build.ps1 +- ps: ./BuildNativeUWP.ps1 artifacts: - path: artifacts/Serilog.*.nupkg deploy: diff --git a/test/Serilog.UWP/App.xaml b/test/Serilog.UWP/App.xaml new file mode 100644 index 000000000..e0d43cd6c --- /dev/null +++ b/test/Serilog.UWP/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/test/Serilog.UWP/App.xaml.cs b/test/Serilog.UWP/App.xaml.cs new file mode 100644 index 000000000..19edf4aff --- /dev/null +++ b/test/Serilog.UWP/App.xaml.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace Serilog.UWP +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + sealed partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + this.Suspending += OnSuspending; + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(LaunchActivatedEventArgs e) + { + Frame rootFrame = Window.Current.Content as Frame; + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == null) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + + rootFrame.NavigationFailed += OnNavigationFailed; + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) + { + //TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + if (e.PrelaunchActivated == false) + { + if (rootFrame.Content == null) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + rootFrame.Navigate(typeof(MainPage), e.Arguments); + } + // Ensure the current window is active + Window.Current.Activate(); + } + } + + /// + /// Invoked when Navigation to a certain page fails + /// + /// The Frame which failed navigation + /// Details about the navigation failure + void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + { + throw new Exception("Failed to load Page " + e.SourcePageType.FullName); + } + + /// + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// + /// The source of the suspend request. + /// Details about the suspend request. + private void OnSuspending(object sender, SuspendingEventArgs e) + { + var deferral = e.SuspendingOperation.GetDeferral(); + //TODO: Save application state and stop any background activity + deferral.Complete(); + } + } +} diff --git a/test/Serilog.UWP/Assets/LockScreenLogo.scale-200.png b/test/Serilog.UWP/Assets/LockScreenLogo.scale-200.png new file mode 100644 index 000000000..735f57adb Binary files /dev/null and b/test/Serilog.UWP/Assets/LockScreenLogo.scale-200.png differ diff --git a/test/Serilog.UWP/Assets/SplashScreen.scale-200.png b/test/Serilog.UWP/Assets/SplashScreen.scale-200.png new file mode 100644 index 000000000..023e7f1fe Binary files /dev/null and b/test/Serilog.UWP/Assets/SplashScreen.scale-200.png differ diff --git a/test/Serilog.UWP/Assets/Square150x150Logo.scale-200.png b/test/Serilog.UWP/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 000000000..af49fec1a Binary files /dev/null and b/test/Serilog.UWP/Assets/Square150x150Logo.scale-200.png differ diff --git a/test/Serilog.UWP/Assets/Square44x44Logo.scale-200.png b/test/Serilog.UWP/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 000000000..ce342a2ec Binary files /dev/null and b/test/Serilog.UWP/Assets/Square44x44Logo.scale-200.png differ diff --git a/test/Serilog.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/test/Serilog.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 000000000..f6c02ce97 Binary files /dev/null and b/test/Serilog.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/test/Serilog.UWP/Assets/StoreLogo.png b/test/Serilog.UWP/Assets/StoreLogo.png new file mode 100644 index 000000000..7385b56c0 Binary files /dev/null and b/test/Serilog.UWP/Assets/StoreLogo.png differ diff --git a/test/Serilog.UWP/Assets/Wide310x150Logo.scale-200.png b/test/Serilog.UWP/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 000000000..288995b39 Binary files /dev/null and b/test/Serilog.UWP/Assets/Wide310x150Logo.scale-200.png differ diff --git a/test/Serilog.UWP/MainPage.xaml b/test/Serilog.UWP/MainPage.xaml new file mode 100644 index 000000000..b5faba2d4 --- /dev/null +++ b/test/Serilog.UWP/MainPage.xaml @@ -0,0 +1,13 @@ + + + + + + diff --git a/test/Serilog.UWP/MainPage.xaml.cs b/test/Serilog.UWP/MainPage.xaml.cs new file mode 100644 index 000000000..6b511b860 --- /dev/null +++ b/test/Serilog.UWP/MainPage.xaml.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409 + +namespace Serilog.UWP +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class MainPage : Page + { + public MainPage() + { + this.InitializeComponent(); + } + } +} diff --git a/test/Serilog.UWP/Package.appxmanifest b/test/Serilog.UWP/Package.appxmanifest new file mode 100644 index 000000000..dc6a8520e --- /dev/null +++ b/test/Serilog.UWP/Package.appxmanifest @@ -0,0 +1,49 @@ + + + + + + + + + + Serilog.UWP + User + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Serilog.UWP/Properties/AssemblyInfo.cs b/test/Serilog.UWP/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..a8cc4fbdc --- /dev/null +++ b/test/Serilog.UWP/Properties/AssemblyInfo.cs @@ -0,0 +1,29 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 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("Serilog.UWP")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Serilog.UWP")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 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.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: ComVisible(false)] \ No newline at end of file diff --git a/test/Serilog.UWP/Properties/Default.rd.xml b/test/Serilog.UWP/Properties/Default.rd.xml new file mode 100644 index 000000000..7c40ffeb1 --- /dev/null +++ b/test/Serilog.UWP/Properties/Default.rd.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Serilog.UWP/Serilog.UWP.csproj b/test/Serilog.UWP/Serilog.UWP.csproj new file mode 100644 index 000000000..8faa84121 --- /dev/null +++ b/test/Serilog.UWP/Serilog.UWP.csproj @@ -0,0 +1,150 @@ + + + + + Debug + x86 + {8E911580-847C-4757-921C-7BCF3B812465} + AppContainerExe + Properties + Serilog.UWP + Serilog.UWP + en-US + UAP + 10.0.10586.0 + 10.0.10586.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true + Serilog.UWP_TemporaryKey.pfx + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + PackageReference + + + + + + + App.xaml + + + MainPage.xaml + + + + + + Designer + + + + + + + + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + 5.3.3 + + + + + + + 14.0 + + + + \ No newline at end of file diff --git a/test/Serilog.UWP/Serilog.UWP_TemporaryKey.pfx b/test/Serilog.UWP/Serilog.UWP_TemporaryKey.pfx new file mode 100644 index 000000000..3272eaa5f Binary files /dev/null and b/test/Serilog.UWP/Serilog.UWP_TemporaryKey.pfx differ