From 40b473ad03d51fbe1d75a8267cc8b627e4b6fa52 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 15 Oct 2019 15:49:22 -0400
Subject: [PATCH 1/2] Remove unnecessary DLLs from UWP project.

---
 support/hololens/ServoApp/ServoApp.vcxproj     | 18 ------------------
 .../hololens/ServoApp/ServoApp.vcxproj.filters | 18 ------------------
 2 files changed, 36 deletions(-)

diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 791409c44eb..9c2d33d6e6b 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -302,9 +302,6 @@
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\libssl.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\msvcp140.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\orc-0.4-0.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
     </None>
@@ -320,9 +317,6 @@
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\swscale-5.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\vcruntime140.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\x264-157.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
     </None>
@@ -482,9 +476,6 @@
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\libssl.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\msvcp140.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\orc-0.4-0.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
     </None>
@@ -500,9 +491,6 @@
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\swscale-5.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\vcruntime140.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\x264-157.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
     </None>
@@ -663,9 +651,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</DeploymentContent>
     </None>
-    <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\msvcp140.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\orc-0.4-0.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
@@ -692,9 +677,6 @@
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\swscale-5.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\vcruntime140.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\x264-157.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index 1254ed98b3c..b0a165aadec 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -191,18 +191,6 @@
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\msvcp140.dll">
       <Filter>ReleaseServoDLLs</Filter>
     </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\msvcp140.dll">
-      <Filter>ReleaseARM64ServoDLLs</Filter>
-    </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\release\vcruntime140.dll">
-      <Filter>ReleaseARM64ServoDLLs</Filter>
-    </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\msvcp140.dll">
-      <Filter>DebugARM64ServoDLLs</Filter>
-    </None>
-    <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\vcruntime140.dll">
-      <Filter>DebugARM64ServoDLLs</Filter>
-    </None>
     <None Include="..\..\..\target\aarch64-uwp-windows-msvc\debug\avcodec-58.dll">
       <Filter>DebugARM64ServoDLLs</Filter>
     </None>
@@ -626,12 +614,6 @@
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\libssl.dll">
       <Filter>DebugServoDLLs</Filter>
     </None>
-    <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\vcruntime140.dll">
-      <Filter>DebugServoDLLs</Filter>
-    </None>
-    <None Include="..\..\..\target\x86_64-uwp-windows-msvc\debug\msvcp140.dll">
-      <Filter>DebugServoDLLs</Filter>
-    </None>
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\bz2.dll">
       <Filter>ReleaseServoDLLs</Filter>
     </None>

From 35dc07ab9e863b0bb7223b83decce27bf588c674 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 15 Oct 2019 15:49:35 -0400
Subject: [PATCH 2/2] Upgrade OpenXR loader package to 1.0.3.

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

diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 9c2d33d6e6b..15b4cec909d 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.1\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.props')" />
+  <Import Project="..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.3\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>
@@ -948,7 +948,7 @@
   <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.1\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.2.1\build\native\OpenXR.Loader.targets')" />
+    <Import Project="..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -957,7 +957,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.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'))" />
+    <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props'))" />
+    <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index b0a165aadec..13eb4b1b423 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -860,6 +860,7 @@
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\swresample-3.dll">
       <Filter>ReleaseServoDLLs</Filter>
     </None>
+    <None Include="$(OpenXRLoaderBinaryRoot)\bin\openxr_loader.dll" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Assets">
@@ -896,4 +897,4 @@
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/support/hololens/ServoApp/packages.config b/support/hololens/ServoApp/packages.config
index b92c2b0ec6b..45b694219be 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.1" targetFramework="native" />
+  <package id="OpenXR.Loader" version="1.0.3" targetFramework="native" />
 </packages>
\ No newline at end of file