update

Author: snnn

.github/workflows/gradle-wrapper-validation.yml

@@ -10,5 +10,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v5
+      - uses: gradle/actions/wrapper-validation@v4

.github/workflows/windows.yml

@@ -13,28 +13,28 @@ jobs:
   Onnxruntime-SCA:
     runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           submodules: false
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.11.x'
           architecture: 'x64'
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v5
         with:
           node-version: 18
 
       - name: Download ORT
         shell: powershell
         run: |
-          &${{ github.workspace }}\ci_build\download_ort_release 1.14.1
+          &${{ github.workspace }}\ci_build\download_ort_release 1.22.1
 
       - name: Config cmake
         run: npm i -g @microsoft/sarif-multitool && mkdir b && cd b && cmake ../c_cxx -DCMAKE_C_FLAGS="/MP /analyze:external- /external:anglebrackets /DWIN32 /D_WINDOWS /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /W4 /Ob0 /Od /RTC1 /analyze:autolog:ext .sarif" -DCMAKE_CXX_FLAGS="/EHsc /MP /analyze:external- /external:anglebrackets /DWIN32 /D_WINDOWS /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /W4 /Ob0 /Od /RTC1 /analyze:autolog:ext .sarif" -A x64 -T host=x64 -DONNXRUNTIME_ROOTDIR=${{ github.workspace }}\onnxruntimebin && cmake --build . --config Debug && npx @microsoft/sarif-multitool merge *.sarif --recurse --output-directory=${{ github.workspace }}\output --output-file=MergeResult.sarif --merge-runs
 
       - name: Upload SARIF to GitHub
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         continue-on-error: true
         with:
           sarif_file: ${{ github.workspace }}\output\MergeResult.sarif

c_cxx/CMakeLists.txt

@@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.13)
 project(onnxruntime_samples C CXX)
 if (WIN32)
  string(APPEND CMAKE_CXX_FLAGS " /W4")
+ add_compile_definitions(-DNOMINMAX)
 else()
  string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra")
  string(APPEND CMAKE_C_FLAGS " -Wall -Wextra")
@@ -19,7 +20,7 @@ option(LIBPNG_ROOTDIR "libpng root dir")
 option(ONNXRUNTIME_ROOTDIR "onnxruntime root dir")
 include(FetchContent)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if(NOT ONNXRUNTIME_ROOTDIR)
   if(WIN32)
@@ -40,15 +41,15 @@ include_directories("${ONNXRUNTIME_ROOTDIR}/include"                           #
 link_directories("${ONNXRUNTIME_ROOTDIR}/lib")
 
 if(WIN32)
-  add_library(wil INTERFACE)
-
+  set(WIL_BUILD_PACKAGING OFF CACHE BOOL "" FORCE)
+  set(WIL_BUILD_TESTS OFF CACHE BOOL "" FORCE)
   FetchContent_Declare(
       microsoft_wil
-      URL https://github.com/microsoft/wil/archive/refs/tags/v1.0.220914.1.zip
+      URL https://github.com/microsoft/wil/archive/refs/tags/v1.0.250325.1.zip
+      EXCLUDE_FROM_ALL
     )
-  FetchContent_Populate(microsoft_wil)
-  target_include_directories(wil INTERFACE ${microsoft_wil_SOURCE_DIR}/include)
-  set(WIL_LIB wil)
+  FetchContent_MakeAvailable(microsoft_wil)
+  set(WIL_LIB "WIL::WIL")
 endif()
 
 # On Linux the samples use libjpeg and libpng for decoding images.
@@ -97,4 +98,4 @@ add_subdirectory(squeezenet)
 if(WIN32 OR PNG_FOUND)
   add_subdirectory(fns_candy_style_transfer)
 endif()
-add_subdirectory(model-explorer)
+add_subdirectory(model-explorer)

c_cxx/MNIST/CMakeLists.txt

@@ -1,9 +1,10 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
-
-cmake_minimum_required(VERSION 3.13)
-
 add_executable(mnist MNIST.cpp)
+if(WIN32)
+  target_compile_definitions(mnist PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX)
+endif()
+target_link_libraries(mnist PRIVATE WIL::WIL)
 target_link_options(mnist PRIVATE "/SUBSYSTEM:WINDOWS")
 
 copy_ort_dlls(mnist)