Upgrade github actions agents to latest

.github/workflows/apps.yml

@@ -27,27 +27,27 @@ jobs:
           git --version
 
       - name: Configure Windows
-        if: matrix.os == 'windows-latest'
+        if: ${{ startsWith(matrix.os, 'windows') }}
         run: cmake ${{github.workspace}} -Ax64 -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} -DPACKAGE_OUTPUT_FILE_PREFIX=${{github.workspace}}/dist -DENABLE_SWIG=OFF -DENABLE_PORTABLE=ON -DDISABLE_PACKAGE_SUBDIR=ON
 
       - name: Configure OSX
-        if: matrix.os == 'macOS-latest'
+        if: ${{ startsWith(matrix.os, 'macOS') }}
         run: cmake ${{github.workspace}} -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} -DPACKAGE_OUTPUT_FILE_PREFIX=${{github.workspace}}/dist -DENABLE_SWIG=OFF -DENABLE_PORTABLE=ON -DDISABLE_PACKAGE_SUBDIR=ON
 
       - name: Build OSX and Windows
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         run: cmake --build build --config ${{matrix.buildtype}}
 
       - name: Test OSX and Windows
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         run: cmake --build build --config ${{matrix.buildtype}} --target check
 
       - name: Package OSX and Windows
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         run: cmake --build build --config ${{matrix.buildtype}} --target bundle
 
       - name: Linux Build, Test and Package in Docker
-        if: matrix.os == 'ubuntu-latest'
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: docker run --rm -v ${{github.workspace}}/:/io ezralanglois/interop bash -c "cmake /io -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} -DPACKAGE_OUTPUT_FILE_PREFIX=/io/dist -DENABLE_SWIG=OFF -DENABLE_PORTABLE=ON -DDISABLE_PACKAGE_SUBDIR=ON && cmake --build build && cmake --build build --target check && cmake --build build --target bundle"
 
       - name: Test Artifacts

.github/workflows/dotnet.yml

@@ -12,13 +12,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-13]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
         buildtype: ["Debug", "Release"]
 
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
 
       - name: Setup Git name
         run: |
@@ -28,31 +31,31 @@ jobs:
           mkdir dist
 
       - name: Configure Windows
-        if: matrix.os == 'windows-latest'
+        if: ${{ startsWith(matrix.os, 'windows') }}
         run: cmake ${{github.workspace}} -Ax64 -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} -DPACKAGE_OUTPUT_FILE_PREFIX=${{github.workspace}}/dist -DENABLE_SWIG=ON -DENABLE_PORTABLE=ON -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=ON -DENABLE_PYTHON=OFF -DCSHARP_TEST_FRAMEWORK=netcoreapp8
 
       - name: Install Swig
-        if: matrix.os == 'macOS-13'
+        if: ${{ startsWith(matrix.os, 'macOS') }}
         run: pip install swig==4.0.2 --prefix="$(pwd)/usr"
 
       - name: Configure OSX
-        if: matrix.os == 'macOS-13'
-        run: cmake ${{github.workspace}} -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} -DPACKAGE_OUTPUT_FILE_PREFIX=${{github.workspace}}/dist -DENABLE_SWIG=ON -DENABLE_PORTABLE=ON -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=ON -DENABLE_PYTHON=OFF -DCSHARP_TEST_FRAMEWORK=netcoreapp8 -DSWIG_EXECUTABLE=$(ls $(pwd)/usr/lib/python3.*/site-packages/swig/data/bin/swig) -DSWIG_DIR=$(dirname $(ls $(pwd)/usr/lib/python3.*/site-packages/swig/data/share/swig/4.0.2/swig.swg))
+        if: ${{ startsWith(matrix.os, 'macOS') }}
+        run: cmake ${{github.workspace}} -B${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} -DPACKAGE_OUTPUT_FILE_PREFIX=${{github.workspace}}/dist -DENABLE_SWIG=ON -DENABLE_PORTABLE=ON -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=ON -DENABLE_PYTHON=OFF -DCSHARP_TEST_FRAMEWORK=netcoreapp9 -DSWIG_EXECUTABLE=$(ls $(pwd)/usr/lib/python3.*/site-packages/swig/data/bin/swig) -DSWIG_DIR=$(dirname $(ls $(pwd)/usr/lib/python3.*/site-packages/swig/data/share/swig/4.0.2/swig.swg)) -DDotNetStandard_EXECUTABLE=${{env.DOTNET_ROOT}}/dotnet
 
       - name: Build OSX and Windows
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         run: cmake --build build --config ${{matrix.buildtype}}
 
       - name: Test OSX and Windows
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         run: cmake --build build --config ${{matrix.buildtype}} --target check
 
       - name: Package OSX and Windows
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         run: cmake --build build --config ${{matrix.buildtype}} --target nupack
 
       - name: Linux Build, Test and Package in Docker
-        if: matrix.os == 'ubuntu-latest'
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: docker run --rm -v ${{github.workspace}}/:/io ezralanglois/interop bash -c "cmake /io -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} -DPACKAGE_OUTPUT_FILE_PREFIX=/io/dist -DENABLE_SWIG=ON -DENABLE_PORTABLE=ON -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=ON -DENABLE_PYTHON=OFF && cmake --build build && cmake --build build --target check && cmake --build build --target nupack"
 
       - name: Test Artifacts

.github/workflows/python.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-2019, macOS-13]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
         pyver: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
@@ -37,38 +37,38 @@ jobs:
           git --version
 
       - name: Package Python 3.8 and earlier
-        if: matrix.os == 'ubuntu-latest' && matrix.pyver != '3.9' && matrix.pyver != '3.10' && matrix.pyver != '3.11' && matrix.pyver != '3.12' && matrix.pyver != '3.13'
+        if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.pyver == '3.8' }}
         run: docker run --rm -v ${{github.workspace}}/:/io ezralanglois/interop sh /io/tools/package.sh /io /io/dist travis OFF
 
       - name: Package Python 3.9
-        if: matrix.os == 'ubuntu-latest' && matrix.pyver == '3.9'
+        if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.pyver == '3.9' }}
         run: docker run --rm -v ${{github.workspace}}/:/io $DOCKER_IMAGE sh /io/tools/package.sh /io /io/dist travis OFF Release cp39-cp39
 
       - name: Package Python 3.10
-        if: matrix.os == 'ubuntu-latest' && matrix.pyver == '3.10'
+        if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.pyver == '3.10' }}
         run: docker run --rm -v ${{github.workspace}}/:/io $DOCKER_IMAGE sh /io/tools/package.sh /io /io/dist travis OFF Release cp310-cp310
 
       - name: Package Python 3.11
-        if: matrix.os == 'ubuntu-latest' && matrix.pyver == '3.11'
+        if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.pyver == '3.11' }}
         run: docker run --rm -v ${{github.workspace}}/:/io $DOCKER_IMAGE sh /io/tools/package.sh /io /io/dist travis OFF Release cp311-cp311
 
       - name: Package Python 3.12
-        if: matrix.os == 'ubuntu-latest' && matrix.pyver == '3.12'
+        if: ${{ startsWith(matrix.os, 'ubuntu') &&  matrix.pyver == '3.12' }}
         run: docker run --rm -v ${{github.workspace}}/:/io $DOCKER_IMAGE sh /io/tools/package.sh /io /io/dist travis OFF Release cp312-cp312
 
       - name: Package Python 3.13
-        if: matrix.os == 'ubuntu-latest' && matrix.pyver == '3.13'
+        if: ${{ startsWith(matrix.os, 'ubuntu') &&  matrix.pyver == '3.13' }}
         run: docker run --rm -v ${{github.workspace}}/:/io $DOCKER_IMAGE sh /io/tools/package.sh /io /io/dist travis OFF Release cp313-cp313
 
       - name: Windows Package Python
-        if: matrix.os == 'windows-2019'
+        if: ${{ startsWith(matrix.os, 'windows') }}
         shell: cmd
         run: |
           python -m pip install --upgrade pip setuptools wheel numpy
-          tools\package.bat Release "Visual Studio 16 2019" package_wheel "-DENABLE_APPS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=OFF -DPython_EXECUTABLE=${{ steps.cpver.outputs.python-path }}" -DENABLE_PORTABLE=ON -A x64
+          tools\package.bat Release "Visual Studio 17 2022" package_wheel "-DENABLE_APPS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=OFF -DPython_EXECUTABLE=${{ steps.cpver.outputs.python-path }} -DENABLE_PORTABLE=ON"
 
       - name: Mac OSX Package Python
-        if: matrix.os == 'macOS-latest' || matrix.os == 'macOS-13'
+        if: ${{ startsWith(matrix.os, 'macOS') }}
         run: bash ./tools/package.sh ${{github.workspace}} ${{github.workspace}}/dist travis OFF Release ${{matrix.pyver}}
 
       - uses: actions/upload-artifact@v4

cmake/Modules/csharp/UseCSharpProjectBuilder.cmake

@@ -157,6 +157,13 @@ macro( csharp_add_project type name )
     message(STATUS "DotNetStandard_FOUND=${DotNetStandard_FOUND}")
     message(STATUS "CSBUILD_NUSPEC_FILE=${CSBUILD_NUSPEC_FILE}")
 
+    set(IPA_VALID_ARM64_PROCESSORS "aarch64;ARM64;arm64")
+    if(CMAKE_SYSTEM_PROCESSOR IN_LIST IPA_VALID_ARM64_PROCESSORS)
+        set(DotNetCore_PLATFORM "arm64" CACHE STRING "C# target platform: x86, x64, anycpu, or itanium")
+    else()
+        set(DotNetCore_PLATFORM "x64" CACHE STRING "C# target platform: x86, x64, anycpu, or itanium")
+    endif()
+
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake/ConfigureFile.cmake "configure_file(\${CONFIG_INPUT_FILE} \${CONFIG_OUTPUT_FILE} @ONLY)")
     set(CSBUILD_${name}_CSPROJ "${name}_${CSBUILD_CSPROJ}")
     file(TO_NATIVE_PATH ${CSHARP_BUILDER_OUTPUT_PATH} CSHARP_BUILDER_OUTPUT_PATH_NATIVE)
@@ -172,6 +179,7 @@ macro( csharp_add_project type name )
             -DCSHARP_BUILDER_SOURCES="${CSHARP_BUILDER_SOURCES}"
             -DCSHARP_TARGET_FRAMEWORK_VERSION="${CSHARP_TARGET_FRAMEWORK_VERSION}"
             -DCSHARP_PACKAGE_REFERENCES="${CSHARP_PACKAGE_REFERENCES}"
+            -DDotNetCore_PLATFORM="${DotNetCore_PLATFORM}"
             -DMSBUILD_TOOLSET="${MSBUILD_TOOLSET}"
             -DCSHARP_IMPORTS="${CSHARP_IMPORTS}"
             -DCONFIG_INPUT_FILE="${CSBUILD_CSPROJ_IN}"

cmake/Modules/csharp/dotnetStandard.csproj.in

@@ -15,6 +15,7 @@
    <OutputPath>@CSHARP_BUILDER_OUTPUT_PATH@</OutputPath>
    <PlatformTarget>@CSHARP_PLATFORM@</PlatformTarget>
    <AssemblyName>@CSHARP_BUILDER_OUTPUT_NAME@</AssemblyName>
+   <PlatformTarget>@DotNetCore_PLATFORM@</PlatformTarget>
    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>

docs/src/changes.md

@@ -1,5 +1,13 @@
 # Changes {#changes}
 
+## v1.6.0
+
+| Date       | Description                                                            |
+|------------|------------------------------------------------------------------------|
+| 2025-06-11 | Add support for ARM Mac                                                |
+| 2025-06-10 | Upgrade github actions agents to latest                                |
+| 2025-06-10 | Update to Visual Studio 17 2022 (workaround segfault in MSVC compiler) |
+
 ## v1.5.0
 
 | Date       | Description                                  |

src/ext/python/CMakeLists.txt

@@ -159,7 +159,15 @@ foreach(SRC ${SWIG_SRCS})
     set(SWIG_MODULE ${SWIG_MODULE_${MODULE}_REAL_NAME})
 
     if(PYTHON_GENERATED_COMPILE_FLAGS)
-        set_target_properties(${SWIG_MODULE} PROPERTIES COMPILE_FLAGS "${PYTHON_GENERATED_COMPILE_FLAGS}")
+        if(MSVC) # Workaround compiler bug
+            if(SRC MATCHES "metrics.i$")
+                set_target_properties(${SWIG_MODULE} PROPERTIES COMPILE_FLAGS "${PYTHON_GENERATED_COMPILE_FLAGS} /Od")
+            else()
+                set_target_properties(${SWIG_MODULE} PROPERTIES COMPILE_FLAGS "${PYTHON_GENERATED_COMPILE_FLAGS}")
+            endif()
+        else()
+            set_target_properties(${SWIG_MODULE} PROPERTIES COMPILE_FLAGS "${PYTHON_GENERATED_COMPILE_FLAGS}")
+        endif()
     endif()
 
     if(PYTHON_GENERATED_LINK_FLAGS)

tools/package.bat

@@ -94,7 +94,7 @@ rem ----------------------------------------------------------------------------
 
 rem https://github.com/actions/setup-python/issues/121
 echo %PREFIX_BEG% Configure %SUFFIX%
-cmake %SOURCE_DIR% -G%COMPILER% -B%BUILD_DIR% %BUILD_PARAM%
+cmake %SOURCE_DIR% -G%COMPILER% -B%BUILD_DIR% %BUILD_PARAM% -A x64
 if "%errorlevel%" == "0" goto CONFIGURE_SUCCESS
 set level=%errorlevel%
 type %BUILD_DIR%\CMakeFiles\CMakeError.log