Skip to content

Commit ba8f814

Browse files
authored
GLFW3.dll missing in Net461 projects (#1357)
* Rename Ult.Native.GLFW.props to .targets This fixes the issue with consuming .net4 applications as described in https://github.com/paralaxsd/ultz.native.glw-framework-test * Adapt version number As discussed in PR * Use .targets rather than .props files for all net461 native projects Also bumped up all applicable package versions. Projects still to discuss as they are using the default versioning from common.props: Silk.NET.OpenGLES.ANGLE.Native, Silk.NET.Vulkan.Loader.Native, Silk.NET.Vulkan.SwiftShader.Native
1 parent b711e23 commit ba8f814

File tree

17 files changed

+13
-13
lines changed

17 files changed

+13
-13
lines changed

src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PropertyGroup>
1010
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
1111
<PackageId>Ultz.Native.Assimp</PackageId> <!-- TODO change this in 3.0 -->
12-
<PackageVersion>5.2.5</PackageVersion>
12+
<PackageVersion>5.2.5.1</PackageVersion>
1313
<Authors>.NET Foundation and Contributors</Authors>
1414
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1515
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
@@ -22,7 +22,7 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
25+
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
2626
<Content Include="runtimes\linux-x64\native\libassimp.so.5" PackagePath="runtimes\linux-x64\native\libassimp.so.5" />
2727
<Content Include="runtimes\osx-x64\native\libassimp.5.dylib" PackagePath="runtimes\osx-x64\native\libassimp.5.dylib" />
2828
<Content Include="runtimes\win-x64\native\Assimp64.dll" PackagePath="runtimes\win-x64\native\Assimp64.dll" />

src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<IncludeContentInPack>true</IncludeContentInPack>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
21+
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
2222
<Content Include="runtimes\win-x64\native\dstorage.dll" PackagePath="runtimes\win-x64\native\dstorage.dll" />
2323
<Content Include="runtimes\win-x86\native\dstorage.dll" PackagePath="runtimes\win-x86\native\dstorage.dll" />
2424
<Content Include="runtimes\win-arm\native\dstorage.dll" PackagePath="runtimes\win-arm\native\dstorage.dll" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.1
1+
1.1.1.1

src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PropertyGroup>
1010
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
1111
<PackageId>Ultz.Native.GLFW</PackageId> <!-- TODO change this in 3.0 -->
12-
<PackageVersion>3.3.9</PackageVersion>
12+
<PackageVersion>3.3.9.1</PackageVersion>
1313
<Authors>.NET Foundation and Contributors</Authors>
1414
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1515
<PackageLicenseExpression>Zlib</PackageLicenseExpression>
@@ -22,7 +22,7 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
25+
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
2626
<Content Include="runtimes\linux-x64\native\libglfw.so.3" PackagePath="runtimes\linux-x64\native\libglfw.so.3" />
2727
<Content Include="runtimes\osx-x64\native\libglfw.3.dylib" PackagePath="runtimes\osx-x64\native\libglfw.3.dylib" />
2828
<Content Include="runtimes\osx-arm64\native\libglfw.3.dylib" PackagePath="runtimes\osx-arm64\native\libglfw.3.dylib" />

src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<PropertyGroup>
1010
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
11-
<PackageVersion>1.21.1.1</PackageVersion>
11+
<PackageVersion>1.21.1.2</PackageVersion>
1212
<Authors>.NET Foundation and Contributors</Authors>
1313
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1414
<PackageLicenseExpression>LGPL-2.0-or-later</PackageLicenseExpression>
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
24+
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
2525
<Content Include="runtimes\linux-x64\native\libopenal.so" PackagePath="runtimes\linux-x64\native\libopenal.so" />
2626
<Content Include="runtimes\osx-x64\native\libopenal.dylib" PackagePath="runtimes\osx-x64\native\libopenal.dylib" />
2727
<Content Include="runtimes\win-x64\native\soft_oal.dll" PackagePath="runtimes\win-x64\native\soft_oal.dll" />

src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<IncludeContentInPack>true</IncludeContentInPack>
1818
</PropertyGroup>
1919
<ItemGroup>
20-
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
20+
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
2121
<Content Include="runtimes\linux-x64\native\libGLESv2.so" PackagePath="runtimes\linux-x64\native\libGLESv2.so" />
2222
<Content Include="runtimes\osx-x64\native\libGLESv2.dylib" PackagePath="runtimes\osx-x64\native\libGLESv2.dylib" />
2323
<Content Include="runtimes\win-x64\native\libGLESv2.dll" PackagePath="runtimes\win-x64\native\libGLESv2.dll" />

0 commit comments

Comments
 (0)