Code cleanup and preparation for the next release (breaking changes) (#…

…1324) * Code cleanup and preparation for .net 8 * Update CompareConverter.shared.cs * Revert global.json * More CleanUps * Remove redundant TrySetCanceled and rely on speech recognition result * Update Formatting --------- Co-authored-by: Brandon Minnick <[email protected]>
CommunityToolkit · Aug 11, 2023 · 930b468 · 930b468
1 parent 272bb46
commit 930b468
Show file tree

Hide file tree

Showing 32 changed files with 103 additions and 189 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
   <PropertyGroup>
+    <NetVersion>net7.0</NetVersion>
     <!-- Fixes https://github.com/dotnet/maui/pull/12114 -->
     <PublishReadyToRun>false</PublishReadyToRun>
     <LangVersion>latest</LangVersion>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net7.0-ios')) != true">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-ios')) != true">
     <Compile Remove="**\**\*.ios.cs" />
     <None Include="**\**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Remove="**\ios\**\*.cs" />
     <None Include="**\ios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('net7.0-maccatalyst')) != true">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-maccatalyst')) != true">
     <Compile Remove="**\*.macos.cs" />
     <None Include="**\*.macos.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Remove="**\macos\**\*.cs" />
     <None Include="**\macos\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net7.0-ios')) != true AND $(TargetFramework.StartsWith('net7.0-maccatalyst')) != true">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-ios')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-maccatalyst')) != true">
     <Compile Remove="**\*.macios.cs" />
     <None Include="**\*.macios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Remove="**\macios\**\*.cs" />
     <None Include="**\macios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net7.0-android')) != true ">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-android')) != true ">
     <Compile Remove="**\**\*.android.cs" />
     <None Include="**\**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Remove="**\android\**\*.cs" />

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0-ios;net7.0-android;net7.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);net7.0-tizen</TargetFrameworks>
+    <TargetFrameworks>$(NetVersion)-ios;$(NetVersion)-android;$(NetVersion)-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);$(NetVersion)-tizen</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/SpeechToTextPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/SpeechToTextPage.xaml
@@ -30,7 +30,7 @@
             <Picker
                 Grid.Row="2"
                 ItemsSource="{Binding Locales}"
-                SelectedItem="{Binding Locale}"
+                SelectedItem="{Binding CurrentLocale}"
                 ItemDisplayBinding="{Binding ., Converter={StaticResource PickerLocaleDisplayConverter}}"
                 Margin="0,0,0,20">
             </Picker>

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml.cs
@@ -20,8 +20,7 @@ public ShowPopupInOnAppearingPage(
 
 	protected override async void OnAppearing()
 	{
-
 		// Proves that we now support showing a popup before the platform is even ready.
-		var result = await this.ShowPopupAsync(new ReturnResultPopup(popupSizeConstants));
+		await this.ShowPopupAsync(new ReturnResultPopup(popupSizeConstants));
 	}
 }
diff --git a/...nityToolkit.Maui.Sample/ViewModels/Converters/ByteArrayToImageSourceConverterViewModel.cs b/...nityToolkit.Maui.Sample/ViewModels/Converters/ByteArrayToImageSourceConverterViewModel.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System.Diagnostics;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Maui.Dispatching;
 
@@ -58,7 +59,7 @@ async Task DownloadDotNetBotImage()
 		}
 		catch (Exception e)
 		{
-			Console.WriteLine(e);
+			Trace.WriteLine(e);
 			OnImageDownloadFailed(e.Message);
 		}
 		finally

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/SpeechToTextViewModel.cs
@@ -18,7 +18,7 @@ public partial class SpeechToTextViewModel : BaseViewModel
 	readonly ISpeechToText speechToText;
 
 	[ObservableProperty]
-	Locale? locale;
+	Locale? currentLocale;
 
 	[ObservableProperty]
 	string? recognitionText = "Welcome to .NET MAUI Community Toolkit!";
@@ -45,15 +45,15 @@ async Task SetLocales()
 			Locales.Add(locale);
 		}
 
-		Locale = Locales.FirstOrDefault(x => x.Language is defaultLanguage or defaultLanguage_android or defaultLanguage_tizen) ?? Locales.FirstOrDefault();
+		CurrentLocale = Locales.FirstOrDefault(x => x.Language is defaultLanguage or defaultLanguage_android or defaultLanguage_tizen) ?? Locales.FirstOrDefault();
 	}
 
 	[RelayCommand]
 	async Task Play(CancellationToken cancellationToken)
 	{
 		await textToSpeech.SpeakAsync(RecognitionText ?? "Welcome to .NET MAUI Community Toolkit!", new()
 		{
-			Locale = Locale,
+			Locale = CurrentLocale,
 			Pitch = 2,
 			Volume = 1
 		}, cancellationToken);
@@ -74,7 +74,7 @@ async Task Listen(CancellationToken cancellationToken)
 		RecognitionText = beginSpeakingPrompt;
 
 		var recognitionResult = await speechToText.ListenAsync(
-											CultureInfo.GetCultureInfo(Locale?.Language ?? defaultLanguage),
+											CultureInfo.GetCultureInfo(CurrentLocale?.Language ?? defaultLanguage),
 											new Progress<string>(partialText =>
 											{
 												if (RecognitionText is beginSpeakingPrompt)
@@ -102,6 +102,6 @@ async Task Listen(CancellationToken cancellationToken)
 
 	void HandleLocalesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
 	{
-		OnPropertyChanged(nameof(Locale));
+		OnPropertyChanged(nameof(CurrentLocale));
 	}
 }
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupAnchorViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupAnchorViewModel.cs
@@ -11,24 +11,10 @@ public sealed partial class PopupAnchorViewModel : BaseViewModel
 	[RelayCommand]
 	static void ShowPopup(View anchor)
 	{
-
-		// Using the C# version of Popup until this get fixed
-		// https://github.com/dotnet/maui/issues/4300
-
-		// This works
-
 		var popup = new TransparentPopupCSharp()
 		{
 			Anchor = anchor
 		};
-
-		// This doesn't work
-
-		//var popup = new TransparentPopup
-		//{
-		//	Anchor = anchor
-		//};
-
 		Page.ShowPopup(popup);
 	}
 }
diff --git a/...ommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/...ommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(NetVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
     <UseMaui>true</UseMaui>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>

diff --git a/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj b/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);net7.0-tizen</TargetFrameworks>
+    <TargetFrameworks>$(NetVersion);$(NetVersion)-android;$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);$(NetVersion)-tizen</TargetFrameworks>
     <UseMauiCore>true</UseMauiCore>
     <UseMauiEssentials>true</UseMauiEssentials>
     <SingleProject>true</SingleProject>
@@ -24,7 +24,7 @@
     <Authors>Microsoft</Authors>
     <Owners>Microsoft</Owners>
     <NeutralLanguage>en</NeutralLanguage>
-    <Product>CommunityToolkit.Maui (net7.0)</Product>
+    <Product>CommunityToolkit.Maui ($(NetVersion))</Product>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/CommunityToolkit/Maui</PackageProjectUrl>
@@ -56,7 +56,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="System.Speech" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0-windows10.0.19041.0'" />
+    <PackageReference Include="System.Speech" Version="7.0.0" Condition="'$(TargetFramework)' == '$(NetVersion)-windows10.0.19041.0'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/FileSaver/FileSaverImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/FileSaver/FileSaverImplementation.macios.cs
@@ -25,7 +25,7 @@ async Task<string> InternalSaveAsync(string initialPath, string fileName, Stream
 		var isDirectoryCreated = fileManager.CreateDirectory(tempDirectoryPath, true, null, out var error);
 		if (!isDirectoryCreated)
 		{
-			throw new Exception(error?.LocalizedDescription ?? "Unable to create temp directory.");
+			throw new FileSaveException(error?.LocalizedDescription ?? "Unable to create temp directory.");
 		}
 
 		var fileUrl = tempDirectoryPath.Append(fileName, false);

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.windows.cs
@@ -86,7 +86,6 @@ async Task<string> ListenOnline(CultureInfo culture, IProgress<string>? recognit
 		await using (cancellationToken.Register(async () =>
 		{
 			await StopRecording();
-			speechRecognitionTaskCompletionSource.SetCanceled();
 		}))
 		{
 			return await speechRecognitionTaskCompletionSource.Task;
@@ -119,7 +118,10 @@ async Task StopRecording()
 	{
 		try
 		{
-			await speechRecognizer?.ContinuousRecognitionSession.StopAsync();
+			if (speechRecognizer is not null)
+			{
+				await speechRecognizer.ContinuousRecognitionSession.StopAsync();
+			}
 		}
 		catch
 		{

diff --git a/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.net.cs b/src/CommunityToolkit.Maui.Core/Platform/StatusBar/StatusBar.net.cs
@@ -2,7 +2,7 @@ namespace CommunityToolkit.Maui.Core.Platform;
 
 static partial class StatusBar
 {
-	static void PlatformSetColor(Color color) => throw new NotSupportedException($"{nameof(PlatformSetColor)} is only supported on net6.0-ios and net6.0-android and later");
+	static void PlatformSetColor(Color color) => throw new NotSupportedException($"{nameof(PlatformSetColor)} is only supported on iOS and Android 23 and later");
 
-	static void PlatformSetStyle(StatusBarStyle statusBarStyle) => throw new NotSupportedException($"{nameof(PlatformSetStyle)} is only supported on net6.0-ios and net6.0-android and later");
+	static void PlatformSetStyle(StatusBarStyle statusBarStyle) => throw new NotSupportedException($"{nameof(PlatformSetStyle)} is only supported on iOS and Android 23 and later");
 }
diff --git a/src/CommunityToolkit.Maui.Core/Views/DrawingView/PlatformView/MauiDrawingView.android.cs b/src/CommunityToolkit.Maui.Core/Views/DrawingView/PlatformView/MauiDrawingView.android.cs
@@ -1,5 +1,7 @@
+using System.Collections.ObjectModel;
 using Android.Content;
 using Android.Views;
+using CommunityToolkit.Maui.Core.Extensions;
 using Microsoft.Maui.Platform;
 using AColor = Android.Graphics.Color;
 using APaint = Android.Graphics.Paint;
@@ -85,4 +87,17 @@ void Redraw()
 	{
 		Invalidate();
 	}
+
+	static ObservableCollection<PointF> CreateCollectionWithNormalizedPoints(in ObservableCollection<PointF> points, in int drawingViewWidth, in int drawingViewHeight, in float canvasScale)
+	{
+		var newPoints = new List<PointF>();
+		foreach (var point in points)
+		{
+			var pointX = Math.Clamp(point.X, 0, drawingViewWidth / canvasScale);
+			var pointY = Math.Clamp(point.Y, 0, drawingViewHeight / canvasScale);
+			newPoints.Add(new PointF(pointX, pointY));
+		}
+
+		return newPoints.ToObservableCollection();
+	}
 }
diff --git a/src/CommunityToolkit.Maui.Core/Views/DrawingView/PlatformView/MauiDrawingView.shared.cs b/src/CommunityToolkit.Maui.Core/Views/DrawingView/PlatformView/MauiDrawingView.shared.cs
@@ -192,8 +192,8 @@ static void SetStroke(in ICanvas canvas, in float lineWidth, in Color lineColor)
 			canvas.StrokeColor = lineColor;
 			canvas.StrokeSize = lineWidth;
 			canvas.StrokeDashOffset = 0;
-			canvas.StrokeLineCap = LineCap.Butt;
-			canvas.StrokeLineJoin = LineJoin.Miter;
+			canvas.StrokeLineCap = LineCap.Round;
+			canvas.StrokeLineJoin = LineJoin.Round;
 			canvas.StrokeDashPattern = Array.Empty<float>();
 		}
 
@@ -221,20 +221,5 @@ static void DrawCurrentLines(in ICanvas canvas, in MauiDrawingView drawingView)
 				}
 			}
 		}
-
-#if ANDROID
-		static ObservableCollection<PointF> CreateCollectionWithNormalizedPoints(in ObservableCollection<PointF> points, in int drawingViewWidth, in int drawingViewHeight, in float canvasScale)
-		{
-			var newPoints = new List<PointF>();
-			foreach (var point in points)
-			{
-				var pointX = Math.Clamp(point.X, 0, drawingViewWidth / canvasScale);
-				var pointY = Math.Clamp(point.Y, 0, drawingViewHeight / canvasScale);
-				newPoints.Add(new PointF(pointX, pointY));
-			}
-
-			return newPoints.ToObservableCollection();
-		}
-#endif
 	}
 }
diff --git a/src/CommunityToolkit.Maui.Core/Views/RoundedStackView.macios.cs b/src/CommunityToolkit.Maui.Core/Views/RoundedStackView.macios.cs
diff --git a/src/CommunityToolkit.Maui.Maps/CommunityToolkit.Maui.Maps.csproj b/src/CommunityToolkit.Maui.Maps/CommunityToolkit.Maui.Maps.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);net7.0-tizen</TargetFrameworks>
+    <TargetFrameworks>$(NetVersion);$(NetVersion)-android;$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);$(NetVersion)-tizen</TargetFrameworks>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -23,7 +23,7 @@
     <Authors>Microsoft</Authors>
     <Owners>Microsoft</Owners>
     <NeutralLanguage>en</NeutralLanguage>
-    <Product>CommunityToolkit.Maui (net7.0)</Product>
+    <Product>CommunityToolkit.Maui ($(NetVersion))</Product>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/CommunityToolkit/Maui</PackageProjectUrl>