From c3bf3806fd5ff2121a51f6b2e74339438669e909 Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Fri, 25 Apr 2025 23:00:50 +0300 Subject: [PATCH 01/15] CI: enable multi-RID build and automated NuGet pack/publish --- nuget/Psyche-C.Native.csproj | 33 +++++++++++++++++++ nuget/buildTransitive/Psyche-C.Native.props | 26 +++++++++++++++ nuget/buildTransitive/Psyche-C.Native.targets | 13 ++++++++ 3 files changed, 72 insertions(+) create mode 100644 nuget/Psyche-C.Native.csproj create mode 100644 nuget/buildTransitive/Psyche-C.Native.props create mode 100644 nuget/buildTransitive/Psyche-C.Native.targets diff --git a/nuget/Psyche-C.Native.csproj b/nuget/Psyche-C.Native.csproj new file mode 100644 index 00000000..46d485c8 --- /dev/null +++ b/nuget/Psyche-C.Native.csproj @@ -0,0 +1,33 @@ + + + Psyche-C.Native + netstandard2.0 + 0.0.1 + Cross-platform native binaries for Psyche-C. + Denis Kudelin + LICENSE + https://github.com/Itexoft/psychec + https://github.com/Itexoft/psychec + git + README.md + true + false + false + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/buildTransitive/Psyche-C.Native.props b/nuget/buildTransitive/Psyche-C.Native.props new file mode 100644 index 00000000..fa9f15e7 --- /dev/null +++ b/nuget/buildTransitive/Psyche-C.Native.props @@ -0,0 +1,26 @@ + + + + <_PsycheC_Rid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier) + + + <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$(OS)'=='Windows_NT' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">win-x64 + <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$(OS)'=='Windows_NT' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='Arm64'">win-arm64 + + + <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">linux-x64 + <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='Arm64'">linux-arm64 + + + <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">osx-x64 + <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='Arm64'">osx-arm64 + + + <_PsycheC_NativeRelativeLibPath>runtimes\$(_PsycheC_Rid)\native + <_PsycheC_NativeLibPath>$(MSBuildThisFileDirectory)\..\$(_PsycheC_NativeRelativeLibPath) + + + + + + \ No newline at end of file diff --git a/nuget/buildTransitive/Psyche-C.Native.targets b/nuget/buildTransitive/Psyche-C.Native.targets new file mode 100644 index 00000000..41a5615e --- /dev/null +++ b/nuget/buildTransitive/Psyche-C.Native.targets @@ -0,0 +1,13 @@ + + + <_PsycheC_NativeLibs Include="$(_PsycheC_NativeLibPath)\*" /> + + + + + + + + + + \ No newline at end of file From b146917d041ea50506bca1bd7b891aa6ab55276d Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 00:04:52 +0300 Subject: [PATCH 02/15] CI: enable multi-RID build and automated NuGet pack/publish From 8ee5e06cbc9b09137ccd858830cf1a1d9fc3eeba Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 01:06:50 +0300 Subject: [PATCH 03/15] Add cnip build --- .github/workflows/multi-rid-build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 60945820..880087e2 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -1,9 +1,9 @@ name: multi-rid-build -on: [push, pull_request, workflow_dispatch] +on: [pull_request, workflow_dispatch] env: PROJECT_NAME: psychec - BUILD_TARGETS: "psychecommon psychecfe" + BUILD_TARGETS: "psychecommon psychecfe cnip" BUILD_TESTING: OFF DEBUG_SYMBOLS: true CMAKE_BUILD_TYPE: Release @@ -75,11 +75,12 @@ jobs: $out = "$(Get-Location)\artifacts" $dbg = if ($env:DEBUG_SYMBOLS -eq 'true') { '/Zi' } else { '' } $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } + $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` - -DCMAKE_C_FLAGS="/w /EHsc $dbg" ` - -DCMAKE_CXX_FLAGS="/w /EHsc $dbg /std:c++${{ env.CMAKE_CXX_STANDARD }}" ` + -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs" ` + -DCMAKE_CXX_FLAGS="/w /EHsc $dbg /std:c++${{ env.CMAKE_CXX_STANDARD }} $defs" ` -DCMAKE_SHARED_LINKER_FLAGS="$linker" ` -DCMAKE_RUNTIME_OUTPUT_DIRECTORY="$out" ` -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$out" ` From 2e13691714410fc0c864a2460edafdaaf94f0ee5 Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 03:42:01 +0300 Subject: [PATCH 04/15] Add cnip build --- .github/workflows/multi-rid-build.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 880087e2..2bb322aa 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -23,9 +23,17 @@ jobs: - ARM64 steps: - uses: actions/checkout@v4 + - name: prepare-dirs shell: pwsh run: New-Item -ItemType Directory -Force -Path artifacts + + - uses: lukka/run-vcpkg@v11 + with: + vcpkgArguments: dlfcn-win32 + vcpkgTriplet: ${{ matrix.arch == 'ARM64' && 'arm64-windows' || 'x64-windows' }} + runVcpkgInstall: true + - id: detect-mingw shell: pwsh run: | @@ -38,6 +46,7 @@ jobs: } else { "full=false" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append } + - name: build-mingw if: steps.detect-mingw.outputs.full == 'true' run: | @@ -46,6 +55,7 @@ jobs: export PATH="$PATH:/c/Program Files/CMake/bin:/c/msys64/usr/bin:/c/msys64/mingw64/bin:/c/msys64/clang-arm64/bin:/c/msys64/ucrt64/bin" mkdir -p artifacts cmake -S . -B build/mingw/${{ matrix.arch }} -G Ninja \ + -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ @@ -68,15 +78,18 @@ jobs: done fi ' + - name: configure-vs if: steps.detect-mingw.outputs.full == 'false' shell: pwsh run: | - $out = "$(Get-Location)\artifacts" - $dbg = if ($env:DEBUG_SYMBOLS -eq 'true') { '/Zi' } else { '' } + $out = "$(Get-Location)\artifacts" + $dbg = if ($env:DEBUG_SYMBOLS -eq 'true') { '/Zi' } else { '' } $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' + $tc = "$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` + -DCMAKE_TOOLCHAIN_FILE=$tc ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs" ` @@ -87,6 +100,7 @@ jobs: -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$out" ` -DBUILD_TESTING=${{ env.BUILD_TESTING }} ` ${{ env.CMAKE_EXTRA_ARGS }} + - name: build-vs if: steps.detect-mingw.outputs.full == 'false' shell: pwsh @@ -94,6 +108,7 @@ jobs: foreach ($t in $env:BUILD_TARGETS.Split()) { cmake --build build/${{ matrix.arch }} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --target $t } + - uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-win-${{ matrix.arch }} From 4a177b38da959e6c504f07d236bfdef27d2bc655 Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 03:53:57 +0300 Subject: [PATCH 05/15] Add cnip build --- .github/workflows/multi-rid-build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 2bb322aa..025838b9 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -28,11 +28,12 @@ jobs: shell: pwsh run: New-Item -ItemType Directory -Force -Path artifacts - - uses: lukka/run-vcpkg@v11 - with: - vcpkgArguments: dlfcn-win32 - vcpkgTriplet: ${{ matrix.arch == 'ARM64' && 'arm64-windows' || 'x64-windows' }} - runVcpkgInstall: true + - name: install dlfcn-win32 + shell: pwsh + run: | + $triplet = ("${{ matrix.arch }}-windows").ToLower() + vcpkg install dlfcn-win32 --triplet $triplet + "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - id: detect-mingw shell: pwsh @@ -55,7 +56,7 @@ jobs: export PATH="$PATH:/c/Program Files/CMake/bin:/c/msys64/usr/bin:/c/msys64/mingw64/bin:/c/msys64/clang-arm64/bin:/c/msys64/ucrt64/bin" mkdir -p artifacts cmake -S . -B build/mingw/${{ matrix.arch }} -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake \ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ @@ -87,9 +88,8 @@ jobs: $dbg = if ($env:DEBUG_SYMBOLS -eq 'true') { '/Zi' } else { '' } $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' - $tc = "$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` - -DCMAKE_TOOLCHAIN_FILE=$tc ` + -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs" ` From 77e03441499032e8d01a3c8347cd7dd43e1d631d Mon Sep 17 00:00:00 2001 From: Denis Kudelin Date: Sat, 26 Apr 2025 04:26:33 +0300 Subject: [PATCH 06/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 025838b9..b264665f 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -33,7 +33,7 @@ jobs: run: | $triplet = ("${{ matrix.arch }}-windows").ToLower() vcpkg install dlfcn-win32 --triplet $triplet - "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append + "VCPKG_INSTALLATION_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - id: detect-mingw shell: pwsh From c4223d29fded44e901eebae1213e5622705b2624 Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 04:45:21 +0300 Subject: [PATCH 07/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index b264665f..2205dea6 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -56,7 +56,7 @@ jobs: export PATH="$PATH:/c/Program Files/CMake/bin:/c/msys64/usr/bin:/c/msys64/mingw64/bin:/c/msys64/clang-arm64/bin:/c/msys64/ucrt64/bin" mkdir -p artifacts cmake -S . -B build/mingw/${{ matrix.arch }} -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake \ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ @@ -89,7 +89,7 @@ jobs: $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` - -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake ` + -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs" ` From fb4ce82a9c161bf36f8adb18bf5eb74b50c51cbc Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 06:40:49 +0300 Subject: [PATCH 08/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 2205dea6..9f0e5094 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -56,7 +56,7 @@ jobs: export PATH="$PATH:/c/Program Files/CMake/bin:/c/msys64/usr/bin:/c/msys64/mingw64/bin:/c/msys64/clang-arm64/bin:/c/msys64/ucrt64/bin" mkdir -p artifacts cmake -S . -B build/mingw/${{ matrix.arch }} -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" \ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ @@ -89,7 +89,7 @@ jobs: $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` - -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake ` + -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs" ` From dc0d6c0c0cf8ca4ea90764ead608270f0bee59c0 Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 07:05:08 +0300 Subject: [PATCH 09/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 9f0e5094..c34c0ce7 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -3,7 +3,7 @@ on: [pull_request, workflow_dispatch] env: PROJECT_NAME: psychec - BUILD_TARGETS: "psychecommon psychecfe cnip" + BUILD_TARGETS: "cnip psychecommon psychecfe" BUILD_TESTING: OFF DEBUG_SYMBOLS: true CMAKE_BUILD_TYPE: Release @@ -33,7 +33,10 @@ jobs: run: | $triplet = ("${{ matrix.arch }}-windows").ToLower() vcpkg install dlfcn-win32 --triplet $triplet + "VCPKG_INSTALLATION_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append + "VCPKG_TRIPLET=$triplet" | Out-File -FilePath $env:GITHUB_ENV -Append + "VCPKG_INCLUDE=$env:VCPKG_INSTALLATION_ROOT\installed\$triplet\include" | Out-File -FilePath $env:GITHUB_ENV -Append - id: detect-mingw shell: pwsh @@ -56,14 +59,15 @@ jobs: export PATH="$PATH:/c/Program Files/CMake/bin:/c/msys64/usr/bin:/c/msys64/mingw64/bin:/c/msys64/clang-arm64/bin:/c/msys64/ucrt64/bin" mkdir -p artifacts cmake -S . -B build/mingw/${{ matrix.arch }} -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" \ + -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} \ -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} \ - -DCMAKE_C_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.C_FLAGS_COMMON }}" \ - -DCMAKE_CXX_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.CXX_FLAGS_COMMON }} -std=c++${{ env.CMAKE_CXX_STANDARD }}" \ + -DCMAKE_INCLUDE_PATH="$VCPKG_INCLUDE" \ + -DCMAKE_C_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.C_FLAGS_COMMON }} -I$VCPKG_INCLUDE" \ + -DCMAKE_CXX_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.CXX_FLAGS_COMMON }} -std=c++${{ env.CMAKE_CXX_STANDARD }} -I$VCPKG_INCLUDE" \ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$(pwd)/artifacts \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$(pwd)/artifacts \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=$(pwd)/artifacts \ @@ -84,16 +88,18 @@ jobs: if: steps.detect-mingw.outputs.full == 'false' shell: pwsh run: | - $out = "$(Get-Location)\artifacts" - $dbg = if ($env:DEBUG_SYMBOLS -eq 'true') { '/Zi' } else { '' } + $out = "$(Get-Location)\artifacts" + $dbg = if ($env:DEBUG_SYMBOLS -eq 'true') { '/Zi' } else { '' } $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } - $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' + $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' + cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` - -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs" ` - -DCMAKE_CXX_FLAGS="/w /EHsc $dbg /std:c++${{ env.CMAKE_CXX_STANDARD }} $defs" ` + -DCMAKE_INCLUDE_PATH="$env:VCPKG_INCLUDE" ` + -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs /I$env:VCPKG_INCLUDE" ` + -DCMAKE_CXX_FLAGS="/w /EHsc $dbg /std:c++${{ env.CMAKE_CXX_STANDARD }} $defs /I$env:VCPKG_INCLUDE" ` -DCMAKE_SHARED_LINKER_FLAGS="$linker" ` -DCMAKE_RUNTIME_OUTPUT_DIRECTORY="$out" ` -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$out" ` From d704d7b7de74262585056f65c13af860acf1397f Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 08:12:09 +0300 Subject: [PATCH 10/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index c34c0ce7..9b0b8963 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -13,7 +13,6 @@ env: CXX_FLAGS_COMMON: "-w -fexceptions" CMAKE_EXTRA_ARGS: "" -jobs: windows: runs-on: windows-latest strategy: @@ -33,7 +32,7 @@ jobs: run: | $triplet = ("${{ matrix.arch }}-windows").ToLower() vcpkg install dlfcn-win32 --triplet $triplet - + "VCPKG_INSTALLATION_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append "VCPKG_TRIPLET=$triplet" | Out-File -FilePath $env:GITHUB_ENV -Append "VCPKG_INCLUDE=$env:VCPKG_INSTALLATION_ROOT\installed\$triplet\include" | Out-File -FilePath $env:GITHUB_ENV -Append @@ -68,6 +67,8 @@ jobs: -DCMAKE_INCLUDE_PATH="$VCPKG_INCLUDE" \ -DCMAKE_C_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.C_FLAGS_COMMON }} -I$VCPKG_INCLUDE" \ -DCMAKE_CXX_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.CXX_FLAGS_COMMON }} -std=c++${{ env.CMAKE_CXX_STANDARD }} -I$VCPKG_INCLUDE" \ + -DCMAKE_EXE_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib" \ + -DCMAKE_SHARED_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib" \ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$(pwd)/artifacts \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$(pwd)/artifacts \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=$(pwd)/artifacts \ @@ -92,7 +93,7 @@ jobs: $dbg = if ($env:DEBUG_SYMBOLS -eq 'true') { '/Zi' } else { '' } $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' - + cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` @@ -100,10 +101,11 @@ jobs: -DCMAKE_INCLUDE_PATH="$env:VCPKG_INCLUDE" ` -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs /I$env:VCPKG_INCLUDE" ` -DCMAKE_CXX_FLAGS="/w /EHsc $dbg /std:c++${{ env.CMAKE_CXX_STANDARD }} $defs /I$env:VCPKG_INCLUDE" ` - -DCMAKE_SHARED_LINKER_FLAGS="$linker" ` - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY="$out" ` - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$out" ` - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$out" ` + -DCMAKE_EXE_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib" ` + -DCMAKE_SHARED_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib $linker" ` + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE="$out" ` + -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="$out" ` + -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="$out" ` -DBUILD_TESTING=${{ env.BUILD_TESTING }} ` ${{ env.CMAKE_EXTRA_ARGS }} From 8d909d38caac28b5107e2bf41b7005b808f7bf62 Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 08:14:03 +0300 Subject: [PATCH 11/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 9b0b8963..25a6cc4e 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -13,6 +13,7 @@ env: CXX_FLAGS_COMMON: "-w -fexceptions" CMAKE_EXTRA_ARGS: "" +jobs: windows: runs-on: windows-latest strategy: From 0c99bb17a4f3167f360e2d9f415131903ab9ebef Mon Sep 17 00:00:00 2001 From: Denis Kudelin Date: Sat, 26 Apr 2025 13:40:04 +0300 Subject: [PATCH 12/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 25a6cc4e..6eeade0b 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -37,6 +37,7 @@ jobs: "VCPKG_INSTALLATION_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append "VCPKG_TRIPLET=$triplet" | Out-File -FilePath $env:GITHUB_ENV -Append "VCPKG_INCLUDE=$env:VCPKG_INSTALLATION_ROOT\installed\$triplet\include" | Out-File -FilePath $env:GITHUB_ENV -Append + "VCPKG_LIB=$env:VCPKG_INSTALLATION_ROOT\installed\$triplet\lib" | Out-File -FilePath $env:GITHUB_ENV -Append - id: detect-mingw shell: pwsh @@ -66,10 +67,11 @@ jobs: -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} \ -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} \ -DCMAKE_INCLUDE_PATH="$VCPKG_INCLUDE" \ + -DCMAKE_LIBRARY_PATH="$VCPKG_LIB" \ -DCMAKE_C_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.C_FLAGS_COMMON }} -I$VCPKG_INCLUDE" \ -DCMAKE_CXX_FLAGS="$([ "${{ env.DEBUG_SYMBOLS }}" = "true" ] && echo "-g") ${{ env.CXX_FLAGS_COMMON }} -std=c++${{ env.CMAKE_CXX_STANDARD }} -I$VCPKG_INCLUDE" \ - -DCMAKE_EXE_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib" \ - -DCMAKE_SHARED_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib" \ + -DCMAKE_EXE_LINKER_FLAGS="-L$VCPKG_LIB -ldlfcn-win32" \ + -DCMAKE_SHARED_LINKER_FLAGS="-L$VCPKG_LIB -ldlfcn-win32" \ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$(pwd)/artifacts \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$(pwd)/artifacts \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=$(pwd)/artifacts \ @@ -97,13 +99,15 @@ jobs: cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ` + -DCMAKE_PREFIX_PATH="$env:VCPKG_INSTALLATION_ROOT\installed\$env:VCPKG_TRIPLET" ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` -DCMAKE_INCLUDE_PATH="$env:VCPKG_INCLUDE" ` + -DCMAKE_LIBRARY_PATH="$env:VCPKG_LIB" ` -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs /I$env:VCPKG_INCLUDE" ` -DCMAKE_CXX_FLAGS="/w /EHsc $dbg /std:c++${{ env.CMAKE_CXX_STANDARD }} $defs /I$env:VCPKG_INCLUDE" ` - -DCMAKE_EXE_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib" ` - -DCMAKE_SHARED_LINKER_FLAGS="/DEFAULTLIB:dlfcn-win32.lib $linker" ` + -DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$env:VCPKG_LIB dlfcn-win32.lib $linker" ` + -DCMAKE_SHARED_LINKER_FLAGS="/LIBPATH:$env:VCPKG_LIB dlfcn-win32.lib $linker" ` -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE="$out" ` -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="$out" ` -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="$out" ` From c1accedc6e6a7d7372b4c52b7ceddcadac6986e3 Mon Sep 17 00:00:00 2001 From: Denis Kudelin Date: Sat, 26 Apr 2025 13:55:42 +0300 Subject: [PATCH 13/15] Update multi-rid-build.yml --- .github/workflows/multi-rid-build.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multi-rid-build.yml b/.github/workflows/multi-rid-build.yml index 6eeade0b..5de18309 100644 --- a/.github/workflows/multi-rid-build.yml +++ b/.github/workflows/multi-rid-build.yml @@ -61,6 +61,7 @@ jobs: mkdir -p artifacts cmake -S . -B build/mingw/${{ matrix.arch }} -G Ninja \ -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_TARGET_TRIPLET=$VCPKG_TRIPLET \ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ @@ -88,6 +89,13 @@ jobs: fi ' + - name: check-lib-files + if: steps.detect-mingw.outputs.full == 'false' + shell: pwsh + run: | + Write-Host "Library files in VCPKG_LIB directory:" + Get-ChildItem -Path $env:VCPKG_LIB -Filter "*.lib" | Select-Object -ExpandProperty Name + - name: configure-vs if: steps.detect-mingw.outputs.full == 'false' shell: pwsh @@ -97,8 +105,17 @@ jobs: $linker = if ($env:DEBUG_SYMBOLS -eq 'true') { '/DEBUG' } else { '' } $defs = '/D_CRT_DECLARE_NONSTDC_NAMES=1 /D_CRT_NONSTDC_NO_DEPRECATE=1 /D_CRT_SECURE_NO_WARNINGS=1 /Dpopen=_popen /Dpclose=_pclose' + $dlfcnLib = "$env:VCPKG_LIB\dlfcn-win32.lib" + if (-not (Test-Path $dlfcnLib)) { + $dlfcnLib = (Get-ChildItem -Path $env:VCPKG_LIB -Filter "dlfcn*.lib" | Select-Object -First 1).FullName + if (-not $dlfcnLib) { + $dlfcnLib = (Get-ChildItem -Path $env:VCPKG_LIB -Filter "*.lib" | Select-Object -First 1).FullName + } + } + cmake -S . -B build/${{ matrix.arch }} -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -T ClangCL ` -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ` + -DVCPKG_TARGET_TRIPLET="$env:VCPKG_TRIPLET" ` -DCMAKE_PREFIX_PATH="$env:VCPKG_INSTALLATION_ROOT\installed\$env:VCPKG_TRIPLET" ` -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} ` -DCMAKE_CXX_STANDARD=${{ env.CMAKE_CXX_STANDARD }} -DCMAKE_CXX_STANDARD_REQUIRED=${{ env.CMAKE_CXX_STANDARD_REQUIRED }} ` @@ -106,12 +123,13 @@ jobs: -DCMAKE_LIBRARY_PATH="$env:VCPKG_LIB" ` -DCMAKE_C_FLAGS="/w /EHsc $dbg $defs /I$env:VCPKG_INCLUDE" ` -DCMAKE_CXX_FLAGS="/w /EHsc $dbg /std:c++${{ env.CMAKE_CXX_STANDARD }} $defs /I$env:VCPKG_INCLUDE" ` - -DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$env:VCPKG_LIB dlfcn-win32.lib $linker" ` - -DCMAKE_SHARED_LINKER_FLAGS="/LIBPATH:$env:VCPKG_LIB dlfcn-win32.lib $linker" ` + -DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$env:VCPKG_LIB $dlfcnLib $linker" ` + -DCMAKE_SHARED_LINKER_FLAGS="/LIBPATH:$env:VCPKG_LIB $dlfcnLib $linker" ` -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE="$out" ` -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="$out" ` -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="$out" ` -DBUILD_TESTING=${{ env.BUILD_TESTING }} ` + -DVCPKG_APPLOCAL_DEPS=ON ` ${{ env.CMAKE_EXTRA_ARGS }} - name: build-vs From bcca7ef5bc66582e307b0707cfe86f9ec0af55c0 Mon Sep 17 00:00:00 2001 From: Denis Kudelin Date: Sat, 26 Apr 2025 14:54:29 +0300 Subject: [PATCH 14/15] Add build for cnip --- nuget/PsycheC.Native.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget/PsycheC.Native.csproj b/nuget/PsycheC.Native.csproj index 11180770..ea27c891 100644 --- a/nuget/PsycheC.Native.csproj +++ b/nuget/PsycheC.Native.csproj @@ -2,7 +2,7 @@ PsycheC.Native netstandard2.0 - 0.0.1 + 0.0.2 Cross-platform native binaries for Psyche-C. Denis Kudelin LICENSE From 34f1b12b6368f61fe09f954ec8193b3f38121597 Mon Sep 17 00:00:00 2001 From: Denis Kudelin <15978569+denis-kudelin@users.noreply.github.com> Date: Sat, 26 Apr 2025 15:08:50 +0300 Subject: [PATCH 15/15] Revert "CI: enable multi-RID build and automated NuGet pack/publish" This reverts commit c3bf3806fd5ff2121a51f6b2e74339438669e909. --- nuget/Psyche-C.Native.csproj | 33 ------------------- nuget/buildTransitive/Psyche-C.Native.props | 26 --------------- nuget/buildTransitive/Psyche-C.Native.targets | 13 -------- 3 files changed, 72 deletions(-) delete mode 100644 nuget/Psyche-C.Native.csproj delete mode 100644 nuget/buildTransitive/Psyche-C.Native.props delete mode 100644 nuget/buildTransitive/Psyche-C.Native.targets diff --git a/nuget/Psyche-C.Native.csproj b/nuget/Psyche-C.Native.csproj deleted file mode 100644 index 46d485c8..00000000 --- a/nuget/Psyche-C.Native.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - Psyche-C.Native - netstandard2.0 - 0.0.1 - Cross-platform native binaries for Psyche-C. - Denis Kudelin - LICENSE - https://github.com/Itexoft/psychec - https://github.com/Itexoft/psychec - git - README.md - true - false - false - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nuget/buildTransitive/Psyche-C.Native.props b/nuget/buildTransitive/Psyche-C.Native.props deleted file mode 100644 index fa9f15e7..00000000 --- a/nuget/buildTransitive/Psyche-C.Native.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - <_PsycheC_Rid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier) - - - <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$(OS)'=='Windows_NT' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">win-x64 - <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$(OS)'=='Windows_NT' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='Arm64'">win-arm64 - - - <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">linux-x64 - <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='Arm64'">linux-arm64 - - - <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">osx-x64 - <_PsycheC_Rid Condition="'$(_PsycheC_Rid)'=='' and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='Arm64'">osx-arm64 - - - <_PsycheC_NativeRelativeLibPath>runtimes\$(_PsycheC_Rid)\native - <_PsycheC_NativeLibPath>$(MSBuildThisFileDirectory)\..\$(_PsycheC_NativeRelativeLibPath) - - - - - - \ No newline at end of file diff --git a/nuget/buildTransitive/Psyche-C.Native.targets b/nuget/buildTransitive/Psyche-C.Native.targets deleted file mode 100644 index 41a5615e..00000000 --- a/nuget/buildTransitive/Psyche-C.Native.targets +++ /dev/null @@ -1,13 +0,0 @@ - - - <_PsycheC_NativeLibs Include="$(_PsycheC_NativeLibPath)\*" /> - - - - - - - - - - \ No newline at end of file