Skip to content

Commit 9014cc3

Browse files
5an7y5an7y
authored
Merge branch 'microsoft:main' into main
2 parents a0d6b25 + 9ca0b0d commit 9014cc3

4 files changed

Lines changed: 34 additions & 33 deletions

File tree

‎Build-SampleSet.ps1‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,20 @@ else {
103103
Write-Error "Could not determine build environment."
104104
exit 1
105105
}
106-
#
107106

108-
# Be lenient with EWDK builds that do not include the package information
107+
# Determine WDK Visual Studio Component version
108+
#
109+
# Be lenient with EWDK builds that do not include the component information
109110
if ($build_environment -match '^EWDK') {
110-
$wdk_extension_ver = "(package is not included for EWDK builds)"
111+
$wdk_vs_component_ver = "(WDK Visual Studio Component Version is not included for EWDK builds)"
111112
} else {
112113
# Get the WDK extension version from installed packages
113-
$wdk_extension_ver = Get-ChildItem "${env:ProgramData}\Microsoft\VisualStudio\Packages\Microsoft.Windows.DriverKit,version=*" -ErrorAction SilentlyContinue
114-
if (-not $wdk_extension_ver) {
115-
Write-Error "No version of the WDK Visual Studio Extension could be found. The WDK Extension is not installed."
114+
$wdk_vs_component_ver = Get-ChildItem "${env:ProgramData}\Microsoft\VisualStudio\Packages\Microsoft.Windows.DriverKit,version=*" -ErrorAction SilentlyContinue
115+
if (-not $wdk_vs_component_ver) {
116+
Write-Error "WDK Visual Studio Component version not found. Please ensure the WDK Component is installed."
116117
exit 1
117118
}
118-
$wdk_extension_ver = [regex]::Match($wdk_extension_ver.Name, '(\d+\.){3}\d+').Value
119+
$wdk_vs_component_ver = [regex]::Match($wdk_vs_component_ver.Name, '(\d+\.){3}\d+').Value
119120
}
120121

121122
#
@@ -180,22 +181,22 @@ $jresult = @{
180181

181182
$SolutionsTotal = $sampleSet.Count * $Configurations.Count * $Platforms.Count
182183

183-
Write-Output "WDK Build Environment: $build_environment"
184-
Write-Output "WDK Build Number: $build_number"
184+
Write-Output "WDK Build Environment: $build_environment"
185+
Write-Output "WDK Build Number: $build_number"
185186
if (($build_environment -eq "GitHub") -or ($build_environment -eq "NuGet")) {
186-
Write-Output "WDK Nuget Version: $nuget_package_version"
187+
Write-Output "WDK Nuget Version: $nuget_package_version"
187188
}
188-
Write-Output "WDK Extension Version: $wdk_extension_ver"
189-
Write-Output "Samples: $($sampleSet.Count)"
190-
Write-Output "Configurations: $($Configurations.Count) ($Configurations)"
191-
Write-Output "Platforms: $($Platforms.Count) ($Platforms)"
192-
Write-Output "InfVerif_AdditionalOptions: $InfVerif_AdditionalOptions"
193-
Write-Output "Combinations: $SolutionsTotal"
194-
Write-Output "LogicalProcessors: $LogicalProcessors"
195-
Write-Output "ThrottleFactor: $ThrottleFactor"
196-
Write-Output "ThrottleLimit: $ThrottleLimit"
197-
Write-Output "WDS_WipeOutputs: $env:WDS_WipeOutputs"
198-
Write-Output "Disk Remaining (GB): $(((Get-Volume ((Get-Item ".").PSDrive.Name)).SizeRemaining) / 1GB)"
189+
Write-Output "WDK Visual Studio Component Version: $wdk_vs_component_ver"
190+
Write-Output "Samples: $($sampleSet.Count)"
191+
Write-Output "Configurations: $($Configurations.Count) ($Configurations)"
192+
Write-Output "Platforms: $($Platforms.Count) ($Platforms)"
193+
Write-Output "InfVerif_AdditionalOptions: $InfVerif_AdditionalOptions"
194+
Write-Output "Combinations: $SolutionsTotal"
195+
Write-Output "LogicalProcessors: $LogicalProcessors"
196+
Write-Output "ThrottleFactor: $ThrottleFactor"
197+
Write-Output "ThrottleLimit: $ThrottleLimit"
198+
Write-Output "WDS_WipeOutputs: $env:WDS_WipeOutputs"
199+
Write-Output "Disk Remaining (GB): $(((Get-Volume ((Get-Item ".").PSDrive.Name)).SizeRemaining) / 1GB)"
199200
Write-Output ""
200201
Write-Output "T: Combinations"
201202
Write-Output "B: Built"

‎Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
2-
<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/>
3-
<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/>
4-
<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/>
5-
<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/>
6-
<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.props')"/>
2+
<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/>
3+
<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/>
4+
<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/>
5+
<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/>
6+
<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.props')"/>
77
</Project>

‎packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.4204" targetFramework="native" />
4-
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.4204" targetFramework="native" />
5-
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.4204" targetFramework="native" />
6-
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.4204" targetFramework="native" />
7-
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.4204" targetFramework="native" />
3+
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.6584" targetFramework="native" />
4+
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.6584" targetFramework="native" />
5+
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.6584" targetFramework="native" />
6+
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.6584" targetFramework="native" />
7+
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.6584" targetFramework="native" />
88
</packages>

‎serial/serial/ioctl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@ Return Value:
20322032
//
20332033
// Override the default settings from allow user control to do not allow.
20342034
//
2035-
wakeSettings.UserControlOfWakeSettings = IdleDoNotAllowUserControl;
2035+
wakeSettings.UserControlOfWakeSettings = WakeDoNotAllowUserControl;
20362036
status = WdfDeviceAssignSxWakeSettings(pDevExt->WdfDevice, &wakeSettings);
20372037
if (!NT_SUCCESS(status)) {
20382038
SerialDbgPrintEx(TRACE_LEVEL_ERROR, DBG_PNP, "WdfDeviceAssignSxWakeSettings failed %x \n", status);
@@ -2050,7 +2050,7 @@ Return Value:
20502050
// Override the default settings.
20512051
//
20522052
wakeSettings.Enabled = WdfFalse; // Disables wait-wake
2053-
wakeSettings.UserControlOfWakeSettings = IdleDoNotAllowUserControl;
2053+
wakeSettings.UserControlOfWakeSettings = WakeDoNotAllowUserControl;
20542054
status = WdfDeviceAssignSxWakeSettings(pDevExt->WdfDevice, &wakeSettings);
20552055
if (!NT_SUCCESS(status)) {
20562056
SerialDbgPrintEx(TRACE_LEVEL_ERROR, DBG_PNP, "WdfDeviceAssignSxWakeSettings failed %x \n", status);

0 commit comments

Comments
 (0)