Feature/v4 stabilisation (#93)

* IJSRuntime Extension functional * Removed useless dotnet config. Added configurable tracing output * Remove commented code from ServiceCollectionHelper example * Cleanup warning exceptions
Tewr · Jan 7, 2024 · 4ca0a74 · 4ca0a74
1 parent f37e8a0
commit 4ca0a74
Show file tree

Hide file tree

Showing 42 changed files with 492 additions and 387 deletions.
diff --git a/src/BlazorWorker.Demo.IoCExample/BlazorWorker.Demo.IoCExample.csproj b/src/BlazorWorker.Demo.IoCExample/BlazorWorker.Demo.IoCExample.csproj
@@ -5,18 +5,23 @@
     <Configurations>Debug;Release;Nuget</Configurations>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>1701;1702;1591;CA1416</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <ProjectReference Include="..\BlazorWorker.Extensions.JSRuntime\BlazorWorker.Extensions.JSRuntime.csproj" />
+    <ProjectReference Include="..\BlazorWorker.WorkerCore\BlazorWorker.WorkerCore.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TG.Blazor.IndexedDB" Version="1.5.0-preview" />
+  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.JSInterop" Version="8.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BlazorWorker.Extensions.JSRuntime\BlazorWorker.Extensions.JSRuntime.csproj" />
-    <ProjectReference Include="..\BlazorWorker.WorkerCore\BlazorWorker.WorkerCore.csproj" />
+  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.JSInterop" Version="7.0.14" />
   </ItemGroup>
-
 
 </Project>
diff --git a/src/BlazorWorker.Demo.IoCExample/MyIndexDBService.cs b/src/BlazorWorker.Demo.IoCExample/MyIndexDBService.cs
diff --git a/src/BlazorWorker.Demo.IoCExample/MyIndexDBServiceStartup.cs b/src/BlazorWorker.Demo.IoCExample/MyIndexDBServiceStartup.cs
diff --git a/src/BlazorWorker.Demo.IoCExample/MyIocService.cs b/src/BlazorWorker.Demo.IoCExample/MyIocService.cs
@@ -2,7 +2,6 @@
 using Microsoft.JSInterop;
 using System;
 using System.Threading.Tasks;
-using TG.Blazor.IndexedDB;
 
 namespace BlazorWorker.Demo.IoCExample
 {
@@ -26,10 +25,10 @@ public MyIocService(
 
         public async Task<int> Five()
         {
-            await this.WorkerMessageService.PostMessageAsync($"aaaaaaa");
             this.FiveCalled?.Invoke(this, FiveCalledCounter++);
             try
             {
+                Console.WriteLine($"MyIocService: Attempting JsRuntime InvokeAsync...");
                 var theNumberOfTheBeast = await this.JSRuntime.InvokeAsync<int>("eval",
                     "(function(){ console.log('Hello world invoke call from MyIocService'); return 666; })()");
 

diff --git a/src/BlazorWorker.Demo.IoCExample/MyServiceStartup.cs b/src/BlazorWorker.Demo.IoCExample/MyServiceStartup.cs
@@ -1,8 +1,10 @@
-using BlazorWorker.Extensions.JSRuntime;
-using BlazorWorker.WorkerCore;
+using BlazorWorker.WorkerCore;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.JSInterop;
 using System;
 
+using BlazorWorker.Extensions.JSRuntime;
+
 namespace BlazorWorker.Demo.IoCExample
 {
     public class MyServiceStartup

diff --git a/src/BlazorWorker.Demo.IoCExample/ServiceCollectionHelper.cs b/src/BlazorWorker.Demo.IoCExample/ServiceCollectionHelper.cs
@@ -1,5 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.JSInterop;
 using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
 
 namespace BlazorWorker.Demo.IoCExample
 {
@@ -11,7 +15,7 @@ public static IServiceProvider BuildServiceProviderFromMethod(Configure configur
         {
             var serviceCollection = new ServiceCollection();
             configureMethod(serviceCollection);
-            return  serviceCollection.BuildServiceProvider();
+            return serviceCollection.BuildServiceProvider();
         }
     }
 }
diff --git a/src/BlazorWorker.Demo.IoCExample/SetupIndexedDBExtensions.cs b/src/BlazorWorker.Demo.IoCExample/SetupIndexedDBExtensions.cs
diff --git a/src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/BlazorWorker.Demo.Client.csproj b/src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/BlazorWorker.Demo.Client.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Pages/IndexedDB.razor b/src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Pages/IndexedDB.razor
diff --git a/src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Shared/NavMenu.razor b/src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Shared/NavMenu.razor
@@ -20,7 +20,7 @@
 @code {
     private bool collapseNavMenu = true;
 
-    private string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
 
     private void ToggleNavMenu()
     {

diff --git a/src/BlazorWorker.Demo/Net8/Client/BlazorWorker.Demo.Client/Pages/IndexedDB.razor b/src/BlazorWorker.Demo/Net8/Client/BlazorWorker.Demo.Client/Pages/IndexedDB.razor
diff --git a/src/BlazorWorker.Demo/Net8/Client/BlazorWorker.Demo.Client/Shared/NavMenu.razor b/src/BlazorWorker.Demo/Net8/Client/BlazorWorker.Demo.Client/Shared/NavMenu.razor
@@ -20,7 +20,7 @@
 @code {
     private bool collapseNavMenu = true;
 
-    private string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
 
     private void ToggleNavMenu()
     {

diff --git a/src/BlazorWorker.Demo/Shared/BlazorWorker.Demo.Shared.csproj b/src/BlazorWorker.Demo/Shared/BlazorWorker.Demo.Shared.csproj
@@ -5,6 +5,10 @@
     <Configurations>Debug;Release;Nuget</Configurations>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>1701;1702;1591;CA1416</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\BlazorWorker.WorkerCore\BlazorWorker.WorkerCore.csproj" />
   </ItemGroup>

diff --git a/src/BlazorWorker.Demo/SharedPages/BlazorWorker.Demo.SharedPages.csproj b/src/BlazorWorker.Demo/SharedPages/BlazorWorker.Demo.SharedPages.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">   
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\BlazorWorker.Demo.IoCExample\BlazorWorker.Demo.IoCExample.csproj" />
     <ProjectReference Include="..\..\BlazorWorker.ServiceFactory\BlazorWorker.BackgroundServiceFactory.csproj" />
     <ProjectReference Include="..\..\BlazorWorker.WorkerBackgroundService\BlazorWorker.WorkerBackgroundService.csproj" />
     <ProjectReference Include="..\..\BlazorWorker.WorkerCore\BlazorWorker.WorkerCore.csproj" />

diff --git a/src/BlazorWorker.Demo/SharedPages/Pages/CoreExample.razor b/src/BlazorWorker.Demo/SharedPages/Pages/CoreExample.razor
@@ -65,12 +65,12 @@
 
                 backgroundService = worker.CreateCoreInstanceService();
 
-                handle = await backgroundService.CreateInstance<CoreMathsService>(options =>
+                handle = await backgroundService.CreateInstance<CoreMathsService>(/*options =>
                     options.AddConventionalAssemblyOfService()
 #if NET5_0_OR_GREATER
                         .AddAssemblies("System.Text.RegularExpressions.dll")
 #endif
-                        );
+                        */);
 
                 output += $"{rn}{LogDate()} Background service created.";
                 StateHasChanged();

diff --git a/src/BlazorWorker.Demo/SharedPages/Pages/Http.razor b/src/BlazorWorker.Demo/SharedPages/Pages/Http.razor
@@ -51,9 +51,9 @@
 
                 sw.Start();
                 backgroundService = await worker.CreateBackgroundServiceAsync<WebCallerService>(
-                    options => options
+                    /*options => options
                         .AddConventionalAssemblyOfService()
-                        .AddHttpClient()
+                        .AddHttpClient()*/
                 );
 
                 sw.Stop();