diff options
author | TheArcaneBrony <myrainbowdash949@gmail.com> | 2023-11-23 05:43:42 +0100 |
---|---|---|
committer | TheArcaneBrony <myrainbowdash949@gmail.com> | 2023-11-23 05:43:42 +0100 |
commit | 41181f694c290acd5c594ef624cb9c1592c8f199 (patch) | |
tree | d6fc1671638c97e9789f26331fde8cd5b02f5f64 | |
parent | Update to .net 8 (diff) | |
download | MatrixUtils-41181f694c290acd5c594ef624cb9c1592c8f199.tar.xz |
Update upstreams
m--------- | ArcaneLibs | 0 | ||||
m--------- | LibMatrix | 0 | ||||
-rw-r--r-- | MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj | 14 | ||||
-rw-r--r-- | MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj | 2 | ||||
-rw-r--r-- | MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj | 4 | ||||
-rw-r--r-- | MatrixRoomUtils.sln.DotSettings.user | 6 | ||||
m--------- | MxApiExtensions | 0 | ||||
-rwxr-xr-x | mkdeps | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/ArcaneLibs b/ArcaneLibs -Subproject 6474a2a5f839e449788a0dd59ae95e996ad6454 +Subproject 3b815f2bffc65d7b42e8845464d6f07391d612e diff --git a/LibMatrix b/LibMatrix -Subproject b6cc5ef26189f4278c0409e1baf7768805ed2f9 +Subproject 3e934eee892f69a8f78b9495099300052270276 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 @@ <ItemGroup> - <PackageReference Include="Avalonia" Version="11.0.4" /> - <PackageReference Include="Avalonia.Desktop" Version="11.0.4" /> - <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" /> - <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.4" /> + <PackageReference Include="Avalonia" Version="11.0.5" /> + <PackageReference Include="Avalonia.Desktop" Version="11.0.5" /> + <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" /> + <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" /> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> - <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" /> + <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.5" /> <PackageReference Include="Sentry" Version="3.36.0" /> </ItemGroup> @@ -35,8 +35,8 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.2" /> - <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" /> + <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.5" /> + <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> </ItemGroup> <ItemGroup> <Content Include="appsettings*.json"> 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 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.10" /> + <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" /> </ItemGroup> <ItemGroup> 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 @@ <ItemGroup> <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" /> <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" /> - <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" /> - <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" PrivateAssets="all" /> + <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" /> + <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" /> </ItemGroup> <ItemGroup> 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 @@ <s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=c33adfe1_002D4af3_002D4c1e_002D9689_002De5e34a9f9113/@EntryIndexedValue"><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></s:String> - <s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=2cb12623_002D4918_002D4176_002D9b4a_002D88d846ccd3ed_0023LibMatrix_002EExampleBot/@EntryIndexedValue">True</s:Boolean> - <s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=48dbb05f_002Db007_002D4b24_002D89b3_002D3cc177c79007_0023MediaModeratorPoC/@EntryIndexedValue">True</s:Boolean> - <s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=95052ee6_002D7513_002D46fb_002D91bd_002Dee82026b42f1_0023PluralContactBotPoC/@EntryIndexedValue">True</s:Boolean> + + + diff --git a/MxApiExtensions b/MxApiExtensions -Subproject 2e8aa30daa4a33fa33622bccb344dfc24483e32 +Subproject d3d95bbb271902391cbd43a11a6a5d72b0ccfae 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 ) |