Create new redistributable packages.

2026-05-29 19:28:07 +03:00
parent f0bb106e41
commit 2f54c0408a
18 changed files with 135 additions and 171 deletions
@@ -9,7 +9,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <!-- <ProjectReference Include="..\ReFuel.StbImage\ReFuel.StbImage.csproj" /> -->
    <PackageReference Include="ReFuel.StbImage" Version="2.1.0"/>
    <PackageReference Include="OpenTK" Version="4.9.4" /> 
    <EmbeddedResource Include="../rf_stbimage.png" LogicalName="default.png"/>
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Nuget Properties. -->
+    <Version>1.0.0$(VersionSuffix)</Version>
+    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>../etc/native.nuspec</NuspecFile>
+    <NuspecProperties>version=$(Version);rid=linux-arm;dllname=libstbi.so</NuspecProperties>
+  </PropertyGroup>
+
+</Project>
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Nuget Properties. -->
+    <Version>1.0.0$(VersionSuffix)</Version>
+    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>../etc/native.nuspec</NuspecFile>
+    <NuspecProperties>version=$(Version);rid=linux-arm64;dllname=libstbi.so</NuspecProperties>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Nuget Properties. -->
+    <Version>1.0.0$(VersionSuffix)</Version>
+    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>../etc/native.nuspec</NuspecFile>
+    <NuspecProperties>version=$(Version);rid=linux-x64;dllname=libstbi.so</NuspecProperties>
+  </PropertyGroup>
+</Project>
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
-
-  <PropertyGroup>
-    <!-- Nuget Properties. -->
-    <PackageId>ReFuel.StbImage.redis.linux.arm</PackageId>
-    <Version>1.0.0-rc.1</Version>
-    <Description>
-      StbImage distribution for Linux ARM.
-    </Description>
-    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/linux-arm/native/*.so">
-      <PackagePath>runtimes/linux-arm/native/</PackagePath>
-      <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
-
-  <PropertyGroup>
-    <!-- Nuget Properties. -->
-    <PackageId>ReFuel.StbImage.redis.linux.arm64</PackageId>
-    <Version>1.0.0-rc.1</Version>
-    <Description>
-      StbImage distribution for Linux ARM64.
-    </Description>
-    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/linux-arm64/native/*.so">
-      <PackagePath>runtimes/linux-arm64/native/</PackagePath>
-      <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
-
-  <PropertyGroup>
-    <!-- Nuget Properties. -->
-    <PackageId>ReFuel.StbImage.redis.linux.x64</PackageId>
-    <Version>1.0.0-rc.1</Version>
-    <Description>
-      StbImage distribution for Linux x64.
-    </Description>
-    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/linux-x64/native/*.so">
-      <PackagePath>runtimes/linux-x64/native/</PackagePath>
-      <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Nuget Properties. -->
+    <Version>1.0.0$(VersionSuffix)</Version>
+    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>../etc/native.nuspec</NuspecFile>
+    <NuspecProperties>version=$(Version);rid=osx-arm64;dllname=libstbi.dylib</NuspecProperties>
+  </PropertyGroup>
+
+</Project>
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Nuget Properties. -->
+    <Version>1.0.0$(VersionSuffix)</Version>
+    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>../etc/native.nuspec</NuspecFile>
+    <NuspecProperties>version=$(Version);rid=osx-x64;dllname=libstbi.dylib</NuspecProperties>
+  </PropertyGroup>
+
+</Project>
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
-
-  <PropertyGroup>
-    <!-- Nuget Properties. -->
-    <PackageId>ReFuel.StbImage.redis.osx.arm64</PackageId>
-    <Version>1.0.0-rc.1</Version>
-    <Description>
-      StbImage distribution for OSX ARM64.
-    </Description>
-    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/osx-arm64/native/*.dylib">
-      <PackagePath>runtimes/osx-arm64/native/</PackagePath>
-      <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
-
-  <PropertyGroup>
-    <!-- Nuget Properties. -->
-    <PackageId>ReFuel.StbImage.redis.osx.x64</PackageId>
-    <Version>1.0.0-rc.1</Version>
-    <Description>
-      StbImage distribution for OSX x64.
-    </Description>
-    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/osx-x64/native/*.dylib">
-      <PackagePath>runtimes/osx-x64/native/</PackagePath>
-      <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Nuget Properties. -->
+    <Version>1.0.0$(VersionSuffix)</Version>
+    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>../etc/native.nuspec</NuspecFile>
+    <NuspecProperties>version=$(Version);rid=win-x64;dllname=libstbi.dll</NuspecProperties>
+  </PropertyGroup>
+
+</Project>
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Nuget Properties. -->
+    <Version>1.0.0$(VersionSuffix)</Version>
+    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NuspecFile>../etc/native.nuspec</NuspecFile>
+    <NuspecProperties>version=$(Version);rid=win-x86;dllname=libstbi.dll</NuspecProperties>
+  </PropertyGroup>
+</Project>
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
-
-  <PropertyGroup>
-    <!-- Nuget Properties. -->
-    <PackageId>ReFuel.StbImage.redis.win.x64</PackageId>
-    <Version>1.0.0-rc.1</Version>
-    <Description>
-      StbImage distribution for Windows x64.
-    </Description>
-    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/win-x64/native/*.dll">
-      <PackagePath>runtimes/win-x64/native/</PackagePath>
-      <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../etc/ReFuel.StbImage.Common.props"/>
-
-  <PropertyGroup>
-    <!-- Nuget Properties. -->
-    <PackageId>ReFuel.StbImage.redis.win.x86</PackageId>
-    <Version>1.0.0-rc.1</Version>
-    <Description>
-      StbImage distribution for Windows x86.
-    </Description>
-    <PackageReleaseNotes>* Initial release.</PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes/win-x86/native/*.dll">
-      <PackagePath>runtimes/win-x86/native/</PackagePath>
-      <Pack>true</Pack>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>
@@ -9,11 +9,15 @@
  <PropertyGroup>
    <!-- Nuget Properties. -->
    <PackageId>ReFuel.StbImage</PackageId>
-    <Version>2.1.1-rc.1</Version>
+    <Version>2.1.1$(VersionSuffix)</Version>
    <Description>
      A C# wrapper for the ubiquitous stb_image.h and stb_image_write.h library.
    </Description>
-    <PackageReleaseNotes># 2.1.0 (ABI BRAKING)
+    <PackageReleaseNotes>
+# 2.1.1
+* Move redistributables to their own packages which can be updated incrementally as required.
+
+# 2.1.0 (ABI BRAKING)
 * Fixed calling convention of unmanaged function pointers. (Thanks NogginBops!)
 * Modified StbiStreamWrapper in order to fixed backing delegates of function pointers from being prematurely collected 
  by release mode JIT and the GC. StbiStreamWrapper.Callbacks is now a readonly field. (ABI BREAKING)
@@ -27,13 +31,13 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="ReFuel.StbImage.redis.linux.arm" Version="1.0.*"/>
-    <PackageReference Include="ReFuel.StbImage.redis.linux.arm64" Version="1.0.*"/>
-    <PackageReference Include="ReFuel.StbImage.redis.linux.x64" Version="1.0.*"/>
-    <PackageReference Include="ReFuel.StbImage.redis.osx.arm64" Version="1.0.*"/>
-    <PackageReference Include="ReFuel.StbImage.redis.osx.x64" Version="1.0.*"/>
-    <PackageReference Include="ReFuel.StbImage.redis.win.x64" Version="1.0.*"/>
-    <PackageReference Include="ReFuel.StbImage.redis.win.x86" Version="1.0.*"/>
+    <PackageReference Include="ReFuel.StbImage.redis.linux-arm" Version="1.0.*"/>
+    <PackageReference Include="ReFuel.StbImage.redis.linux-arm64" Version="1.0.*"/>
+    <PackageReference Include="ReFuel.StbImage.redis.linux-x64" Version="1.0.*"/>
+    <PackageReference Include="ReFuel.StbImage.redis.osx-arm64" Version="1.0.*"/>
+    <PackageReference Include="ReFuel.StbImage.redis.osx-x64" Version="1.0.*"/>
+    <PackageReference Include="ReFuel.StbImage.redis.win-x64" Version="1.0.*"/>
+    <PackageReference Include="ReFuel.StbImage.redis.win-x86" Version="1.0.*"/>
  </ItemGroup>

 </Project>
@@ -4,12 +4,12 @@ cd $(dirname "$0")
 dotnet nuget add source -n ReFuel.StbImage bin

 # Build each architecture in its own subfolder.
-DST=ReFuel.StbImage.redis.linux.arm     ./docker-cross-compiler/sh/build_native.sh $PWD linux-arm
-DST=ReFuel.StbImage.redis.linux.arm64   ./docker-cross-compiler/sh/build_native.sh $PWD linux-arm64
-DST=ReFuel.StbImage.redis.linux.x64     ./docker-cross-compiler/sh/build_native.sh $PWD linux-x64
-DST=ReFuel.StbImage.redis.osx.arm64     ./docker-cross-compiler/sh/build_native.sh $PWD osx-arm64
-DST=ReFuel.StbImage.redis.osx.x64       ./docker-cross-compiler/sh/build_native.sh $PWD osx-x64
-DST=ReFuel.StbImage.redis.win.x64       ./docker-cross-compiler/sh/build_native.sh $PWD win-x64
-DST=ReFuel.StbImage.redis.win.x86       ./docker-cross-compiler/sh/build_native.sh $PWD win-x86
+DST=$PWD    ./docker-cross-compiler/sh/build_native.sh $PWD linux-arm64
+DST=$PWD    ./docker-cross-compiler/sh/build_native.sh $PWD linux-arm
+DST=$PWD    ./docker-cross-compiler/sh/build_native.sh $PWD linux-x64
+DST=$PWD    ./docker-cross-compiler/sh/build_native.sh $PWD osx-arm64
+DST=$PWD    ./docker-cross-compiler/sh/build_native.sh $PWD osx-x64
+DST=$PWD    ./docker-cross-compiler/sh/build_native.sh $PWD win-x64
+DST=$PWD    ./docker-cross-compiler/sh/build_native.sh $PWD win-x86

 dotnet build -c Release
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+    <metadata>
+    <id>ReFuel.StbImage.redis.$rid$</id>
+    <version>$version$</version>
+    <authors>STB Authors, H. Utku Maden</authors>
+    <license type="expression">MIT</license>
+    <readme>README.md</readme>
+    <icon>images\icon.png</icon>
+
+    <description>Native dependencies for ReFuel.StbImage</description>
+    <repository type="git" url="https://github.com/ReFuelGameEngine/ReFuel.StbImage" />
+  </metadata>
+  <files>
+    <file src="..\runtimes\$rid$\native\$dllname$" target="runtimes\$rid$\native\$dllname$" />
+    <file src="..\README.md" target="README.md"/>
+    <file src="..\LICENSE.md" target="LICENSE.md"/>
+    <file src="..\rf_stbimage.png" target="images\icon.png"/>
+  </files>
+</package>