Skip to content

Commit 322a87b

Browse files
MaxymGornColdForeigndependabot[bot]
authored
Update nuget 1 4 2 (#415)
## Target <!-- Why are you making this change? --> Overall, this will reduce the number of iterations with incomplete data and speed up the transfer when interception the image chunks, in addition, it gives more opportunities to control the size of the stream #### Open Questions <!-- OPTIONAL - [ ] Use the GitHub checklists to spark discussion on issues that may arise from your approach. Please tick the box and explain your answer. --> ## Checklist <!-- It serves as a gentle reminder for common tasks. Confirm it's done and check everything that applies. --> - [ ] Tests cover new or modified code - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the site documentation - [ ] I have made corresponding changes to the README, NuGet README file - [ ] My changes generate no new warnings - [ ] New dependencies added or updated - [ ] Includes breaking changes - [ ] Version bumped ## Visuals <!-- OPTIONAL Show results both before and after this change. When the output changes, it can be a screenshot of a trace, metric, or log illustrating the change. --> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: ColdForeign <[email protected]> Co-authored-by: George Radchuk <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 9c9eefc commit 322a87b

File tree

69 files changed

+1408
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1408
-61
lines changed

.github/workflows/cd.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153

154154
- name: Install Windows, Android MAUI Workloads
155155
run: |
156-
dotnet workload install maui-windows maui-android --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/8.0.1xx.json --ignore-failed-sources
156+
dotnet workload install maui-windows maui-android --ignore-failed-sources
157157
dotnet workload install wasm-tools --ignore-failed-sources
158158
159159
- name: list workloads
@@ -201,4 +201,8 @@ jobs:
201201

202202
- name: DotNet Build Blazor Server Demo Project for .net 9
203203
run: dotnet build --no-restore
204-
working-directory: examples\Cropper.Blazor.Server.Net9
204+
working-directory: examples\Cropper.Blazor.Server.Net9
205+
206+
- name: DotNet Build Blazor MAUI Demo Project for .net 9
207+
run: dotnet build --no-restore
208+
working-directory: examples\Cropper.Blazor.MAUI.Net9

examples/Cropper.Blazor.Demo.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FE00A0
3333
EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cropper.Blazor.Server.Net9", "Cropper.Blazor.Server.Net9\Cropper.Blazor.Server.Net9.csproj", "{AB066CDE-E4BA-4093-8EEF-64E0794EB9A4}"
3535
EndProject
36+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cropper.Blazor.MAUI.Net9", "Cropper.Blazor.MAUI.Net9\Cropper.Blazor.MAUI.Net9.csproj", "{7B9B6B17-976B-4875-B68B-E199B72374AC}"
37+
EndProject
3638
Global
3739
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3840
Debug|Any CPU = Debug|Any CPU
@@ -77,6 +79,10 @@ Global
7779
{AB066CDE-E4BA-4093-8EEF-64E0794EB9A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
7880
{AB066CDE-E4BA-4093-8EEF-64E0794EB9A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
7981
{AB066CDE-E4BA-4093-8EEF-64E0794EB9A4}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{7B9B6B17-976B-4875-B68B-E199B72374AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{7B9B6B17-976B-4875-B68B-E199B72374AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{7B9B6B17-976B-4875-B68B-E199B72374AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{7B9B6B17-976B-4875-B68B-E199B72374AC}.Release|Any CPU.Build.0 = Release|Any CPU
8086
EndGlobalSection
8187
GlobalSection(SolutionProperties) = preSolution
8288
HideSolutionNode = FALSE
@@ -95,6 +101,7 @@ Global
95101
{C1872578-F52C-42A9-98E1-7057E54705E6} = {49B4C364-A66D-44E3-8094-35C8CEC06100}
96102
{FE00A07D-B8ED-4AC5-81A7-9F0AF7AE949B} = {49B4C364-A66D-44E3-8094-35C8CEC06100}
97103
{AB066CDE-E4BA-4093-8EEF-64E0794EB9A4} = {FE00A07D-B8ED-4AC5-81A7-9F0AF7AE949B}
104+
{7B9B6B17-976B-4875-B68B-E199B72374AC} = {4DED931E-A01B-4B5F-AA64-A003FC0F8DC1}
98105
EndGlobalSection
99106
GlobalSection(ExtensibilityGlobals) = postSolution
100107
SolutionGuid = {5FA0980D-10C3-4751-9432-DE20984B0A69}

examples/Cropper.Blazor.MAUI.Net8/Components/Pages/Home.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public async void GetCroppedCanvasDataURL(GetCroppedCanvasOptions getCroppedCanv
107107
{ "Src", croppedCanvasDataURL }
108108
};
109109
var options = new DialogOptions() { CloseButton = true, MaxWidth = MaxWidth.Medium, FullWidth = true, BackdropClick = true };
110-
_dialogService!.Show<Shared.CroppedCanvasDialog>("CroppedCanvasDialog", parameters, options);
110+
_dialogService!.ShowAsync<Shared.CroppedCanvasDialog>("CroppedCanvasDialog", parameters, options);
111111
}
112112
catch (ImageProcessingException ex)
113113
{

examples/Cropper.Blazor.MAUI.Net8/Components/Shared/CroppedCanvasDialog.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</MudDialog>
1818

1919
@code {
20-
[CascadingParameter] private MudDialogInstance MudDialog { get; set; } = null!;
20+
[CascadingParameter] private IMudDialogInstance MudDialog { get; set; } = null!;
2121

2222
[Parameter]
2323
[System.ComponentModel.DataAnnotations.Required]

examples/Cropper.Blazor.MAUI.Net8/Cropper.Blazor.MAUI.Net8.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.100" />
6363
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.100" />
6464
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
65-
<PackageReference Include="MudBlazor" Version="7.4.0" />
65+
<PackageReference Include="MudBlazor" Version="8.7.0" />
6666
</ItemGroup>
6767

6868
<ItemGroup>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:local="clr-namespace:Cropper.Blazor.MAUI.Net9"
5+
x:Class="Cropper.Blazor.MAUI.Net9.App">
6+
<Application.Resources>
7+
<ResourceDictionary>
8+
9+
<!--
10+
For information about styling .NET MAUI pages
11+
please refer to the documentation:
12+
https://go.microsoft.com/fwlink/?linkid=2282329
13+
-->
14+
15+
</ResourceDictionary>
16+
</Application.Resources>
17+
</Application>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace Cropper.Blazor.MAUI.Net9
2+
{
3+
public partial class App : Application
4+
{
5+
public App()
6+
{
7+
InitializeComponent();
8+
}
9+
10+
protected override Window CreateWindow(IActivationState? activationState)
11+
{
12+
return new Window(new MainPage()) { Title = "Cropper.Blazor.MAUI.Net9" };
13+
}
14+
}
15+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@using MudBlazor
2+
@inherits LayoutComponentBase
3+
4+
<MudThemeProvider />
5+
<MudDialogProvider />
6+
<MudSnackbarProvider />
7+
<MudPopoverProvider />
8+
9+
<div class="page">
10+
<div class="sidebar">
11+
<NavMenu />
12+
</div>
13+
14+
<main>
15+
<div class="top-row px-4">
16+
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
17+
</div>
18+
19+
<article class="content px-4">
20+
@Body
21+
</article>
22+
</main>
23+
</div>
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
.page {
2+
position: relative;
3+
display: flex;
4+
flex-direction: column;
5+
}
6+
7+
main {
8+
flex: 1;
9+
}
10+
11+
.sidebar {
12+
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
13+
}
14+
15+
.top-row {
16+
background-color: #f7f7f7;
17+
border-bottom: 1px solid #d6d5d5;
18+
justify-content: flex-end;
19+
height: 3.5rem;
20+
display: flex;
21+
align-items: center;
22+
}
23+
24+
.top-row ::deep a, .top-row ::deep .btn-link {
25+
white-space: nowrap;
26+
margin-left: 1.5rem;
27+
text-decoration: none;
28+
}
29+
30+
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
31+
text-decoration: underline;
32+
}
33+
34+
.top-row ::deep a:first-child {
35+
overflow: hidden;
36+
text-overflow: ellipsis;
37+
}
38+
39+
@media (max-width: 640.98px) {
40+
.top-row {
41+
justify-content: space-between;
42+
}
43+
44+
.top-row ::deep a, .top-row ::deep .btn-link {
45+
margin-left: 0;
46+
}
47+
}
48+
49+
@media (min-width: 641px) {
50+
.page {
51+
flex-direction: row;
52+
}
53+
54+
.sidebar {
55+
width: 250px;
56+
height: 100vh;
57+
position: sticky;
58+
top: 0;
59+
}
60+
61+
.top-row {
62+
position: sticky;
63+
top: 0;
64+
z-index: 1;
65+
}
66+
67+
.top-row.auth ::deep a:first-child {
68+
flex: 1;
69+
text-align: right;
70+
width: 0;
71+
}
72+
73+
.top-row, article {
74+
padding-left: 2rem !important;
75+
padding-right: 1.5rem !important;
76+
}
77+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<div class="top-row ps-3 navbar navbar-dark">
2+
<div class="container-fluid">
3+
<a class="navbar-brand" href="">Cropper.Blazor.MAUI.Net9</a>
4+
</div>
5+
</div>
6+
7+
<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
8+
9+
<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
10+
<nav class="flex-column">
11+
<div class="nav-item px-3">
12+
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
13+
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
14+
</NavLink>
15+
</div>
16+
<div class="nav-item px-3">
17+
<NavLink class="nav-link" href="counter">
18+
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
19+
</NavLink>
20+
</div>
21+
<div class="nav-item px-3">
22+
<NavLink class="nav-link" href="weather">
23+
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
24+
</NavLink>
25+
</div>
26+
</nav>
27+
</div>

0 commit comments

Comments
 (0)