From 41181f694c290acd5c594ef624cb9c1592c8f199 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Thu, 23 Nov 2023 05:43:42 +0100 Subject: Update upstreams --- ArcaneLibs | 2 +- LibMatrix | 2 +- MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj | 14 +++++++------- .../MatrixRoomUtils.Web.Server.csproj | 2 +- MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj | 4 ++-- MatrixRoomUtils.sln.DotSettings.user | 6 +++--- MxApiExtensions | 2 +- mkdeps | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ArcaneLibs b/ArcaneLibs index 6474a2a..3b815f2 160000 --- a/ArcaneLibs +++ b/ArcaneLibs @@ -1 +1 @@ -Subproject commit 6474a2a5f839e449788a0dd59ae95e996ad64542 +Subproject commit 3b815f2bffc65d7b42e8845464d6f07391d612e1 diff --git a/LibMatrix b/LibMatrix index b6cc5ef..3e934ee 160000 --- a/LibMatrix +++ b/LibMatrix @@ -1 +1 @@ -Subproject commit b6cc5ef26189f4278c0409e1baf7768805ed2f90 +Subproject commit 3e934eee892f69a8f78b94950993000522702769 diff --git a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj b/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj index 93eaacf..012f74b 100644 --- a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj +++ b/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj @@ -20,12 +20,12 @@ - - - - + + + + - + @@ -35,8 +35,8 @@ - - + + diff --git a/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj b/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj index 6f902c2..6e11bbe 100644 --- a/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj +++ b/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj @@ -8,7 +8,7 @@ - + diff --git a/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj b/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj index afe46c1..e5ca180 100644 --- a/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj +++ b/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/MatrixRoomUtils.sln.DotSettings.user b/MatrixRoomUtils.sln.DotSettings.user index 7597038..ffebeec 100644 --- a/MatrixRoomUtils.sln.DotSettings.user +++ b/MatrixRoomUtils.sln.DotSettings.user @@ -44,9 +44,9 @@ <SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from &lt;LibMatrix&gt; #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> <Project Location="/home/root@Rory/git/Matrix/MatrixRoomUtils" Presentation="&lt;LibMatrix&gt;" /> </SessionState> - True - True - True + + + diff --git a/MxApiExtensions b/MxApiExtensions index 2e8aa30..d3d95bb 160000 --- a/MxApiExtensions +++ b/MxApiExtensions @@ -1 +1 @@ -Subproject commit 2e8aa30daa4a33fa33622bccb344dfc24483e320 +Subproject commit d3d95bbb271902391cbd43a11a6a5d72b0ccfaef diff --git a/mkdeps b/mkdeps index eb39592..ccb1370 100755 --- a/mkdeps +++ b/mkdeps @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i "bash -x" -p bash nuget-to-nix git dotnet-sdk_7 nix curl jq yq +#!nix-shell -i "bash -x" -p bash nuget-to-nix git dotnet-sdk_8 nix curl jq yq projects=( MatrixRoomUtils.Web ) -- cgit 1.5.1