From 14e387aa1a7d67e79502015f46dac3701796a615 Mon Sep 17 00:00:00 2001
From: Tiago Koji Castro Shibata <ticastro@microsoft.com>
Date: Sat, 18 Apr 2020 20:46:01 -0700
Subject: [PATCH] Fix WinML namespace build break (#3583)

* Add missing winrt namespace

* Conditional compilation of dxcore code

* Fix TAEF macros
---
 winml/lib/Api.Image/D3DDeviceCache.cpp                 | 2 +-
 winml/lib/Common/inc/CommonDeviceHelpers.h             | 2 ++
 winml/test/api/LearningModelSessionAPITest.cpp         | 2 +-
 winml/test/common/taefTestMacros.h                     | 2 +-
 winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/winml/lib/Api.Image/D3DDeviceCache.cpp b/winml/lib/Api.Image/D3DDeviceCache.cpp
index 1aedd23709..21d46c9317 100644
--- a/winml/lib/Api.Image/D3DDeviceCache.cpp
+++ b/winml/lib/Api.Image/D3DDeviceCache.cpp
@@ -63,7 +63,7 @@ D3DDeviceCache::D3DDeviceCache(winml::LearningModelDeviceKind const& deviceKind)
   }
 #ifdef ENABLE_DXCORE
   if (support.has_dxgi == false) {
-    com_ptr<IDXCoreAdapter> spAdapter;
+    winrt::com_ptr<IDXCoreAdapter> spAdapter;
     WINML_THROW_IF_FAILED_MSG(GetDXCoreHardwareAdapterWithPreference(preference, spAdapter.put()), errStr);
     WINML_THROW_IF_FAILED(D3D12CreateDevice(spAdapter.get(), D3D_FEATURE_LEVEL_11_0, IID_PPV_ARGS(device_.put())));
   }
diff --git a/winml/lib/Common/inc/CommonDeviceHelpers.h b/winml/lib/Common/inc/CommonDeviceHelpers.h
index a14474a245..0d28f25b6c 100644
--- a/winml/lib/Common/inc/CommonDeviceHelpers.h
+++ b/winml/lib/Common/inc/CommonDeviceHelpers.h
@@ -7,6 +7,8 @@
 #include <initguid.h>
 #include <d3d11.h>
 
+#include "NamespaceAliases.h"
+
 #if __has_include("dxcore.h")
 #define ENABLE_DXCORE 1
 #endif
diff --git a/winml/test/api/LearningModelSessionAPITest.cpp b/winml/test/api/LearningModelSessionAPITest.cpp
index 2aa98d0b78..dc27735080 100644
--- a/winml/test/api/LearningModelSessionAPITest.cpp
+++ b/winml/test/api/LearningModelSessionAPITest.cpp
@@ -29,7 +29,7 @@ static void LearningModelSessionAPITestsGpuMethodSetup() {
 
 static void LearningModelSessionAPITestsGpuSkipEdgeCoreMethodSetup() {
   LearningModelSessionAPITestsGpuMethodSetup();
-  SKIP_EDGECORE
+  SKIP_EDGECORE;
 }
 
 static void CreateSessionDeviceDefault()
diff --git a/winml/test/common/taefTestMacros.h b/winml/test/common/taefTestMacros.h
index 269d404c89..0624f2041a 100644
--- a/winml/test/common/taefTestMacros.h
+++ b/winml/test/common/taefTestMacros.h
@@ -16,7 +16,7 @@ using namespace WEX::TestExecution;
     TEST_CLASS(test_class_name);
 
 #define WINML_TEST_CLASS_SETUP_CLASS(setup_class) \
-    TEST_CLASS_SETUP(TestMethodSetup) {           \
+    TEST_CLASS_SETUP(TestClassSetup) {           \
       getapi().setup_class();                     \
       return true;                                \
     }
diff --git a/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp b/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp
index 6dfb396ec9..38919439f2 100644
--- a/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp
+++ b/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp
@@ -55,12 +55,12 @@ static void ScenarioCppWinrtTestsGpuMethodSetup() {
 };
 
 static void ScenarioCppWinrtTestsSkipEdgeCoreMethodSetup() {
-  SKIP_EDGECORE
+  SKIP_EDGECORE;
 };
 
 static void ScenarioCppWinrtTestsGpuSkipEdgeCoreMethodSetup() {
   ScenarioCppWinrtTestsGpuMethodSetup();
-  SKIP_EDGECORE
+  SKIP_EDGECORE;
 };
 
 static void Sample1() {