diff --git a/Directory.Build.props b/Directory.Build.props
index 0d1517614..e829e1094 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,6 +8,10 @@
<_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android;net7.0-android
+
+
+ <_BindingsToolsLocation>$(MSBuildThisFileDirectory)/tools/Microsoft.Android.Sdk.Windows.34.0.43/tools/
+
true
@@ -37,8 +41,11 @@
© Microsoft Corporation. All rights reserved.
true
https://aka.ms/androidx
-
+
+ **/*.MonoAndroid*.0.xml;**/*.net*.0-android.xml
+
+
diff --git a/build.cake b/build.cake
index 132970424..14c4aa812 100755
--- a/build.cake
+++ b/build.cake
@@ -1,6 +1,7 @@
// Tools needed by cake addins
#tool nuget:?package=Cake.CoreCLR
#tool nuget:?package=vswhere&version=3.1.7
+#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=34.0.43
// Cake Addins
#addin nuget:?package=Cake.FileHelpers&version=6.1.3
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
index 3b3f1dcc9..640cf75f2 100644
--- a/source/AndroidXProject.cshtml
+++ b/source/AndroidXProject.cshtml
@@ -126,7 +126,10 @@
Transforms/Metadata.common.xml
-
+
+ Transforms/%(RecursiveDir)/%(Filename)%(Extension)
+
+
Transforms/%(RecursiveDir)/%(Filename)%(Extension)
Size;
+
+ global::System.Collections.ICollection IMap.Values () => Values;
+ }
+
+ public partial class MapBuilderEntries
+ {
+ public override bool Add (Object? element) => Add ((IMapEntry) element!);
+
+ public override int GetSize () => Size;
+ }
+}
+#endif
diff --git a/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.net7.0-android.xml b/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.net7.0-android.xml
new file mode 100644
index 000000000..ea20cbc9d
--- /dev/null
+++ b/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.net7.0-android.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.MonoAndroid12.0.xml b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.MonoAndroid12.0.xml
new file mode 100644
index 000000000..6e8d5a8c1
--- /dev/null
+++ b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.MonoAndroid12.0.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.net6.0-android.xml b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.net6.0-android.xml
new file mode 100644
index 000000000..6e8d5a8c1
--- /dev/null
+++ b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.net6.0-android.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml
index 9b4d0c2d6..cdb5e9634 100644
--- a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml
+++ b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml
@@ -569,17 +569,6 @@
>
Xamarin.Google.Crypto.Tink.Key
-
-
-
-
-
Xamarin.Google.Crypto.Tink.Parameters
-
-
-
-
Xamarin.Google.Crypto.Tink.Parameters
-
-
-
Xamarin.Google.Crypto.Tink.Parameters
-
-
-
-
-
-
-
-
-
-
-
-
-
Xamarin.Google.Crypto.Tink.Parameters
-
-
-
-
-
-
Xamarin.Google.Crypto.Tink.Parameters
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/templates/tink/Project.cshtml b/templates/tink/Project.cshtml
index 6906b13be..5ced4b8c1 100644
--- a/templates/tink/Project.cshtml
+++ b/templates/tink/Project.cshtml
@@ -39,7 +39,8 @@
-
+
+