Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 49b0882

Browse files
authored
[release/3.1] Backport test build fix when a newer Windows SDK is installed. (#28162)
* [release/3.1] Backport test build fix when a newer Windows SDK is installed. Backport dotnet/runtime#34513. This change enables people to build coreclr on a machine with the 10.0.19025.0 Windows SDK installed. This is a test-only change, so this has no product risk. * Update tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt
1 parent 86f85f5 commit 49b0882

File tree

5 files changed

+7
-0
lines changed

5 files changed

+7
-0
lines changed

tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
55
include_directories("../Contracts")
66
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
77

8+
add_definitions(-DWINRT_NO_MAKE_DETECTION)
9+
810
set(SOURCES
911
Component.Contracts.ArrayTesting.cpp
1012
Component.Contracts.BindingProjectionsTesting.cpp

tests/src/Interop/WinRT/NativeComponent/Component.Contracts.BindingViewModel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#pragma once
55

66
#include "Component/Contracts/BindingViewModel.g.h"
7+
#include "winrt/Windows.Foundation.Collections.h"
8+
#include "winrt/Windows.UI.Xaml.Interop.h"
79
#include <vector>
810

911
template<typename T>

tests/src/Interop/WinRT/NativeComponent/Component.Contracts.KeyValuePairTesting.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44
#include "pch.h"
55
#include "Component.Contracts.KeyValuePairTesting.h"
6+
#include "winrt/Windows.Foundation.Collections.h"
67
#include <utility>
78
#include <vector>
89

tests/src/Interop/WinRT/NativeComponent/Component.Contracts.NullableTesting.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44
#include "pch.h"
55
#include "Component.Contracts.NullableTesting.h"
6+
#include "winrt/Windows.Foundation.h"
67

78
namespace winrt::Component::Contracts::implementation
89
{

tests/src/Interop/WinRT/NativeComponent/Component.Contracts.UriTesting.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44
#include "pch.h"
55
#include "Component.Contracts.UriTesting.h"
6+
#include "winrt/Windows.Foundation.h"
67

78
namespace winrt::Component::Contracts::implementation
89
{

0 commit comments

Comments
 (0)