Skip to content

Commit 3d5fef5

Browse files
Copilotjfversluis
andcommitted
Add exclusion for Xamarin.AndroidX.Tracing.Tracing.Ktx to resolve conflict
Co-authored-by: jfversluis <[email protected]>
1 parent 4562cae commit 3d5fef5

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131
<ItemGroup>
3232
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.40" />
3333
</ItemGroup>
34+
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
35+
<!-- Exclude Tracing.Ktx to prevent conflict with Tracing (they contain the same classes) -->
36+
<PackageReference Include="Xamarin.AndroidX.Tracing.Tracing.Ktx" Version="1.2.0.9" ExcludeAssets="All" />
37+
</ItemGroup>
3438
</Project>

ZXing.Net.MAUI/ZXing.Net.MAUI.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.1.1" />
2525
<PackageReference Include="Xamarin.AndroidX.Camera.Lifecycle" Version="1.4.1.1" />
2626
<PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.1.1" />
27+
<!-- Exclude Tracing.Ktx to prevent conflict with Tracing (they contain the same classes) -->
28+
<PackageReference Include="Xamarin.AndroidX.Tracing.Tracing.Ktx" Version="1.2.0.9" ExcludeAssets="All" />
2729
</ItemGroup>
2830
<ItemGroup>
2931
<PackageReference Include="ZXing.Net" Version="0.16.10" />

0 commit comments

Comments
 (0)