Skip to content

Commit cf18f60

Browse files
ChrisGuzakChris Guzak (WINDOWS)
andauthored
specify Win10 + maxversiontested to enable xaml APIs to be used in tests running under testhost.exe (#4888)
* specify Win10 + maxversiontested to enable xaml APIs to be used in tests * remove redundant Win10, move maxversiontested under 10 * go with a single maxversion tested, fixe quotes * use 18226 per the quirk def * use first release OS version after the quirk test --------- Co-authored-by: Chris Guzak (WINDOWS) <[email protected]>
1 parent f232324 commit cf18f60

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/testhost.x86/app.manifest

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
33
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
44
<!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
@@ -7,6 +7,8 @@
77
<application>
88
<!-- Windows 10 -->
99
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
10+
<!-- Enables Xaml Islands -->
11+
<maxversiontested Id="10.0.18362.0"/>
1012
<!-- Windows 8.1 -->
1113
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
1214
<!-- Windows Vista -->

src/testhost/app.manifest

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
33
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
44
<!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
@@ -7,6 +7,8 @@
77
<application>
88
<!-- Windows 10 -->
99
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
10+
<!-- Enables Xaml Islands -->
11+
<maxversiontested Id="10.0.18362.0"/>
1012
<!-- Windows 8.1 -->
1113
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
1214
<!-- Windows Vista -->
@@ -24,4 +26,4 @@
2426
</requestedPrivileges>
2527
</security>
2628
</trustInfo>
27-
</assembly>
29+
</assembly>

src/vstest.console/app.manifest

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<application>
88
<!-- Windows 10 -->
99
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
10+
<!-- Enables Xaml Islands -->
11+
<maxversiontested Id="10.0.18362.0"/>
1012
<!-- Windows 8.1 -->
1113
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
1214
<!-- Windows Vista -->
@@ -24,4 +26,4 @@
2426
</requestedPrivileges>
2527
</security>
2628
</trustInfo>
27-
</assembly>
29+
</assembly>

0 commit comments

Comments
 (0)