Skip to content

Commit b18ee5a

Browse files
authored
Merge pull request #2 from joreg/master
fixes nuget:
2 parents e3a39b6 + aca9344 commit b18ee5a

6 files changed

Lines changed: 11 additions & 31 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: vvvv/PublishVLNuget@1.0.43
3838
with:
3939
# Your project to build
40-
csproj: src\VL.Assimp\VL.Assimp.csproj
40+
csproj: csproj\VL.AssimpUtils\VL.AssimpUtils.csproj
4141
# Your nuspec to package/publish
4242
nuspec: deployment\VL.Assimp.nuspec
4343
# Optional icon

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/lib/

.vl/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

VL.Assimp.vl

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@
17891789
</Node>
17901790
</Patch>
17911791
</Node>
1792-
<Pad Id="OjcE1NOMGpeOUwPdurQDau" Comment="Force" Bounds="344,120,35,35" ShowValueBox="true" isIOBox="true" Value="True">
1792+
<Pad Id="OjcE1NOMGpeOUwPdurQDau" Comment="Force" Bounds="344,120,35,35" ShowValueBox="true" isIOBox="true" Value="False">
17931793
<p:TypeAnnotation LastCategoryFullName="Primitive" LastDependency="VL.CoreLib.vl">
17941794
<Choice Kind="ImmutableTypeFlag" Name="Boolean" />
17951795
</p:TypeAnnotation>
@@ -2450,17 +2450,6 @@
24502450
</Node>
24512451
</Patch>
24522452
</Node>
2453-
<Node Bounds="776,731,52,19" Id="CMOFUexJz5pPubvA3bv8KM">
2454-
<p:NodeReference LastCategoryFullName="Collections.Spread" LastDependency="VL.CoreLib.vl">
2455-
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
2456-
<CategoryReference Kind="4026531840" Name="Spread" NeedsToBeDirectParent="true" />
2457-
<Choice Kind="OperationCallFlag" Name="GetSlice" />
2458-
</p:NodeReference>
2459-
<Pin Id="BmYW6XQLAxlL4t7VTS1Y7T" Name="Input" Kind="StateInputPin" />
2460-
<Pin Id="A7nToU60MU8MuTszPkcxCt" Name="Default Value" Kind="InputPin" />
2461-
<Pin Id="MmOmEJ0Uc7VMIKs6hhMepA" Name="Index" Kind="InputPin" />
2462-
<Pin Id="O5KLXAZc2jBPgcFgISTOeR" Name="Result" Kind="OutputPin" />
2463-
</Node>
24642453
</Canvas>
24652454
<Patch Id="FHu57Bx8eSdNfvIob2p6HW" Name="Create" />
24662455
<Patch Id="O5PW6qex5PtMKbR4wjoqA7" Name="Update" ParticipatingElements="ObV51BdobPNMrsUSLIg4U1" ManuallySortedPins="true">
@@ -2502,7 +2491,6 @@
25022491
<Link Id="RPLFFgXE0FvOcP29gZV0hQ" Ids="O64PPJluXgrNCHIOAu10Hj,T8b9eFp37yGPuhdLrZWQCo" />
25032492
<Link Id="TOFrHyvqLSeLz2xdT2i5WD" Ids="F52TSgBBmr9OnvB1cTllsk,PDT9CmUiELbOhgjpklTPlB" />
25042493
<Link Id="ITbOeZO7dWXLkNB67RWJet" Ids="HFCPAoytLYaPNIer2Fqu3u,K6Mc4rZAgv2PLoM3eoyX6m" />
2505-
<Link Id="JuPWQYeOsp0M2GiGXQG464" Ids="PLOjuPLIADAPW0kvQQmKKe,BmYW6XQLAxlL4t7VTS1Y7T" />
25062494
</Patch>
25072495
</Node>
25082496
<!--
@@ -2652,6 +2640,6 @@
26522640
<NugetDependency Id="UWsspiB5CpOMXW3bO32AvB" Location="VL.Stride" Version="2025.7.0" />
26532641
<PlatformDependency Id="PKXdAprO3wsPyBZJCq2zd4" Location="../../../../../Program Files/vvvv/vvvv_gamma_2020.3.0-0082-g7f8ac28314/lib/Stride.Engine.dll" />
26542642
<NugetDependency Id="Pgc7WD5Nms7P7qSMQHSYuT" Location="VL.Stride.TextureFX" Version="2025.7.0" />
2655-
<ProjectDependency Id="QXIygJZ44sLM5wRegnvQU6" Location="./csharp/VL.AssimpUtils/VL.AssimpUtils.csproj" />
26562643
<NugetDependency Id="AEIKMegw0wTQFdIMS0r9XO" Location="AssimpNet" Version="5.0.0-beta1" />
2644+
<PlatformDependency Id="BvBlYUrRm39NkkZu8QagYb" Location="./lib/net8.0/VL.AssimpUtils.dll" />
26572645
</Document>

csharp/VL.AssimpUtils/VL.AssimpUtils.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GenerateDocumentationFile>True</GenerateDocumentationFile>
8+
<OutputPath>..\..\lib</OutputPath>
89
</PropertyGroup>
910

1011
<ItemGroup>

deployment/VL.Assimp.nuspec

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,13 @@
1717
<dependency id="AssimpNet" version="[5.0.0-beta1]" />
1818
</dependencies>
1919

20-
<!-- optional icon -->
21-
<icon>icon/nugeticon.png</icon>
20+
<icon>icon\nugeticon.png</icon>
2221
</metadata>
2322

2423
<files>
25-
<!-- ✅ Icon -->
26-
<file src="nugeticon.png" target="icon/" />
27-
28-
<!-- ✅ VL file(s) at root -->
29-
<!-- Use relative paths without `..` if you call nuget.exe from the package folder -->
30-
<file src="VL.Assimp.vl" target="" />
31-
32-
<!-- ✅ include the compiled DLLs -->
33-
<file src="bin\Release\net8.0\*.dll" target="lib/net8.0" />
34-
35-
<!-- ✅ include optional help patches -->
36-
<file src="help\**" target="help/" />
24+
<file src="..\lib\**\*.dll" target="lib\" exclude="" />
25+
<file src="..\*.vl" target="" exclude="" />
26+
<file src="..\help\**" target="help\" exclude="" />
27+
<file src="nugeticon.png" target="icon\" />
3728
</files>
3829
</package>

0 commit comments

Comments
 (0)