Add missing compilation flags for vcpkg ports (microsoft#5587)

microsoft#5567 didn't actually fix the crash we were seeing.

The actual cause of the crash seems to be that I missed adding some
compilation flags that we had added to the `.vcxproj` for cpprestsdk
when I moved the dependencies to vcpkg (which does not use the
`.vcxproj`). Specifically, I didn't set a flag to compile it without
async support, so the library used async but winget wasn't prepared for
that.

This PR adds the missing compilation flags for all ports, taken from the
project files before the migration to vcpkg. I added the flags to the
triplet files (conditionally) so that it applies the same regardless of
whether a port comes from the official registry or a local overlay.

I noticed that for `libyaml` and `jsoncpp` I missed the flags to prepare
for fuzzing, so I added a new triplet for those.

This PR also updates the pipeline to publish the compilation logs from
vcpkg for easier debugging in the future.
###### Microsoft Reviewers: [Open in
CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/5587)

Author: florelis

.github/actions/spelling/expect.txt

@@ -68,6 +68,7 @@ Browsable
 BSODs
 Buf
 buildtransitive
+buildtrees
 cancelledbyuser
 casemap
 casemappings
@@ -113,6 +114,7 @@ dacl
 datetimeoffset
 Dbg
 Dcom
+DCPPREST
 debian
 decompressor
 dedupe
@@ -126,6 +128,7 @@ desktopappinstaller
 devblogs
 devhome
 DFX
+DHAVE
 dic
 diskfull
 DISPLAYCATALOG
@@ -139,6 +142,7 @@ dustojnikhummer
 dvinns
 dwgs
 dwrite
+DYAML
 ecfr
 ecfrbrowse
 EFGH
@@ -468,6 +472,7 @@ rwgch
 rwgs
 ryfu
 sacl
+sancov
 SARL
 savepoint
 sawgc

azure-pipelines.yml

@@ -148,6 +148,14 @@ jobs:
                          /p:AppxPackageSigningEnabled=false'
       maximumCpuCount: true
 
+  - task: CopyFiles@2
+    displayName: Copy vcpkg logs
+    inputs:
+      SourceFolder: $(VCPKG_INSTALLATION_ROOT)\buildtrees
+      Contents: '**\*.log'
+      TargetFolder: '$(artifactsDir)\vcpkgLogs'
+    condition: succeededOrFailed()
+
   - task: CopyFiles@2
     displayName: 'Copy specific build artifacts'
     inputs:
@@ -285,6 +293,7 @@ jobs:
     inputs:
       targetPath: '$(artifactsDir)'
       artifact: 'Build.$(artifactIdentifier)'
+    condition: succeededOrFailed()
 
   - task: ComponentGovernanceComponentDetection@0
     displayName: Component Governance
@@ -639,6 +648,14 @@ jobs:
       msbuildArgs: '/bl:$(artifactsDir)\msbuild.binlog'
       maximumCpuCount: true
 
+  - task: CopyFiles@2
+    displayName: Copy vcpkg logs
+    inputs:
+      SourceFolder: $(VCPKG_INSTALLATION_ROOT)\buildtrees
+      Contents: '**\*.log'
+      TargetFolder: '$(artifactsDir)\vcpkgLogs'
+    condition: succeededOrFailed()
+
   - task: CopyFiles@2
     displayName: Copy Fuzzing Artifacts for Publishing
     inputs:
@@ -650,6 +667,7 @@ jobs:
     displayName: Publish Fuzzing Artifacts
     inputs:
       targetPath: '$(artifactsDir)'
+    condition: succeededOrFailed()
 
   - task: onefuzz-task@0
     inputs:

src/AppInstallerCLI.sln

@@ -183,9 +183,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VcpkgCustomTriplets", "Vcpk
 		VcpkgCustomTriplets\arm64-release.cmake = VcpkgCustomTriplets\arm64-release.cmake
 		VcpkgCustomTriplets\arm64.cmake = VcpkgCustomTriplets\arm64.cmake
 		VcpkgCustomTriplets\common.cmake = VcpkgCustomTriplets\common.cmake
+		VcpkgCustomTriplets\fuzzing.cmake = VcpkgCustomTriplets\fuzzing.cmake
+		VcpkgCustomTriplets\x64-fuzzing.cmake = VcpkgCustomTriplets\x64-fuzzing.cmake
 		VcpkgCustomTriplets\x64-release-static.cmake = VcpkgCustomTriplets\x64-release-static.cmake
 		VcpkgCustomTriplets\x64-release.cmake = VcpkgCustomTriplets\x64-release.cmake
 		VcpkgCustomTriplets\x64.cmake = VcpkgCustomTriplets\x64.cmake
+		VcpkgCustomTriplets\x86-fuzzing.cmake = VcpkgCustomTriplets\x86-fuzzing.cmake
 		VcpkgCustomTriplets\x86-release-static.cmake = VcpkgCustomTriplets\x86-release-static.cmake
 		VcpkgCustomTriplets\x86-release.cmake = VcpkgCustomTriplets\x86-release.cmake
 		VcpkgCustomTriplets\x86.cmake = VcpkgCustomTriplets\x86.cmake

src/VcpkgCustomTriplets/common.cmake

@@ -2,3 +2,19 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_C_FLAGS "/Qspectre /W3 /guard:cf")
 set(VCPKG_CXX_FLAGS "/Qspectre /W3 /guard:cf")
 set(VCPKG_INSTALL_OPTIONS, "--debug")
+
+if(PORT MATCHES "cpprestsdk")
+    set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_NO_ASYNCRTIMP /DCPPREST_EXCLUDE_WEBSOCKETS")
+    set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_NO_ASYNCRTIMP /DCPPREST_EXCLUDE_WEBSOCKETS")
+elseif(PORT MATCHES "detours")
+    set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_LIB")
+    set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_LIB")
+elseif(PORT MATCHES "jsoncpp")
+    set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_VECTOR_ANNOTATION /D_DISABLE_STRING_ANNOTATION")
+    set(VCPKG_CXX_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_VECTOR_ANNOTATION /D_DISABLE_STRING_ANNOTATION")
+elseif(PORT MATCHES "libyaml")
+    set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DYAML_DECLARE_STATIC /DHAVE_CONFIG_H")
+    set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /DYAML_DECLARE_STATIC /DHAVE_CONFIG_H")
+endif()
+
+message("Compilation flags for ${PORT}: ${VCPKG_CXX_FLAGS}")

src/VcpkgCustomTriplets/fuzzing.cmake

@@ -0,0 +1,5 @@
+if(PORT MATCHES "jsoncpp|libyaml")
+    set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div")
+    set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div")
+    set(VCPKG_LINKER_FLAGS libsancov.lib)
+endif()

src/VcpkgCustomTriplets/x64-fuzzing.cmake

@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/x64-release-static.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/fuzzing.cmake")

src/VcpkgCustomTriplets/x86-fuzzing.cmake

@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/x86-release-static.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/fuzzing.cmake")

src/vcpkg.props

@@ -41,11 +41,11 @@
     <VcpkgConfiguration>Release</VcpkgConfiguration>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Fuzzing|x64'">
-    <VcpkgTriplet>x64-release-static</VcpkgTriplet>
+    <VcpkgTriplet>x64-fuzzing</VcpkgTriplet>
     <VcpkgConfiguration>Release</VcpkgConfiguration>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Fuzzing|Win32'">
-    <VcpkgTriplet>x86-release-static</VcpkgTriplet>
+    <VcpkgTriplet>x86-fuzzing</VcpkgTriplet>
     <VcpkgConfiguration>Release</VcpkgConfiguration>
   </PropertyGroup>
 </Project>