GH77: Updates Jarvis to new project format

build.cake

@@ -60,7 +60,6 @@ Task("Patch-Version")
 });
 
 Task("Patch-AppX-Info")
-    .WithCriteria(() => patch)
     .Does(() =>
 {
     var manifest = File("./src/Jarvis.Package/Package.appxmanifest");
@@ -96,9 +95,9 @@ Task("Copy-Binaries")
     .IsDependentOn("Build")
     .Does(() => 
 {
-    CopyFiles($"./src/Jarvis/bin/{configuration}/*", "./.artifacts/bin");
-    CopyFiles($"./src/Jarvis/bin/{configuration}/*", "./.artifacts/installer/bin");
-    CopyFiles($"./src/Jarvis.Package/AppPackages/Jarvis.Package_{version.MsiVersion}.0_*/**/*", "./.artifacts/appx");
+    CopyFiles($"./src/Jarvis/bin/{configuration}/net47/*", "./.artifacts/bin");
+    CopyFiles($"./src/Jarvis/bin/{configuration}/net47/*", "./.artifacts/installer/bin");
+    CopyFiles($"./src/Jarvis.Package/bin/AnyCPU/{configuration}/**/*", "./.artifacts/appx");
 
     DeleteFiles("./.artifacts/installer/bin/*.xml");
     DeleteFiles("./.artifacts/installer/bin/*.pdb");

global.json

@@ -0,0 +1,5 @@
+{
+    "msbuild-sdks": {
+      "MSBuild.Sdk.Extras": "1.6.20-preview"
+    }
+  }

src/Jarvis.Package/Jarvis.Package.wapproj

@@ -20,9 +20,11 @@
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
     <ProjectGuid>121a7682-edca-4031-b9bf-3b01ea6675dd</ProjectGuid>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Always</AppxBundle>
     <PackageCertificateKeyFile>Jarvis.Package_TemporaryKey.pfx</PackageCertificateKeyFile>
     <EntryPointProjectUniqueName>..\Jarvis\Jarvis.csproj</EntryPointProjectUniqueName>
     <PackageCertificateThumbprint>E018FA042C858503529CA2F55A2CF3B1BB569312</PackageCertificateThumbprint>
@@ -81,7 +83,7 @@
     <Content Include="Images\Wide310x150Logo.scale-400.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Jarvis\Jarvis.csproj" />
+    <ProjectReference Include="..\Jarvis\Jarvis.csproj" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>

src/Jarvis.Package/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
-  <Identity Name="SpectreSystemsAB.Jarvis-Yourroboticbutler" Publisher="CN=BD765503-99E8-40AA-91EC-B3E295890BB4" Version="0.9.10009.0" />
+  <Identity Name="SpectreSystemsAB.Jarvis-Yourroboticbutler" Publisher="CN=BD765503-99E8-40AA-91EC-B3E295890BB4" Version="0.9.10010.0" />
   <Properties>
     <DisplayName>Jarvis - Your robotic butler</DisplayName>
     <PublisherDisplayName>Spectre Systems AB</PublisherDisplayName>

src/Jarvis.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jarvis", "Jarvis\Jarvis.csproj", "{7C90B0C6-A0F6-4E4B-BE77-A81F893E167E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jarvis", "Jarvis\Jarvis.csproj", "{7C90B0C6-A0F6-4E4B-BE77-A81F893E167E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jarvis.Core", "Jarvis.Core\Jarvis.Core.csproj", "{5826D320-9026-4BE9-8C82-893C55B80871}"
 EndProject

src/Jarvis/JarvisApplication.xaml → src/Jarvis/App.xaml

@@ -1,4 +1,4 @@
-<Application x:Class="Jarvis.JarvisApplication"
+<Application x:Class="Jarvis.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Jarvis">

src/Jarvis/JarvisApplication.xaml.cs → src/Jarvis/App.xaml.cs

@@ -8,7 +8,7 @@
 
 namespace Jarvis
 {
-    public partial class JarvisApplication : IDisposable
+    public partial class App : IDisposable
     {
         private Mutex _mutex;
 

src/Jarvis/Bootstrapper.cs

@@ -37,7 +37,7 @@ protected override void Configure()
 
             // Configure container.
             var builder = new ContainerBuilder();
-            builder.RegisterInstance(Application).As<JarvisApplication>();
+            builder.RegisterInstance(Application).As<App>();
             builder.RegisterModule(new JarvisModule());
             builder.RegisterModule<UpdaterModule>();
             builder.RegisterModule<LoggingModule>();