Skip to content

Commit

Permalink
specify Win10 + maxversiontested to enable xaml APIs to be used in te…
Browse files Browse the repository at this point in the history
…sts 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) <chrisg@ntdev.microsoft.com>
  • Loading branch information
ChrisGuzak and Chris Guzak (WINDOWS) authored Feb 26, 2024
1 parent f232324 commit cf18f60
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/testhost.x86/app.manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
Expand All @@ -7,6 +7,8 @@
<application>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
<!-- Enables Xaml Islands -->
<maxversiontested Id="10.0.18362.0"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows Vista -->
Expand Down
6 changes: 4 additions & 2 deletions src/testhost/app.manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
Expand All @@ -7,6 +7,8 @@
<application>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
<!-- Enables Xaml Islands -->
<maxversiontested Id="10.0.18362.0"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows Vista -->
Expand All @@ -24,4 +26,4 @@
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
</assembly>
4 changes: 3 additions & 1 deletion src/vstest.console/app.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<application>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
<!-- Enables Xaml Islands -->
<maxversiontested Id="10.0.18362.0"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows Vista -->
Expand All @@ -24,4 +26,4 @@
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
</assembly>

0 comments on commit cf18f60

Please sign in to comment.