Fixed Macro issue on windows

Author: ras0219-msft

Release/tests/Common/utilities/include/common_utilities_public.h

@@ -23,14 +23,14 @@
 
 #pragma once
 
-#ifndef _MS_WINDOWS
+#if !defined(_WIN32) && !defined(__cplusplus_winrt)
 #define TEST_UTILITY_API
-#endif // _MS_WINDOWS
+#endif // !_WIN32 && !__cplusplus_winrt
 
 #ifndef TEST_UTILITY_API
 #ifdef COMMONUTILITIES_EXPORTS
-    #define TEST_UTILITY_API __declspec(dllexport)
+#define TEST_UTILITY_API __declspec(dllexport)
 #else // COMMONUTILITIES_EXPORTS
-    #define TEST_UTILITY_API __declspec(dllimport)
+#define TEST_UTILITY_API __declspec(dllimport)
 #endif // COMMONUTILITIES_EXPORTS
 #endif // TEST_UTILITY_API

Release/tests/Functional/http/utilities/include/http_test_utilities_public.h

@@ -23,14 +23,14 @@
 
 #pragma once
 
-#ifndef _MS_WINDOWS
+#if !defined(_WIN32) && !defined(__cplusplus_winrt)
 #define TEST_UTILITY_API
-#endif // _MS_WINDOWS
+#endif // !_WIN32 && !__cplusplus_winrt
 
 #ifndef TEST_UTILITY_API
 #ifdef HTTPTESTUTILITY_EXPORTS
-    #define TEST_UTILITY_API __declspec(dllexport)
-#else
-    #define TEST_UTILITY_API __declspec(dllimport)
+#define TEST_UTILITY_API __declspec(dllexport)
+#else // HTTPTESTUTILITIES_EXPORTS
+#define TEST_UTILITY_API __declspec(dllimport)
 #endif // HTTPTESTUTILITIES_EXPORTS
 #endif // TEST_UTILITY_API