Skip to content

Commit 382eb16

Browse files
canhorncanhorn
authored
feat: Updated to .NET 6 ✨ (#64)
feat: Added Result Callback to Blazor Server Generator Templates ✨ feat: Updated to current version for Package References ✨ build: Regenerated _generated projects 🛠 +semver: minor
1 parent cdfcb7f commit 382eb16

File tree

268 files changed

+1020
-757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+1020
-757
lines changed

‎.github/workflows/dotnet-core.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Setup .NET 5
16+
- name: Setup .NET6
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: '5.0.100'
19+
dotnet-version: '6.0.x'
2020
- name: Setup NodeJS
2121
uses: actions/setup-node@v2
2222
with:

‎.github/workflows/dotnet-package.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
additionalArguments: '/updateAssemblyInfo'
2626
- run: |
2727
echo "NuGetVersionV2: ${{ steps.gitversion.outputs.NuGetVersionV2 }}"
28-
- name: Setup .NET 5
28+
- name: Setup .NET6
2929
uses: actions/setup-dotnet@v1
3030
with:
31-
dotnet-version: '5.0.100'
31+
dotnet-version: '6.0.x'
3232
- name: Build with dotnet
3333
run: dotnet build --configuration Release
3434
- name: Pack with dotnet

‎Sample/EventHorizon.BabylonJS.Interop.Generator.ConsoleApp/EventHorizon.BabylonJS.Interop.Generator.ConsoleApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

‎Sample/EventHorizon.Blazor.BabylonJS/EventHorizon.Blazor.BabylonJS.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55

66
<BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
77
<BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎Sample/EventHorizon.Blazor.Server.BabylonJS/EventHorizon.Blazor.Server.BabylonJS.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Sample/Sample.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30309.148
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32014.148
55
MinimumVisualStudioVersion = 10.0.40219.1
66
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}"
77
EndProject
@@ -17,9 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1717
EndProject
1818
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}"
1919
EndProject
20-
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}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHorizon.Blazor.Server.BabylonJS", "EventHorizon.Blazor.Server.BabylonJS\EventHorizon.Blazor.Server.BabylonJS.csproj", "{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}"
2121
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventHorizon.Blazor.Server.BabylonJS", "EventHorizon.Blazor.Server.BabylonJS\EventHorizon.Blazor.Server.BabylonJS.csproj", "{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}"
22+
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}"
2323
EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,14 +39,14 @@ Global
3939
{5081122D-209B-490A-9929-60A879B18EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
4040
{5081122D-209B-490A-9929-60A879B18EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
4141
{5081122D-209B-490A-9929-60A879B18EFD}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{B98C5D82-DE43-4169-A5E4-6A59890F6B1E}.Release|Any CPU.Build.0 = Release|Any CPU
4642
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4743
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Debug|Any CPU.Build.0 = Debug|Any CPU
4844
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Release|Any CPU.ActiveCfg = Release|Any CPU
4945
{5A7F8107-FDA7-42DC-AE91-0A0D8A128526}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{7DCFFDC3-7633-41A5-B09B-2ABAE571E721}.Release|Any CPU.Build.0 = Release|Any CPU
5050
EndGlobalSection
5151
GlobalSection(SolutionProperties) = preSolution
5252
HideSolutionNode = FALSE

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.Server/AbstractActionManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Server.Interop;
99
using EventHorizon.Blazor.Server.Interop.Callbacks;
10+
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -203,7 +204,7 @@ public async ValueTask<bool> hasSpecificTriggers2(decimal triggerA, decimal trig
203204
);
204205
}
205206

206-
public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionCallback<object> parameterPredicate = null)
207+
public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionResultCallback<object, bool> parameterPredicate = null)
207208
{
208209
return await EventHorizonBlazorInterop.Func<bool>(
209210
new object[]

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.Server/AbstractMesh.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Server.Interop;
99
using EventHorizon.Blazor.Server.Interop.Callbacks;
10+
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -1431,7 +1432,7 @@ public async ValueTask<BoundingInfo> getBoundingInfo()
14311432
);
14321433
}
14331434

1434-
public async ValueTask<AbstractMesh> normalizeToUnitCube(System.Nullable<bool> includeDescendants = null, System.Nullable<bool> ignoreRotation = null, ActionCallback<AbstractMesh> predicate = null)
1435+
public async ValueTask<AbstractMesh> normalizeToUnitCube(System.Nullable<bool> includeDescendants = null, System.Nullable<bool> ignoreRotation = null, ActionResultCallback<AbstractMesh, bool> predicate = null)
14351436
{
14361437
return await EventHorizonBlazorInterop.FuncClass<AbstractMesh>(
14371438
entity => new AbstractMesh() { ___guid = entity.___guid },
@@ -1570,7 +1571,7 @@ public async ValueTask<AbstractMesh> moveWithCollisions(Vector3 displacement)
15701571
);
15711572
}
15721573

1573-
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)
1574+
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)
15741575
{
15751576
return await EventHorizonBlazorInterop.FuncClass<PickingInfo>(
15761577
entity => new PickingInfo() { ___guid = entity.___guid },

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.Server/AbstractScene.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Server.Interop;
99
using EventHorizon.Blazor.Server.Interop.Callbacks;
10+
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -43,7 +44,7 @@ public static async ValueTask<ActionCallback<CachedEntity, Scene, AssetContainer
4344
);
4445
}
4546

46-
public static async ValueTask AddIndividualParser(string name, ActionCallback<CachedEntity, Scene, string> parser)
47+
public static async ValueTask AddIndividualParser(string name, ActionResultCallback<CachedEntity, Scene, string, CachedEntity> parser)
4748
{
4849
await EventHorizonBlazorInterop.Func<CachedEntity>(
4950
new object[]
@@ -53,9 +54,9 @@ await EventHorizonBlazorInterop.Func<CachedEntity>(
5354
);
5455
}
5556

56-
public static async ValueTask<ActionCallback<CachedEntity, Scene, string>> GetIndividualParser(string name)
57+
public static async ValueTask<ActionResultCallback<CachedEntity, Scene, string, CachedEntity>> GetIndividualParser(string name)
5758
{
58-
return await EventHorizonBlazorInterop.Func<ActionCallback<CachedEntity, Scene, string>>(
59+
return await EventHorizonBlazorInterop.Func<ActionResultCallback<CachedEntity, Scene, string, CachedEntity>>(
5960
new object[]
6061
{
6162
new string[] { "BABYLON", "AbstractScene", "GetIndividualParser" }, name

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.Server/ActionManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Server.Interop;
99
using EventHorizon.Blazor.Server.Interop.Callbacks;
10+
using EventHorizon.Blazor.Server.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -283,7 +284,7 @@ public async ValueTask<bool> hasSpecificTriggers2(decimal triggerA, decimal trig
283284
);
284285
}
285286

286-
public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionCallback<object> parameterPredicate = null)
287+
public async ValueTask<bool> hasSpecificTrigger(decimal trigger, ActionResultCallback<object, bool> parameterPredicate = null)
287288
{
288289
return await EventHorizonBlazorInterop.Func<bool>(
289290
new object[]

0 commit comments

Comments
 (0)