diff --git a/Directory.Build.props b/Directory.Build.props
index 9bd6d040e..1472fbab9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,7 +6,7 @@
$(BUILD_SOURCEVERSION)
- <_DefaultTargetFrameworks>net8.0-android
+ <_DefaultTargetFrameworks>net8.0-android;net9.0-android
<_DefaultNetTargetFrameworks>net8.0
@@ -85,11 +85,14 @@
+
+
+
diff --git a/build/ci/build.yml b/build/ci/build.yml
index 34cc3a946..f5bc5e45d 100644
--- a/build/ci/build.yml
+++ b/build/ci/build.yml
@@ -71,7 +71,7 @@ jobs:
- ${{ if ne(parameters.use1ESTemplate, true) }}:
- task: PublishPipelineArtifact@1
displayName: Upload logs
+ condition: always()
inputs:
artifactName: output-${{ parameters.name }}
targetPath: ${{ parameters.artifactsPath }}
- condition: always()
diff --git a/build/ci/variables.yml b/build/ci/variables.yml
index e68610ead..31d54b760 100644
--- a/build/ci/variables.yml
+++ b/build/ci/variables.yml
@@ -19,7 +19,7 @@ variables:
macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name
# Tool variables
- dotnetVersion: '8.0.408' # .NET version to install on agent
+ dotnetVersion: '9.0.300' # .NET version to install on agent
dotnetWorkloadRollbackFile: 'workloads.json' # Rollback file specifying workload versions to install
dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' # NuGet.org URL to find workloads
dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json' # .NET engineering URL to find workloads
diff --git a/build/scripts/provision-android/provision-android.csproj b/build/scripts/provision-android/provision-android.csproj
index fcf0fb159..3d09ca3bf 100644
--- a/build/scripts/provision-android/provision-android.csproj
+++ b/build/scripts/provision-android/provision-android.csproj
@@ -1,5 +1,9 @@
- net8.0-android
+ net9.0-android
+
+
+
+
diff --git a/config.json b/config.json
index 53069935f..832ee16df 100644
--- a/config.json
+++ b/config.json
@@ -5204,7 +5204,7 @@
"groupId": "androidx.emoji2",
"artifactId": "emoji2",
"version": "1.2.0",
- "nugetVersion": "1.2.0.3",
+ "nugetVersion": "1.2.0.2",
"nugetId": "Xamarin.AndroidX.Emoji2",
"dependencyOnly": true,
"comments": "Required by 'androidx.emoji2.emoji2-emojipicker:1.5.0'"
diff --git a/global.json b/global.json
index 0d8cf64bd..64e65d283 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,4 @@
{
- "sdk":
- {
- "version": "8.0.408",
- "rollForward": "patch"
- },
"msbuild-sdks":
{
"MSBuild.Sdk.Extras": "3.0.44",
diff --git a/source/_PackageLevelCustomizations.cshtml b/source/_PackageLevelCustomizations.cshtml
index 2b6428c52..fa0177964 100644
--- a/source/_PackageLevelCustomizations.cshtml
+++ b/source/_PackageLevelCustomizations.cshtml
@@ -60,7 +60,7 @@
to the old behavior. Once we are .NET 9+ we should redo our hand bound code and remove this. *@
@if (@Model.NuGetPackageId == "Xamarin.AndroidX.Media3.ExoPlayer" )
{
-
+
<_AndroidEmitLegacyInterfaceInvokers>true
}
\ No newline at end of file
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index d8a473f19..a4f788978 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -3,7 +3,7 @@
which is tuned for building bindings packages. -->
- <_DefaultTargetFrameworks>net8.0-android
+ <_DefaultTargetFrameworks>net8.0-android;net9.0-android
<_DefaultNetTargetFrameworks>net8.0
diff --git a/workloads.json b/workloads.json
index 3aadb359c..ed8617fd1 100644
--- a/workloads.json
+++ b/workloads.json
@@ -1,10 +1,10 @@
{
- "microsoft.net.sdk.android": "34.0.154/8.0.100",
- "microsoft.net.sdk.ios": "18.0.8319/8.0.100",
- "microsoft.net.sdk.maccatalyst": "18.0.8319/8.0.100",
- "microsoft.net.sdk.macos": "15.0.8319/8.0.100",
- "microsoft.net.sdk.maui": "8.0.100/8.0.100",
- "microsoft.net.sdk.tvos": "18.0.8319/8.0.100",
- "microsoft.net.workload.mono.toolchain.current": "8.0.15/8.0.100",
- "microsoft.net.workload.emscripten.current": "8.0.15/8.0.100"
+ "microsoft.net.sdk.android": "35.0.61/9.0.100",
+ "microsoft.net.sdk.ios": "18.4.9288/9.0.100",
+ "microsoft.net.sdk.maccatalyst": "18.4.9288/9.0.100",
+ "microsoft.net.sdk.macos": "15.4.9288/9.0.100",
+ "microsoft.net.sdk.maui": "9.0.51/9.0.100",
+ "microsoft.net.sdk.tvos": "18.4.9288/9.0.100",
+ "microsoft.net.workload.mono.toolchain.current": "9.0.5/9.0.100",
+ "microsoft.net.workload.emscripten.current": "9.0.5/9.0.100"
}