bump dep versions

StardustDL · Apr 3, 2021 · b2e4c64 · b2e4c64
1 parent 335a2a3
commit b2e4c64
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 40 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "strawberryshake.tools": {
-      "version": "11.1.0-preview.73",
+      "version": "11.1.0",
       "commands": [
         "dotnet-graphql"
       ]

diff --git a/Modulight.sln b/Modulight.sln
@@ -23,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hello", "hello", "{DD934DD7
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Delights.Modules.Hello.Shared", "src\modules\hello\Delights.Modules.Hello.Shared\Delights.Modules.Hello.Shared.shproj", "{058AB875-CB8C-4A40-A154-E42C7FFDF4A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Delights.Modules.Hello", "src\modules\hello\Delights.Modules.Hello\Delights.Modules.Hello.csproj", "{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Delights.Modules.Hello.Server", "src\modules\hello\Delights.Modules.Hello.Server\Delights.Modules.Hello.Server.csproj", "{85CB913C-4CE0-42AF-88C6-C33EF6E96D34}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Delights.Modules.Hello.UI", "src\modules\hello\Delights.Modules.Hello.UI\Delights.Modules.Hello.UI.csproj", "{DE633E7B-2562-4A5A-A522-847C8A5C9802}"
@@ -41,13 +39,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{9098AF37
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "build\Build.csproj", "{6516817A-6BBE-4945-ADEF-CFEEA7A99F23}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.UI.Clean", "test\Test.UI.Clean\Test.UI.Clean.csproj", "{F9493A51-1577-484A-8165-AC1203E54ED3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.UI.Clean", "test\Test.UI.Clean\Test.UI.Clean.csproj", "{F9493A51-1577-484A-8165-AC1203E54ED3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Delights.Modules.Hello", "src\modules\hello\Delights.Modules.Hello\Delights.Modules.Hello.csproj", "{22E47306-C79B-4A43-BD59-B5E0822B045A}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\modules\hello\Delights.Modules.Hello.Shared\Delights.Modules.Hello.Shared.projitems*{058ab875-cb8c-4a40-a154-e42c7ffdf4a1}*SharedItemsImports = 13
+		src\modules\hello\Delights.Modules.Hello.Shared\Delights.Modules.Hello.Shared.projitems*{22e47306-c79b-4a43-bd59-b5e0822b045a}*SharedItemsImports = 5
 		src\modules\hello\Delights.Modules.Hello.Shared\Delights.Modules.Hello.Shared.projitems*{85cb913c-4ce0-42af-88c6-c33ef6e96d34}*SharedItemsImports = 5
-		src\modules\hello\Delights.Modules.Hello.Shared\Delights.Modules.Hello.Shared.projitems*{a3ed5966-43fd-4ef1-a520-7ad40ef4d596}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -130,18 +130,6 @@ Global
 		{B4672AA5-E6AF-4E77-88EE-43CB17BF589B}.Release|x64.Build.0 = Release|Any CPU
 		{B4672AA5-E6AF-4E77-88EE-43CB17BF589B}.Release|x86.ActiveCfg = Release|Any CPU
 		{B4672AA5-E6AF-4E77-88EE-43CB17BF589B}.Release|x86.Build.0 = Release|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Debug|x64.Build.0 = Debug|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Debug|x86.Build.0 = Debug|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Release|x64.ActiveCfg = Release|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Release|x64.Build.0 = Release|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Release|x86.ActiveCfg = Release|Any CPU
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596}.Release|x86.Build.0 = Release|Any CPU
 		{85CB913C-4CE0-42AF-88C6-C33EF6E96D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{85CB913C-4CE0-42AF-88C6-C33EF6E96D34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85CB913C-4CE0-42AF-88C6-C33EF6E96D34}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -238,6 +226,18 @@ Global
 		{F9493A51-1577-484A-8165-AC1203E54ED3}.Release|x64.Build.0 = Release|Any CPU
 		{F9493A51-1577-484A-8165-AC1203E54ED3}.Release|x86.ActiveCfg = Release|Any CPU
 		{F9493A51-1577-484A-8165-AC1203E54ED3}.Release|x86.Build.0 = Release|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Debug|x64.Build.0 = Debug|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Debug|x86.Build.0 = Debug|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Release|x64.ActiveCfg = Release|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Release|x64.Build.0 = Release|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Release|x86.ActiveCfg = Release|Any CPU
+		{22E47306-C79B-4A43-BD59-B5E0822B045A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -246,13 +246,13 @@ Global
 		{2F1565A4-FD8B-47A1-9E96-D2E989FA9ED8} = {193F731A-A3DE-4DDC-842C-56AFA5D2B8F5}
 		{DD934DD7-12BA-4B29-AC96-8812DFEA7EAD} = {EB1A9B34-879A-4763-AFF9-28FD269495FE}
 		{058AB875-CB8C-4A40-A154-E42C7FFDF4A1} = {DD934DD7-12BA-4B29-AC96-8812DFEA7EAD}
-		{A3ED5966-43FD-4EF1-A520-7AD40EF4D596} = {DD934DD7-12BA-4B29-AC96-8812DFEA7EAD}
 		{85CB913C-4CE0-42AF-88C6-C33EF6E96D34} = {DD934DD7-12BA-4B29-AC96-8812DFEA7EAD}
 		{DE633E7B-2562-4A5A-A522-847C8A5C9802} = {DD934DD7-12BA-4B29-AC96-8812DFEA7EAD}
 		{03ED459E-8288-47DF-977A-BD73B7E7D6C6} = {193F731A-A3DE-4DDC-842C-56AFA5D2B8F5}
 		{654F5EB8-2CF9-4578-9137-123B0FC2955C} = {193F731A-A3DE-4DDC-842C-56AFA5D2B8F5}
 		{6516817A-6BBE-4945-ADEF-CFEEA7A99F23} = {9098AF37-1239-46EA-9DC5-233B944E8733}
 		{F9493A51-1577-484A-8165-AC1203E54ED3} = {193F731A-A3DE-4DDC-842C-56AFA5D2B8F5}
+		{22E47306-C79B-4A43-BD59-B5E0822B045A} = {DD934DD7-12BA-4B29-AC96-8812DFEA7EAD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {98F4A001-F8D2-4F67-9C6E-8AC3C64E45A4}

diff --git a/build/Build.csproj b/build/Build.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Cake.Coverlet" Version="2.5.4" />
-		<PackageReference Include="Cake.DocFx" Version="0.13.1" />
+		<PackageReference Include="Cake.DocFx" Version="1.0.0" />
 		<PackageReference Include="Cake.Frosting" Version="1.1.0" />
 		<PackageReference Include="Cake.Issues.PullRequests.GitHubActions" Version="0.9.0" />
 	</ItemGroup>

diff --git a/src/Modulight.Modules.Server.GraphQL/Modulight.Modules.Server.GraphQL.csproj b/src/Modulight.Modules.Server.GraphQL/Modulight.Modules.Server.GraphQL.csproj
@@ -15,8 +15,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="HotChocolate.Data" Version="11.0.9" />
-		<PackageReference Include="HotChocolate.AspNetCore" Version="11.0.9" />
+    <PackageReference Include="HotChocolate.Data" Version="11.1.0" />
+		<PackageReference Include="HotChocolate.AspNetCore" Version="11.1.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Modulight.Modules.Test/Modulight.Modules.Test.csproj b/src/Modulight.Modules.Test/Modulight.Modules.Test.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
 
   </ItemGroup>
 

diff --git a/src/Modulight.UI.Blazor/App.razor b/src/Modulight.UI.Blazor/App.razor
@@ -1,5 +1,4 @@
 @using System.Reflection
-@inject IRazorComponentClientModuleCollection ClientModuleHost
 @inject IBlazorUIProvider UIProvider
 @inject IOptions<BlazorUiModuleOption> Options
 
@@ -23,8 +22,8 @@
     {
         AdditionalAssemblies.Clear();
 
-        var results = await ClientModuleHost.GetAssembliesForRouting(context.Path, cancellationToken: context.CancellationToken);
-        var filterdResults = new HashSet<Assembly>(results);
-        AdditionalAssemblies.AddRange(filterdResults.Where(x => x != UIProvider.AppAssembly));
+        await UIProvider.OnNavigateAsync(context);
+
+        AdditionalAssemblies.AddRange(UIProvider.AdditionalAssemblies.Where(x => x != UIProvider.AppAssembly));
     }
 }
diff --git a/src/Modulight.UI.Blazor/Modulight.UI.Blazor.csproj b/src/Modulight.UI.Blazor/Modulight.UI.Blazor.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
-    <PackageReference Include="StardustDL.RazorComponents.AntDesigns" Version="0.7.1.30" />
+    <PackageReference Include="StardustDL.RazorComponents.AntDesigns" Version="0.7.3" />
     <PackageReference Include="StardustDL.RazorComponents.Bootstraps" Version="4.6.0.30" />
     <PackageReference Include="StardustDL.RazorComponents.MaterialDesignIcons" Version="5.9.55.30" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web.Extensions" Version="5.0.0-preview9.20513.1" />

diff --git a/src/Modulight.UI.Blazor/Services/BlazorUIProvider.cs b/src/Modulight.UI.Blazor/Services/BlazorUIProvider.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Routing;
 using Modulight.Modules.Client.RazorComponents;
 using Modulight.Modules.Hosting;
 using Modulight.UI.Blazor.Components;
@@ -7,6 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace Modulight.UI.Blazor.Services
 {
@@ -81,6 +83,18 @@ public interface IBlazorUIProvider
         /// Default assembly.
         /// </summary>
         Assembly AppAssembly { get; }
+
+        /// <summary>
+        /// Additional assemblies
+        /// </summary>
+        IEnumerable<Assembly> AdditionalAssemblies { get; }
+
+        /// <summary>
+        /// On router navigating
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        Task OnNavigateAsync(NavigationContext context);
     }
 
     /// <summary>
@@ -130,6 +144,9 @@ public BlazorUIProvider(IModuleHost host)
         /// <inheritdoc/>
         public virtual Type RootComponent => typeof(App);
 
+        /// <inheritdoc/>
+        public virtual IEnumerable<Assembly> AdditionalAssemblies { get; protected set; } = Array.Empty<Assembly>();
+
         /// <inheritdoc/>
         public virtual IEnumerable<IRazorComponentClientModule> GetVisibleClientModules()
         {
@@ -139,5 +156,13 @@ public virtual IEnumerable<IRazorComponentClientModule> GetVisibleClientModules(
                 return provider is not null && provider.RootPath is not "";
             });
         }
+
+        /// <inheritdoc/>
+        public virtual async Task OnNavigateAsync(NavigationContext context)
+        {
+            var results = await RazorComponentClientModuleCollection.GetAssembliesForRouting(context.Path, cancellationToken: context.CancellationToken);
+            var filterdResults = new HashSet<Assembly>(results);
+            AdditionalAssemblies = filterdResults.Where(x => x != AppAssembly);
+        }
     }
 }
diff --git a/src/modules/hello/Delights.Modules.Hello/Delights.Modules.Hello.csproj b/src/modules/hello/Delights.Modules.Hello/Delights.Modules.Hello.csproj
@@ -13,9 +13,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    <PackageReference Include="StardustDL.RazorComponents.MaterialDesignIcons" Version="5.9.55.27" />
-    <PackageReference Include="StrawberryShake.CodeGeneration.CSharp.Analyzers" Version="11.1.0-preview.73" />
-    <PackageReference Include="StrawberryShake.Transport.Http" Version="11.1.0-preview.73" />
+    <PackageReference Include="StardustDL.RazorComponents.MaterialDesignIcons" Version="5.9.55.30" />
+    <PackageReference Include="StrawberryShake.CodeGeneration.CSharp.Analyzers" Version="11.1.0" />
+    <PackageReference Include="StrawberryShake.Transport.Http" Version="11.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/modules/hello/Delights.Modules.Hello/HelloModule.cs b/src/modules/hello/Delights.Modules.Hello/HelloModule.cs
@@ -49,12 +49,11 @@ class Startup : ModuleStartup
     {
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddHttpClient<HelloClient>((sp, client) =>
-                {
-                    var option = sp.GetRequiredService<IOptions<ModuleOption>>().Value;
-                    client.BaseAddress = new Uri(option.GraphQLEndpoint.TrimEnd('/') + $"/Hello");
-                });
-            services.AddHelloClient();
+            services.AddHelloClient().ConfigureHttpClient((sp, client) =>
+            {
+                var option = sp.GetRequiredService<IOptions<ModuleOption>>().Value;
+                client.BaseAddress = new Uri(option.GraphQLEndpoint.TrimEnd('/') + $"/Hello");
+            });
             base.ConfigureServices(services);
         }
     }

diff --git a/test/Test.Modulights.UI.Wasm/Test.Modulights.UI.Wasm.csproj b/test/Test.Modulights.UI.Wasm/Test.Modulights.UI.Wasm.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\modules\hello\Delights.Modules.Hello.UI\Delights.Modules.Hello.UI.csproj" />
-    <ProjectReference Include="..\..\src\modules\hello\Delights.Modules.Hello\Delights.Modules.Hello.csproj" />
     <ProjectReference Include="..\..\src\Modulight.UI.Blazor\Modulight.UI.Blazor.csproj" />
   </ItemGroup>
 

diff --git a/test/Test.Modulights/Test.Modulights.csproj b/test/Test.Modulights/Test.Modulights.csproj
@@ -15,9 +15,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
 
   </ItemGroup>