diff --git a/Directory.Build.props b/Directory.Build.props index 2d481698..63ff3aca 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,7 +10,7 @@ - <_BindingsToolsLocation>$(MSBuildThisFileDirectory)/tools/Microsoft.Android.Sdk.Windows.34.0.43/tools/ + <_BindingsToolsLocation>$(MSBuildThisFileDirectory)/tools/Microsoft.Android.Sdk.Windows.34.0.95/tools/ true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 35ca5dd1..f9011274 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,12 +19,12 @@ variables: # Windows specific variables windowsAgentPoolName: Maui-1ESPT # Windows VM pool name windowsImage: 1ESPT-Windows2022 # Windows VM image name - windowsClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-4-windows # Windows Classic XA installer URL + windowsClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-8-windows # Windows Classic XA installer URL # macOS specific variables macosAgentPoolName: Azure Pipelines # macOS VM pool name macosImage: internal-macos12 # macOS VM image name - macosClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-4-macos # macOS Classic XA installer URL + macosClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-8-macos # macOS Classic XA installer URL resources: repositories: diff --git a/build.cake b/build.cake index 9bdd69c0..73567aa3 100755 --- a/build.cake +++ b/build.cake @@ -2,13 +2,13 @@ #tool nuget:?package=vswhere&version=3.1.7 #tool nuget:?package=Cake.CoreCLR -#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=34.0.43 +#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=34.0.95 // Cake Addins #addin nuget:?package=Cake.FileHelpers&version=7.0.0 #addin nuget:?package=Newtonsoft.Json&version=13.0.3 #addin nuget:?package=Cake.MonoApiTools&version=3.0.5 -#addin nuget:?package=CsvHelper&version=30.1.0 +#addin nuget:?package=CsvHelper&version=31.0.3 #addin nuget:?package=SharpZipLib&version=1.4.2 // #addin nuget:?package=NuGet.Protocol&loaddependencies=true&version=5.6.0 diff --git a/build/ci/build.yml b/build/ci/build.yml index 19155091..cc2bd9db 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -12,18 +12,18 @@ parameters: runAPIScan: false # Run APIScan analysis # Tool Parameters - dotnetVersion: '8.0.201' # the version of .NET to use + dotnetVersion: '8.0.204' # the version of .NET to use dotnetWorkloadRollbackFile: 'workloads.json' dotnetWorkloadSource: 'https://api.nuget.org/v3/index.json' dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' - classicXAPkg: https://aka.ms/xamarin-android-commercial-d17-4-macos - classicXAVsix: https://aka.ms/xamarin-android-commercial-d17-4-windows + classicXAPkg: https://aka.ms/xamarin-android-commercial-d17-8-macos + classicXAVsix: https://aka.ms/xamarin-android-commercial-d17-8-windows skipUnitTests: false # do not run unit test step tools: # Additional .NET global tools to install - 'xamarin.androidbinderator.tool': '0.5.7' - 'Cake.Tool': '4.0.0' - - 'boots': '1.1.0.712-preview2' + - 'boots': '1.1.0.36' - 'private-api-tools': '1.0.3' # Reporting/Analysis Parameters @@ -46,6 +46,7 @@ jobs: - output: pipelineArtifact targetPath: ${{ parameters.artifactsPath }} artifactName: output-${{ parameters.name }} + condition: always() steps: - template: setup-environment.yml diff --git a/cgmanifest.json b/cgmanifest.json index cde37474..01e66331 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1255,9 +1255,9 @@ "maven": { "artifactId": "databinding-adapters", "groupId": "androidx.databinding", - "version": "8.3.1", + "version": "8.3.2", "nuGetId": "Xamarin.AndroidX.DataBinding.DataBindingAdapters", - "nuGetVersion": "8.3.1" + "nuGetVersion": "8.3.2" } }, "license": "The Apache Software License, Version 2.0" @@ -1268,9 +1268,9 @@ "maven": { "artifactId": "databinding-common", "groupId": "androidx.databinding", - "version": "8.3.1", + "version": "8.3.2", "nuGetId": "Xamarin.AndroidX.DataBinding.DataBindingCommon", - "nuGetVersion": "8.3.1" + "nuGetVersion": "8.3.2" } }, "license": "The Apache Software License, Version 2.0" @@ -1281,9 +1281,9 @@ "maven": { "artifactId": "databinding-runtime", "groupId": "androidx.databinding", - "version": "8.3.1", + "version": "8.3.2", "nuGetId": "Xamarin.AndroidX.DataBinding.DataBindingRuntime", - "nuGetVersion": "8.3.1" + "nuGetVersion": "8.3.2" } }, "license": "The Apache Software License, Version 2.0" @@ -1294,9 +1294,9 @@ "maven": { "artifactId": "viewbinding", "groupId": "androidx.databinding", - "version": "8.3.1", + "version": "8.3.2", "nuGetId": "Xamarin.AndroidX.DataBinding.ViewBinding", - "nuGetVersion": "8.3.1" + "nuGetVersion": "8.3.2" } }, "license": "The Apache Software License, Version 2.0" diff --git a/config.json b/config.json index 64055893..52401f13 100644 --- a/config.json +++ b/config.json @@ -808,32 +808,32 @@ { "groupId": "androidx.databinding", "artifactId": "databinding-adapters", - "version": "8.3.1", - "nugetVersion": "8.3.1", + "version": "8.3.2", + "nugetVersion": "8.3.2", "nugetId": "Xamarin.AndroidX.DataBinding.DataBindingAdapters", "dependencyOnly": false }, { "groupId": "androidx.databinding", "artifactId": "databinding-common", - "version": "8.3.1", - "nugetVersion": "8.3.1", + "version": "8.3.2", + "nugetVersion": "8.3.2", "nugetId": "Xamarin.AndroidX.DataBinding.DataBindingCommon", "dependencyOnly": false }, { "groupId": "androidx.databinding", "artifactId": "databinding-runtime", - "version": "8.3.1", - "nugetVersion": "8.3.1", + "version": "8.3.2", + "nugetVersion": "8.3.2", "nugetId": "Xamarin.AndroidX.DataBinding.DataBindingRuntime", "dependencyOnly": false }, { "groupId": "androidx.databinding", "artifactId": "viewbinding", - "version": "8.3.1", - "nugetVersion": "8.3.1", + "version": "8.3.2", + "nugetVersion": "8.3.2", "nugetId": "Xamarin.AndroidX.DataBinding.ViewBinding", "dependencyOnly": false }, diff --git a/docs/artifact-list-with-versions.md b/docs/artifact-list-with-versions.md index 65145351..1692ca52 100644 --- a/docs/artifact-list-with-versions.md +++ b/docs/artifact-list-with-versions.md @@ -101,10 +101,10 @@ | 94|androidx.cursoradapter:cursoradapter |1.0.0 |Xamarin.AndroidX.CursorAdapter |1.0.0.23 | | 95|androidx.customview:customview |1.1.0 |Xamarin.AndroidX.CustomView |1.1.0.22 | | 96|androidx.customview:customview-poolingcontainer |1.0.0 |Xamarin.AndroidX.CustomView.PoolingContainer |1.0.0.9 | -| 97|androidx.databinding:databinding-adapters |8.3.1 |Xamarin.AndroidX.DataBinding.DataBindingAdapters |8.3.1 | -| 98|androidx.databinding:databinding-common |8.3.1 |Xamarin.AndroidX.DataBinding.DataBindingCommon |8.3.1 | -| 99|androidx.databinding:databinding-runtime |8.3.1 |Xamarin.AndroidX.DataBinding.DataBindingRuntime |8.3.1 | -| 100|androidx.databinding:viewbinding |8.3.1 |Xamarin.AndroidX.DataBinding.ViewBinding |8.3.1 | +| 97|androidx.databinding:databinding-adapters |8.3.2 |Xamarin.AndroidX.DataBinding.DataBindingAdapters |8.3.2 | +| 98|androidx.databinding:databinding-common |8.3.2 |Xamarin.AndroidX.DataBinding.DataBindingCommon |8.3.2 | +| 99|androidx.databinding:databinding-runtime |8.3.2 |Xamarin.AndroidX.DataBinding.DataBindingRuntime |8.3.2 | +| 100|androidx.databinding:viewbinding |8.3.2 |Xamarin.AndroidX.DataBinding.ViewBinding |8.3.2 | | 101|androidx.datastore:datastore |1.0.0 |Xamarin.AndroidX.DataStore |1.0.0.4 | | 102|androidx.datastore:datastore-core |1.0.0 |Xamarin.AndroidX.DataStore.Core |1.0.0.4 | | 103|androidx.datastore:datastore-preferences |1.0.0 |Xamarin.AndroidX.DataStore.Preferences |1.0.0.4 | diff --git a/global.json b/global.json index 3f921938..b6b214c8 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.201", + "version": "8.0.204", "rollForward": "patch" }, "msbuild-sdks": diff --git a/source/androidx.browser/browser/Additions/CustomTabsActivityManager.cs b/source/androidx.browser/browser/Additions/CustomTabsActivityManager.cs index 7adb0c1a..82e644df 100644 --- a/source/androidx.browser/browser/Additions/CustomTabsActivityManager.cs +++ b/source/androidx.browser/browser/Additions/CustomTabsActivityManager.cs @@ -9,8 +9,10 @@ namespace AndroidX.Browser.CustomTabs { public class CustomTabsActivityManager { - static CustomTabsActivityManager instance; - public static CustomTabsActivityManager From (Activity parentActivity, string servicePackageName = null) + static CustomTabsActivityManager? instance; + + [Obsolete ("This method only supports a single parentActivity and caches a reference to it forever. It is recommended to use the CustomTabsActivityManager constructor instead and implement any desired caching in the consuming application.")] + public static CustomTabsActivityManager From (Activity parentActivity, string? servicePackageName = null) { if (instance == null) { instance = new CustomTabsActivityManager (parentActivity); @@ -22,8 +24,8 @@ namespace AndroidX.Browser.CustomTabs public Activity ParentActivity { get; private set; } public CustomTabsClient Client { get; private set; } - CustomTabsSession session = null; - public CustomTabsSession Session { + CustomTabsSession? session = null; + public CustomTabsSession? Session { get { if (Client == null) { return null;