diff --git a/.gitignore b/.gitignore
index 984ec54..67e71e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ MatrixRoomUtils.Bot/bot_data/
appsettings.Local*.json
nixpkgs/
*.DotSettings.user
+**/.DS_Store
*.patch
test.tsv
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/.gitignore b/.idea/.idea.MatrixUtils/.idea/.gitignore
index f938d5a..f938d5a 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/.gitignore
+++ b/.idea/.idea.MatrixUtils/.idea/.gitignore
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/.name b/.idea/.idea.MatrixUtils/.idea/.name
index 58beadf..58beadf 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/.name
+++ b/.idea/.idea.MatrixUtils/.idea/.name
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/avalonia.xml b/.idea/.idea.MatrixUtils/.idea/avalonia.xml
index 0aa65bb..0aa65bb 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/avalonia.xml
+++ b/.idea/.idea.MatrixUtils/.idea/avalonia.xml
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.MatrixUtils/.idea/codeStyles/codeStyleConfig.xml
index a55e7a1..a55e7a1 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/.idea.MatrixUtils/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/encodings.xml b/.idea/.idea.MatrixUtils/.idea/encodings.xml
index df87cf9..df87cf9 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/encodings.xml
+++ b/.idea/.idea.MatrixUtils/.idea/encodings.xml
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/indexLayout.xml b/.idea/.idea.MatrixUtils/.idea/indexLayout.xml
index 4520708..4520708 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/indexLayout.xml
+++ b/.idea/.idea.MatrixUtils/.idea/indexLayout.xml
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.MatrixUtils/.idea/inspectionProfiles/Project_Default.xml
index 55540ea..55540ea 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/.idea.MatrixUtils/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/.idea.MatrixRoomUtils/.idea/vcs.xml b/.idea/.idea.MatrixUtils/.idea/vcs.xml
index 94a25f7..94a25f7 100644
--- a/.idea/.idea.MatrixRoomUtils/.idea/vcs.xml
+++ b/.idea/.idea.MatrixUtils/.idea/vcs.xml
diff --git a/LibMatrix b/LibMatrix
-Subproject bb0c00531dfacd30ecef1ac4444c2e3281fa36b
+Subproject 1f08fe9d5c917a4cfc3e4d6ba6d372ac78de033
diff --git a/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj b/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj
index 0b8e793..154e3da 100644
--- a/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj
+++ b/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj
@@ -5,8 +5,4 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\LibMatrix\LibMatrix\LibMatrix.csproj" />
- </ItemGroup>
</Project>
diff --git a/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj b/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj
index aaee6b6..c3e2ec3 100644
--- a/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj
+++ b/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj
@@ -8,8 +8,4 @@
<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 2c4bb64..b0db23c 100644
--- a/MatrixUtils.Web/MatrixUtils.Web.csproj
+++ b/MatrixUtils.Web/MatrixUtils.Web.csproj
@@ -13,7 +13,7 @@
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
<BlazorCacheBootResources>false</BlazorCacheBootResources>
<TrimMode>full</TrimMode>
-<!-- <RunAOTCompilation>true</RunAOTCompilation>-->
+ <!-- <RunAOTCompilation>true</RunAOTCompilation>-->
<BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
@@ -21,59 +21,38 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
- <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
- <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
- <PackageReference Include="SpawnDev.BlazorJS.WebWorkers" Version="2.5.18" />
+ <PackageReference Include="Blazored.LocalStorage" Version="4.5.0"/>
+ <PackageReference Include="Blazored.SessionStorage" Version="2.4.0"/>
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0"/>
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all"/>
+ <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0"/>
+ <PackageReference Include="SpawnDev.BlazorJS.WebWorkers" Version="2.5.18"/>
</ItemGroup>
<ItemGroup>
- <ProjectReference Condition="Exists('..\LibMatrix\ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj')" Include="..\LibMatrix\ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj" />
- <PackageReference Condition="!Exists('..\LibMatrix\ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj')" Include="ArcaneLibs.Blazor.Components" Version="*-preview*" />
- <ProjectReference Include="..\LibMatrix\LibMatrix\LibMatrix.csproj" />
- <ProjectReference Include="..\MatrixUtils.Abstractions\MatrixUtils.Abstractions.csproj" />
- <ProjectReference Include="..\MatrixUtils.LibDMSpace\MatrixUtils.LibDMSpace.csproj" />
+ <ProjectReference Include="..\MatrixUtils.Abstractions\MatrixUtils.Abstractions.csproj"/>
+ <ProjectReference Include="..\MatrixUtils.LibDMSpace\MatrixUtils.LibDMSpace.csproj"/>
</ItemGroup>
<ItemGroup>
- <Content Update="appsettings.Development.json">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Update="appsettings.json">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Update="wwwroot\appsettings.json">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
+ <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'"/>
</ItemGroup>
<ItemGroup>
- <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+ <Content Update="appsettings.Development.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Update="appsettings.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Update="wwwroot\appsettings.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<ItemGroup>
- <_ContentIncludedByDefault Remove="Pages\Client\ClientComponents\ClientRoomList.razor" />
- <_ContentIncludedByDefault Remove="Pages\Client\ClientComponents\ClientStatusList.razor" />
- <_ContentIncludedByDefault Remove="Pages\Client\ClientComponents\MatrixClient.razor" />
- <_ContentIncludedByDefault Remove="Pages\Client\Index.razor" />
+ <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js"/>
</ItemGroup>
- <ItemGroup>
- <AdditionalFiles Include="Pages\Labs\Client\ClientComponents\ClientRoomList.razor" />
- <AdditionalFiles Include="Pages\Labs\Client\ClientComponents\ClientStatusList.razor" />
- <AdditionalFiles Include="Pages\Labs\Client\ClientComponents\MatrixClient.razor" />
- <AdditionalFiles Include="Pages\Labs\Client\Index.razor" />
- <AdditionalFiles Include="Pages\Labs\DMSpace\DMSpaceStages\DMSpaceStage0.razor" />
- <AdditionalFiles Include="Pages\Labs\DMSpace\DMSpaceStages\DMSpaceStage1.razor" />
- <AdditionalFiles Include="Pages\Labs\DMSpace\DMSpaceStages\DMSpaceStage2.razor" />
- <AdditionalFiles Include="Pages\Labs\DMSpace\DMSpaceStages\DMSpaceStage3.razor" />
- <AdditionalFiles Include="Pages\Labs\Rooms2\Index2Components\MainTabComponents\MainTabSpaceItem.razor" />
- <AdditionalFiles Include="Pages\Labs\Rooms2\Index2Components\RoomsIndex2ByRoomTypeTab.razor" />
- <AdditionalFiles Include="Pages\Labs\Rooms2\Index2Components\RoomsIndex2DMsTab.razor" />
- <AdditionalFiles Include="Pages\Labs\Rooms2\Index2Components\RoomsIndex2MainTab.razor" />
- <AdditionalFiles Include="Pages\Labs\Rooms2\Index2Components\RoomsIndex2SyncContainer.razor" />
- </ItemGroup>
-
</Project>
diff --git a/MatrixUtils.sln b/MatrixUtils.sln
index 01fb16a..e4193c2 100644
--- a/MatrixUtils.sln
+++ b/MatrixUtils.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-#
+#
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatrixUtils.Web", "MatrixUtils.Web\MatrixUtils.Web.csproj", "{D38DA95D-DD83-4340-96A4-6F59FC6AE3D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatrixUtils.Web.Server", "MatrixUtils.Web.Server\MatrixUtils.Web.Server.csproj", "{F997F26F-2EC1-4D18-B3DD-C46FB2AD65C0}"
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LibMatrix", "LibMatrix", "{
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArcaneLibs", "ArcaneLibs", "{84BE90C4-2FDE-4A48-B154-58926EF24846}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLib.Tests", "LibMatrix\ArcaneLibs\ArcaneLib.Tests\ArcaneLib.Tests.csproj", "{EC5536AB-0613-4CB5-B22B-822A3DBB112A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Tests", "LibMatrix\ArcaneLibs\ArcaneLibs.Tests\ArcaneLibs.Tests.csproj", "{EC5536AB-0613-4CB5-B22B-822A3DBB112A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Blazor.Components", "LibMatrix\ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj", "{CF252EDF-C5A1-4030-8666-C78AA0A3B7DE}"
EndProject
@@ -31,14 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.UsageTest", "Lib
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs", "LibMatrix\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj", "{03466515-77CC-49E4-90E5-9A21EDD0A644}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExampleBots", "ExampleBots", "{D11CC8C3-9F25-4424-9006-2A8FC3F9473D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.ExampleBot", "LibMatrix\ExampleBots\LibMatrix.ExampleBot\LibMatrix.ExampleBot.csproj", "{8BB44883-AA14-4E0C-A999-A4391AF14FA8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModerationBot", "LibMatrix\ExampleBots\ModerationBot\ModerationBot.csproj", "{8AFE074B-3102-41DF-A05E-982B7A2A8F64}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralContactBotPoC", "LibMatrix\ExampleBots\PluralContactBotPoC\PluralContactBotPoC.csproj", "{2FAB4B42-4D09-48F7-A589-5F264FF5C620}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.EventTypes", "LibMatrix\LibMatrix.EventTypes\LibMatrix.EventTypes.csproj", "{0336306C-285A-4810-9253-5C5F0373992E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix", "LibMatrix\LibMatrix\LibMatrix.csproj", "{D7E5B226-114C-4747-9277-A4D6341A16FE}"
@@ -131,18 +123,6 @@ Global
{03466515-77CC-49E4-90E5-9A21EDD0A644}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03466515-77CC-49E4-90E5-9A21EDD0A644}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03466515-77CC-49E4-90E5-9A21EDD0A644}.Release|Any CPU.Build.0 = Release|Any CPU
- {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Release|Any CPU.Build.0 = Release|Any CPU
- {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Release|Any CPU.Build.0 = Release|Any CPU
- {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Release|Any CPU.Build.0 = Release|Any CPU
{0336306C-285A-4810-9253-5C5F0373992E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0336306C-285A-4810-9253-5C5F0373992E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0336306C-285A-4810-9253-5C5F0373992E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -210,10 +190,6 @@ Global
{ADFBDF2D-0CEC-43C1-8896-75DCE439CF72} = {84BE90C4-2FDE-4A48-B154-58926EF24846}
{D6315791-949B-4501-AA95-50516DE899C1} = {84BE90C4-2FDE-4A48-B154-58926EF24846}
{03466515-77CC-49E4-90E5-9A21EDD0A644} = {84BE90C4-2FDE-4A48-B154-58926EF24846}
- {D11CC8C3-9F25-4424-9006-2A8FC3F9473D} = {933DC8A6-8B1F-46BF-9046-4B636AA46469}
- {8BB44883-AA14-4E0C-A999-A4391AF14FA8} = {D11CC8C3-9F25-4424-9006-2A8FC3F9473D}
- {8AFE074B-3102-41DF-A05E-982B7A2A8F64} = {D11CC8C3-9F25-4424-9006-2A8FC3F9473D}
- {2FAB4B42-4D09-48F7-A589-5F264FF5C620} = {D11CC8C3-9F25-4424-9006-2A8FC3F9473D}
{0336306C-285A-4810-9253-5C5F0373992E} = {933DC8A6-8B1F-46BF-9046-4B636AA46469}
{D7E5B226-114C-4747-9277-A4D6341A16FE} = {933DC8A6-8B1F-46BF-9046-4B636AA46469}
{B37F87A8-B5E2-4724-800C-F5D9A91F35C7} = {933DC8A6-8B1F-46BF-9046-4B636AA46469}
|
