Skip to content

Commit

Permalink
feat: Updated to .NET 6 ✨ (#64)
Browse files Browse the repository at this point in the history
feat: Added Result Callback to Blazor Server Generator Templates ✨
feat: Updated to current version for Package References ✨
build: Regenerated _generated projects 🛠

+semver: minor
  • Loading branch information
canhorn authored Dec 27, 2021
1 parent cdfcb7f commit 382eb16
Show file tree
Hide file tree
Showing 268 changed files with 1,020 additions and 757 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup .NET 5
- name: Setup .NET6
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '6.0.x'
- name: Setup NodeJS
uses: actions/setup-node@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
additionalArguments: '/updateAssemblyInfo'
- run: |
echo "NuGetVersionV2: ${{ steps.gitversion.outputs.NuGetVersionV2 }}"
- name: Setup .NET 5
- name: Setup .NET6
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '6.0.x'
- name: Build with dotnet
run: dotnet build --configuration Release
- name: Pack with dotnet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
<BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions Sample/Sample.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30309.148
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHorizon.Blazor.BabylonJS.WASM", "_generated\EventHorizon.Blazor.BabylonJS.WASM\EventHorizon.Blazor.BabylonJS.WASM.csproj", "{59959313-8708-4A01-BF30-257F999DA16B}"
EndProject
Expand All @@ -17,9 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHorizon.BabylonJS.Interop.Generator.ConsoleApp", "EventHorizon.BabylonJS.Interop.Generator.ConsoleApp\EventHorizon.BabylonJS.Interop.Generator.ConsoleApp.csproj", "{5081122D-209B-490A-9929-60A879B18EFD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHorizon.Blazor.BabylonJS.Server", "_generated\EventHorizon.Blazor.BabylonJS.Server\EventHorizon.Blazor.BabylonJS.Server.csproj", "{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHorizon.Blazor.Server.BabylonJS", "EventHorizon.Blazor.Server.BabylonJS\EventHorizon.Blazor.Server.BabylonJS.csproj", "{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventHorizon.Blazor.Server.BabylonJS", "EventHorizon.Blazor.Server.BabylonJS\EventHorizon.Blazor.Server.BabylonJS.csproj", "{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHorizon.Blazor.BabylonJS.Server", "_generated\EventHorizon.Blazor.BabylonJS.Server\EventHorizon.Blazor.BabylonJS.Server.csproj", "{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -39,14 +39,14 @@ Global
{5081122D-209B-490A-9929-60A879B18EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5081122D-209B-490A-9929-60A879B18EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5081122D-209B-490A-9929-60A879B18EFD}.Release|Any CPU.Build.0 = Release|Any CPU
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Release|Any CPU.Build.0 = Release|Any CPU
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Release|Any CPU.Build.0 = Release|Any CPU
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down Expand Up @@ -203,7 +204,7 @@ public async ValueTask<bool> hasSpecificTriggers2(decimal triggerA, decimal trig
);
}

public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionCallback<object> parameterPredicate = null)
public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionResultCallback<object, bool> parameterPredicate = null)
{
return await EventHorizonBlazorInterop.Func<bool>(
new object[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down Expand Up @@ -1431,7 +1432,7 @@ public async ValueTask<BoundingInfo> getBoundingInfo()
);
}

public async ValueTask<AbstractMesh> normalizeToUnitCube(System.Nullable<bool> includeDescendants = null, System.Nullable<bool> ignoreRotation = null, ActionCallback<AbstractMesh> predicate = null)
public async ValueTask<AbstractMesh> normalizeToUnitCube(System.Nullable<bool> includeDescendants = null, System.Nullable<bool> ignoreRotation = null, ActionResultCallback<AbstractMesh, bool> predicate = null)
{
return await EventHorizonBlazorInterop.FuncClass<AbstractMesh>(
entity => new AbstractMesh() { ___guid = entity.___guid },
Expand Down Expand Up @@ -1570,7 +1571,7 @@ public async ValueTask<AbstractMesh> moveWithCollisions(Vector3 displacement)
);
}

public async ValueTask<PickingInfo> intersects(Ray ray, System.Nullable<bool> fastCheck = null, ActionCallback<Vector3, Vector3, Vector3, Ray> trianglePredicate = null, System.Nullable<bool> onlyBoundingInfo = null, Matrix worldToUse = null, System.Nullable<bool> skipBoundingInfo = null)
public async ValueTask<PickingInfo> intersects(Ray ray, System.Nullable<bool> fastCheck = null, ActionResultCallback<Vector3, Vector3, Vector3, Ray, bool> trianglePredicate = null, System.Nullable<bool> onlyBoundingInfo = null, Matrix worldToUse = null, System.Nullable<bool> skipBoundingInfo = null)
{
return await EventHorizonBlazorInterop.FuncClass<PickingInfo>(
entity => new PickingInfo() { ___guid = entity.___guid },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down Expand Up @@ -43,7 +44,7 @@ public static async ValueTask<ActionCallback<CachedEntity, Scene, AssetContainer
);
}

public static async ValueTask AddIndividualParser(string name, ActionCallback<CachedEntity, Scene, string> parser)
public static async ValueTask AddIndividualParser(string name, ActionResultCallback<CachedEntity, Scene, string, CachedEntity> parser)
{
await EventHorizonBlazorInterop.Func<CachedEntity>(
new object[]
Expand All @@ -53,9 +54,9 @@ await EventHorizonBlazorInterop.Func<CachedEntity>(
);
}

public static async ValueTask<ActionCallback<CachedEntity, Scene, string>> GetIndividualParser(string name)
public static async ValueTask<ActionResultCallback<CachedEntity, Scene, string, CachedEntity>> GetIndividualParser(string name)
{
return await EventHorizonBlazorInterop.Func<ActionCallback<CachedEntity, Scene, string>>(
return await EventHorizonBlazorInterop.Func<ActionResultCallback<CachedEntity, Scene, string, CachedEntity>>(
new object[]
{
new string[] { "BABYLON", "AbstractScene", "GetIndividualParser" }, name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down Expand Up @@ -283,7 +284,7 @@ public async ValueTask<bool> hasSpecificTriggers2(decimal triggerA, decimal trig
);
}

public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionCallback<object> parameterPredicate = null)
public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionResultCallback<object, bool> parameterPredicate = null)
{
return await EventHorizonBlazorInterop.Func<bool>(
new object[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down Expand Up @@ -285,7 +286,7 @@ ICachedEntity entity
}

public static async ValueTask<Animatable> NewAnimatable(
Scene scene, object target, System.Nullable<decimal> fromFrame = null, System.Nullable<decimal> toFrame = null, System.Nullable<bool> loopAnimation = null, System.Nullable<decimal> speedRatio = null, ActionCallback onAnimationEnd = null, Animation[] animations = null, ActionCallback onAnimationLoop = null, System.Nullable<bool> isAdditive = null
Scene scene, object target, System.Nullable<decimal> fromFrame = null, System.Nullable<decimal> toFrame = null, System.Nullable<bool> loopAnimation = null, System.Nullable<decimal> speedRatio = null, ActionResultCallback<ActionCallback> onAnimationEnd = null, Animation[] animations = null, ActionResultCallback<ActionCallback> onAnimationLoop = null, System.Nullable<bool> isAdditive = null
)
{
var entity = await EventHorizonBlazorInterop.New(
Expand Down Expand Up @@ -500,7 +501,7 @@ await EventHorizonBlazorInterop.Func<CachedEntity>(
);
}

public async ValueTask stop(string animationName = null, ActionCallback<object> targetMask = null)
public async ValueTask stop(string animationName = null, ActionResultCallback<object, bool> targetMask = null)
{
await EventHorizonBlazorInterop.Func<CachedEntity>(
new object[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down Expand Up @@ -525,7 +526,7 @@ await EventHorizonBlazorInterop.Func<CachedEntity>(
);
}

public async ValueTask<AnimationGroup> clone(string newName, ActionCallback<object> targetConverter = null)
public async ValueTask<AnimationGroup> clone(string newName, ActionResultCallback<object, CachedEntity> targetConverter = null)
{
return await EventHorizonBlazorInterop.FuncClass<AnimationGroup>(
entity => new AnimationGroup() { ___guid = entity.___guid },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down Expand Up @@ -81,7 +82,7 @@ Scene scene
#endregion

#region Methods
public async ValueTask<InstantiatedEntries> instantiateModelsToScene(ActionCallback<string> nameFunction = null, System.Nullable<bool> cloneMaterials = null)
public async ValueTask<InstantiatedEntries> instantiateModelsToScene(ActionResultCallback<string, string> nameFunction = null, System.Nullable<bool> cloneMaterials = null)
{
return await EventHorizonBlazorInterop.FuncClass<InstantiatedEntries>(
entity => new InstantiatedEntries() { ___guid = entity.___guid },
Expand Down Expand Up @@ -143,7 +144,7 @@ public async ValueTask<Mesh> createRootMesh()
);
}

public async ValueTask<AnimationGroup[]> mergeAnimationsTo(Animatable[] animatables, Scene scene = null, ActionCallback<CachedEntity> targetConverter = null)
public async ValueTask<AnimationGroup[]> mergeAnimationsTo(Animatable[] animatables, Scene scene = null, ActionResultCallback<CachedEntity, Node> targetConverter = null)
{
return await EventHorizonBlazorInterop.FuncArrayClass<AnimationGroup>(
entity => new AnimationGroup() { ___guid = entity.___guid },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;

public interface Behavior<T> : ICachedEntity { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace BABYLON
using System.Threading.Tasks;
using EventHorizon.Blazor.Server.Interop;
using EventHorizon.Blazor.Server.Interop.Callbacks;
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
using Microsoft.JSInterop;


Expand Down
Loading

0 comments on commit 382eb16

Please sign in to comment.