Merge branch 'main' into feature/fix-missing-hsdp-error-traces

Author: ccrugoPhilips

.devcontainer/Dockerfile

@@ -1,3 +1,3 @@
-FROM ghcr.io/philips-software/amp-devcontainer-cpp:6.7.0@sha256:004cea4fd31114f4e341bb0d777d7c3bbacd6f51d86b8eec0ca4e79ee532509d
+FROM ghcr.io/philips-software/amp-devcontainer-cpp:6.8.0@sha256:5c6d33d6d4642163481eb5cab49ccd861be6b558c45b4902616bc653c7e22e2a
 
 HEALTHCHECK NONE

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
   host_build_test_container:
     name: Host Build & Test (amp-devcontainer-cpp)
     runs-on: ubuntu-latest
-    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.7.0@sha256:004cea4fd31114f4e341bb0d777d7c3bbacd6f51d86b8eec0ca4e79ee532509d # v6.7.0
+    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.8.0@sha256:5c6d33d6d4642163481eb5cab49ccd861be6b558c45b4902616bc653c7e22e2a # v6.8.0
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -74,7 +74,7 @@ jobs:
   host_build_test_clang_msvc:
     name: Host Build & Test (clang-msvc)
     runs-on: ubuntu-latest
-    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.7.0@sha256:004cea4fd31114f4e341bb0d777d7c3bbacd6f51d86b8eec0ca4e79ee532509d # v6.7.0
+    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.8.0@sha256:5c6d33d6d4642163481eb5cab49ccd861be6b558c45b4902616bc653c7e22e2a # v6.8.0
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:

.github/workflows/static-analysis.yml

@@ -18,7 +18,7 @@ jobs:
   sonar:
     name: SonarCloud
     runs-on: ubuntu-latest
-    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.7.0@sha256:004cea4fd31114f4e341bb0d777d7c3bbacd6f51d86b8eec0ca4e79ee532509d # v6.7.0
+    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.8.0@sha256:5c6d33d6d4642163481eb5cab49ccd861be6b558c45b4902616bc653c7e22e2a # v6.8.0
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -63,7 +63,7 @@ jobs:
   codeql:
     name: CodeQL
     runs-on: ubuntu-latest
-    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.7.0@sha256:004cea4fd31114f4e341bb0d777d7c3bbacd6f51d86b8eec0ca4e79ee532509d # v6.7.0
+    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.8.0@sha256:5c6d33d6d4642163481eb5cab49ccd861be6b558c45b4902616bc653c7e22e2a # v6.8.0
     permissions:
       security-events: write
     steps:

cmake/toolchain-clang-x86_64-pc-windows-msvc.cmake

@@ -20,6 +20,8 @@ else()
 endif()
 
 set(CMAKE_RC_STANDARD_INCLUDE_DIRECTORIES ${WINDOWS_SDK_ROOT}/sdk/include/um ${WINDOWS_SDK_ROOT}/sdk/include/ucrt ${WINDOWS_SDK_ROOT}/sdk/include/shared)
+set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES ${WINDOWS_SDK_ROOT}/sdk/include/um ${WINDOWS_SDK_ROOT}/sdk/include/ucrt ${WINDOWS_SDK_ROOT}/sdk/include/shared)
+set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${WINDOWS_SDK_ROOT}/sdk/include/um ${WINDOWS_SDK_ROOT}/sdk/include/ucrt ${WINDOWS_SDK_ROOT}/sdk/include/shared)
 
 find_program(CMAKE_C_COMPILER NAMES clang-cl REQUIRED)
 find_program(CMAKE_CXX_COMPILER NAMES clang-cl REQUIRED)