user/jakobl/partial_merge_develop_to_main

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)))

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