feat(upgrade): Upgraded to .NET8

Migrated to new Interop patterns. Expanded on Performance Validations.
canhorn · Dec 16, 2023 · e635c66 · e635c66
1 parent 318b156
commit e635c66
Show file tree

Hide file tree

Showing 25 changed files with 1,023 additions and 846 deletions.
diff --git a/EventHorizon.Blazor.Interop.Sample/EventHorizon.Blazor.Interop.Sample.csproj b/EventHorizon.Blazor.Interop.Sample/EventHorizon.Blazor.Interop.Sample.csproj
@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 
 		<BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
 		<BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
+
+		<RunAOTCompilation>true</RunAOTCompilation>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MediatR" Version="9.0.0" />
-		<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
-		<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+		<PackageReference Include="MediatR" Version="12.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+		<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/.../Testing/InteropTesting/Callbacks/Validation/InteropFuncArrayCallbackValidationTest.razor b/.../Testing/InteropTesting/Callbacks/Validation/InteropFuncArrayCallbackValidationTest.razor
@@ -58,33 +58,34 @@
                 actualClass1 = arg1[0];
                 actualClass2 = arg1[1];
                 actualClass3 = arg1[2];
+
+                ValidateTest();
                 return Task.CompletedTask;
             });
 
             EventHorizonBlazorInterop.Func<string>(
-                new string[] { testId, "register" },
-                actionHandler
+            new string[] { testId, "register" },
+            actionHandler
             );
             initialized = true;
         }
 
         RunTest();
-        ValidateTest();
     }
 
     public void RunTest()
     {
         EventHorizonBlazorInterop.Func<CachedEntity>(
-            new object[] { new string[] { testId, "trigger" } }
+        new object[] { new string[] { testId, "trigger" } }
         );
     }
 
     public void ValidateTest()
     {
         var value = actualClass1.Id;
         if (actualClass1.Id == expectedClass1
-            && actualClass2.Id == expectedClass2
-            && actualClass3.Id == expectedClass3
+        && actualClass2.Id == expectedClass2
+        && actualClass3.Id == expectedClass3
         )
         {
             TestStatus = "Passed";
@@ -93,5 +94,7 @@
         {
             TestStatus = "Failed";
         }
+
+        StateHasChanged();
     }
 }
diff --git a/...Pages/Testing/InteropTesting/Callbacks/Validation/InteropFuncCallbackValidationTest.razor b/...Pages/Testing/InteropTesting/Callbacks/Validation/InteropFuncCallbackValidationTest.razor
@@ -64,6 +64,8 @@
                 actualClass2 = arg3;
                 actualString2 = arg4;
                 actualClass3 = arg5;
+
+                ValidateTest();
                 return Task.CompletedTask;
             });
 
@@ -75,7 +77,6 @@
         }
 
         RunTest();
-        ValidateTest();
     }
 
     public void RunTest()
@@ -101,5 +102,7 @@
         {
             TestStatus = "Failed";
         }
+
+        StateHasChanged();
     }
 }
diff --git a/...esting/InteropTesting/Callbacks/Validation/InteropFuncLiteralCallbackValidationTest.razor b/...esting/InteropTesting/Callbacks/Validation/InteropFuncLiteralCallbackValidationTest.razor
@@ -64,6 +64,8 @@
                 actualClass2 = arg3;
                 actualString2 = arg4;
                 actualClass3 = arg5;
+
+                ValidateTest();
                 return Task.CompletedTask;
             });
 
@@ -78,7 +80,6 @@
         }
 
         RunTest();
-        ValidateTest();
     }
 
     public void RunTest()
@@ -104,5 +105,7 @@
         {
             TestStatus = "Failed";
         }
+
+        StateHasChanged();
     }
 }
diff --git a/...s/Testing/InteropTesting/Callbacks/Validation/InteropNewArrayCallbackValidationTest.razor b/...s/Testing/InteropTesting/Callbacks/Validation/InteropNewArrayCallbackValidationTest.razor
@@ -61,6 +61,8 @@
                 actualClass1 = arg1[0];
                 actualClass2 = arg1[1];
                 actualClass3 = arg1[2];
+
+                ValidateTest();
                 return Task.CompletedTask;
             });
 
@@ -72,7 +74,6 @@
         }
 
         RunTest();
-        ValidateTest();
     }
 
     public void RunTest()
@@ -97,5 +98,7 @@
         {
             TestStatus = "Failed";
         }
+
+        StateHasChanged();
     }
 }
diff --git a/.../Pages/Testing/InteropTesting/Callbacks/Validation/InteropNewCallbackValidationTest.razor b/.../Pages/Testing/InteropTesting/Callbacks/Validation/InteropNewCallbackValidationTest.razor
@@ -66,6 +66,8 @@
                 actualClass2 = arg3;
                 actualString2 = arg4;
                 actualClass3 = arg5;
+
+                ValidateTest();
                 return Task.CompletedTask;
             });
 
@@ -77,7 +79,6 @@
         }
 
         RunTest();
-        ValidateTest();
     }
 
     public void RunTest()
@@ -104,5 +105,7 @@
         {
             TestStatus = "Failed";
         }
+
+        StateHasChanged();
     }
 }
diff --git a/...Testing/InteropTesting/Callbacks/Validation/InteropNewLiteralCallbackValidationTest.razor b/...Testing/InteropTesting/Callbacks/Validation/InteropNewLiteralCallbackValidationTest.razor
@@ -66,6 +66,8 @@
                 actualClass2 = arg3;
                 actualString2 = arg4;
                 actualClass3 = arg5;
+
+                ValidateTest();
                 return Task.CompletedTask;
             });
 
@@ -80,7 +82,6 @@
         }
 
         RunTest();
-        ValidateTest();
     }
 
     public void RunTest()
@@ -107,5 +108,7 @@
         {
             TestStatus = "Failed";
         }
+
+        StateHasChanged();
     }
 }
diff --git a/...or.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetDecimalTest.razor b/...or.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetDecimalTest.razor
@@ -0,0 +1,36 @@
+@using System.Diagnostics
+@using EventHorizon.Blazor.Interop;
+
+<div>
+    <h3>Interop Set Decimal Test</h3>
+    <div class="--lighter">Interop Set</div>
+    <ReportTimeTaken Runs="_max" TimeTaken="TimeTaken" />
+    <button class="run-btn" @onclick="HandleRunTest">Run</button>
+</div>
+
+@code {
+    public TimeSpan TimeTaken { get; set; }
+
+    const int _max = 1_000;
+    private void HandleRunTest()
+    {
+        var s1 = Stopwatch.StartNew();
+        for (int i = 0; i < _max; i++)
+        {
+
+            RunTest();
+        }
+        s1.Stop();
+        TimeTaken = s1.Elapsed;
+        Console.WriteLine(((double)(s1.ElapsedMilliseconds * 1000000) / _max).ToString("0.00 ns"));
+    }
+
+    public void RunTest()
+    {
+        EventHorizonBlazorInterop.Set(
+            "setPrimitive",
+            "setNumber",
+            999.99m
+        );
+    }
+}
diff --git a/...azor.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetFloatTest.razor b/...azor.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetFloatTest.razor
@@ -0,0 +1,35 @@
+@using System.Diagnostics
+@using EventHorizon.Blazor.Interop;
+
+<div>
+    <h3>Interop Set Float Test</h3>
+    <div class="--lighter">Interop Set</div>
+    <ReportTimeTaken Runs="_max" TimeTaken="TimeTaken" />
+    <button class="run-btn" @onclick="HandleRunTest">Run</button>
+</div>
+
+@code {
+    public TimeSpan TimeTaken { get; set; }
+
+    const int _max = 1_000;
+    private void HandleRunTest()
+    {
+        var s1 = Stopwatch.StartNew();
+        for (int i = 0; i < _max; i++)
+        {
+            RunTest();
+        }
+        s1.Stop();
+        TimeTaken = s1.Elapsed;
+        Console.WriteLine(((double)(s1.ElapsedMilliseconds * 1000000) / _max).ToString("0.00 ns"));
+    }
+
+    public void RunTest()
+    {
+        EventHorizonBlazorInterop.Set(
+            "setPrimitive",
+            "setNumber",
+            99.99f
+        );
+    }
+}
diff --git a/...Blazor.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetIntTest.razor b/...Blazor.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetIntTest.razor
@@ -0,0 +1,35 @@
+@using System.Diagnostics
+@using EventHorizon.Blazor.Interop;
+
+<div>
+    <h3>Interop Set Int Test</h3>
+    <div class="--lighter">Interop Set</div>
+    <ReportTimeTaken Runs="_max" TimeTaken="TimeTaken" />
+    <button class="run-btn" @onclick="HandleRunTest">Run</button>
+</div>
+
+@code {
+    public TimeSpan TimeTaken { get; set; }
+
+    const int _max = 1_000;
+    private void HandleRunTest()
+    {
+        var s1 = Stopwatch.StartNew();
+        for (int i = 0; i < _max; i++)
+        {
+            RunTest();
+        }
+        s1.Stop();
+        TimeTaken = s1.Elapsed;
+        Console.WriteLine(((double)(s1.ElapsedMilliseconds * 1000000) / _max).ToString("0.00 ns"));
+    }
+
+    public void RunTest()
+    {
+        EventHorizonBlazorInterop.Set(
+            "setPrimitive",
+            "setInt",
+            9999
+        );
+    }
+}
diff --git a/...nterop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetPerformancePage.razor b/...nterop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetPerformancePage.razor
@@ -0,0 +1,10 @@
+@page "/interop/performance/set"
+
+<h1>Interop Set Performance</h1>
+
+<div class="testing-content">
+    <InteropSetDecimalTest />
+    <InteropSetFloatTest />
+    <InteropSetIntTest />
+    <InteropSetTest />
+</div>
diff --git a/...on.Blazor.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetTest.razor b/...on.Blazor.Interop.Sample/Pages/Testing/InteropTesting/GetPerformance/InteropSetTest.razor
@@ -0,0 +1,35 @@
+@using System.Diagnostics
+@using EventHorizon.Blazor.Interop;
+
+<div>
+    <h3>Interop Set Test</h3>
+    <div class="--lighter">Interop Set</div>
+    <ReportTimeTaken TimeTaken="TimeTaken" Runs="_max" />
+    <button class="run-btn" @onclick="HandleRunTest">Run</button>
+</div>
+
+@code {
+    public TimeSpan TimeTaken { get; set; }
+
+    const int _max = 1_000;
+    private void HandleRunTest()
+    {
+        var s1 = Stopwatch.StartNew();
+        for (int i = 0; i < _max; i++)
+        {
+            RunTest();
+        }
+        s1.Stop();
+        TimeTaken = s1.Elapsed;
+        Console.WriteLine(((double)(s1.ElapsedMilliseconds * 1000000) / _max).ToString("0.00 ns"));
+    }
+
+    public void RunTest()
+    {
+        EventHorizonBlazorInterop.Set(
+            "setPrimitive",
+            "setString",
+            "location"
+        );
+    }
+}
diff --git a/EventHorizon.Blazor.Interop.Sample/Pages/Testing/InteropTesting/InteropGetTest.razor b/EventHorizon.Blazor.Interop.Sample/Pages/Testing/InteropTesting/InteropGetTest.razor
@@ -3,6 +3,7 @@
 
 <div>
     <h3>Interop Get Test</h3>
+    <div class="--lighter">Interop Get</div>
     <ReportTimeTaken TimeTaken="TimeTaken" Runs="_max" />
     <button class="run-btn" @onclick="HandleRunTest">Run</button>
 </div>

diff --git a/...g/InteropTesting/ResultCallback/Validation/InteropResultClassCallbackValidationTest.razor b/...g/InteropTesting/ResultCallback/Validation/InteropResultClassCallbackValidationTest.razor
@@ -45,8 +45,8 @@
                 if (arg1 == expectedArg)
                 {
                     return new TestClass { Found = true, Arg1 = arg1 };
-                }
-
+                }
+
                 return new TestClass { Found = false };
             });
 
@@ -58,13 +58,13 @@
                 actionHandler
             );
             initialized = true;
-            TestStatus = "Failed";
-
-            if (result.Found
-                && result.Arg1 == expectedArg)
-            {
-                TestStatus = "Passed";
-            }
-        }
-    }
+            TestStatus = "Failed";
+
+            if (result.Found
+                && result.Arg1 == expectedArg)
+            {
+                TestStatus = "Passed";
+            }
+        }
+    }
 }