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

Manual updates and fix for issue 1041 androidx.camera #1042

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+1,997 −1,946
Open

Manual updates and fix for issue 1041 androidx.camera #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
192e012
binderator green
moljac Nov 12, 2024
7a91101
additional car removed
moljac Nov 12, 2024
eae007b
Merge branch 'main' into mu-20241112-issue-1041-camera-mlkit-vision
moljac Nov 12, 2024
42950b4
automagic files
moljac Nov 13, 2024
03a4b27
Merge branch 'mu-20241112-issue-1041-camera-mlkit-vision' of https://…
moljac Nov 13, 2024
fe4ed0d
namespace fixes
moljac Nov 14, 2024
8255b5b
Merge branch 'main' into mu-20241112-issue-1041-camera-mlkit-vision
moljac Nov 14, 2024
40f2fa0
Update published-namespaces.txt
moljac Nov 14, 2024
287d013
Merge branch 'mu-20241112-issue-1041-camera-mlkit-vision' of https://…
moljac Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 50 additions & 47 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Default TFM's we build for -->
<_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>

<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>

Expand All @@ -18,24 +18,24 @@

<!-- .NET 6+ generates Resource.designer.cs files for bindings projects which we do not want -->
<AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>

<!-- .NET 6+ packages support back to API-21 -->
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>

<!-- Assemblies should be deterministic -->
<Deterministic>true</Deterministic>

<!-- Generate NRT annotations -->
<Nullable Condition=" '$(Nullable)' == '' ">enable</Nullable>

<!-- Warnings we want to error on: -->
<!-- NU5104: A stable release of a package should not have a prerelease dependency. -->
<WarningsAsErrors>$(WarningsAsErrors);NU5104</WarningsAsErrors>

<!-- Ignore binding generator warnings by default -->
<_AndroidIgnoreGeneratorWarnings>true</_AndroidIgnoreGeneratorWarnings>
<!--

<!--
BG8102: Class 'foo' has unknown base type 'foo'.
BG8103: Class 'foo' has invalid base type 'foo'.
BG8300: For constructor 'foo', could not find enclosing type 'foo'.
Expand All @@ -59,8 +59,8 @@
BG8A01: Metadata.xml element '<add-node path="foo" />' matched no nodes.
BG8A04: Metadata.xml element '<attr path="foo" />' matched no nodes.
BG8B00: Unknown generic argument constraint type 'S' for member 'foo'.
BG8C00: Could not find base interface 'foo' for type 'foo'.
BG8C01: For type 'IFoo', base interface 'foo' is invalid.
BG8C00: Could not find base interface 'foo' for type 'foo'.
BG8C01: For type 'IFoo', base interface 'foo' is invalid.
-->
<NoWarn Condition=" '$(_AndroidIgnoreGeneratorWarnings)' == 'true' ">$(NoWarn);BG8102;BG8103;BG8300;BG8400;BG8401;BG8402;BG8403;BG8501;BG8502;BG8503;BG8504;BG8601;BG8604;BG8605;BG8606;BG8700;BG8701;BG8800;BG8801;BG8A00;BG8A01;BG8A04;BG8B00;BG8C00;BG8C01;nullable</NoWarn>

Expand Down Expand Up @@ -95,10 +95,10 @@
<AndroidNamespaceReplacement Include='com.google.inject' Replacement='Xamarin.Google.Inject' />
<AndroidNamespaceReplacement Include='com.google.errorprone' Replacement='Xamarin.Google.ErrorProne' />
<AndroidNamespaceReplacement Include='com.google.protobuf' Replacement='Xamarin.Protobuf.Lite' />
<AndroidNamespaceReplacement Include='com.google.android.datatransport' Replacement='Xamarin.Google.Android.DataTransport' />
<AndroidNamespaceReplacement Include='com.google.android.finsky' Replacement='Xamarin.Google.Android.Finsky' />
<AndroidNamespaceReplacement Include='com.google.android.datatransport' Replacement='Xamarin.Google.Android.DataTransport' />
<AndroidNamespaceReplacement Include='com.google.android.finsky' Replacement='Xamarin.Google.Android.Finsky' />
<AndroidNamespaceReplacement Include='com.google.flatbuffers' Replacement='Xamarin.Google.FlatBuffers' />

<!-- Yes, this is spelled incorrectly :( -->
<AndroidNamespaceReplacement Include='com.google.android.ump' Replacement='Xamarin.Google.UserMesssagingPlatform' />

Expand Down Expand Up @@ -286,42 +286,45 @@
<AndroidNamespaceReplacement Include='RTMP' Replacement='Rtmp' />
<AndroidNamespaceReplacement Include='OkIO' Replacement='OkIO' />
<AndroidNamespaceReplacement Include='Atomicfu' Replacement='AtomicFU' />
<AndroidNamespaceReplacement Include='Emojipicker' Replacement='EmojiPicker' />
<AndroidNamespaceReplacement Include='privacysandbox' Replacement='PrivacySandbox' />
<AndroidNamespaceReplacement Include='adservices' Replacement='AdServices' />
<AndroidNamespaceReplacement Include='adid' Replacement='AdId' />
<AndroidNamespaceReplacement Include='adselection' Replacement='AdSelection' />
<AndroidNamespaceReplacement Include='appsetid' Replacement='AppSetId' />
<AndroidNamespaceReplacement Include='customaudience' Replacement='CustomAudience' />
<AndroidNamespaceReplacement Include='mediaextensions' Replacement='MediaExtensions' />
<AndroidNamespaceReplacement Include='jobscheduling' Replacement='JobScheduling' />
<AndroidNamespaceReplacement Include='consent_sdk' Replacement='ConsentSDK' />
<AndroidNamespaceReplacement Include='ump' Replacement='UserMessagingPlatform' />
<AndroidNamespaceReplacement Include='flatbuffers' Replacement='FlatBuffers' />
<AndroidNamespaceReplacement Include='tls' Replacement='TLS' />
<AndroidNamespaceReplacement Include='appengine' Replacement='AppEngine' />
<AndroidNamespaceReplacement Include='inprocess' Replacement='InProcess' />
<AndroidNamespaceReplacement Include='apihelpers' Replacement='ApiHelpers' />
<AndroidNamespaceReplacement Include='urlconnection' Replacement='UrlConnection' />
<AndroidNamespaceReplacement Include='animal_sniffer' Replacement='AnimalSnifferAnnotations' />
<AndroidNamespaceReplacement Include='gpu' Replacement='GPU' />
<AndroidNamespaceReplacement Include='tensorbuffer' Replacement='TensorBuffer' />
<AndroidNamespaceReplacement Include='bertclu' Replacement='BertClu' />
<AndroidNamespaceReplacement Include='nlclassifier' Replacement='NLClassifier' />
<AndroidNamespaceReplacement Include='zxing' Replacement='ZXing' />
<AndroidNamespaceReplacement Include='reedsolomon' Replacement='ReedSolomon' />
<AndroidNamespaceReplacement Include='datamatrix' Replacement='DataMatrix' />
<AndroidNamespaceReplacement Include='maxicode' Replacement='MaxiCode' />
<AndroidNamespaceReplacement Include='qrcode' Replacement='QRCode' />
<AndroidNamespaceReplacement Include='oned' Replacement='OneD' />
<AndroidNamespaceReplacement Include='rss' Replacement='RSS' />
<AndroidNamespaceReplacement Include='pdf417' Replacement='PDF417' />
<AndroidNamespaceReplacement Include='rtmp_client' Replacement='Rtmp.Client' />
<AndroidNamespaceReplacement Include='rxkotlin' Replacement='RxKotlin' />
<AndroidNamespaceReplacement Include='native_test' Replacement='Native_Test' />
<AndroidNamespaceReplacement Include='httpflags' Replacement='HttpFlags' />
<AndroidNamespaceReplacement Include='Emojipicker' Replacement='EmojiPicker' />
<AndroidNamespaceReplacement Include='privacysandbox' Replacement='PrivacySandbox' />
<AndroidNamespaceReplacement Include='adservices' Replacement='AdServices' />
<AndroidNamespaceReplacement Include='adid' Replacement='AdId' />
<AndroidNamespaceReplacement Include='adselection' Replacement='AdSelection' />
<AndroidNamespaceReplacement Include='appsetid' Replacement='AppSetId' />
<AndroidNamespaceReplacement Include='customaudience' Replacement='CustomAudience' />
<AndroidNamespaceReplacement Include='mediaextensions' Replacement='MediaExtensions' />
<AndroidNamespaceReplacement Include='jobscheduling' Replacement='JobScheduling' />
<AndroidNamespaceReplacement Include='consent_sdk' Replacement='ConsentSDK' />
<AndroidNamespaceReplacement Include='ump' Replacement='UserMessagingPlatform' />
<AndroidNamespaceReplacement Include='flatbuffers' Replacement='FlatBuffers' />
<AndroidNamespaceReplacement Include='tls' Replacement='TLS' />
<AndroidNamespaceReplacement Include='appengine' Replacement='AppEngine' />
<AndroidNamespaceReplacement Include='inprocess' Replacement='InProcess' />
<AndroidNamespaceReplacement Include='apihelpers' Replacement='ApiHelpers' />
<AndroidNamespaceReplacement Include='urlconnection' Replacement='UrlConnection' />
<AndroidNamespaceReplacement Include='animal_sniffer' Replacement='AnimalSnifferAnnotations' />
<AndroidNamespaceReplacement Include='gpu' Replacement='GPU' />
<AndroidNamespaceReplacement Include='tensorbuffer' Replacement='TensorBuffer' />
<AndroidNamespaceReplacement Include='bertclu' Replacement='BertClu' />
<AndroidNamespaceReplacement Include='nlclassifier' Replacement='NLClassifier' />
<AndroidNamespaceReplacement Include='zxing' Replacement='ZXing' />
<AndroidNamespaceReplacement Include='reedsolomon' Replacement='ReedSolomon' />
<AndroidNamespaceReplacement Include='datamatrix' Replacement='DataMatrix' />
<AndroidNamespaceReplacement Include='maxicode' Replacement='MaxiCode' />
<AndroidNamespaceReplacement Include='qrcode' Replacement='QRCode' />
<AndroidNamespaceReplacement Include='oned' Replacement='OneD' />
<AndroidNamespaceReplacement Include='rss' Replacement='RSS' />
<AndroidNamespaceReplacement Include='pdf417' Replacement='PDF417' />
<AndroidNamespaceReplacement Include='rtmp_client' Replacement='Rtmp.Client' />
<AndroidNamespaceReplacement Include='rxkotlin' Replacement='RxKotlin' />
<AndroidNamespaceReplacement Include='native_test' Replacement='Native_Test' />
<AndroidNamespaceReplacement Include='httpflags' Replacement='HttpFlags' />

<AndroidNamespaceReplacement Include='org.aomedia.avif' Replacement='Xamarin.AOMedia.AVIF' />
<AndroidNamespaceReplacement Include='mlkit' Replacement='MLKit' />
<AndroidNamespaceReplacement Include='opengl' Replacement='OpenGL' />

<AndroidNamespaceReplacement Include='org.aomedia.avif' Replacement='Xamarin.AOMedia.AVIF' />
</ItemGroup>

</Project>
Loading