diff --git a/Android/ARCore/build.cake b/Android/ARCore/build.cake index 6f507c1e74..65184a6897 100644 --- a/Android/ARCore/build.cake +++ b/Android/ARCore/build.cake @@ -2,9 +2,9 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var NUGET_VERSION = "1.26.0"; +var NUGET_VERSION = "1.29.0"; -var AAR_VERSION = "1.26.0"; +var AAR_VERSION = "1.29.0"; var AAR_URL = string.Format("https://dl.google.com/dl/android/maven2/com/google/ar/core/{0}/core-{0}.aar", AAR_VERSION); var OBJ_VERSION = "0.3.0"; var OBJ_URL = string.Format("https://oss.sonatype.org/content/repositories/releases/de/javagl/obj/{0}/obj-{0}.jar", OBJ_VERSION); @@ -12,17 +12,27 @@ var OBJ_URL = string.Format("https://oss.sonatype.org/content/repositories/relea Task ("externals") .Does (() => { - var AAR_FILE = "./externals/arcore.aar"; - var OBJ_JAR_FILE = "./externals/obj.jar"; + var AAR_FILE = string.Format("./externals/arcore-{0}.aar", AAR_VERSION); + var OBJ_JAR_FILE = string.Format("./externals/obj-{0}.jar", OBJ_VERSION);; if (!DirectoryExists ("./externals/")) CreateDirectory ("./externals"); if (!FileExists (AAR_FILE)) + { DownloadFile (AAR_URL, AAR_FILE); + if(FileExists ("./externals/arcore.aar")) + DeleteFile("./externals/arcore.aar"); + CopyFile(AAR_FILE, "./externals/arcore.aar"); + } if (!FileExists (OBJ_JAR_FILE)) + { DownloadFile (OBJ_URL, OBJ_JAR_FILE); + if(FileExists ("./externals/obj.aar")) + DeleteFile("./externals/obj.aar"); + CopyFile(OBJ_JAR_FILE, "./externals/obj.jar"); + } }); Task("libs") diff --git a/Android/ARCore/source/Additions/Additions.cs b/Android/ARCore/source/Additions/Additions.cs index 5f282702bb..1b47bddf13 100644 --- a/Android/ARCore/source/Additions/Additions.cs +++ b/Android/ARCore/source/Additions/Additions.cs @@ -1 +1,13 @@ - \ No newline at end of file +using System; + +namespace Google.AR.Core +{ + // Add ITrackable interface + // https://developers.google.com/ar/reference/java/com/google/ar/core/Trackable + public partial class AugmentedFace : Google.AR.Core.ITrackable {} + public partial class AugmentedImage : Google.AR.Core.ITrackable {} + public partial class DepthPoint : Google.AR.Core.ITrackable {} + public partial class InstantPlacementPoint : Google.AR.Core.ITrackable {} + public partial class Plane : Google.AR.Core.ITrackable {} + public partial class Point : Google.AR.Core.ITrackable {} +} diff --git a/Android/ARCore/source/Transforms/Metadata.xml b/Android/ARCore/source/Transforms/Metadata.xml index ec2bd12932..19f7a15c3a 100644 --- a/Android/ARCore/source/Transforms/Metadata.xml +++ b/Android/ARCore/source/Transforms/Metadata.xml @@ -1,65 +1,54 @@  - Google.AR.Core - Google.AR.Core.Annotations - Google.AR.Core.Exceptions - - Google.VR.Dynamite.Client - - Android.Media.Image - Java.Lang.Object - - - - - - - - - - - - - - - + Google.AR.Core + Google.AR.Core.Annotations + Google.AR.Core.Exceptions + Google.VR.Dynamite.Client + Android.Media.Image + + Java.Lang.Object + + - - java.util.Collection<com.google.ar.core.Anchor> - + - + + java.util.Collection<com.google.ar.core.Anchor> + + java.util.Collection<com.google.ar.core.Anchor> + - + java.util.Collection<com.google.ar.core.Anchor> - + java.util.Collection<com.google.ar.core.Anchor> - + java.util.Collection<com.google.ar.core.Anchor> - + - + java.util.Collection<com.google.ar.core.Anchor> + + + override + protected diff --git a/Android/CoilBase/build.cake b/Android/CoilBase/build.cake index 3a25575e38..881f22dca2 100644 --- a/Android/CoilBase/build.cake +++ b/Android/CoilBase/build.cake @@ -1,8 +1,8 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var NUGET_VERSION = "1.3.2"; +var NUGET_VERSION = "1.4.0"; -var AAR_VERSION = "1.3.2"; +var AAR_VERSION = "1.4.0"; var AAR_URL = $"https://repo1.maven.org/maven2/io/coil-kt/coil-base/{AAR_VERSION}/coil-base-{AAR_VERSION}.aar"; Task ("externals") diff --git a/Android/CoilBase/cgmanifest.json b/Android/CoilBase/cgmanifest.json index c3423872c0..c1385067da 100644 --- a/Android/CoilBase/cgmanifest.json +++ b/Android/CoilBase/cgmanifest.json @@ -6,7 +6,7 @@ "Maven": { "ArtifactId": "coil-base", "GroupId": "io.coil-kt", - "Version": "1.3.2", + "Version": "1.4.0", "NuGetId": "Xamarin.Io.CoilKt.CoilBase" } } diff --git a/Android/CoilBase/source/CoilBase/CoilBase.csproj b/Android/CoilBase/source/CoilBase/CoilBase.csproj index 2b20f398c5..24737256db 100644 --- a/Android/CoilBase/source/CoilBase/CoilBase.csproj +++ b/Android/CoilBase/source/CoilBase/CoilBase.csproj @@ -22,15 +22,15 @@ LICENSE.md true coil base xamarin android monodroid - 1.3.2 + 1.4.0 - - + + diff --git a/Android/Guava/Directory.Build.props b/Android/Guava/Directory.Build.props index f1ca18816c..89fb574cbf 100644 --- a/Android/Guava/Directory.Build.props +++ b/Android/Guava/Directory.Build.props @@ -3,9 +3,9 @@ - 29.0.0$(PackageVersionSuffix) - 1.0.1.5$(PackageVersionSuffix) - 1.0.0.5$(PackageVersionSuffix) + 31.1.0$(PackageVersionSuffix) + 1.0.1.6$(PackageVersionSuffix) + 1.0.0.6$(PackageVersionSuffix) false diff --git a/Android/Guava/Guava.sln b/Android/Guava/Guava.sln index 3f01014601..310aa1b98c 100644 --- a/Android/Guava/Guava.sln +++ b/Android/Guava/Guava.sln @@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Guava.FailureAccess", "sour EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Guava.ListenableFuture", "source\Guava.ListenableFuture\Guava.ListenableFuture.csproj", "{6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Google.J2Objc.Annotations", "source\Xamarin.Google.J2Objc.Annotations\Xamarin.Google.J2Objc.Annotations.csproj", "{650C222B-1BE3-4F5E-970A-96B78002B741}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.CheckerFramework.CheckerCompatQual", "source\Xamarin.CheckerFramework.CheckerCompatQual\Xamarin.CheckerFramework.CheckerCompatQual.csproj", "{A5060B44-96C5-4B01-A024-C7310386F118}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +31,14 @@ Global {6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU {6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU {6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}.Release|Any CPU.Build.0 = Release|Any CPU + {650C222B-1BE3-4F5E-970A-96B78002B741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {650C222B-1BE3-4F5E-970A-96B78002B741}.Debug|Any CPU.Build.0 = Debug|Any CPU + {650C222B-1BE3-4F5E-970A-96B78002B741}.Release|Any CPU.ActiveCfg = Release|Any CPU + {650C222B-1BE3-4F5E-970A-96B78002B741}.Release|Any CPU.Build.0 = Release|Any CPU + {A5060B44-96C5-4B01-A024-C7310386F118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5060B44-96C5-4B01-A024-C7310386F118}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5060B44-96C5-4B01-A024-C7310386F118}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5060B44-96C5-4B01-A024-C7310386F118}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Android/Guava/build.cake b/Android/Guava/build.cake index 59547398b5..9a2f7b44f1 100644 --- a/Android/Guava/build.cake +++ b/Android/Guava/build.cake @@ -2,16 +2,16 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var GUAVA_VERSION_BASE = "29.0"; +var GUAVA_VERSION_BASE = "31.1"; var GUAVA_VERSION = GUAVA_VERSION_BASE + "-android"; var GUAVA_FAILUREACCESS_VERSION = "1.0.1"; var GUAVA_LISTENABLEFUTURE_VERSION = "1.0"; var JSR305_VERSION = "3.0.2"; var CHECKER_COMPAT_QUAL_VERSION = "2.5.5"; -var ERROR_PRONE_ANNOTATIONS_VERSION = "2.3.3"; +var ERROR_PRONE_ANNOTATIONS_VERSION = "2.3.4"; var J2OBJC_ANNOTATIONS_VERSION = "1.3"; -var ANIMAL_SNIFFER_ANNOTATIONS_VERSION = "1.17"; +var ANIMAL_SNIFFER_ANNOTATIONS_VERSION = "1.19"; var GUAVA_JAR_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/google/guava/guava/{0}/guava-{0}.jar", GUAVA_VERSION); var GUAVA_DOCS_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/google/guava/guava/{0}/guava-{0}-javadoc.jar", GUAVA_VERSION); diff --git a/Android/Guava/cgmanifest.json b/Android/Guava/cgmanifest.json index 72183f62d0..238d90ed90 100644 --- a/Android/Guava/cgmanifest.json +++ b/Android/Guava/cgmanifest.json @@ -6,7 +6,7 @@ "Maven": { "ArtifactId": "guava", "GroupId": "com.google.guava", - "Version": "28.2-android" + "Version": "31.1-android" } } }, diff --git a/Android/Guava/samples/NuGet.config b/Android/Guava/samples/NuGet.config index a80312bcf3..af132ebaab 100644 --- a/Android/Guava/samples/NuGet.config +++ b/Android/Guava/samples/NuGet.config @@ -1,6 +1,8 @@ + + \ No newline at end of file diff --git a/Android/Guava/source/Guava.FailureAccess/Guava.FailureAccess.csproj b/Android/Guava/source/Guava.FailureAccess/Guava.FailureAccess.csproj index 7264387ca8..a12824245f 100644 --- a/Android/Guava/source/Guava.FailureAccess/Guava.FailureAccess.csproj +++ b/Android/Guava/source/Guava.FailureAccess/Guava.FailureAccess.csproj @@ -4,7 +4,9 @@ true Xamarin.Google.Guava.FailureAccess Guava.FailureAccess + diff --git a/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.csproj b/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.csproj index 729007fdda..3b8d7561f2 100644 --- a/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.csproj +++ b/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.csproj @@ -4,7 +4,9 @@ true Xamarin.Google.Guava.ListenableFuture Guava.ListenableFuture + diff --git a/Android/Guava/source/Guava/Guava.csproj b/Android/Guava/source/Guava/Guava.csproj index 81846a77c0..5096832d8b 100644 --- a/Android/Guava/source/Guava/Guava.csproj +++ b/Android/Guava/source/Guava/Guava.csproj @@ -4,7 +4,9 @@ true Xamarin.Google.Guava Guava + @@ -28,7 +30,7 @@ Guava is a set of core libraries that includes new collection types (such as mul - + @@ -36,10 +38,17 @@ Guava is a set of core libraries that includes new collection types (such as mul + + + + + + + diff --git a/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Transforms/Transforms.xml b/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Transforms/Transforms.xml new file mode 100644 index 0000000000..e0de2346a3 --- /dev/null +++ b/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Transforms/Transforms.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.csproj b/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.csproj new file mode 100644 index 0000000000..1e9c5a9967 --- /dev/null +++ b/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.csproj @@ -0,0 +1,37 @@ + + + net6.0-android;monoandroid90 + true + Xamarin.CheckerFramework.CheckerCompatQual + Xamarin.CheckerFramework.CheckerCompatQual + + + + + Xamarin.CheckerFramework.CheckerCompatQual + Xamarin.CheckerFramework.CheckerCompatQual + + Xamarin.CheckerFramework.CheckerCompatQual + + Microsoft + Microsoft + © Microsoft Corporation. All rights reserved. + https://go.microsoft.com/fwlink/?linkid=865028 + https://go.microsoft.com/fwlink/?linkid=865030 + true + 2.5.5 + + + + + + + + + + + + + diff --git a/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.targets b/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.targets new file mode 100644 index 0000000000..548d5f16c2 --- /dev/null +++ b/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.targets @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Transforms/Transforms.xml b/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Transforms/Transforms.xml new file mode 100644 index 0000000000..e0de2346a3 --- /dev/null +++ b/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Transforms/Transforms.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.csproj b/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.csproj new file mode 100644 index 0000000000..36ee867107 --- /dev/null +++ b/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.csproj @@ -0,0 +1,37 @@ + + + net6.0-android;monoandroid90 + true + Xamarin.Google.J2Objc.Annotations + Xamarin.Google.J2Objc.Annotations + + + + + Xamarin.Google.J2Objc.Annotations + Xamarin.Google.J2Objc.Annotations + + Xamarin.Google.J2Objc.Annotations + + Microsoft + Microsoft + © Microsoft Corporation. All rights reserved. + https://go.microsoft.com/fwlink/?linkid=865028 + https://go.microsoft.com/fwlink/?linkid=865030 + true + 1.3.0 + + + + + + + + + + + + + diff --git a/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.targets b/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.targets new file mode 100644 index 0000000000..548d5f16c2 --- /dev/null +++ b/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.targets @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Android/SignalRJavaClient/build.cake b/Android/SignalRJavaClient/build.cake index a32b15dfb3..d34760a980 100644 --- a/Android/SignalRJavaClient/build.cake +++ b/Android/SignalRJavaClient/build.cake @@ -1,8 +1,8 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var NUGET_VERSION = "6.0.1"; +var NUGET_VERSION = "6.0.2"; -var JAR_VERSION = "6.0.1"; +var JAR_VERSION = "6.0.2"; var JAR_URL = $"https://repo1.maven.org/maven2/com/microsoft/signalr/signalr/{JAR_VERSION}/signalr-{JAR_VERSION}.jar"; Task ("externals") diff --git a/Android/SignalRJavaClient/cgmanifest.json b/Android/SignalRJavaClient/cgmanifest.json index 9394d8bdab..602782449e 100644 --- a/Android/SignalRJavaClient/cgmanifest.json +++ b/Android/SignalRJavaClient/cgmanifest.json @@ -6,7 +6,7 @@ "Maven": { "ArtifactId": "signalr", "GroupId": "com.microsoft.signalr", - "Version": "6.0.1", + "Version": "6.0.2", "NuGetId": "Xamarin.AspNet.SignalR.Java.Client" } } diff --git a/Android/SignalRJavaClient/source/SignalR.Java.Client/SignalR.Java.Client.csproj b/Android/SignalRJavaClient/source/SignalR.Java.Client/SignalR.Java.Client.csproj index b7cb267f43..22e3e5ac1b 100644 --- a/Android/SignalRJavaClient/source/SignalR.Java.Client/SignalR.Java.Client.csproj +++ b/Android/SignalRJavaClient/source/SignalR.Java.Client/SignalR.Java.Client.csproj @@ -22,7 +22,7 @@ LICENSE.md true signalr java client xamarin android monodroid - 6.0.1 + 6.0.2 diff --git a/XPlat/TensorFlow.Lite/build.cake b/XPlat/TensorFlow.Lite/build.cake index 7b4c024530..d523641076 100644 --- a/XPlat/TensorFlow.Lite/build.cake +++ b/XPlat/TensorFlow.Lite/build.cake @@ -1,17 +1,17 @@ var TARGET = Argument("t", Argument("target", "ci")); -var TENSOR_FLOW_LITE_NUGET_VERSION = "2.4.0"; -var TENSOR_FLOW_LITE_AAR_VERSION = "2.4.0"; -var TENSOR_FLOW_LITE_GPU_NUGET_VERSION = "2.4.0"; -var TENSOR_FLOW_LITE_GPU_AAR_VERSION = "2.4.0"; +var TENSOR_FLOW_LITE_NUGET_VERSION = "2.5.0"; +var TENSOR_FLOW_LITE_AAR_VERSION = "2.5.0"; +var TENSOR_FLOW_LITE_GPU_NUGET_VERSION = "2.5.0"; +var TENSOR_FLOW_LITE_GPU_AAR_VERSION = "2.5.0"; var TENSOR_FLOW_LITE_URL_AAR_VERSION = $"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-lite/{TENSOR_FLOW_LITE_AAR_VERSION}/tensorflow-lite-{TENSOR_FLOW_LITE_AAR_VERSION}.aar"; var TENSOR_FLOW_LITE_URL_POM_VERSION = $"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-lite/{TENSOR_FLOW_LITE_AAR_VERSION}/tensorflow-lite-{TENSOR_FLOW_LITE_AAR_VERSION}.pom"; var TENSOR_FLOW_LITE_URL_JAVADOC_VERSION = $"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-lite/{TENSOR_FLOW_LITE_AAR_VERSION}/tensorflow-lite-{TENSOR_FLOW_LITE_AAR_VERSION}-javadoc.aar"; var TENSOR_FLOW_LITE_URL_SOURCES_VERSION = $"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-lite/{TENSOR_FLOW_LITE_AAR_VERSION}/tensorflow-lite-{TENSOR_FLOW_LITE_AAR_VERSION}-sources.aar"; -var TENSOR_FLOW_LITE_GPU_URL_AAR_VERSION = $"https://bintray.com/google/tensorflow/download_file?file_path=org%2Ftensorflow%2Ftensorflow-lite-gpu%2F{TENSOR_FLOW_LITE_GPU_AAR_VERSION}%2Ftensorflow-lite-gpu-{TENSOR_FLOW_LITE_GPU_AAR_VERSION}.aar"; +var TENSOR_FLOW_LITE_GPU_URL_AAR_VERSION = $"https://repo1.maven.org/maven2/org/tensorflow/tensorflow-lite-gpu/{TENSOR_FLOW_LITE_GPU_AAR_VERSION}/tensorflow-lite-gpu-{TENSOR_FLOW_LITE_GPU_AAR_VERSION}.aar"; Task("externals") .WithCriteria(!FileExists($"./externals/tensorflow-lite-{TENSOR_FLOW_LITE_AAR_VERSION}.aar")) diff --git a/XPlat/TensorFlow.Lite/cgmanifest.json b/XPlat/TensorFlow.Lite/cgmanifest.json index 67e12014ef..7ac7e74478 100644 --- a/XPlat/TensorFlow.Lite/cgmanifest.json +++ b/XPlat/TensorFlow.Lite/cgmanifest.json @@ -6,7 +6,7 @@ "Maven": { "ArtifactId": "tensorflow-lite", "GroupId": "org.tensorflow", - "Version": "2.4.0", + "Version": "2.5.0", "NuGetId": "Xamarin.TensorFlow.Lite" } } diff --git a/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid.csproj b/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid.csproj index 163b0df4a7..b6722f8452 100644 --- a/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid.csproj +++ b/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Bindings.XamarinAndroid.csproj @@ -24,7 +24,7 @@ --> true Xamarin.TensorFlow.Lite - 2.4.0 + 2.5.0 Xamarin.TensorFlow.Lite Bindings for Google's TensorFlow Lite package (Google Play Services dependency) @@ -44,7 +44,7 @@ - + Jars\tensorflow-lite.aar diff --git a/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid.csproj b/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid.csproj index b70d5c233b..37c7de4f8f 100644 --- a/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid.csproj +++ b/XPlat/TensorFlow.Lite/source/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid/Xamarin.TensorFlow.Lite.Gpu.Bindings.XamarinAndroid.csproj @@ -24,7 +24,7 @@ --> true Xamarin.TensorFlow.Lite.Gpu - 2.4.0 + 2.5.0 Xamarin.TensorFlow.Lite.Gpu Bindings for Google's TensorFlow Lite GPU package (Google Play Services dependency) @@ -44,7 +44,7 @@ - + Jars\tensorflow-lite-gpu.aar diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 006795072f..c5250f105b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ resources: variables: DotNet6Version: 6.0.200 - XamarinAndroidVsix: https://download.visualstudio.microsoft.com/download/pr/7372b89a-b719-426c-9916-c33cbc6c7a61/45c38957fdcacfbee95be95ee40c4f5a4cc9ace69416625ad26e2da83b176941/Xamarin.Android.Sdk-11.4.0.5.vsix + XamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-1-windows # NOTE: there wasn't a public release of 16.11 for macOS XamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5673868/d17-1/19b97b7614b275a84d9e38096bd1fe0e25a494d4/xamarin.android-12.2.0.4.pkg jobs: @@ -88,3 +88,12 @@ jobs: parameters: dependsOn: [ 'linux', 'macos', 'windows' ] condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') + # Executive Order (EO): Software Bill of Materials (SBOM): https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/secure-supply-chain/ado-sbom-generator + - template: compliance/sbom/job.v1.yml@internal-templates + parameters: + dependsOn: [ 'signing' ] + artifactNames: [ 'nuget-signed' ] + packageName: Xamarin.Components # SBOM package name. TODO: Customize for specific component: Replace with the name of the nuget package such as Square.Moshi.Adapters + packageVersionRegex: '' # SBOM package version. TODO: Customize for specific component: Regular expression used to glean the version number from the package name such as '(?i)^Square.Moshi.Adapters\.(?\d+\.\d+\.\d+).nupkg$' + packageFilter: '*.nupkg' + condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') diff --git a/global.json b/global.json index 1ca5ffe99e..ae792db5f3 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "3.0.23", - "Microsoft.Build.Traversal": "2.1.1", - "Microsoft.Build.NoTargets": "2.0.1", - "Xamarin.Legacy.Sdk": "0.1.0-alpha2" + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "3.1.3", + "Microsoft.Build.NoTargets": "3.3.0", + "Xamarin.Legacy.Sdk": "0.1.2-alpha6" } } \ No newline at end of file