GitHub Actions: add missing native folder in .NET workflow

.github/workflows/dotnet.yml

@@ -8,40 +8,42 @@ jobs:
   Linux:
     runs-on: ${{matrix.runner}}
     container:
-      image: ${{matrix.image}}
+      image: almalinux:8
     strategy:
       matrix:
         arch: [arm64, x64]
-        libc: [glibc]
         include:
           - arch: arm64
             runner: ubuntu-24.04-arm
           - arch: x64
             runner: ubuntu-24.04
-          - libc: glibc
-            image: almalinux:8
-            install: dnf install -y cmake gcc gcc-c++
-            libdir: lib64
     steps:
     - name: Cloning
       uses: actions/checkout@v5
     - name: Install packages
-      run: ${{matrix.install}}
+      run: dnf install -y cmake gcc gcc-c++
     - name: Configure CMake
-      run: cmake -B "build/shared" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: |
+        cmake -B "build/shared" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        cmake -B "build/static" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DRAGEPHOTO_STATIC=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
     - name: Build
-      run: cmake --build "build/shared" --config ${{env.BUILD_TYPE}}
+      run: |
+        cmake --build "build/shared" --config ${{env.BUILD_TYPE}}
+        cmake --build "build/static" --config ${{env.BUILD_TYPE}}
     - name: Install
-      run: cmake --install "build/shared" --config ${{env.BUILD_TYPE}} --prefix "install/shared/"
+      run: |
+        cmake --install "build/shared" --config ${{env.BUILD_TYPE}} --prefix "install/shared/"
+        cmake --install "build/static" --config ${{env.BUILD_TYPE}} --prefix "install/static/"
     - name: Preparing for Upload
       run: |
         mkdir "artifacts"
-        cp "install/shared/${{matrix.libdir}}/libragephoto.so" \
+        cp "install/shared/lib64/libragephoto.so" \
+          "install/static/lib64/libragephoto.a" \
           "artifacts/"
     - name: Upload
       uses: actions/upload-artifact@v5
       with:
-        name: Linux ${{matrix.arch}} ${{matrix.libc}}
+        name: Linux ${{matrix.arch}}
         path: ${{github.workspace}}/artifacts/
   macOS:
     runs-on: ${{matrix.runner}}
@@ -59,15 +61,22 @@ jobs:
     - name: Cloning
       uses: actions/checkout@v5
     - name: Configure CMake
-      run: cmake -B "${{github.workspace}}/build/shared" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_DEPLOYMENT_TARGET=${{env.OSX_DEPLOYMENT_TARGET}}
+      run: |
+        cmake -B "${{github.workspace}}/build/shared" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_DEPLOYMENT_TARGET=${{env.OSX_DEPLOYMENT_TARGET}}
+        cmake -B "${{github.workspace}}/build/static" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DRAGEPHOTO_STATIC=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_DEPLOYMENT_TARGET=${{env.OSX_DEPLOYMENT_TARGET}}
     - name: Build
-      run: cmake --build "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}}
+      run: |
+        cmake --build "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}}
+        cmake --build "${{github.workspace}}/build/static" --config ${{env.BUILD_TYPE}}
     - name: Install
-      run: cmake --install "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/shared/"
+      run: |
+        cmake --install "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/shared/"
+        cmake --install "${{github.workspace}}/build/static" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/static/"
     - name: Preparing for Upload
       run: |
         mkdir "artifacts"
         cp "install/shared/lib/libragephoto.dylib" \
+          "install/static/lib/libragephoto.a" \
           "artifacts/"
     - name: Upload
       uses: actions/upload-artifact@v5
@@ -94,19 +103,26 @@ jobs:
       with:
         arch: ${{matrix.msvc}}
     - name: Configure CMake
-      run: cmake -B "${{github.workspace}}/build/shared" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DRAGEPHOTO_UNICODE=wincvt -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -GNinja
+      run: |
+        cmake -B "${{github.workspace}}/build/shared" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DRAGEPHOTO_UNICODE=wincvt -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        cmake -B "${{github.workspace}}/build/static" -DRAGEPHOTO_C_LIBRARY=ON -DRAGEPHOTO_EXTRACT=OFF -DRAGEPHOTO_STATIC=ON -DRAGEPHOTO_UNICODE=wincvt -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
     - name: Build
-      run: cmake --build "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}}
+      run: |
+        cmake --build "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}}
+        cmake --build "${{github.workspace}}/build/static" --config ${{env.BUILD_TYPE}}
     - name: Install
-      run: cmake --install "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/shared/"
+      run: |
+        cmake --install "${{github.workspace}}/build/shared" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/shared/"
+        cmake --install "${{github.workspace}}/build/static" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/static/"
     - name: Preparing for Upload
       run: |
         mkdir "artifacts"
         Copy-Item "install\shared\bin\libragephoto.dll" "artifacts\"
+        Copy-Item "install\static\lib\ragephoto.lib" "artifacts\"
     - name: Upload
       uses: actions/upload-artifact@v5
       with:
-        name: Windows ${{matrix.arch}}
+        name: Windows MSVC ${{matrix.arch}}
         path: ${{github.workspace}}/artifacts/
   Release:
     needs: [Linux, macOS, Windows]
@@ -114,15 +130,15 @@ jobs:
     steps:
     - name: Cloning
       uses: actions/checkout@v5
-    - name: Download Linux arm64 glibc Artifacts
+    - name: Download Linux arm64 Artifacts
       uses: actions/download-artifact@v6
       with:
-        name: Linux arm64 glibc
+        name: Linux arm64
         path: ${{github.workspace}}/src/dotnet/runtimes/linux-arm64/native
-    - name: Download Linux x64 glibc Artifacts
+    - name: Download Linux x64 Artifacts
       uses: actions/download-artifact@v6
       with:
-        name: Linux x64 glibc
+        name: Linux x64
         path: ${{github.workspace}}/src/dotnet/runtimes/linux-x64/native
     - name: Download macOS arm64 Artifacts
       uses: actions/download-artifact@v6
@@ -137,17 +153,17 @@ jobs:
     - name: Download Windows arm64 Artifacts
       uses: actions/download-artifact@v6
       with:
-        name: Windows arm64
+        name: Windows MSVC arm64
         path: ${{github.workspace}}/src/dotnet/runtimes/win-arm64/native
     - name: Download Windows x64 Artifacts
       uses: actions/download-artifact@v6
       with:
-        name: Windows x64
+        name: Windows MSVC x64
         path: ${{github.workspace}}/src/dotnet/runtimes/win-x64/native
     - name: Download Windows x86 Artifacts
       uses: actions/download-artifact@v6
       with:
-        name: Windows x86
+        name: Windows MSVC x86
         path: ${{github.workspace}}/src/dotnet/runtimes/win-x86/native
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v2

CMakeLists.txt

@@ -18,7 +18,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 cmake_policy(VERSION 3.16...3.28)
-project(ragephoto VERSION 0.8.2 LANGUAGES C CXX)
+project(ragephoto VERSION 0.7.1 LANGUAGES C CXX)
 include(GNUInstallDirs)
 
 # RagePhoto CMake includes

doc/CMakeLists.txt

@@ -1,6 +1,6 @@
 #[[**************************************************************************
 * libragephoto RAGE Photo Parser
-* Copyright (C) 2021-2025 Syping
+* Copyright (C) 2021-2024 Syping
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -16,8 +16,7 @@
 * responsible for anything with use of the software, you are self responsible.
 ****************************************************************************]]
 
-cmake_minimum_required(VERSION 3.16)
-cmake_policy(VERSION 3.16...3.28)
+cmake_minimum_required(VERSION 3.7)
 find_package(Doxygen REQUIRED)
 include(GNUInstallDirs)
 

examples/ragephoto-gtkviewer/CMakeLists.txt

@@ -1,6 +1,6 @@
 #[[**************************************************************************
 * libragephoto RAGE Photo Parser
-* Copyright (C) 2021-2025 Syping
+* Copyright (C) 2021-2022 Syping
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -16,8 +16,7 @@
 * responsible for anything with use of the software, you are self responsible.
 ****************************************************************************]]
 
-cmake_minimum_required(VERSION 3.16)
-cmake_policy(VERSION 3.16...3.28)
+cmake_minimum_required(VERSION 3.7)
 project(ragephoto-gtkviewer LANGUAGES CXX)
 include(GNUInstallDirs)
 
@@ -36,7 +35,7 @@ if (TARGET ragephoto)
     set(RAGEPHOTO_LIBRARIES ragephoto)
     set(RAGEPHOTO_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 else()
-    pkg_check_modules(RAGEPHOTO REQUIRED ragephoto>=0.8)
+    pkg_check_modules(RAGEPHOTO REQUIRED ragephoto>=0.6)
 endif()
 
 add_executable(ragephoto-gtkviewer WIN32 ${GTKVIEWER_SOURCES})
@@ -45,6 +44,8 @@ set_target_properties(ragephoto-gtkviewer PROPERTIES
 )
 target_compile_options(ragephoto-gtkviewer PRIVATE ${GTKMM_CFLAGS} ${RAGEPHOTO_CFLAGS})
 target_link_libraries(ragephoto-gtkviewer PRIVATE ${GTKMM_LIBRARIES} ${RAGEPHOTO_LIBRARIES})
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.13.0")
     target_link_directories(ragephoto-gtkviewer PRIVATE ${GTKMM_LIBRARY_DIRS} ${RAGEPHOTO_LIBRARY_DIRS})
+endif()
 target_include_directories(ragephoto-gtkviewer PRIVATE ${GTKMM_INCLUDE_DIRS} ${RAGEPHOTO_INCLUDE_DIRS})
 install(TARGETS ragephoto-gtkviewer DESTINATION ${CMAKE_INSTALL_BINDIR})

examples/ragephoto-qtviewer/CMakeLists.txt

@@ -1,6 +1,6 @@
 #[[**************************************************************************
 * libragephoto RAGE Photo Parser
-* Copyright (C) 2021-2025 Syping
+* Copyright (C) 2021-2022 Syping
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -16,8 +16,7 @@
 * responsible for anything with use of the software, you are self responsible.
 ****************************************************************************]]
 
-cmake_minimum_required(VERSION 3.16)
-cmake_policy(VERSION 3.16...3.28)
+cmake_minimum_required(VERSION 3.7)
 project(ragephoto-qtviewer LANGUAGES CXX)
 include(GNUInstallDirs)
 
@@ -42,7 +41,7 @@ if (TARGET ragephoto)
     set(RAGEPHOTO_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 else()
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(RAGEPHOTO REQUIRED ragephoto>=0.8)
+    pkg_check_modules(RAGEPHOTO REQUIRED ragephoto>=0.6)
 endif()
 
 add_executable(ragephoto-qtviewer WIN32 ${QTVIEWER_SOURCES})
@@ -51,6 +50,8 @@ set_target_properties(ragephoto-qtviewer PROPERTIES
 )
 target_compile_options(ragephoto-qtviewer PRIVATE ${RAGEPHOTO_CFLAGS})
 target_link_libraries(ragephoto-qtviewer PRIVATE Qt${QT_VERSION_MAJOR}::Widgets ${RAGEPHOTO_LIBRARIES})
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.13.0")
     target_link_directories(ragephoto-qtviewer PRIVATE ${RAGEPHOTO_LIBRARY_DIRS})
+endif()
 target_include_directories(ragephoto-qtviewer PRIVATE ${RAGEPHOTO_INCLUDE_DIRS})
 install(TARGETS ragephoto-qtviewer DESTINATION ${CMAKE_INSTALL_BINDIR})

src/core/RagePhoto.c

@@ -972,14 +972,10 @@ bool ragephotodata_savef(RagePhotoData *rp_data, RagePhotoFormatParser *rp_parse
 #endif
     }
     else if (photoFormat == RAGEPHOTO_FORMAT_JPEG) {
-        if (rp_data->jpeg) {
+        const size_t length = ragephotodata_getsavesizef(rp_data, NULL, photoFormat);
         size_t pos = 0;
-            writeBuffer(rp_data->jpeg, data, &pos, rp_data->jpegSize, rp_data->jpegSize);
-        }
-        else {
-            rp_data->error = RAGEPHOTO_ERROR_PHOTOREADERROR; // 17
-            return false;
-        }
+
+        writeBuffer(rp_data->jpeg, data, &pos, length, rp_data->jpegSize);
 
         rp_data->error = RAGEPHOTO_ERROR_NOERROR; // 255
         return true;
@@ -1239,7 +1235,6 @@ bool ragephoto_setphotojpeg(ragephoto_t instance, const char *data, uint32_t siz
     else if (instance->data->jpeg) {
         free(instance->data->jpeg);
         instance->data->jpeg = NULL;
-        instance->data->jpegSize = 0;
     }
 
     if (bufferSize != 0) {

src/core/RagePhoto.cpp

@@ -66,16 +66,13 @@ const char* nullchar = "";
 
 /* BEGIN OF STATIC LIBRARY FUNCTIONS */
 #if defined(_WIN32) && ((RAGEPHOTO_CXX_STD < 17) || (__cplusplus < 201703L))
-inline std::wstring convertPath(const char *path)
+inline std::unique_ptr<wchar_t> convertPath(const char *path)
 {
     int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, path, -1, nullptr, 0);
     if (wideCharSize <= 0)
-        return {};
-    std::wstring wideCharPath;
-    wideCharPath.resize(wideCharSize);
-    if (!MultiByteToWideChar(CP_UTF8, 0, path, -1, &wideCharPath[0], wideCharSize))
-        return {};
-    wideCharPath.resize(wideCharSize - 1);
+        return std::unique_ptr<wchar_t>(new wchar_t[1]());
+    std::unique_ptr<wchar_t> wideCharPath(new wchar_t[wideCharSize]);
+    MultiByteToWideChar(CP_UTF8, 0, path, -1, wideCharPath.get(), wideCharSize);
     return wideCharPath;
 }
 #endif
@@ -295,7 +292,7 @@ bool RagePhoto::load(const char *data, size_t length, RagePhotoData *rp_data, Ra
             rp_data->error = Error::HeaderMallocError; // 4
             return false;
         }
-        memcpy(rp_data->header, photoHeader_string.data(), photoHeader_size);
+        memcpy(rp_data->header, photoHeader_string.c_str(), photoHeader_size);
 #elif defined UNICODE_ICONV
         iconv_t iconv_in = iconv_open("UTF-8", "UTF-16LE");
         if (iconv_in == (iconv_t)-1) {
@@ -613,7 +610,7 @@ bool RagePhoto::loadFile(const char *filename)
 #if defined(_WIN32) && (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L)
     std::ifstream ifs(std::filesystem::u8path(filename), std::ios::in | std::ios::binary);
 #elif defined(_WIN32)
-    std::ifstream ifs(convertPath(filename).data(), std::ios::in | std::ios::binary);
+    std::ifstream ifs(convertPath(filename).get(), std::ios::in | std::ios::binary);
 #else
     std::ifstream ifs(filename, std::ios::in | std::ios::binary);
 #endif
@@ -946,14 +943,10 @@ bool RagePhoto::save(char *data, uint32_t photoFormat, RagePhotoData *rp_data, R
 #endif
     }
     else if (photoFormat == PhotoFormat::JPEG) {
-        if (rp_data->jpeg) {
+        const size_t length = saveSize(photoFormat, rp_data, nullptr);
         size_t pos = 0;
-            writeBuffer(rp_data->jpeg, data, &pos, rp_data->jpegSize, rp_data->jpegSize);
-        }
-        else {
-            rp_data->error = Error::PhotoReadError; // 17
-            return false;
-        }
+
+        writeBuffer(rp_data->jpeg, data, &pos, length, rp_data->jpegSize);
 
         rp_data->error = Error::NoError; // 255
         return true;
@@ -1015,7 +1008,7 @@ bool RagePhoto::saveFile(const char *filename, uint32_t photoFormat)
 #if defined(_WIN32) && (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L)
         std::ofstream ofs(std::filesystem::u8path(filename), std::ios::out | std::ios::binary | std::ios::trunc);
 #elif defined(_WIN32)
-        std::ofstream ofs(convertPath(filename).data(), std::ios::out | std::ios::binary | std::ios::trunc);
+        std::ofstream ofs(convertPath(filename).get(), std::ios::out | std::ios::binary | std::ios::trunc);
 #else
         std::ofstream ofs(filename, std::ios::out | std::ios::binary | std::ios::trunc);
 #endif
@@ -1238,7 +1231,6 @@ bool RagePhoto::setJpeg(const char *data, uint32_t size, uint32_t bufferSize)
     else if (m_data->jpeg) {
         free(m_data->jpeg);
         m_data->jpeg = nullptr;
-        m_data->jpegSize = 0;
     }
 
     if (bufferSize != 0) {

src/core/RagePhoto.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 * libragephoto RAGE Photo Parser
-* Copyright (C) 2021-2025 Syping
+* Copyright (C) 2021-2024 Syping
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:

src/core/RagePhoto.hpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 * libragephoto RAGE Photo Parser
-* Copyright (C) 2023-2025 Syping
+* Copyright (C) 2023-2024 Syping
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:

src/core/RagePhotoLibrary.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 * libragephoto RAGE Photo Parser
-* Copyright (C) 2023-2025 Syping
+* Copyright (C) 2023 Syping
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:

src/dotnet/README.md

@@ -1,21 +0,0 @@
-## RagePhoto.Core
-Open Source RAGE Photo Parser for GTA V and RDR 2
-
-- Read/Write RAGE Photos error free and correct
-- Support for metadata stored in RAGE Photos
-- Simple .NET API
-- Based on libragephoto
-
-#### How to Use RagePhoto.Core
-
-```c#
-using RagePhoto;
-
-/* Get Image from Photo */
-static Image GetImageFromPhoto(String inputFile) {
-    using Photo photo = new();
-    photo.LoadFile(inputFile);
-    using MemoryStream jpegStream = new(photo.Jpeg);
-    return Image.FromStream(jpegStream);
-}
-```

src/dotnet/RagePhoto.Core.csproj

@@ -4,15 +4,13 @@
     <TargetFrameworks>netstandard2.1;net47</TargetFrameworks>
     <AssemblyName>RagePhoto.Core</AssemblyName>
     <RootNamespace>RagePhoto</RootNamespace>
-    <Version>0.8.2</Version>
-    <AssemblyVersion>0.8.2</AssemblyVersion>
-    <FileVersion>0.8.2</FileVersion>
+    <Version>0.7.1</Version>
+    <AssemblyVersion>0.7.1</AssemblyVersion>
+    <FileVersion>0.7.1</FileVersion>
     <Authors>Syping</Authors>
     <Copyright>Copyright © 2025 Syping</Copyright>
     <Description>Open Source RAGE Photo Parser for GTA V and RDR 2</Description>
     <PackageLicenseExpression>BSD-2-Clause</PackageLicenseExpression>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageTags>libragephoto;gta5;gtav;snapmatic;rdr2;photo</PackageTags>
     <RepositoryUrl>https://github.com/Syping/libragephoto</RepositoryUrl>
     <Nullable>disable</Nullable>
   </PropertyGroup>
@@ -22,14 +20,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <SharedLibraries Include="runtimes\**\libragephoto.*" />
-    <None Include="@(SharedLibraries)" Pack="true" PackagePath="runtimes\%(RecursiveDir)%(Filename)%(Extension)" />
-    <None Include="net47\RagePhoto.Core.targets" Pack="true" PackagePath="build\net47\RagePhoto.Core.targets" />
-    <None Include="net47\RagePhoto.Core.targets" Pack="true" PackagePath="buildTransitive\net47\RagePhoto.Core.targets" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="README.md" />
+    <NativeDlls Include="runtimes\**\*ragephoto.*" />
+    <None Include="@(NativeDlls)" Pack="true" PackagePath="runtimes\%(RecursiveDir)%(Filename)%(Extension)">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="RagePhoto.Core.targets" Pack="true" PackagePath="build\net47\RagePhoto.Core.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="RagePhoto.Core.targets" Pack="true" PackagePath="buildTransitive\net47\RagePhoto.Core.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

src/dotnet/RagePhoto.Core.targets

@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Windows arm64 -->
-  <ItemGroup Condition="'$(Platform)' == 'arm64'">
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(Platform)' == 'arm64'">
     <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\libragephoto.dll">
-      <TargetPath>libragephoto.dll</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>false</Pack>
     </Content>
   </ItemGroup>
-
-  <!-- Windows x64 -->
-  <ItemGroup Condition="'$(Platform)' == 'x64'">
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(Platform)' == 'x64'">
     <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libragephoto.dll">
-      <TargetPath>libragephoto.dll</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>false</Pack>
     </Content>
   </ItemGroup>
-
-  <!-- Windows x86 -->
-  <ItemGroup Condition="'$(Platform)' == 'x86'">
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(Platform)' == 'x86'">
     <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libragephoto.dll">
-      <TargetPath>libragephoto.dll</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>false</Pack>
     </Content>
   </ItemGroup>
-
 </Project>

src/dotnet/RagePhoto.cs

@@ -6,7 +6,7 @@ namespace RagePhoto {
 
     public class Photo : IDisposable {
 
-        private Boolean _disposed;
+        private bool _disposed;
         private readonly IntPtr _instance;
         private const String _library = "libragephoto";
 
@@ -18,10 +18,10 @@ namespace RagePhoto {
         private static extern void ragephoto_close(IntPtr instance);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_load(IntPtr instance, Byte[] data, UIntPtr size);
+        private static extern bool ragephoto_load(IntPtr instance, Byte[] data, UIntPtr size);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_loadfile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename);
+        private static extern bool ragephoto_loadfile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         private static extern Int32 ragephoto_error(IntPtr instance);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
@@ -48,30 +48,30 @@ namespace RagePhoto {
         private static extern UIntPtr ragephoto_getsavesizef(IntPtr instance, UInt32 photoFormat);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_save(IntPtr instance, [Out] Byte[] data);
+        private static extern bool ragephoto_save(IntPtr instance, [Out] Byte[] data);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_savef(IntPtr instance, [Out] Byte[] data, UInt32 photoFormat);
+        private static extern bool ragephoto_savef(IntPtr instance, [Out] Byte[] data, UInt32 photoFormat);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_savefile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename);
+        private static extern bool ragephoto_savefile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_savefilef(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename, UInt32 photoFormat);
+        private static extern bool ragephoto_savefilef(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename, UInt32 photoFormat);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         private static extern void ragephoto_setbufferdefault(IntPtr instance);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         private static extern void ragephoto_setbufferoffsets(IntPtr instance);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_setphotodatac(IntPtr instance, IntPtr data);
+        private static extern bool ragephoto_setphotodatac(IntPtr instance, IntPtr data);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         private static extern void ragephoto_setphotodesc(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String description, UInt32 bufferSize);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         private static extern void ragephoto_setphotoformat(IntPtr instance, UInt32 photoFormat);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private static extern Boolean ragephoto_setphotojpeg(IntPtr instance, Byte[] jpeg, UInt32 size, UInt32 bufferSize);
+        private static extern bool ragephoto_setphotojpeg(IntPtr instance, Byte[] jpeg, UInt32 size, UInt32 bufferSize);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         private static extern void ragephoto_setphotojson(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String json, UInt32 bufferSize);
         [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
@@ -98,7 +98,7 @@ namespace RagePhoto {
                 if (_instance == IntPtr.Zero)
                     throw new RagePhotoException("Failed to initialize libragephoto");
                 if (!ragephoto_setphotodatac(_instance, ragephoto_getphotodata(photo._instance)))
-                    throw new RagePhotoException(this, "Failed to copy Photo", Error);
+                    throw new RagePhotoException(this, String.Format("Failed to copy Photo: {0}", Error), Error);
             }
             catch (Exception exception) {
                 throw new RagePhotoException("Failed to initialize libragephoto", exception);
@@ -114,7 +114,7 @@ namespace RagePhoto {
             GC.SuppressFinalize(this);
         }
 
-        protected virtual void Dispose(Boolean disposing) {
+        protected virtual void Dispose(bool disposing) {
             if (_disposed)
                 return;
             ragephoto_close(_instance);
@@ -127,12 +127,12 @@ namespace RagePhoto {
 
         public void Load(Byte[] data) {
             if (!ragephoto_load(_instance, data, (UIntPtr)data.LongLength))
-                throw new RagePhotoException(this, "Failed to load Photo", Error);
+                throw new RagePhotoException(this, String.Format("Failed to load Photo: {0}", Error), Error);
         }
 
         public void LoadFile(String path) {
             if (!ragephoto_loadfile(_instance, path))
-                throw new RagePhotoException(this, "Failed to load Photo", Error);
+                throw new RagePhotoException(this, String.Format("Failed to load Photo: {0}", Error), Error);
         }
 
         public String Description {
@@ -159,16 +159,7 @@ namespace RagePhoto {
                 Marshal.Copy(ptr, buffer, 0, (Int32)size);
                 return buffer;
             }
-            set {
-                UInt32 size = (UInt32)value.Length;
-                UInt32 bufferSize = Format switch {
-                    PhotoFormat.GTA5 => size > (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER ? size : (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER,
-                    PhotoFormat.RDR2 => size > (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER ? size : (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER,
-                    _ => size
-                };
-                if (!ragephoto_setphotojpeg(_instance, value, size, bufferSize))
-                    throw new RagePhotoException(this, "Failed to set Jpeg", Error);
-            }
+            set => SetJpeg(value);
         }
 
         public UInt32 JpegSize {
@@ -208,25 +199,25 @@ namespace RagePhoto {
         public Byte[] Save() {
             Byte[] photo = new Byte[Environment.Is64BitProcess ? (UInt64)GetSaveSize() : (UInt32)GetSaveSize()];
             if (!ragephoto_save(_instance, photo))
-                throw new RagePhotoException(this, "Failed to save Photo", Error);
+                throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error), Error);
             return photo;
         }
 
         public Byte[] Save(PhotoFormat photoFormat) {
             Byte[] photo = new Byte[Environment.Is64BitProcess ? (UInt64)GetSaveSize(photoFormat) : (UInt32)GetSaveSize(photoFormat)];
             if (!ragephoto_savef(_instance, photo, (UInt32)photoFormat))
-                throw new RagePhotoException(this, "Failed to save Photo", Error);
+                throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error), Error);
             return photo;
         }
 
         public void SaveFile(String path) {
             if (!ragephoto_savefile(_instance, path))
-                throw new RagePhotoException(this, "Failed to save Photo", Error);
+                throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error), Error);
         }
 
         public void SaveFile(String path, PhotoFormat photoFormat) {
             if (!ragephoto_savefilef(_instance, path, (UInt32)photoFormat))
-                throw new RagePhotoException(this, "Failed to save Photo", Error);
+                throw new RagePhotoException(this, string.Format("Failed to save Photo: {0}", Error), Error);
         }
 
         public void SetBufferDefault() {
@@ -250,19 +241,32 @@ namespace RagePhoto {
         }
 
         public void SetJpeg(Byte[] jpeg) {
+            UInt32 bufferSize;
             UInt32 size = (UInt32)jpeg.Length;
-            UInt32 bufferSize = Format switch {
-                PhotoFormat.GTA5 => size > (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER ? size : (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER,
-                PhotoFormat.RDR2 => size > (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER ? size : (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER,
-                _ => size
-            };
+            switch (Format) {
+                case PhotoFormat.GTA5:
+                    if (size > (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER)
+                        bufferSize = size;
+                    else
+                        bufferSize = (UInt32)DefaultSize.DEFAULT_GTA5_PHOTOBUFFER;
+                    break;
+                case PhotoFormat.RDR2:
+                    if (size > (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER)
+                        bufferSize = size;
+                    else
+                        bufferSize = (UInt32)DefaultSize.DEFAULT_RDR2_PHOTOBUFFER;
+                    break;
+                default:
+                    bufferSize = size;
+                    break;
+            }
             if (!ragephoto_setphotojpeg(_instance, jpeg, size, bufferSize))
-                throw new RagePhotoException(this, "Failed to set Jpeg", Error);
+                throw new RagePhotoException(this, String.Format("Failed to set Jpeg: {0}", Error), Error);
         }
 
         public void SetJpeg(Byte[] jpeg, UInt32 bufferSize) {
             if (!ragephoto_setphotojpeg(_instance, jpeg, (UInt32)jpeg.Length, bufferSize))
-                throw new RagePhotoException(this, "Failed to set Jpeg", Error);
+                throw new RagePhotoException(this, String.Format("Failed to set Jpeg: {0}", Error), Error);
         }
 
         public void SetJson(String json) {

src/dotnet/RagePhotoException.cs

@@ -15,7 +15,7 @@ namespace RagePhoto {
             _error = PhotoError.Uninitialised;
         }
 
-        public RagePhotoException(Photo photo, String message, PhotoError error) : base(String.Format("{0}: {1}", message, error)) {
+        public RagePhotoException(Photo photo, String message, PhotoError error) : base(message) {
             _error = error;
             _photo = photo;
         }