Fix runtime crash

brminnick · Dec 12, 2024 · 74c7806 · 74c7806
1 parent 87a9761
commit 74c7806
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,9 +20,6 @@
     <NuGetAuditMode>all</NuGetAuditMode>
 
     <!-- MAUI Specific -->
-    <MauiPackageVersion>9.0.10</MauiPackageVersion>
-    <NextMauiPackageVersion>10.0.0</NextMauiPackageVersion>
-    <MauiCommunityToolkitPackageVersion>9.1.1</MauiCommunityToolkitPackageVersion>
     <MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
     <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
     <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
@@ -95,8 +92,4 @@
   <ItemGroup>
     <InternalsVisibleTo Include="CommunityToolkit.Maui.Markup.UnitTests" />
   </ItemGroup>
-
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true' and $([MSBuild]::IsOSPlatform('windows')) == 'true'">
-    <IncludeTizenTargetFrameworks>true</IncludeTizenTargetFrameworks>
-  </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,7 +8,7 @@
     <PackageVersion Include="CommunityToolkit.Maui" Version="9.1.1" />
     <PackageVersion Include="CommunityToolkit.Maui.Markup" Version="5.1.0" />
     <PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="4.1.2" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0-preview3" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -25,8 +25,9 @@
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" OutputItemType="Analyzer" />
     <PackageVersion Include="Microsoft.Azure.NotificationHubs" Version="4.2.0" />
     <PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.3.3" />
-    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.12" />
-    <PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.12" />
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.14" />
+    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.14" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/GitTrends/GitTrends.csproj b/GitTrends/GitTrends.csproj
@@ -88,6 +88,8 @@
     <PackageReference Include="GitHubApiStatus" />
     <PackageReference Include="HtmlAgilityPack" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+    <PackageReference Include="Microsoft.Maui.Controls" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
     <PackageReference Include="Plugin.StoreReview" />
     <PackageReference Include="Sentry.Maui" />
     <PackageReference Include="Sharpnado.MaterialFrame.Maui" />

diff --git a/GitTrends/Pages/SplashScreenPage.cs b/GitTrends/Pages/SplashScreenPage.cs
@@ -110,7 +110,7 @@ async void Animate(CancellationToken pulseCancellationToken) => await Dispatcher
 		while (!pulseCancellationToken.IsCancellationRequested)
 		{
 			var pulseImageTask = PulseImage();
-			await Task.Delay(TimeSpan.FromMilliseconds(400), pulseCancellationToken).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
+			await Task.Delay(TimeSpan.FromMilliseconds(400), pulseCancellationToken).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing | ConfigureAwaitOptions.ContinueOnCapturedContext);
 
 			//Label leaves the screen
 			await _loadingLabel.TranslateTo(10, 0, 100, Easing.CubicInOut);
@@ -132,7 +132,7 @@ async void Animate(CancellationToken pulseCancellationToken) => await Dispatcher
 			await _loadingLabel.TranslateTo(0, 0, 250, Easing.CubicOut);
 
 			await pulseImageTask;
-			await Task.Delay(TimeSpan.FromMilliseconds(250), pulseCancellationToken).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
+			await Task.Delay(TimeSpan.FromMilliseconds(250), pulseCancellationToken).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing | ConfigureAwaitOptions.ContinueOnCapturedContext);
 		}
 	});