From 5b77c861fe962fb390e50f64f1a22d327b28fb42 Mon Sep 17 00:00:00 2001
From: Danilo Gasques <danilod100@gmail.com>
Date: Thu, 20 Jun 2019 08:33:37 -0700
Subject: [PATCH 1/4] Upgrading to 10.0.14393.0 with v142

---
 .../Source/Shared/Media/NetworkMediaSinkStream.cpp          | 2 +-
 .../Source/Shared/MixedRemoteViewCompositor.idl             | 2 +-
 MixedRemoteViewCompositor/Source/Shared/pch.h               | 2 +-
 MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj            | 2 +-
 MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj        | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MixedRemoteViewCompositor/Source/Shared/Media/NetworkMediaSinkStream.cpp b/MixedRemoteViewCompositor/Source/Shared/Media/NetworkMediaSinkStream.cpp
index 127b4d2c..c7c85f9d 100644
--- a/MixedRemoteViewCompositor/Source/Shared/Media/NetworkMediaSinkStream.cpp
+++ b/MixedRemoteViewCompositor/Source/Shared/Media/NetworkMediaSinkStream.cpp
@@ -1057,7 +1057,7 @@ HRESULT NetworkMediaSinkStreamImpl::ProcessCameraData(
     UINT32 blobSize = 0;
 
     using float4x4 = ABI::Windows::Foundation::Numerics::Matrix4x4;
-    MFPinholeCameraIntrinsics cameraIntrinsics;
+    ABI::MixedRemoteViewCompositor::MFPinholeCameraIntrinsics cameraIntrinsics;
     float4x4 worldToCameraMatrix;
     float4x4 cameraProjectionTransform;
     float4x4 cameraViewTransform;
diff --git a/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl b/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl
index 1205e089..a5182c71 100644
--- a/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl
+++ b/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl
@@ -293,7 +293,7 @@ namespace MixedRemoteViewCompositor {
         Windows.Foundation.Numerics.Matrix4x4 worldToCameraMatrix;
         Windows.Foundation.Numerics.Matrix4x4 cameraProjectionTransform;
         Windows.Foundation.Numerics.Matrix4x4 cameraViewTransform;
-        MFPinholeCameraIntrinsics cameraIntrinsics;
+		MFPinholeCameraIntrinsics cameraIntrinsics;
     };
 
     [version(1.0)]
diff --git a/MixedRemoteViewCompositor/Source/Shared/pch.h b/MixedRemoteViewCompositor/Source/Shared/pch.h
index 9d7564d3..9eaa2b8e 100644
--- a/MixedRemoteViewCompositor/Source/Shared/pch.h
+++ b/MixedRemoteViewCompositor/Source/Shared/pch.h
@@ -75,7 +75,7 @@
 #endif
 
 // mf guids for pulling sample data
-EXTERN_GUID(MFSampleExtension_PinholeCameraIntrinsics, 0x4ee3b6c5, 0x6a15, 0x4e72, 0x97, 0x61, 0x70, 0xc1, 0xdb, 0x8b, 0x9f, 0xe3);
+//EXTERN_GUID(MFSampleExtension_PinholeCameraIntrinsics, 0x4ee3b6c5, 0x6a15, 0x4e72, 0x97, 0x61, 0x70, 0xc1, 0xdb, 0x8b, 0x9f, 0xe3);
 #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 EXTERN_GUID(MFSampleExtension_Spatial_CameraCoordinateSystem, 0x9d13c82f, 0x2199, 0x4e67, 0x91, 0xcd, 0xd1, 0xa4, 0x18, 0x1f, 0x25, 0x34);
 EXTERN_GUID(MFSampleExtension_Spatial_CameraViewTransform, 0x4e251fa4, 0x830f, 0x4770, 0x85, 0x9a, 0x4b, 0x8d, 0x99, 0xaa, 0x80, 0x9b);
diff --git a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
index 4816e0bf..c929a6ea 100644
--- a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
+++ b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
@@ -18,7 +18,7 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <ProjectName>WSA</ProjectName>
diff --git a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
index 5926eab4..2fe85784 100644
--- a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
+++ b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
@@ -14,19 +14,19 @@
     <ProjectGuid>{60B0431F-7F25-4A1E-811C-7B7DE08A4393}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Win32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

From 0b4fa94412c0c50bc38015b3c679a15a05354178 Mon Sep 17 00:00:00 2001
From: Danilo Gasques <danilod100@gmail.com>
Date: Thu, 20 Jun 2019 08:39:26 -0700
Subject: [PATCH 2/4] Upgrading to 10.0.15063.0 with v142

---
 MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj     | 4 ++--
 MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
index c929a6ea..54202358 100644
--- a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
+++ b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
@@ -18,8 +18,8 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <ProjectName>WSA</ProjectName>
   </PropertyGroup>
diff --git a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
index 2fe85784..3c2d7e97 100644
--- a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
+++ b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{60B0431F-7F25-4A1E-811C-7B7DE08A4393}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Win32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

From b93d3e4427a0e80650a7a97096c8100ccf940f3b Mon Sep 17 00:00:00 2001
From: Danilo Gasques <danilod100@gmail.com>
Date: Thu, 20 Jun 2019 09:15:14 -0700
Subject: [PATCH 3/4] Upgrading to 10.0.16299.0 with v142

---
 .../Source/Shared/MixedRemoteViewCompositor.idl      | 12 ++++++------
 MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj     |  4 ++--
 MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl b/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl
index a5182c71..489f018b 100644
--- a/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl
+++ b/MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl
@@ -15,16 +15,16 @@ import "Windows.Storage.idl";
 import "Windows.Storage.Streams.idl";
 
 // Additional imports to ensure that all required headers are included
-cpp_quote("#if defined(__cplusplus)")
-cpp_quote("}")
-cpp_quote("#endif // defined(__cplusplus)")
+//cpp_quote("#if defined(__cplusplus)")
+//cpp_quote("}")
+//cpp_quote("#endif // defined(__cplusplus)")
 cpp_quote("#include <Windows.Foundation.h>")
 cpp_quote("#if !defined(__windows2Enetworking2Esockets_h__)")
 cpp_quote("#include <Windows.Networking.Sockets.h>")
 cpp_quote("#endif // !defined(__windows2Enetworking2Esockets_h__)")
-cpp_quote("#if defined(__cplusplus)")
-cpp_quote("extern \"C\" {")
-cpp_quote("#endif // defined(__cplusplus)")
+//cpp_quote("#if defined(__cplusplus)")
+//cpp_quote("extern \"C\" {")
+//cpp_quote("#endif // defined(__cplusplus)")
 
 namespace MixedRemoteViewCompositor
 {
diff --git a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
index 54202358..5af5cfbc 100644
--- a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
+++ b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
@@ -18,8 +18,8 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.16299.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <ProjectName>WSA</ProjectName>
   </PropertyGroup>
diff --git a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
index 3c2d7e97..aea05bce 100644
--- a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
+++ b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{60B0431F-7F25-4A1E-811C-7B7DE08A4393}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Win32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

From 2a1b18e199e6ccbf6d7816e745e2ebe1b281d549 Mon Sep 17 00:00:00 2001
From: Danilo Gasques <danilod100@gmail.com>
Date: Thu, 20 Jun 2019 09:26:31 -0700
Subject: [PATCH 4/4] Upgrading to 10.0.18362.0 with v142

---
 MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj     | 4 ++--
 MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
index 5af5cfbc..c15bfb42 100644
--- a/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
+++ b/MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
@@ -18,8 +18,8 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.16299.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <ProjectName>WSA</ProjectName>
   </PropertyGroup>
diff --git a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
index aea05bce..c37550fa 100644
--- a/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
+++ b/MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{60B0431F-7F25-4A1E-811C-7B7DE08A4393}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Win32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">