From 7e74c8021f961544ee14e55eb56166a671d66ee3 Mon Sep 17 00:00:00 2001 From: JakobL-MSFT <110699333+JakobL-MSFT@users.noreply.github.com> Date: Mon, 22 Jan 2024 09:34:24 -0800 Subject: Partial Manual Merge of develop to main specifically to add /sw1402 (#1083) user/jakobl/partial_merge_develop_to_main --- Build-Sample.ps1 | 4 ++-- Build-SampleSet.ps1 | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Build-Sample.ps1 b/Build-Sample.ps1 index 27f1b6bb..a7c9deb2 100644 --- a/Build-Sample.ps1 +++ b/Build-Sample.ps1 @@ -145,9 +145,9 @@ Write-Verbose "Building Sample: $SampleName; Configuration: $Configuration; Plat # error 1233: Missing directive CatalogFile required for digital signature - storage\class\disk # error 2083: Section [xxx] not referenced or used - network\trans, storage\msdsm # error 2084: Service binary 'xxx' should reference a CopyFiles destination file - network\trans, wpd\wpdservicesampledriver -# errors 1324, 1420, 1421 will be excluded in main branch only until the fixes are merged. +# errors 1324, 1420, 1421, 1402 will be excluded in main branch only until the fixes are merged. # error 2086 will be excluded until the WDK used in GitHub is updated. -msbuild $solutionFile -clp:Verbosity=m -t:clean,build -property:Configuration=$Configuration -property:Platform=$Platform -p:TargetVersion=Windows10 -p:InfVerif_AdditionalOptions="/samples /msft /sw1144 /sw1199 /sw1205 /sw1233 /sw1324 /sw1420 /sw1421 /sw2083 /sw2084 /sw2086" -p:SignToolWS=/fdws -p:DriverCFlagAddOn=/wd4996 -warnaserror -flp1:errorsonly`;logfile=$errorLogFilePath -flp2:WarningsOnly`;logfile=$warnLogFilePath -noLogo > $OutLogFilePath +msbuild $solutionFile -clp:Verbosity=m -t:clean,build -property:Configuration=$Configuration -property:Platform=$Platform -p:TargetVersion=Windows10 -p:InfVerif_AdditionalOptions="/samples /msft /sw1144 /sw1199 /sw1205 /sw1233 /sw1324 /sw1420 /sw1421 /sw2083 /sw2084 /sw2086 /sw1402" -p:SignToolWS=/fdws -p:DriverCFlagAddOn=/wd4996 -warnaserror -flp1:errorsonly`;logfile=$errorLogFilePath -flp2:WarningsOnly`;logfile=$warnLogFilePath -noLogo > $OutLogFilePath if ($env:WDS_WipeOutputs -ne $null) { Write-Verbose ("WipeOutputs: "+$Directory+" "+(((Get-Volume ($DriveLetter=(Get-Item ".").PSDrive.Name)).SizeRemaining/1GB))) diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1 index 2c75143a..535ac6db 100644 --- a/Build-SampleSet.ps1 +++ b/Build-SampleSet.ps1 @@ -51,10 +51,10 @@ finally { $build_environment="" $build_number=0 # -# EWDK sets environment variable Version_Number. For example '10.0.22621.0'. +# EWDK sets environment variable BuildLab. For example 'ni_release_svc_prod1.22621.2428'. # -if($env:Version_Number -match '10.0.(?.*).0') { - $build_environment="EWDK" +if($env:BuildLab -match '(?[^.]*).(?[^.]*).(?[^.]*)') { + $build_environment=("EWDK."+$Matches.branch+"."+$Matches.build+"."+$Matches.qfe) $build_number=$Matches.build } # @@ -115,12 +115,14 @@ Import-Csv 'exclusions.csv' | ForEach-Object { } $jresult = @{ - SolutionsBuilt = 0 - SolutionsExcluded = 0 - SolutionsFailed = 0 - Results = @() - FailSet = @() - lock = [System.Threading.Mutex]::new($false) + SolutionsBuilt = 0 + SolutionsSucceeded = 0 + SolutionsExcluded = 0 + SolutionsUnsupported = 0 + SolutionsFailed = 0 + Results = @() + FailSet = @() + lock = [System.Threading.Mutex]::new($false) } $SolutionsTotal = $sampleSet.Count * $Configurations.Count * $Platforms.Count -- cgit v1.3.1 From 19e64358a658dc458e7bdc87424217f39c9e1075 Mon Sep 17 00:00:00 2001 From: zlockard Date: Mon, 22 Jan 2024 16:37:33 -0800 Subject: Fix build issues in vhid samples (#1084) * Fix build issues in vhid samples * Merge from main branch and remove entries from exclusion.csv. Still see failure 2087 for hid.hidusbfx2 * Also update hidusbfx2.inf --------- Co-authored-by: Zac Lockard Co-authored-by: Jakob Lichtenberg (170957) --- exclusions.csv | 2 -- hid/hidusbfx2/sys/hidusbfx2.inx | Bin 10346 -> 7642 bytes hid/vhidmini2/driver/kmdf/vhidmini.inx | Bin 5066 -> 4072 bytes hid/vhidmini2/driver/umdf2/VhidminiUm.inx | Bin 5556 -> 4588 bytes 4 files changed, 2 deletions(-) diff --git a/exclusions.csv b/exclusions.csv index 11330227..ebaea66a 100644 --- a/exclusions.csv +++ b/exclusions.csv @@ -7,8 +7,6 @@ general\filehistory,*,,,Deprecated APIs general\simplemediasource,Debug|arm64,,,Only Debug|arm64: LNK1181: cannot open input file 'SimpleMediaSource.lib' general\winhec 2017 lab\toaster driver,*,,,Needs input from end user general\winhec 2017 lab\toaster support app,*,,,Needs input from end user -hid\hidusbfx2,*,,22621,Only NI: Bug 48374115: NI Serviced version of infverif and NI version of Windows Driver Samples should be compatible -hid\vhidmini2,*,,22621,Only NI: Bug 48374115: NI Serviced version of infverif and NI version of Windows Driver Samples should be compatible network\trans\stmedit,*,,,Invalid Win32 architecture network\trans\wfpsampler,*,,,Missing INF section; missing libs network\wlan\wdi,*,,,Invalid architecture diff --git a/hid/hidusbfx2/sys/hidusbfx2.inx b/hid/hidusbfx2/sys/hidusbfx2.inx index 22f32303..f45b9708 100644 Binary files a/hid/hidusbfx2/sys/hidusbfx2.inx and b/hid/hidusbfx2/sys/hidusbfx2.inx differ diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx index 771d664d..e126977f 100644 Binary files a/hid/vhidmini2/driver/kmdf/vhidmini.inx and b/hid/vhidmini2/driver/kmdf/vhidmini.inx differ diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx index 30855f4a..bc5314b6 100644 Binary files a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx and b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx differ -- cgit v1.3.1 From 64c1afad486ce84bb7d7128afab0aba0fd00f9ef Mon Sep 17 00:00:00 2001 From: zlockard Date: Mon, 22 Jan 2024 18:17:04 -0800 Subject: mshidkmdf->mshidumdf (#1085) Co-authored-by: Zac Lockard --- hid/vhidmini2/driver/umdf2/VhidminiUm.inx | Bin 4588 -> 4588 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx index bc5314b6..aa617a3f 100644 Binary files a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx and b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx differ -- cgit v1.3.1