Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed sample application crashed with MediaElement for Windows #1870

Merged
merged 12 commits into from
Jun 20, 2024
Merged

fixed sample application crashed with MediaElement for Windows #1870

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cf4d134
fixed crash with Change Aspect Clicked
May 7, 2024
0ce8cf2
updated Microsoft.Maui.Controls package version
May 7, 2024
0e9d7a1
updated MauiPackageVersion
May 9, 2024
cbc29de
Merge branch 'main' into 1863-bug-application-crashes
brminnick Jun 6, 2024
e1474b7
Merge branch 'main' into 1863-bug-application-crashes
brminnick Jun 6, 2024
216f9de
Merge branch 'main' into 1863-bug-application-crashes
brminnick Jun 14, 2024
6f5103e
Use reflection to assign `Application. _systemResources`
brminnick Jun 14, 2024
9bcb6e7
Remove Reflection
brminnick Jun 14, 2024
abfa6b6
Use `MockApplication`
brminnick Jun 14, 2024
849abd5
Merge branch 'main' into 1863-bug-application-crashes
brminnick Jun 20, 2024
b583d21
Fix Unit Tests
brminnick Jun 20, 2024
fbe0aed
Merge branch 'main' into 1863-bug-application-crashes
brminnick Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NetVersion>net8.0</NetVersion>
<MauiPackageVersion>8.0.14</MauiPackageVersion>
<MauiPackageVersion>8.0.21</MauiPackageVersion>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
4 changes: 2 additions & 2 deletions samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />

<PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),)"/>
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="[$(MauiPackageVersion),)"/>
<PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="[$(MauiPackageVersion),)" />
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
Expand Down
2 changes: 1 addition & 1 deletion samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ async void ChangeAspectClicked(object? sender, EventArgs e)
"Cancel", null, Aspect.AspectFit.ToString(),
Aspect.AspectFill.ToString(), Aspect.Fill.ToString());

if (resultAspect.Equals("Cancel"))
if (resultAspect is null || resultAspect.Equals("Cancel"))
{
return;
}
Expand Down