From dcd784ffd68b2924d5c3a53145dcdb557af31298 Mon Sep 17 00:00:00 2001
From: Kori Francis <kfrancis@clinicalsupportsystems.com>
Date: Thu, 30 May 2024 09:54:08 -0400
Subject: [PATCH] fixes #2

---
 src/Plugin.Maui.OCR/Plugin.Maui.OCR.csproj    | 66 +++++++++----------
 .../Plugin.Xamarin.OCR.csproj                 | 23 ++++---
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/Plugin.Maui.OCR/Plugin.Maui.OCR.csproj b/src/Plugin.Maui.OCR/Plugin.Maui.OCR.csproj
index 9fe5e52..e673133 100644
--- a/src/Plugin.Maui.OCR/Plugin.Maui.OCR.csproj
+++ b/src/Plugin.Maui.OCR/Plugin.Maui.OCR.csproj
@@ -71,47 +71,52 @@
 	</PropertyGroup>
 	<!-- iOS & MacCatalyst -->
 	<ItemGroup Condition="$(TargetFramework.StartsWith('net')) == true AND $(TargetFramework.Contains('-ios')) != true AND $(TargetFramework.Contains('-maccatalyst')) != true ">
-		<Compile Remove="**\*.ios.cs" />
-		<None Include="**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-		<Compile Remove="**\ios\**\*.cs" />
-		<None Include="**\ios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-		<Compile Remove="**\*.macios.cs" />
-		<None Include="**\*.macios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-		<Compile Remove="**\macios\**\*.cs" />
-		<None Include="**\macios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+		<Compile Remove="**\*.ios.cs"/>
+		<None Include="**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
+		<Compile Remove="**\ios\**\*.cs"/>
+		<None Include="**\ios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
+		<Compile Remove="**\*.macios.cs"/>
+		<None Include="**\*.macios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
+		<Compile Remove="**\macios\**\*.cs"/>
+		<None Include="**\macios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
 	</ItemGroup>
 	<!-- Android -->
 	<ItemGroup Condition="$(TargetFramework.StartsWith('net')) == true AND $(TargetFramework.Contains('-android')) != true">
-		<Compile Remove="**\*.android.cs" />
-		<None Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-		<Compile Remove="**\android\**\*.cs" />
-		<None Include="**\android\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+		<Compile Remove="**\*.android.cs"/>
+		<None Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
+		<Compile Remove="**\android\**\*.cs"/>
+		<None Include="**\android\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
 	</ItemGroup>
 	<!-- Windows -->
 	<ItemGroup Condition="$(TargetFramework.StartsWith('net')) == true AND $(TargetFramework.Contains('-windows')) != true">
-		<Compile Remove="**\*.windows.cs" />
-		<None Include="**\*.windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-		<Compile Remove="**\windows\**\*.cs" />
-		<None Include="**\windows\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+		<Compile Remove="**\*.windows.cs"/>
+		<None Include="**\*.windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
+		<Compile Remove="**\windows\**\*.cs"/>
+		<None Include="**\windows\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
 	</ItemGroup>
 	<!-- .NET (generic) -->
 	<ItemGroup Condition="!($(TargetFramework.StartsWith('net')) == true AND $(TargetFramework.EndsWith('.0')) == true AND $(TargetFramework.Contains('-')) != true)">
 		<!-- e.g net6.0 or net8.0 (and higher) -->
-		<Compile Remove="**\*.net.cs" />
-		<None Include="**\*.net.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+		<Compile Remove="**\*.net.cs"/>
+		<None Include="**\*.net.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
 		<PackageReference Include="MinVer" Version="5.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Management" Version="8.0.0" Condition="$(TargetFramework.Contains('-windows')) == true" />
+		<PackageReference Include="System.Management" Version="8.0.0" Condition="$(TargetFramework.Contains('-windows')) == true"/>
 		<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
+        <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.2" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"/>
+		<PackageReference Include="Xamarin.AndroidX.Camera.Lifecycle" Version="1.3.2" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"/>
+		<PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.2" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'" />
+		<PackageReference Include="Xamarin.Google.MLKit.TextRecognition" Version="116.0.0.6" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"/>
+        <PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.6.2.2" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"/>
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
 		<PackageReference Include="Roslynator.Analyzers" Version="4.12.2">
@@ -119,32 +124,23 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
-	<ItemGroup Condition="( '$(TargetFramework)' == 'net8.0-android' )">
-		<PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.2">
-    </PackageReference>
-		<PackageReference Include="Xamarin.AndroidX.Camera.Lifecycle" Version="1.3.2">
-    </PackageReference>
-		<PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.2">
-    </PackageReference>
-		<PackageReference Include="Xamarin.Google.MLKit.TextRecognition" Version="116.0.0.6" />
-	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
   </ItemGroup>
 	<!-- Package additions -->
 	<ItemGroup>
-		<None Include="..\..\nuget.png" PackagePath="icon.png" Pack="true" />
-		<None Include="..\..\README.md" Pack="true" PackagePath="\" />
+		<None Include="..\..\nuget.png" PackagePath="icon.png" Pack="true"/>
+		<None Include="..\..\README.md" Pack="true" PackagePath="\"/>
 	</ItemGroup>
 	<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
 		<ItemGroup>
 			<!-- Filter out unnecessary files -->
-			<_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('PrivateAssets', 'All'))" />
+			<_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('PrivateAssets', 'All'))"/>
 		</ItemGroup>
 		<!-- Print batches for debug purposes -->
-		<Message Text="Batch for .nupkg: ReferenceCopyLocalPaths = @(_ReferenceCopyLocalPaths), ReferenceCopyLocalPaths.DestinationSubDirectory = %(_ReferenceCopyLocalPaths.DestinationSubDirectory) Filename = %(_ReferenceCopyLocalPaths.Filename) Extension = %(_ReferenceCopyLocalPaths.Extension)" Importance="High" Condition="'@(_ReferenceCopyLocalPaths)' != ''" />
+		<Message Text="Batch for .nupkg: ReferenceCopyLocalPaths = @(_ReferenceCopyLocalPaths), ReferenceCopyLocalPaths.DestinationSubDirectory = %(_ReferenceCopyLocalPaths.DestinationSubDirectory) Filename = %(_ReferenceCopyLocalPaths.Filename) Extension = %(_ReferenceCopyLocalPaths.Extension)" Importance="High" Condition="'@(_ReferenceCopyLocalPaths)' != ''"/>
 		<ItemGroup>
 			<!-- Add file to package with consideration of sub folder. If empty, the root folder is chosen. -->
-			<BuildOutputInPackage Include="@(_ReferenceCopyLocalPaths)" TargetPath="%(_ReferenceCopyLocalPaths.DestinationSubDirectory)" />
+			<BuildOutputInPackage Include="@(_ReferenceCopyLocalPaths)" TargetPath="%(_ReferenceCopyLocalPaths.DestinationSubDirectory)"/>
 		</ItemGroup>
 	</Target>
 </Project>
diff --git a/src/Plugin.Xamarin.OCR/Plugin.Xamarin.OCR.csproj b/src/Plugin.Xamarin.OCR/Plugin.Xamarin.OCR.csproj
index 6f0b7d8..0dc5af9 100644
--- a/src/Plugin.Xamarin.OCR/Plugin.Xamarin.OCR.csproj
+++ b/src/Plugin.Xamarin.OCR/Plugin.Xamarin.OCR.csproj
@@ -30,8 +30,8 @@
 	</PropertyGroup>
 	<!-- Package additions -->
 	<ItemGroup>
-		<Compile Include="*.cs" />
-		<None Include="..\..\README.md" Pack="true" PackagePath="." />
+		<Compile Include="*.cs"/>
+		<None Include="..\..\README.md" Pack="true" PackagePath="."/>
 		<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -42,25 +42,25 @@
 		</PackageReference>
 	</ItemGroup>
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
-		<Compile Include="netstandard\*.cs" />
+		<Compile Include="netstandard\*.cs"/>
 	</ItemGroup>
 	<!-- iOS -->
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
-		<Compile Include="Platforms\Apple\**\*.cs" />
+		<Compile Include="Platforms\Apple\**\*.cs"/>
 	</ItemGroup>
 	<PropertyGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
 		<DefineConstants>$(DefineConstants);IOS;</DefineConstants>
 	</PropertyGroup>
 	<!-- macOS -->
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
-		<Compile Include="Platforms\Apple\**\*.cs" />
+		<Compile Include="Platforms\Apple\**\*.cs"/>
 	</ItemGroup>
 	<PropertyGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
 		<DefineConstants>$(DefineConstants);MACOS;</DefineConstants>
 	</PropertyGroup>
 	<!-- Android -->
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
-		<Compile Include="Platforms\Android\**\*.cs" />
+		<Compile Include="Platforms\Android\**\*.cs"/>
 		<PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.0">
     </PackageReference>
 		<PackageReference Include="Xamarin.AndroidX.Camera.Lifecycle" Version="1.3.0">
@@ -72,20 +72,23 @@
 		<PackageReference Include="Xamarin.Google.MLKit.TextRecognition">
 			<Version>116.0.0.5</Version>
 		</PackageReference>
+		<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx">
+			<Version>1.6.2.2</Version>
+		</PackageReference>
 	</ItemGroup>
 	<PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
 		<DefineConstants>$(DefineConstants);ANDROID;</DefineConstants>
 	</PropertyGroup>
 	<!-- UWP -->
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
-		<Compile Include="Platforms\UWP\**\*.cs" />
+		<Compile Include="Platforms\UWP\**\*.cs"/>
 	</ItemGroup>
 	<PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
 		<!--<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>-->
 		<DefineConstants>$(DefineConstants);WINDOWS_UWP;</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) OR $(TargetFramework.StartsWith('Xamarin.TVOS')) OR $(TargetFramework.StartsWith('Xamarin.WatchOS')) OR $(TargetFramework.StartsWith('Tizen')) ">
-		<Compile Include="Platforms\NotImplemented\**\*.cs" />
+		<Compile Include="Platforms\NotImplemented\**\*.cs"/>
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
 		<PackageReference Include="Roslynator.Analyzers" Version="4.12.3">
@@ -94,9 +97,9 @@
 		</PackageReference>
 	</ItemGroup>
 	<ItemGroup>
-		<None Remove="Abstractions\IOcrService.cs" />
+		<None Remove="Abstractions\IOcrService.cs"/>
 	</ItemGroup>
 	<ItemGroup>
-		<Compile Include="Abstractions\IOcrService.cs" />
+		<Compile Include="Abstractions\IOcrService.cs"/>
 	</ItemGroup>
 </Project>