diff options
| author | Jakob Lichtenberg (170957) <[email protected]> | 2024-06-28 11:45:49 -0700 |
|---|---|---|
| committer | Jakob Lichtenberg (170957) <[email protected]> | 2024-06-28 11:45:49 -0700 |
| commit | bfb5cf0ba9ea78233b92a8d60c66626a5f2fcc14 (patch) | |
| tree | 17d01000199c2caceae7efbb4a70ab8a4ecd2ab2 | |
| parent | cfe00b2235113a618b52f2a9fca9ac5dce5ca9fe (diff) | |
Merge branch 'main' into user/jakobl/do_not_set_TargetVersionuser/jakobl/do_not_set_TargetVersion
| -rw-r--r-- | Build-Sample.ps1 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Build-Sample.ps1 b/Build-Sample.ps1 index 4f4ec639..bc63972d 100644 --- a/Build-Sample.ps1 +++ b/Build-Sample.ps1 @@ -138,14 +138,6 @@ if (-not $configurationIsSupported) } Write-Verbose "Building Sample: $SampleName; Configuration: $Configuration; Platform: $Platform {" -<<<<<<< HEAD -msbuild $solutionFile -clp:Verbosity=m -t:rebuild -property:Configuration=$Configuration -property:Platform=$Platform -p:InfVerif_AdditionalOptions="$InfVerif_AdditionalOptions" -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))) - Get-ChildItem -path $Directory -Recurse -Include x64|Remove-Item -Recurse - Get-ChildItem -path $Directory -Recurse -Include arm64|Remove-Item -Recurse -======= $myexit=0 @@ -160,7 +152,7 @@ for ($i=0; $i -le 2; $i++) { $warnLogFilePath = "$LogFilesDirectory\$SampleName.$Configuration.$Platform.$i.wrn" $OutLogFilePath = "$LogFilesDirectory\$SampleName.$Configuration.$Platform.$i.out" - msbuild $solutionFile -clp:Verbosity=m -t:rebuild -property:Configuration=$Configuration -property:Platform=$Platform -p:TargetVersion=Windows10 -p:InfVerif_AdditionalOptions="$InfVerif_AdditionalOptions" -warnaserror -flp1:errorsonly`;logfile=$errorLogFilePath -flp2:WarningsOnly`;logfile=$warnLogFilePath -noLogo > $OutLogFilePath + msbuild $solutionFile -clp:Verbosity=m -t:rebuild -property:Configuration=$Configuration -property:Platform=$Platform -p:InfVerif_AdditionalOptions="$InfVerif_AdditionalOptions" -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))) @@ -193,7 +185,6 @@ for ($i=0; $i -le 2; $i++) { Write-Warning "`u{274C} Build failed. Retrying to see if sporadic..." } } ->>>>>>> main } if ($myexit -eq 1) |