From 5ece081af0a34c3cfd4ed2f7e0870b78036ed311 Mon Sep 17 00:00:00 2001 From: Adonais Romero González Date: Mon, 12 Jun 2023 17:26:49 -0700 Subject: [general/DCHU] Fix toolset, target version and signing errors (#994) * Set WindowsTargetPlatformVersion to target latest one instead of a fixed version * Set PlatformToolset to target latest one instead of a fixed version * Set FileDigestAlgorithm to clear errors caused by a digest algorithm not being specified * Removed exception for general\dchu\osrfx2_dchu_base; sample now builds successfully --- exclusions.csv | 3 +-- .../osrfx2_DCHU_base/osrfx2_DCHU_base.vcxproj | 14 ++++++++++++- .../osrfx2_DCHU_filter/osrfx2_DCHU_filter.vcxproj | 14 ++++++++++++- .../osrfx2_DCHU_testapp/osrusbfx2.vcxproj | 2 +- .../osrfx2_DCHU_usersvc.vcxproj | 10 ++++----- .../osrfx2_DCHU_componentsoftware.vcxproj | 10 ++++----- .../osrfx2_DCHU_extension.vcxproj | 24 ++++++++++++++++++++++ .../osrfx2_DCHU_componentsoftware.vcxproj | 10 ++++----- .../osrfx2_DCHU_extension.vcxproj | 12 +++++++++++ 9 files changed, 79 insertions(+), 20 deletions(-) diff --git a/exclusions.csv b/exclusions.csv index 83e5a880..2d977973 100644 --- a/exclusions.csv +++ b/exclusions.csv @@ -1,7 +1,6 @@ Path,Reason -general\dchu\osrfx2_dchu_base,Wrong Toolset - needs migration general\dchu\osrfx2_dchu_extension_loose,Needs fix for project not found -general\dchu\osrfx2_dchu_extension_tight,Wrong Toolset - needs migration +general\dchu\osrfx2_dchu_extension_tight,InfVerif error 1144: Device software with SoftwareType 1 may not execute on all product types general\winhec 2017 lab\toaster driver,Needs input from end user general\winhec 2017 lab\toaster support app,Needs input from end user network\trans\wfpsampler,Missing INF section; missing libs diff --git a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.vcxproj b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.vcxproj index f78f16b4..1d839558 100644 --- a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.vcxproj +++ b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.vcxproj @@ -26,7 +26,7 @@ Win32 {F915ED95-7BE9-4CDB-B09A-0D3F4C9657FE} osrfx2_DCHU_base - 10.0.17134.0 + $(LatestTargetPlatformVersion) @@ -142,6 +142,9 @@ 1.0.0.0 + + sha256 + @@ -168,6 +171,9 @@ 1.0.0.0 + + sha256 + @@ -194,6 +200,9 @@ 1.0.0.0 + + sha256 + @@ -220,6 +229,9 @@ 1.0.0.0 + + sha256 + diff --git a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_filter/osrfx2_DCHU_filter.vcxproj b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_filter/osrfx2_DCHU_filter.vcxproj index 09724ba5..02dc1573 100644 --- a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_filter/osrfx2_DCHU_filter.vcxproj +++ b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_filter/osrfx2_DCHU_filter.vcxproj @@ -27,7 +27,7 @@ Debug Win32 {1A4A32BA-1596-4F52-BC48-B85A6D8D5D12} - 10.0.17134.0 + $(LatestTargetPlatformVersion) osrfx2_DCHU_filter @@ -109,6 +109,9 @@ %(AdditionalIncludeDirectories);..\..\inc + + sha256 + @@ -127,6 +130,9 @@ %(AdditionalIncludeDirectories);..\..\inc + + sha256 + @@ -145,6 +151,9 @@ %(AdditionalIncludeDirectories);..\..\inc + + sha256 + @@ -163,6 +172,9 @@ %(AdditionalIncludeDirectories);..\..\inc + + sha256 + diff --git a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_testapp/osrusbfx2.vcxproj b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_testapp/osrusbfx2.vcxproj index bc56feac..e1450faf 100644 --- a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_testapp/osrusbfx2.vcxproj +++ b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_testapp/osrusbfx2.vcxproj @@ -25,7 +25,7 @@ Win32 {F19E45AF-8B05-4204-A66B-9BDBFE333233} osrfx2_DCHU_testapp - 10.0.17134.0 + $(LatestTargetPlatformVersion) diff --git a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_usersvc/osrfx2_DCHU_usersvc.vcxproj b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_usersvc/osrfx2_DCHU_usersvc.vcxproj index 60174c56..af9fe1c7 100644 --- a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_usersvc/osrfx2_DCHU_usersvc.vcxproj +++ b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_usersvc/osrfx2_DCHU_usersvc.vcxproj @@ -23,30 +23,30 @@ osrfx2_DCHU_usersvc Win32Proj osrfx2_DCHU_usersvc - 10.0.17134.0 + $(LatestTargetPlatformVersion) Application Unicode true - v141 + $(DefaultPlatformToolset) Application Unicode - v141 + $(DefaultPlatformToolset) Application Unicode false - v141 + $(DefaultPlatformToolset) Application Unicode - v141 + $(DefaultPlatformToolset) diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj index 8cbf7180..8819665e 100644 --- a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj @@ -22,33 +22,33 @@ {26D91630-B8FF-4102-A258-32F7D1C84E20} Win32Proj osrfx2_DCHU_componentsoftware - 10.0.16299.0 + $(LatestTargetPlatformVersion) osrfx2_DCHU_componentsoftware Application true - v141 + $(DefaultPlatformToolset) Unicode Application false - v141 + $(DefaultPlatformToolset) false Unicode Application true - v141 + $(DefaultPlatformToolset) Unicode Application false - v141 + $(DefaultPlatformToolset) false Unicode diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj index 770f6ebb..1a0a21a3 100644 --- a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj @@ -169,48 +169,72 @@ $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + diff --git a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj index e15ff8f9..24bd79ea 100644 --- a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj @@ -22,33 +22,33 @@ {26D91630-B8FF-4102-A258-32F7D1C84E20} Win32Proj osrfx2_DCHU_componentsoftware - 10.0.16299.0 + $(LatestTargetPlatformVersion) osrfx2_DCHU_componentsoftware Application true - v141 + $(DefaultPlatformToolset) Unicode Application false - v141 + $(DefaultPlatformToolset) false Unicode Application true - v141 + $(DefaultPlatformToolset) Unicode Application false - v141 + $(DefaultPlatformToolset) false Unicode diff --git a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj index 41d8a9c8..557c8a24 100644 --- a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj @@ -139,24 +139,36 @@ $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + $(InfArch) 1.0.0.0 + + sha256 + -- cgit v1.3.1