From d128e9e86298285081510364a598d652f9f6702d Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sat, 11 Jan 2025 19:49:19 +0100
Subject: Fix dependency resolution

---
 LibMatrix                                                             | 2 +-
 MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj              | 4 ++++
 MatrixUtils.DmSpaced/MatrixUtils.DmSpaced.csproj                      | 2 +-
 MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj                  | 4 ++++
 MatrixUtils.Web/MatrixUtils.Web.csproj                                | 4 ++--
 MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor                 | 4 ++--
 MatrixUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor | 2 +-
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/LibMatrix b/LibMatrix
index 1f08fe9..76b81ed 160000
--- a/LibMatrix
+++ b/LibMatrix
@@ -1 +1 @@
-Subproject commit 1f08fe9d5c917a4cfc3e4d6ba6d372ac78de0336
+Subproject commit 76b81ed77d8085655bdb3f2777ac237fb30820d2
diff --git a/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj b/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj
index 154e3da..96f9fcb 100644
--- a/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj
+++ b/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj
@@ -5,4 +5,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\LibMatrix\LibMatrix\LibMatrix.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/MatrixUtils.DmSpaced/MatrixUtils.DmSpaced.csproj b/MatrixUtils.DmSpaced/MatrixUtils.DmSpaced.csproj
index 4b0f599..f8dd598 100644
--- a/MatrixUtils.DmSpaced/MatrixUtils.DmSpaced.csproj
+++ b/MatrixUtils.DmSpaced/MatrixUtils.DmSpaced.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj b/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj
index c3e2ec3..e39440e 100644
--- a/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj
+++ b/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj
@@ -8,4 +8,8 @@
         <LangVersion>preview</LangVersion>
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\LibMatrix\LibMatrix\LibMatrix.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/MatrixUtils.Web/MatrixUtils.Web.csproj b/MatrixUtils.Web/MatrixUtils.Web.csproj
index b0db23c..13a9014 100644
--- a/MatrixUtils.Web/MatrixUtils.Web.csproj
+++ b/MatrixUtils.Web/MatrixUtils.Web.csproj
@@ -35,8 +35,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ArcaneLibs.Blazor.Components" Version="1.0.0-preview.20241122-053825" Condition="Configuration == 'Release'"/>
-        <ProjectReference Include="..\ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj" Condition="Configuration == 'Debug'"/>
+        <PackageReference Include="ArcaneLibs.Blazor.Components" Version="1.0.0-preview.20241210-161342" Condition="'$(Configuration)' == 'Release'"/>
+        <ProjectReference Include="..\ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj" Condition="'$(Configuration)' == 'Debug'"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor b/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor
index 667b518..ef484bc 100644
--- a/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor
+++ b/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor
@@ -42,7 +42,7 @@
     private async Task Execute() {
         foreach (var hs in hss) {
             var rooms = await hs.GetJoinedRooms();
-            var tasks = rooms.Select(x=>Execute(hs, x)).ToAsyncEnumerable();
+            var tasks = rooms.Select(x=>ApplyPowerlevelsInRoom(hs, x)).ToAsyncEnumerable();
             await foreach (var a in tasks) {
                 if (!string.IsNullOrWhiteSpace(a)) {
                     log.Add(a);
@@ -52,7 +52,7 @@
         }
     }
 
-    private async Task<string> Execute(AuthenticatedHomeserverGeneric hs, GenericRoom room) {
+    private async Task<string> ApplyPowerlevelsInRoom(AuthenticatedHomeserverGeneric hs, GenericRoom room) {
         try {
             var pls = await room.GetPowerLevelsAsync();
             // if (pls.GetUserPowerLevel(hs.WhoAmI.UserId) == pls.UsersDefault) return "I am default PL in " + room.RoomId;
diff --git a/MatrixUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor b/MatrixUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor
index fc536c0..a1d870c 100644
--- a/MatrixUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor
+++ b/MatrixUtils.Web/Shared/PolicyEditorComponents/PolicyEditorModal.razor
@@ -52,7 +52,7 @@
                             else {
                                 switch (Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType) {
                                     case Type t when t == typeof(string):
-                                        <FancyTextBox Value="@(getter?.Invoke(PolicyData, null) as string)" ValueChanged="@(e => { Console.WriteLine($"{prop.Name} ({setter is not null}) -> {e}"); setter?.Invoke(PolicyData, [e]); PolicyEvent.TypedContent = PolicyData; StateHasChanged(); })"></FancyTextBox>
+                                        <FancyTextBox Value="@(getter?.Invoke(PolicyData, null) as string)" ValueChanged="@((string e) => { Console.WriteLine($"{prop.Name} ({setter is not null}) -> {e}"); setter?.Invoke(PolicyData, [e]); PolicyEvent.TypedContent = PolicyData; StateHasChanged(); })"></FancyTextBox>
                                         break;
                                     case Type t when t == typeof(DateTime):
                                         if (!isNullable) {
-- 
cgit 1.5.1