From 6240caacbd36014e9b8a5b0d7131ce619940ba36 Mon Sep 17 00:00:00 2001 From: "Jakob Lichtenberg (170957)" Date: Wed, 14 Feb 2024 17:52:24 -0800 Subject: [PATCH 1/2] Build: Do not set TargetVersion --- Build-Sample.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build-Sample.ps1 b/Build-Sample.ps1 index 0ef9d0518..8a7cb42ef 100644 --- a/Build-Sample.ps1 +++ b/Build-Sample.ps1 @@ -142,7 +142,7 @@ $warnLogFilePath = "$LogFilesDirectory\$SampleName.$Configuration.$Platform.wrn" $OutLogFilePath = "$LogFilesDirectory\$SampleName.$Configuration.$Platform.out" Write-Verbose "Building Sample: $SampleName; Configuration: $Configuration; Platform: $Platform {" -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))) From bfb5cf0ba9ea78233b92a8d60c66626a5f2fcc14 Mon Sep 17 00:00:00 2001 From: "Jakob Lichtenberg (170957)" Date: Fri, 28 Jun 2024 11:45:49 -0700 Subject: [PATCH 2/2] Merge branch 'main' into user/jakobl/do_not_set_TargetVersion --- Build-Sample.ps1 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Build-Sample.ps1 b/Build-Sample.ps1 index 4f4ec6398..bc63972d8 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)