summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakobL-MSFT <[email protected]>2024-02-06 18:07:09 -0800
committerGitHub <[email protected]>2024-02-06 18:07:09 -0800
commitaff38669771c597fbd008a7a018993f4e2814d62 (patch)
tree189585da2de36ce17217a4caba1b8b4bbe135620
parent1ad137b6e5a762d3dc0ea0e0bd95f4e46e2dd329 (diff)
Simplify MSBuild Flags (#1093)
* user/jakobl/simplify_flags * user/jakobl/simplify_flags * Update Build-Sample.ps1 * Merge with upcoming PR https://github.com/microsoft/Windows-driver-samples/pull/1088 * white space only change
-rw-r--r--Build-Sample.ps13
-rw-r--r--nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj12
-rw-r--r--thermal/simsensor/simsensor.vcxproj11
3 files changed, 23 insertions, 3 deletions
diff --git a/Build-Sample.ps1 b/Build-Sample.ps1
index 4fdf93b8..0ef9d051 100644
--- a/Build-Sample.ps1
+++ b/Build-Sample.ps1
@@ -142,8 +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:clean,build -property:Configuration=$Configuration -property:Platform=$Platform -p:TargetVersion=Windows10 -p:InfVerif_AdditionalOptions="$InfVerif_AdditionalOptions" -p:SignToolWS=/fdws -p:DriverCFlagAddOn=/wd4996 -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:TargetVersion=Windows10 -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)))
diff --git a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj
index ce9fe362..38113dbd 100644
--- a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj
+++ b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj
@@ -78,6 +78,18 @@
<ClCompile>
<EnablePREfast>true</EnablePREfast>
</ClCompile>
+ <DriverSign>
+ <FileDigestAlgorithm Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sha256</FileDigestAlgorithm>
+ </DriverSign>
+ <DriverSign>
+ <FileDigestAlgorithm Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sha256</FileDigestAlgorithm>
+ </DriverSign>
+ <DriverSign>
+ <FileDigestAlgorithm Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">sha256</FileDigestAlgorithm>
+ </DriverSign>
+ <DriverSign>
+ <FileDigestAlgorithm Condition="'$(Configuration)|$(Platform)'=='Release|x64'">sha256</FileDigestAlgorithm>
+ </DriverSign>
</ItemDefinitionGroup>
<ItemGroup>
<FilesToPackage Include="$(TargetPath)" />
diff --git a/thermal/simsensor/simsensor.vcxproj b/thermal/simsensor/simsensor.vcxproj
index a155d12a..1d77a7de 100644
--- a/thermal/simsensor/simsensor.vcxproj
+++ b/thermal/simsensor/simsensor.vcxproj
@@ -106,7 +106,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc\</AdditionalIncludeDirectories>
</ResourceCompile>
<DriverSign>
- <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+ <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
</DriverSign>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -126,6 +126,9 @@
<PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1;STRICT=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc\</AdditionalIncludeDirectories>
</ResourceCompile>
+ <DriverSign>
+ <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
+ </DriverSign>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -144,6 +147,9 @@
<PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1;STRICT=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc\</AdditionalIncludeDirectories>
</ResourceCompile>
+ <DriverSign>
+ <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
+ </DriverSign>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -162,6 +168,9 @@
<PreprocessorDefinitions>%(PreprocessorDefinitions);DRIVER=1;STRICT=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc\</AdditionalIncludeDirectories>
</ResourceCompile>
+ <DriverSign>
+ <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
+ </DriverSign>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="simsensor.c" />