Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reapply "Delegate to OS RegFreeWinRT when available (>=24H1) (#4728)" (#4935) #4949

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
04c7ea4
Reapply "Delegate to OS RegFreeWinRT when available (>=24H1) (#4728)"…
DrusTheAxe Dec 10, 2024
efeed82
Merge branch 'main' into user/drustheaxe/DynDepAndURFW-DelegateToOS
DrusTheAxe Jan 6, 2025
be41f1f
Added missing dependencies for OAuth2ManagerTests
DrusTheAxe Jan 7, 2025
806c30f
Expanded tests
DrusTheAxe Jan 7, 2025
19b7e11
Modified IsSupported with temporary debugging hack to expedite testin…
DrusTheAxe Jan 7, 2025
c89516b
Removed debug hackery
DrusTheAxe Jan 7, 2025
bd81139
Test fixes
DrusTheAxe Jan 7, 2025
9a169ea
More test fiddling
DrusTheAxe Jan 10, 2025
10fb555
Merge branch 'main' into user/drustheaxe/DynDepAndURFW-DelegateToOS
DrusTheAxe Jan 10, 2025
5a636e0
Merge branch 'main' into user/drustheaxe/DynDepAndURFW-DelegateToOS
DrusTheAxe Jan 13, 2025
c3d1d8c
Merge branch 'user/drustheaxe/DynDepAndURFW-DelegateToOS' of https://…
DrusTheAxe Jan 13, 2025
2165016
Microsoft.Windows.BadgeNotifications.Projection project is missing a …
DrusTheAxe Jan 14, 2025
bef7396
Removed redundant Import
DrusTheAxe Jan 14, 2025
f89b678
Fixed bad merge
DrusTheAxe Jan 14, 2025
3267be7
Fixed WinAppSDK framework package family name construction in GetFram…
DrusTheAxe Jan 20, 2025
bb13991
Merge branch 'main' into user/drustheaxe/DynDepAndURFW-DelegateToOS
DrusTheAxe Jan 21, 2025
3f8675b
Fixed DevCheck -CheckDependencies if packages.config has no <package>…
DrusTheAxe Jan 21, 2025
758dca4
Fix test framework package Name from name-major.minor to name.major.m…
DrusTheAxe Jan 23, 2025
8c7ef93
Workaround Windows bug https://task.ms/54835001 where IsPackage*Ready…
DrusTheAxe Jan 24, 2025
86e6194
Merge branch 'main' into user/drustheaxe/DynDepAndURFW-DelegateToOS
DrusTheAxe Jan 24, 2025
9015b70
Ran devcheck -syncdependencies
DrusTheAxe Jan 24, 2025
bd09186
Fixed failing PackageManagementTests
DrusTheAxe Jan 25, 2025
f4a8a3a
Merge branch 'main' into user/drustheaxe/DynDepAndURFW-DelegateToOS
DrusTheAxe Jan 27, 2025
9229615
Updated dependnecies via DevCheck -SyncDependencies. Removed unused M…
DrusTheAxe Jan 27, 2025
de19f8f
Updated link to latest SDK rev
DrusTheAxe Jan 27, 2025
38f1d56
Fixed dependencies (syntax and usage
DrusTheAxe Jan 27, 2025
ddabde6
Put WindowsAppRuntime_UniversalBGTaskDLL back to what's in main. No i…
DrusTheAxe Jan 27, 2025
55981ef
Fixed hardcoded versions in OAuthTestApp.vcxproj (wasn't using versio…
DrusTheAxe Jan 27, 2025
1bdc702
Fixed more bad projects - Import Microsoft.Cpp.Default.props not at t…
DrusTheAxe Jan 27, 2025
3411a5e
Fixed WindowsAppRuntime_UniversalBGTaskDLL - Import Microsoft.Cpp.Def…
DrusTheAxe Jan 27, 2025
c69ede0
Added -ShowSystemInfo (default=$true) to Testall so test run output i…
DrusTheAxe Jan 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion TestAll.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ param(
[Switch]$Test,

[Parameter(Mandatory=$false)]
[Switch]$List
[Switch]$List,

[Parameter(Mandatory=$false)]
[Switch]$ShowSystemInfo=$true
)

$StartTime = Get-Date
Expand Down Expand Up @@ -175,6 +178,44 @@ function Run-Tests
}
}

function Get-SystemInfo
{
$regkey = 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion'
$productname = $(Get-Item -Path $regkey).GetValue('ProductName')
$displayversion = $(Get-Item -Path $regkey).GetValue('DisplayVersion')
$currentmajor = $(Get-Item -Path $regkey).GetValue('CurrentMajorVersionNumber')
$currentminor = $(Get-Item -Path $regkey).GetValue('CurrentMinorVersionNumber')
$currentbuild = $(Get-Item -Path $regkey).GetValue('CurrentBuild')
Write-Host "Product : $($productname) $($displayversion) $($currentmajor).$($currentminor).$($currentbuild)"

$installationtype = $(Get-Item -Path $regkey).GetValue('InstallationType')
Write-Host "InstallationType: $($installationtype)"

$editionid = $(Get-Item -Path $regkey).GetValue('EditionId')
$compositioneditionid = $(Get-Item -Path $regkey).GetValue('CompositionEditionID')
if ($editionid -eq $compositioneditionid)
{
Write-Host "Edition : $($editionid)"
}
else
{
Write-Host "Edition : $($editionid) [$($compositioneditionid)]"
}

$buildlabex = $(Get-Item -Path $regkey).GetValue('BuildLabEx')
Write-Host "Build : $($buildlabex)"

$lcuver = $(Get-Item -Path $regkey).GetValue('LCUVer')
Write-Host "LCU Version : $($lcuver)"

Write-Host "Powershell : $($PSVersionTable.PSEdition) $($PSVersionTable.PSVersion)"
}

if ($ShowSystemInfo -eq $true)
{
Get-SystemInfo
}

if ($List -eq $true)
{
List-Tests | Out-String
Expand Down
116 changes: 116 additions & 0 deletions WindowsAppRuntime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseNotifications", "dev\Notifications\BaseNotifications\BaseNotifications.vcxitems", "{2BD7A1BB-D3D8-484F-9180-409D781DCCF9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Windows.BadgeNotifications.Projection", "dev\Projections\CS\Microsoft.Windows.BadgeNotifications.Projection\Microsoft.Windows.BadgeNotifications.Projection.csproj", "{A243A58D-ABD7-4520-8C71-F492247B7B92}"
ProjectSection(ProjectDependencies) = postProject
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompatibilityOptions", "dev\CompatibilityOptions\CompatibilityOptions.vcxitems", "{1F7B9E9F-9987-490B-9E6E-093C7F63FEC4}"
EndProject
Expand All @@ -603,6 +606,46 @@ EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "OAuthTestAppPackage", "test\TestApps\OAuthTestAppPackage\OAuthTestAppPackage.wapproj", "{455C01F8-0A3E-42C4-9F22-13992EB909EC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OAuth2ManagerTests", "test\OAuth2ManagerTests\OAuth2ManagerTests.vcxproj", "{0FF6A68F-6C7F-4E66-8CB8-C0B9501060CA}"
ProjectSection(ProjectDependencies) = postProject
{455C01F8-0A3E-42C4-9F22-13992EB909EC} = {455C01F8-0A3E-42C4-9F22-13992EB909EC}
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ManualTest", "ManualTest", "{E0B0DD9F-5F0B-48A6-9D5D-132ABE480747}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloWorldAdvanced", "HelloWorldAdvanced", "{152921FE-A7C0-47AF-A58D-984E6B4899AA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "C", "C", "{EE9B5D98-8CB3-4225-BD0C-36A5BB825841}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorldAdvancedC", "test\DynamicDependency\ManualTest\HelloWorldAdvanced\C\HelloWorldAdvancedC\HelloWorldAdvancedC.vcxproj", "{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}"
ProjectSection(ProjectDependencies) = postProject
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
{F76B776E-86F5-48C5-8FC7-D2795ECC9746} = {F76B776E-86F5-48C5-8FC7-D2795ECC9746}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CPP", "CPP", "{9CC59C65-A2EE-4EFB-9889-B3870A4B48AB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CS", "CS", "{63196919-AEA8-4EA8-BFB4-08CE824249A3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorldAdvancedCPP", "test\DynamicDependency\ManualTest\HelloWorldAdvanced\CPP\HelloWorldAdvancedCPP\HelloWorldAdvancedCPP.vcxproj", "{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}"
ProjectSection(ProjectDependencies) = postProject
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
{F76B776E-86F5-48C5-8FC7-D2795ECC9746} = {F76B776E-86F5-48C5-8FC7-D2795ECC9746}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldAdvancedCS", "test\DynamicDependency\ManualTest\HelloWorldAdvanced\CS\HelloWorldAdvancedCS\HelloWorldAdvancedCS.csproj", "{9369C7DD-430B-4B52-822A-231AA2791D23}"
ProjectSection(ProjectDependencies) = postProject
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
{D6574FD6-8D13-4412-9FCB-308D44063CDA} = {D6574FD6-8D13-4412-9FCB-308D44063CDA}
{F76B776E-86F5-48C5-8FC7-D2795ECC9746} = {F76B776E-86F5-48C5-8FC7-D2795ECC9746}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldAdvancedCS_NoThrow", "test\DynamicDependency\ManualTest\HelloWorldAdvanced\CS\HelloWorldAdvancedCS_NoThrow\HelloWorldAdvancedCS_NoThrow.csproj", "{9D26A965-065A-4897-B476-4F15B0F5A19F}"
ProjectSection(ProjectDependencies) = postProject
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
{D6574FD6-8D13-4412-9FCB-308D44063CDA} = {D6574FD6-8D13-4412-9FCB-308D44063CDA}
{F76B776E-86F5-48C5-8FC7-D2795ECC9746} = {F76B776E-86F5-48C5-8FC7-D2795ECC9746}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BadgeNotificationTest", "test\BadgeNotificationTest\BadgeNotificationTest.vcxproj", "{7C8BEED1-7B27-41C5-A22F-9D6B4468F52A}"
EndProject
Expand Down Expand Up @@ -2178,6 +2221,70 @@ Global
{0FF6A68F-6C7F-4E66-8CB8-C0B9501060CA}.Release|x64.Build.0 = Release|x64
{0FF6A68F-6C7F-4E66-8CB8-C0B9501060CA}.Release|x86.ActiveCfg = Release|Win32
{0FF6A68F-6C7F-4E66-8CB8-C0B9501060CA}.Release|x86.Build.0 = Release|Win32
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|Any CPU.ActiveCfg = Debug|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|Any CPU.Build.0 = Debug|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|ARM64.ActiveCfg = Debug|ARM64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|ARM64.Build.0 = Debug|ARM64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|x64.ActiveCfg = Debug|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|x64.Build.0 = Debug|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|x86.ActiveCfg = Debug|Win32
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Debug|x86.Build.0 = Debug|Win32
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|Any CPU.ActiveCfg = Release|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|Any CPU.Build.0 = Release|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|ARM64.ActiveCfg = Release|ARM64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|ARM64.Build.0 = Release|ARM64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|x64.ActiveCfg = Release|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|x64.Build.0 = Release|x64
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|x86.ActiveCfg = Release|Win32
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78}.Release|x86.Build.0 = Release|Win32
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|Any CPU.ActiveCfg = Debug|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|Any CPU.Build.0 = Debug|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|ARM64.Build.0 = Debug|ARM64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|x64.ActiveCfg = Debug|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|x64.Build.0 = Debug|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|x86.ActiveCfg = Debug|Win32
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Debug|x86.Build.0 = Debug|Win32
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|Any CPU.ActiveCfg = Release|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|Any CPU.Build.0 = Release|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|ARM64.ActiveCfg = Release|ARM64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|ARM64.Build.0 = Release|ARM64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|x64.ActiveCfg = Release|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|x64.Build.0 = Release|x64
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|x86.ActiveCfg = Release|Win32
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3}.Release|x86.Build.0 = Release|Win32
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|Any CPU.ActiveCfg = Debug|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|Any CPU.Build.0 = Debug|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|ARM64.ActiveCfg = Debug|arm64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|ARM64.Build.0 = Debug|arm64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|x64.ActiveCfg = Debug|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|x64.Build.0 = Debug|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|x86.ActiveCfg = Debug|x86
{9369C7DD-430B-4B52-822A-231AA2791D23}.Debug|x86.Build.0 = Debug|x86
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|Any CPU.ActiveCfg = Release|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|Any CPU.Build.0 = Release|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|ARM64.ActiveCfg = Release|arm64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|ARM64.Build.0 = Release|arm64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|x64.ActiveCfg = Release|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|x64.Build.0 = Release|x64
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|x86.ActiveCfg = Release|x86
{9369C7DD-430B-4B52-822A-231AA2791D23}.Release|x86.Build.0 = Release|x86
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|Any CPU.ActiveCfg = Debug|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|Any CPU.Build.0 = Debug|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|ARM64.ActiveCfg = Debug|arm64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|ARM64.Build.0 = Debug|arm64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|x64.ActiveCfg = Debug|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|x64.Build.0 = Debug|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|x86.ActiveCfg = Debug|x86
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Debug|x86.Build.0 = Debug|x86
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|Any CPU.ActiveCfg = Release|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|Any CPU.Build.0 = Release|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|ARM64.ActiveCfg = Release|arm64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|ARM64.Build.0 = Release|arm64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|x64.ActiveCfg = Release|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|x64.Build.0 = Release|x64
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|x86.ActiveCfg = Release|x86
{9D26A965-065A-4897-B476-4F15B0F5A19F}.Release|x86.Build.0 = Release|x86
{7C8BEED1-7B27-41C5-A22F-9D6B4468F52A}.Debug|Any CPU.ActiveCfg = Debug|x64
{7C8BEED1-7B27-41C5-A22F-9D6B4468F52A}.Debug|Any CPU.Build.0 = Debug|x64
{7C8BEED1-7B27-41C5-A22F-9D6B4468F52A}.Debug|ARM64.ActiveCfg = Debug|ARM64
Expand Down Expand Up @@ -2389,6 +2496,15 @@ Global
{4CAA3052-7FAE-4C5B-A1CB-02D7F910C991} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
{455C01F8-0A3E-42C4-9F22-13992EB909EC} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
{0FF6A68F-6C7F-4E66-8CB8-C0B9501060CA} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
{E0B0DD9F-5F0B-48A6-9D5D-132ABE480747} = {17B1F036-8FC3-49E6-9464-0C1F96CEAEB9}
{152921FE-A7C0-47AF-A58D-984E6B4899AA} = {E0B0DD9F-5F0B-48A6-9D5D-132ABE480747}
{EE9B5D98-8CB3-4225-BD0C-36A5BB825841} = {152921FE-A7C0-47AF-A58D-984E6B4899AA}
{7CFBDD18-006C-4AC5-B3AD-D3C0BEA18C78} = {EE9B5D98-8CB3-4225-BD0C-36A5BB825841}
{9CC59C65-A2EE-4EFB-9889-B3870A4B48AB} = {152921FE-A7C0-47AF-A58D-984E6B4899AA}
{63196919-AEA8-4EA8-BFB4-08CE824249A3} = {152921FE-A7C0-47AF-A58D-984E6B4899AA}
{24821683-4AD8-4AA9-807A-5A9A0CDDB5F3} = {9CC59C65-A2EE-4EFB-9889-B3870A4B48AB}
{9369C7DD-430B-4B52-822A-231AA2791D23} = {63196919-AEA8-4EA8-BFB4-08CE824249A3}
{9D26A965-065A-4897-B476-4F15B0F5A19F} = {63196919-AEA8-4EA8-BFB4-08CE824249A3}
{7C8BEED1-7B27-41C5-A22F-9D6B4468F52A} = {1FDC307C-2DB7-4B40-8F18-F1057E9E0969}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
13 changes: 12 additions & 1 deletion build/AzurePipelinesTemplates/WindowsAppSDK-RunTests-Steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
inputs:
targetType: filePath
filePath: tools\DevCheck\DevCheck.ps1
arguments: -NoInteractive -Offline -Verbose -CheckTestPfx -Clean -CheckDependencies -ShowSystemInfo
arguments: -NoInteractive -Offline -Verbose -CheckTestPfx -Clean -CheckDependencies -CheckVisualStudio -ShowSystemInfo
workingDirectory: '$(Build.SourcesDirectory)'

- task: DownloadPipelineArtifact@2
Expand Down Expand Up @@ -147,6 +147,17 @@ steps:
Write-Host "WhoAmI"
Write-Host (whoami /user /groups /priv)

- task: PowerShell@2
displayName: 'Dump services'
inputs:
targetType: 'inline'
script: |
Get-Service
Get-Service | Write-Host
Get-Service | Out-Host
sc.exe queryex te.service | Write-Host
sc.exe qc te.service | Write-Host

- task: PowerShell@2
displayName: 'Run TAEF Tests'
inputs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ steps:
inputs:
targetType: filePath
filePath: tools\DevCheck\DevCheck.ps1
arguments: -NoInteractive -Offline -Verbose -CheckTestPfx -Clean -CheckDependencies -ShowSystemInfo
arguments: -NoInteractive -Offline -Verbose -CheckTestPfx -Clean -CheckDependencies -CheckVisualStudio -ShowSystemInfo
workingDirectory: '$(Build.SourcesDirectory)'

- task: PowerShell@2
Expand Down
17 changes: 11 additions & 6 deletions dev/Common/IsWindowsVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,35 @@ inline bool IsExportPresent(

inline bool IsWindows10_19H1OrGreater()
{
// GetPackageInfo2() added to kernelbase.dll in NTDDI_WIN10_19H1 (aka 19H1)
// GetPackageInfo2() added to kernelbase.dll in 19H1 (aka NTDDI_WIN10_19H1)
return IsExportPresent(L"kernelbase.dll", "GetPackageInfo2");
}

inline bool IsWindows10_20H1OrGreater()
{
// GetPackageInfo3() added to kernelbase.dll in NTDDI_WIN10_VB (aka 20H1)
// GetPackageInfo3() added to kernelbase.dll in 20H1 (aka NTDDI_WIN10_VB)
return IsExportPresent(L"kernelbase.dll", "GetPackageInfo3");
}
inline bool IsWindows11_21H2OrGreater()
{
// GetMachineTypeAttributes() added to kernelbase.dll in NTDDI_WIN10_CO (aka Windows 11 21H2)
// GetMachineTypeAttributes() added to kernelbase.dll in Windows 11 21H2 (aka NTDDI_WIN10_CO)
return IsExportPresent(L"kernelbase.dll", "GetMachineTypeAttributes");
}
inline bool IsWindows11_22H2OrGreater()
{
// GetPackageGraphRevisionId() added to kernelbase.dll in NTDDI_WIN10_NI (aka Windows 11 22H2)
// GetPackageGraphRevisionId() added to kernelbase.dll in Windows 11 22H2 (aka NTDDI_WIN10_NI)
return IsExportPresent(L"kernelbase.dll", "GetPackageGraphRevisionId");
}
inline bool IsWindows11_23H1OrGreater()
inline bool IsWindows11_24H1OrGreater()
{
// TryCreatePackageDependency2() added to in NTDDI_WIN10_GE (aka Windows 11 23H1)
// TryCreatePackageDependency2() added to in Windows 11 24H1 (aka NTDDI_WIN11_GE)
return IsExportPresent(L"kernelbase.dll", "TryCreatePackageDependency2");
}
inline bool IsWindows11_24H2OrGreater()
{
// MsixIsPackageFeatureSupported() added to in Windows 11 24H2 (aka NTDDI_WIN11_GE)
return IsExportPresent(L"appxdeploymentclient.dll", "MsixIsPackageFeatureSupported");
}
}

#endif // __ISWINDOWSVERSION_H
Loading