From 4490b2de9acf398ca9b13a4c3ac8a68619daef54 Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Fri, 20 Sep 2019 08:03:53 +0200
Subject: [PATCH 1/3] Isolate default URL in its own file, for convenience

---
 support/hololens/ServoApp/DefaultUrl.h                | 3 +++
 support/hololens/ServoApp/ServoApp.vcxproj            | 3 ++-
 support/hololens/ServoApp/ServoApp.vcxproj.filters    | 1 +
 support/hololens/ServoApp/ServoControl/ServoControl.h | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 support/hololens/ServoApp/DefaultUrl.h

diff --git a/support/hololens/ServoApp/DefaultUrl.h b/support/hololens/ServoApp/DefaultUrl.h
new file mode 100644
index 0000000000000..359a7962dbd64
--- /dev/null
+++ b/support/hololens/ServoApp/DefaultUrl.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define DEFAULT_URL L"about:blank";
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 201c4955edf2d..ad16700df6b86 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -128,6 +128,7 @@
     <ClInclude Include="ServoControl\OpenGLES.h" />
     <ClInclude Include="ServoControl\Servo.h" />
     <ClInclude Include="ServoControl\ServoControl.h" />
+    <ClInclude Include="DefaultUrl.h" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -981,4 +982,4 @@
     <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props'))" />
     <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index d4f1f4a9de74e..73859388feb97 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -37,6 +37,7 @@
     <ClInclude Include="ServoControl\ServoControl.h">
       <Filter>ServoControl</Filter>
     </ClInclude>
+    <ClInclude Include="DefaultUrl.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\Wide310x150Logo.scale-200.png">
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h
index 9c38cec5efb0e..e13e3b0c69ba8 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.h
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.h
@@ -2,6 +2,7 @@
 #include "ServoControl.g.h"
 #include "OpenGLES.h"
 #include "Servo.h"
+#include "DefaultUrl.h"
 
 namespace winrt::ServoApp::implementation {
 struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
@@ -95,7 +96,7 @@ struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
   winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent;
 
   float mDPI = 1;
-  hstring mInitialURL = L"about:blank";
+  hstring mInitialURL = DEFAULT_URL;
   bool mTransient = false;
 
   Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();

From 95a9287a8a22f1e6742e58b2c2795cea7af632ae Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Sat, 21 Sep 2019 09:37:20 +0200
Subject: [PATCH 2/3] Add more capabilities to UWP app

---
 support/hololens/ServoApp/Package.appxmanifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/support/hololens/ServoApp/Package.appxmanifest b/support/hololens/ServoApp/Package.appxmanifest
index a8363f8d0fa78..5c706ebafaa61 100644
--- a/support/hololens/ServoApp/Package.appxmanifest
+++ b/support/hololens/ServoApp/Package.appxmanifest
@@ -37,5 +37,7 @@
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
+    <Capability Name="codeGeneration" />
+    <Capability Name="privateNetworkClientServer" />
   </Capabilities>
 </Package>
\ No newline at end of file

From 3e4cac3481dcfc6ebe667be950dd40fe5fc91bc3 Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Sat, 21 Sep 2019 09:43:13 +0200
Subject: [PATCH 3/3] Cleanup AppPackages on mach clean

---
 .gitignore                     | 1 +
 python/servo/build_commands.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index ba1ba3c1d669b..142ce91e4b575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,4 +58,5 @@ support/hololens/ServoApp/support/
 support/hololens/ServoApp/Debug/
 support/hololens/ServoApp/Release/
 support/hololens/packages/
+support/hololens/AppPackages/
 support/hololens/.vs/
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index f5ea973939146..9d9f90331d515 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -742,6 +742,7 @@ def clean(self, manifest_path=None, params=[], verbose=False):
             "support/hololens/ServoApp/Debug/",
             "support/hololens/ServoApp/Release/",
             "support/hololens/packages/",
+            "support/hololens/AppPackages/",
         ]
 
         for uwp_artifact in uwp_artifacts: