diff options
| 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 | ||||
| -rwxr-xr-x | mkdeps | 20 |
5 files changed, 24 insertions, 16 deletions
diff --git a/LibMatrix b/LibMatrix -Subproject 8fdc48e5b21b1eea61534b181585858727500f3 +Subproject 15d2ed6a992619b72ffd692a37e93f53ae948ab diff --git a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj b/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj index e6a8169..4dc9558 100644 --- a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj +++ b/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj @@ -20,13 +20,13 @@ <ItemGroup> - <PackageReference Include="Avalonia" Version="11.0.0" /> - <PackageReference Include="Avalonia.Desktop" Version="11.0.0" /> - <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" /> - <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0" /> + <PackageReference Include="Avalonia" Version="11.0.3" /> + <PackageReference Include="Avalonia.Desktop" Version="11.0.3" /> + <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.3" /> + <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.3" /> <!--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.0" /> - <PackageReference Include="Sentry" Version="3.34.0" /> + <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.3" /> + <PackageReference Include="Sentry" Version="3.35.0" /> </ItemGroup> @@ -36,7 +36,7 @@ <ItemGroup> <PackageReference Include="ArcaneLibs" Version="1.0.0-preview3020494760.012ed3f" /> - <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0.1" /> + <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.2" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" /> </ItemGroup> <ItemGroup> diff --git a/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj b/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj index a647a2f..f89a603 100644 --- a/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj +++ b/MatrixRoomUtils.Web.Server/MatrixRoomUtils.Web.Server.csproj @@ -7,7 +7,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.7" /> + <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.10" /> </ItemGroup> <ItemGroup> diff --git a/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj b/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj index e6580e9..a351b5f 100644 --- a/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj +++ b/MatrixRoomUtils.Web/MatrixRoomUtils.Web.csproj @@ -9,8 +9,8 @@ <ItemGroup> <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" /> <PackageReference Include="Blazored.SessionStorage" Version="2.3.0" /> - <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.7" /> - <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.7" PrivateAssets="all" /> + <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" /> + <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" PrivateAssets="all" /> </ItemGroup> <ItemGroup> diff --git a/mkdeps b/mkdeps index e6bea58..eb39592 100755 --- a/mkdeps +++ b/mkdeps @@ -4,7 +4,7 @@ projects=( MatrixRoomUtils.Web ) -find . | grep -E '(bin|obj)$' | while read d; do rm -rf $d & done +find . | grep -E '(bin|obj)$' | while read -r d; do rm -rf "$d" & done wait execDir=$(pwd) @@ -12,12 +12,20 @@ execDir=$(pwd) for p in $projects do ( - cd $p + set -euo pipefail + cd "$p" || exit pwd - MSBUILDLIVELOGGER=false dotnet restore --packages=packages -v n --ucr - #dotnet --list-sdks - ${execDir}/nuget-to-nix.sh packages | tee deps.nix - #where nuget-to-nix + MSBUILDLIVELOGGER=false dotnet restore --packages=packages -v n --ucr || exit 1 + + #for blazor: https://globalcdn.nuget.org/packages/microsoft.netcore.app.runtime.mono.browser-wasm.7.0.10.nupkg +# if [ -f wwwroot/index.html ]; then +# curl -L https://globalcdn.nuget.org/packages/microsoft.netcore.app.runtime.mono.browser-wasm.7.0.10.nupkg -o Microsoft.NETCore.App.Runtime.Mono.browser-wasm.7.0.10.nupkg +# mkdir -p packages/Microsoft.NETCore.App.Runtime.Mono.browser-wasm/7.0.10 +# unzip -d packages/Microsoft.NETCore.App.Runtime.Mono.browser-wasm/7.0.10 Microsoft.NETCore.App.Runtime.Mono.browser-wasm.7.0.10.nupkg +# rm Microsoft.NETCore.App.Runtime.Mono.browser-wasm.7.0.10.nupkg +# fi + + "${execDir}"/nuget-to-nix.sh packages | tee deps.nix pwd du -sh packages rm -rf packages |