From c90c32238c76f4b437598d6c162d6c03ccb01e62 Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Tue, 17 Sep 2019 07:32:23 +0200
Subject: [PATCH 1/2] Update OpenXRLoader Nuget package

---
 support/hololens/ServoApp/ServoApp.vcxproj         | 12 +++++++-----
 support/hololens/ServoApp/ServoApp.vcxproj.filters |  2 +-
 support/hololens/ServoApp/packages.config          |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index ffafbda050a..11a2569a74a 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props')" />
+  <Import Project="..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" />
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -986,14 +986,16 @@
     <Midl Include="ServoControl\ServoControl.idl" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="PropertySheet.props" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets" Condition="Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" />
-    <Import Project="..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets')" />
+    <Import Project="..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -1002,7 +1004,7 @@
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets'))" />
-    <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.props'))" />
-    <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.2\build\native\OpenXR.Loader.targets'))" />
+    <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
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index 2f5050c59d7..d4f1f4a9de7 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -919,4 +919,4 @@
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/support/hololens/ServoApp/packages.config b/support/hololens/ServoApp/packages.config
index 769e8e7db8f..b92c2b0ec6b 100644
--- a/support/hololens/ServoApp/packages.config
+++ b/support/hololens/ServoApp/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="ANGLE.WindowsStore.Servo" version="2.1.13" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
-  <package id="OpenXR.Loader" version="1.0.2" targetFramework="native" />
-</packages>
+  <package id="OpenXR.Loader" version="1.0.2.1" targetFramework="native" />
+</packages>
\ No newline at end of file

From 94eeea36645a8279ef0aa7a7344244f6b60baf19 Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Tue, 17 Sep 2019 07:33:12 +0200
Subject: [PATCH 2/2] "mach clean" cleans uwp artifacts

---
 .gitignore                     | 36 +++-------------------------------
 python/servo/build_commands.py | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9d754bc569..ba1ba3c1d66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,37 +55,7 @@ support/hololens/ServoApp/ARM64/
 support/hololens/ServoApp/Generated\ Files
 support/hololens/ServoApp/BundleArtifacts/
 support/hololens/ServoApp/support/
-
-# Ignore thumbnails created by Windows
-support/hololens/ServoApp/Thumbs.db
-
-# Ignore files built by Visual Studio
-support/hololens/ServoApp/*.obj
-support/hololens/ServoApp/*.exe
-support/hololens/ServoApp/*.pdb
-support/hololens/ServoApp/*.user
-support/hololens/ServoApp/*.aps
-support/hololens/ServoApp/*.pch
-support/hololens/ServoApp/*.vspscc
-support/hololens/ServoApp/*_i.c
-support/hololens/ServoApp/*_p.c
-support/hololens/ServoApp/*.ncb
-support/hololens/ServoApp/*.suo
-support/hololens/ServoApp/*.tlb
-support/hololens/ServoApp/*.tlh
-support/hololens/ServoApp/*.bak
-support/hololens/ServoApp/*.cache
-support/hololens/ServoApp/*.ilk
-support/hololens/ServoApp/*.log
-support/hololens/ServoApp/[Bb]in
-support/hololens/ServoApp/[Dd]ebug*/
-support/hololens/ServoApp/*.lib
-support/hololens/ServoApp/*.sbr
-support/hololens/ServoApp/obj/
-support/hololens/ServoApp/[Rr]elease*/
-support/hololens/ServoApp/_ReSharper*/
-support/hololens/ServoApp/[Tt]est[Rr]esult*
-support/hololens/.vs/
-
-# Nuget packages folder
+support/hololens/ServoApp/Debug/
+support/hololens/ServoApp/Release/
 support/hololens/packages/
+support/hololens/.vs/
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index e07a7666e0e..bbd4eca73da 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -741,6 +741,26 @@ class MachCommands(CommandBase):
             print('Removing virtualenv directory: %s' % virtualenv_path)
             shutil.rmtree(virtualenv_path)
 
+        uwp_artifacts = [
+            "support/hololens/x64/",
+            "support/hololens/ARM/",
+            "support/hololens/ARM64/",
+            "support/hololens/ServoApp/x64/",
+            "support/hololens/ServoApp/ARM/",
+            "support/hololens/ServoApp/ARM64/",
+            "support/hololens/ServoApp/Generated Files/",
+            "support/hololens/ServoApp/BundleArtifacts/",
+            "support/hololens/ServoApp/support/",
+            "support/hololens/ServoApp/Debug/",
+            "support/hololens/ServoApp/Release/",
+            "support/hololens/packages/",
+        ]
+
+        for uwp_artifact in uwp_artifacts:
+            dir_path = path.join(self.get_top_dir(), uwp_artifact)
+            if path.exists(dir_path):
+                shutil.rmtree(dir_path)
+
         opts = ["--manifest-path", manifest_path or path.join(self.context.topdir, "Cargo.toml")]
         if verbose:
             opts += ["-v"]