Improve NuGet package management (#2671)

* Download packages into Axmol's cache directory

Author: halx99

1k/build.profiles

@@ -10,7 +10,7 @@ axslcc=1.9.6+
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible
-cmake=3.30.0~4.1.0+
+cmake=3.30.0~4.1.1+
 
 # The ninja
 ninja=1.10.0~1.12.1+

CHANGELOG.md

@@ -2,12 +2,17 @@
 
 ## Bug fixes
 
+- Fix #2669: Windows UWP not running on Windows 11 due to DriverGL initialization failure by @halx99
+- Fix #2655: Multi-touch not work on android scene contains imgui layer by @halx99
 - Fix incorrect FontAtlas when switching label rendering mode from normal to SDF by @halx99 in https://github.com/axmolengine/axmol/pull/2629
 - Fix wasm Device::getTextureDataForText will report exception when process whitespace text by @halx99
 - Fix linux label color incorrect when LabelType is STRING_TEXTURE by @halx99
 - Fix incorrect fmt::format_to use case by @halx99 in https://github.com/axmolengine/axmol/pull/2612
 - Fix llvm ver trim in genbindings.ps1 by @halx99
 - Fix Label SDF rendering issues with font resizing and other bugs by @halx99 in https://github.com/axmolengine/axmol/pull/2625
+- Fix compile error when project contains swift code by @halx99 in https://github.com/axmolengine/axmol/pull/2632
+- Fix wasm Downloader open file with wrong permision (#2666) by @AlexandreK38 in https://github.com/axmolengine/axmol/pull/2666
+- Fix failure in CMake 4.1 when targeting Windows: assembler not found by @halx99
 
 ## Improvements
 
@@ -24,12 +29,17 @@
 - Use pragma once for more header files by @halx99 in https://github.com/axmolengine/axmol/pull/2616
 - Add support set window size limits by @NgVThangBz in https://github.com/axmolengine/axmol/pull/2618
 - Renamed cpp-tests "Node: Label - New API" to "Node: Label" by @aismann in https://github.com/axmolengine/axmol/pull/2627
+- Update ImGui mult-viewports hint message by @halx99
+- Improve tests (Naming of menu entries on cpp-/lua- tests) by @aismann in https://github.com/axmolengine/axmol/pull/2640
+- Move SIMD availability detection into its own CMake file by @j-jorge in https://github.com/axmolengine/axmol/pull/2642
+- Setting CMAKE_MSVC_DEBUG_INFORMATION_FORMAT to Embedded to resolve pdb too large problem by @halx99
+- Improve NuGet package management by @halx99 in https://github.com/axmolengine/axmol/pull/2671
 
 ## SDK & Tools updates
 
 - agp: 8.11.0 => 8.11.1
 - gradle: 8.14.3 => 9.0.0
-- cmake: 4.0.3 => 4.1.0
+- cmake: 4.0.3 => 4.1.1
 
 ## 3rdparty updates
 

CMakeLists.txt

@@ -27,7 +27,7 @@
 
 # build engine library and all tests
 
-cmake_minimum_required(VERSION 3.22...4.0)
+cmake_minimum_required(VERSION 3.22...4.1)
 
 project(axmol)
 

CMakeOptions.md

@@ -41,7 +41,7 @@
   - win32: whether use ANGLE GLES backend
   - osx: whether use OpenGL instead Metal backend
   - ios/tvos: whether use GLES instead Metal backend
-- AX_CORE_PROFILE: whether strip all deprecated features, default `FALSE`, it's useful to pre-upgrade your game project to adapte future axmol versions
+- AX_CORE_PROFILE: whether strip all deprecated features, default `FALSE`, Setting this to `TRUE` before upgrading your game project helps ensure compatibility with future Axmol versions.
 - AX_ISA_LEVEL: specifiy SIMD Instructions Acceleration Level: 0~4, 0: disabled, 1: SSE2, 2: SSE4.1/NEON, 3: SSE4.2, 4: AVX2, default: 2
 - AX_GLES_PROFILE: specify GLES profile version for GLES backend, valid value `200`, `300`
 - AX_WASM_THREADS: specify wasm thread count, valid value: number: `>=0` , string: must be: `auto` or `navigator.hardwareConcurrency`(default), 

INFRA.md

@@ -1,16 +1,24 @@
 # The axmol sdk & tools references
 
-## cppwinrt
+## Microsoft.Windows.CppWinRT
 
-- [![Upstream](https://img.shields.io/github/v/release/microsoft/cppwinrt?label=Upstream)](https://github.com/microsoft/cppwinrt)
+- [![nuget](https://img.shields.io/nuget/v/Microsoft.Windows.CppWinRT?label=Upstream)](https://www.nuget.org/packages/Microsoft.Windows.CppWinRT)
 - Version: 2.0.250303.1
 - License: MIT
 - Platform: WinRT/WinUWP
 - Manged by: `cmake/Modules/AXConfigDefine.cmake`
 
+## Microsoft.Web.WebView2
+
+- [![nuget](https://img.shields.io/nuget/v/Microsoft.Web.WebView2?label=Upstream)](https://www.nuget.org/packages/Microsoft.Web.WebView2)
+- Version: 1.0.3045.78
+- License: https://www.nuget.org/packages/Microsoft.Web.WebView2/1.0.3405.78/License
+- Platform: Win32
+- Managed by: `cmake/Modules/AXConfigDefine.cmake`
+
 ## gradle
 
-- [![Upstream](https://img.shields.io/github/v/release/gradle/gradle?label=Upstream)](https://github.com/gradle/gradle)
+- [![github](https://img.shields.io/github/v/release/gradle/gradle?label=Upstream)](https://github.com/gradle/gradle)
 - Version: 9.0.0
 - License: Apache-2.0
 - Platform: Android

cmake/CppWinRT.props.in

@@ -1,6 +1,6 @@
 <Project>
   <!-- CppWinRT.props for Axmol Universal Apps -->
-  <Import Project="@AX_TOP_SOLUTION_DIR@\packages\Microsoft.Windows.CppWinRT\build\native\Microsoft.Windows.CppWinRT.props" />
+  <Import Project="@_NUGET_PACKAGE_DIR_N@\Microsoft.Windows.CppWinRT\build\native\Microsoft.Windows.CppWinRT.props" />
   <ItemGroup>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
   </ItemGroup>

cmake/Modules/AXBuildHelpers.cmake

@@ -243,7 +243,7 @@ function(ax_sync_target_dlls ax_target)
     if(CMAKE_GENERATOR MATCHES "Ninja")
       add_custom_command(TARGET ${ax_target} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll"
+        "${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll"
         $<TARGET_FILE_DIR:${ax_target}>)
     endif()
   endif()
@@ -609,7 +609,7 @@ macro(ax_setup_app_props app_name)
       VS_GLOBAL_AppContainerApplication true
       VS_GLOBAL_RootNameSpace "AxmolAppWinRT" # this is important for cppwinrt to fix Generated Files\XamlMetaDataProvider.idl(4): error MIDL2025: [msg]syntax error [context]: expecting NamespaceTag near "{"
     )
-    target_link_libraries(${APP_NAME} ${CMAKE_BINARY_DIR}/packages/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.targets)
+    target_link_libraries(${APP_NAME} ${_NUGET_PACKAGE_DIR}/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.targets)
   elseif(WASM)
     get_target_property(_APP_SOURCE_DIR ${app_name} SOURCE_DIR)
     set(CMAKE_EXECUTABLE_SUFFIX ".html")

cmake/Modules/AXConfigDefine.cmake

@@ -13,6 +13,12 @@ if(MSVC)
   set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
 endif()
 
+if(WINDOWS)
+  set(_NUGET_PACKAGE_DIR "${_AX_ROOT}/cache/packages" CACHE INTERNAL "" FORCE)
+  file(TO_NATIVE_PATH ${_NUGET_PACKAGE_DIR} _NUGET_PACKAGE_DIR_N)
+  set(_NUGET_PACKAGE_DIR_N "${_NUGET_PACKAGE_DIR_N}" CACHE INTERNAL "" FORCE)
+endif()
+
 # UWP min deploy target support, VS property: targetPlatformMinVersion
 if(WINRT)
   # The minmal deploy target version: Windows 10, version 1809 (Build 10.0.17763) for building msix package
@@ -23,6 +29,8 @@ if(WINRT)
   # For axmol deprecated policy, we need disable /sdl checks explicitly to avoid compiler traits invoking deprecated functions as error
   set(CMAKE_C_FLAGS "/sdl- ${CMAKE_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "/sdl- ${CMAKE_CXX_FLAGS}")
+elseif(WIN32)
+  set(AX_MSEDGE_WEBVIEW2_VERSION "1.0.3405.78" CACHE STRING "")
 endif()
 
 # config c standard
@@ -278,6 +286,7 @@ if(MSVC)
 else()
   enable_language(ASM OPTIONAL)
 endif()
+
 enable_language(ASM_NASM OPTIONAL)
 
 # we don't need cmake BUILD_TESTING feature

cmake/Modules/AXLinkHelpers.cmake

@@ -23,7 +23,7 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
   # stupid: exclude CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG to avoid cmake generate
   # .vcxproj with incorrect debug msvc runtime, should be /MDd but got /MD
   set(AXSLCC_OUT_DIR_PROJ "${AXSLCC_OUT_DIR}")
-  load_cache("${AX_ROOT_DIR}/${AX_PREBUILT_DIR}" EXCLUDE thirdparty_LIB_DEPENDS CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG)
+  load_cache("${AX_ROOT_DIR}/${AX_PREBUILT_DIR}" INCLUDE_INTERNALS _NUGET_PACKAGE_DIR EXCLUDE thirdparty_LIB_DEPENDS CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG)
   set(AXSLCC_OUT_DIR_ENGINE ${AXSLCC_OUT_DIR})
   set(AXSLCC_OUT_DIR "${AXSLCC_OUT_DIR_PROJ}" CACHE STRING "" FORCE)
   unset(AXSLCC_OUT_DIR_PROJ)
@@ -44,6 +44,7 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
   message(STATUS "AX_ENABLE_EXT_EFFEKSEER=${AX_ENABLE_EXT_EFFEKSEER}")
   message(STATUS "AX_ENABLE_EXT_LUA=${AX_ENABLE_EXT_LUA}")
   message(STATUS "AX_ENABLE_EXT_DRAWNODEEX=${AX_ENABLE_EXT_DRAWNODEEX}")
+  message(STATUS "_NUGET_PACKAGE_DIR=${_NUGET_PACKAGE_DIR}")
 
   # compile defines can't inherit when link prebuits, so need add manually
   target_compile_definitions(${APP_NAME}
@@ -262,24 +263,24 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
     if(AX_GLES_PROFILE)
       add_custom_command(TARGET ${APP_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        ${AX_ROOT_DIR}/3rdparty/angle/_x/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll
-        ${AX_ROOT_DIR}/3rdparty/angle/_x/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll
-        ${AX_ROOT_DIR}/3rdparty/angle/_x/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll
+        "${AX_ROOT_DIR}/3rdparty/angle/_x/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll"
+        "${AX_ROOT_DIR}/3rdparty/angle/_x/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll"
+        "${AX_ROOT_DIR}/3rdparty/angle/_x/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll"
         $<TARGET_FILE_DIR:${APP_NAME}>
       )
     endif()
 
     if(AX_ENABLE_MSEDGE_WEBVIEW2)
       if(CMAKE_GENERATOR MATCHES "Ninja")
-        target_link_libraries(${APP_NAME} ${AX_ROOT_DIR}/${AX_PREBUILT_DIR}/packages/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll.lib)
-        target_include_directories(${APP_NAME} PRIVATE ${AX_ROOT_DIR}/${AX_PREBUILT_DIR}/packages/Microsoft.Web.WebView2/build/native/include)
+        target_link_libraries(${APP_NAME} "${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll.lib")
+        target_include_directories(${APP_NAME} PRIVATE "${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/include")
         add_custom_command(TARGET ${APP_NAME} POST_BUILD
           COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          "${AX_ROOT_DIR}/${AX_PREBUILT_DIR}/packages/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll"
+          "${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll"
           $<TARGET_FILE_DIR:${APP_NAME}>
         )
       else()
-        target_link_libraries(${APP_NAME} ${AX_ROOT_DIR}/${AX_PREBUILT_DIR}/packages/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)
+        target_link_libraries(${APP_NAME} "${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets")
       endif()
     endif()
   endif()

core/CMakeLists.txt

@@ -32,7 +32,7 @@
 # include_guard (GLOBAL)
 
 # The version number
-set(_AX_VERSION 2.7)
+set(_AX_VERSION 2.8)
 
 if(NOT DEFINED _AX_CORE_LIB)
   set(_AX_CORE_LIB axmol CACHE INTERNAL "The axmol core lib name")
@@ -409,27 +409,26 @@ if(WINDOWS)
   endif()
 
   if(WINDOWS_STORE)
-    file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} AX_TOP_SOLUTION_DIR)
     configure_file(${_AX_ROOT}/cmake/CppWinRT.props.in ${CMAKE_BINARY_DIR}/CppWinRT.props @ONLY)
 
     # intsall cppwinrt package for xaml apps
     execute_process(COMMAND "${NUGET_EXE}"
-      install "Microsoft.Windows.CppWinRT" -Version ${AX_CPPWINRT_VERSION} -ExcludeVersion -OutputDirectory "${CMAKE_BINARY_DIR}/packages")
+      install "Microsoft.Windows.CppWinRT" -Version ${AX_CPPWINRT_VERSION} -ExcludeVersion -OutputDirectory "${_NUGET_PACKAGE_DIR}")
     set_target_properties(${_AX_CORE_LIB} PROPERTIES
-      VS_PROJECT_IMPORT ${CMAKE_BINARY_DIR}/packages/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.props
+      VS_PROJECT_IMPORT ${_NUGET_PACKAGE_DIR}/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.props
     )
-    target_link_libraries(${_AX_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.targets)
+    target_link_libraries(${_AX_CORE_LIB} ${_NUGET_PACKAGE_DIR}/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.targets)
   endif()
 
   if(AX_ENABLE_MSEDGE_WEBVIEW2)
     execute_process(COMMAND "${NUGET_EXE}"
-      install "Microsoft.Web.WebView2" -Version 1.0.992.28 -ExcludeVersion -OutputDirectory "${CMAKE_BINARY_DIR}/packages")
+      install "Microsoft.Web.WebView2" -Version ${AX_MSEDGE_WEBVIEW2_VERSION} -ExcludeVersion -OutputDirectory "${_NUGET_PACKAGE_DIR}")
 
     if(CMAKE_GENERATOR MATCHES "Ninja")
-      target_link_libraries(${_AX_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll.lib)
-      target_include_directories(${_AX_CORE_LIB} PUBLIC ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/include)
+      target_link_libraries(${_AX_CORE_LIB} ${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll.lib)
+      target_include_directories(${_AX_CORE_LIB} PUBLIC ${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/include)
     else()
-      target_link_libraries(${_AX_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)
+      target_link_libraries(${_AX_CORE_LIB} ${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)
     endif()
   endif()
 endif()