diff options
| author | JakobL-MSFT <[email protected]> | 2024-01-22 09:34:24 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-22 09:34:24 -0800 |
| commit | 7e74c8021f961544ee14e55eb56166a671d66ee3 (patch) | |
| tree | 1687e7e09581a4f2462e9181368a00cd4a106bd6 | |
| parent | d3e7ba7e0625b0235a51206f558b4b5574992916 (diff) | |
Partial Manual Merge of develop to main specifically to add /sw1402 (#1083)
user/jakobl/partial_merge_develop_to_main
| -rw-r--r-- | Build-Sample.ps1 | 4 | ||||
| -rw-r--r-- | 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.(?<build>.*).0') { - $build_environment="EWDK" +if($env:BuildLab -match '(?<branch>[^.]*).(?<build>[^.]*).(?<qfe>[^.]*)') { + $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 |