Updates needed to build on net9.0-android RTM. (#1021)

Changes needed to build on `net9.0-android` RTM. These should be safe to commit for `net8.0-android` as well without affecting anything. Each change should have a comment explaining its purpose. This adds the "Run on .NET next preview" option that can be selected when kicking off a new CI build. Selecting this will run the CI build on .NET 9.
dotnet · Jan 8, 2025 · 3a4c512 · 3a4c512
1 parent d86f032
commit 3a4c512
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 5 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -89,6 +89,7 @@ extends:
           name: $(windowsAgentPoolName)
           image: $(windowsImage)
           os: windows
+        runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
 
     - template: build/ci/stage-extended-tests.yml@self
       parameters:
@@ -97,5 +98,6 @@ extends:
           name: $(windowsAgentPoolName)
           image: $(windowsImage)
           os: windows
+        runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
 
     - template: build/ci/stage-sign-artifacts.yml@self
diff --git a/build/ci/build.yml b/build/ci/build.yml
@@ -9,7 +9,6 @@ parameters:
   runDotnetNextTest: false
 
   tools:                                                            # Additional .NET global tools to install
-  - 'xamarin.androidbinderator.tool': '0.5.7'
   - 'Cake.Tool': '4.0.0'
   - 'private-api-tools': '1.0.3'
 
@@ -22,7 +21,9 @@ jobs:
   displayName: ${{ parameters.name }}
   timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
   pool: ${{ parameters.buildPool }}
-
+  workspace:
+    clean: all
+
   templateContext:
     sdl:
       spotBugs:

diff --git a/build/ci/job-extended-tests.yml b/build/ci/job-extended-tests.yml
@@ -7,9 +7,11 @@ parameters:
   testFilter:                                     # Test category filter 
   testProject:                                    # The test .csproj to build
   testAssembly:                                   # The test .dll to execute
+  runDotnetNextTest: false
 
   tools:                                          # Additional .NET global tools to install
   - 'dotnet-test-slicer' : '0.1.0-alpha7'
+  - 'Cake.Tool': '4.0.0'
 
 jobs:
 - job: ${{ parameters.jobName }}_package_tests
@@ -23,6 +25,7 @@ jobs:
   - template: setup-environment.yml
     parameters:
       dotnetTools: ${{ parameters.tools }}
+      runDotnetNextTest: ${{ parameters.runDotnetNextTest }}
 
   - task: DownloadPipelineArtifact@2
     inputs:

diff --git a/build/ci/stage-extended-tests.yml b/build/ci/stage-extended-tests.yml
@@ -3,6 +3,7 @@
 parameters:
   stageCondition:                    # When to run this stage
   buildPool:                         # VM pool information
+  runDotnetNextTest: false
 
 stages:
 - stage: extended_tests
@@ -20,7 +21,8 @@ stages:
       testProject: $(extendedTestProject)
       testAssembly: $(extendedTestAssembly)
       buildPool: ${{ parameters.buildPool }}
-
+      runDotnetNextTest: ${{ parameters.runDotnetNextTest }}
+
 # Disabled because of too many failures until MAUI updates its AndroidX packages
 #  - template: job-extended-tests.yml
 #    parameters:

diff --git a/build/ci/stage-standard-tests.yml b/build/ci/stage-standard-tests.yml
@@ -3,6 +3,7 @@
 parameters:
   buildPool:                                                        # VM pool information
   stageCondition: and(succeeded(), ne('$(skipUnitTests)', 'true'))  # When to run this stage
+  runDotnetNextTest: false
 
 stages:
 - stage: standard_tests
@@ -20,3 +21,4 @@ stages:
       testProject: $(standardTestProject)
       testAssembly: $(standardTestAssembly)
       buildPool: ${{ parameters.buildPool }}
+      runDotnetNextTest: ${{ parameters.runDotnetNextTest }}
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
@@ -22,8 +22,9 @@
        - CS0809: Obsolete member 'member' overrides non-obsolete member 'member'
        - CS1572: XML comment has a param tag for '', but there is no parameter by that name
        - XAOBS001: While this member is 'public', Google considers it internal API and reserves the right to modify or delete it in the future. Use at your own risk. 
+       - NU1605: Detected package downgrade
     -->
-    <NoWarn>$(NoWarn);0618;0109;0114;0628;0108;0809;1572;XAOBS001</NoWarn>
+    <NoWarn>$(NoWarn);0618;0109;0114;0628;0108;0809;1572;XAOBS001;NU1605</NoWarn>
 
 @if (Model.AllowPrereleaseDependencies) {
     <!-- Allow this package to have prerelease dependencies -->

diff --git a/source/_PackageLevelCustomizations.cshtml b/source/_PackageLevelCustomizations.cshtml
@@ -55,3 +55,12 @@
     <EmbeddedJar Include="..\..\externals\com.xamarin.google.android.play.feature.delivery.extensions\extensions.jar" />
   </ItemGroup>
 }
+
+@* .NET 9 changes some binding internals that breaks some of our hand bound code. This property reverts
+   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")
+{
+  <PropertyGroup>
+    <_AndroidEmitLegacyInterfaceInvokers>true</_AndroidEmitLegacyInterfaceInvokers>
+  </PropertyGroup>
+}
diff --git a/source/androidx.paging/paging-common-jvm/Transforms/Metadata.xml b/source/androidx.paging/paging-common-jvm/Transforms/Metadata.xml
@@ -109,4 +109,12 @@
         public
     </attr>
 
+    <!-- Workaround generator can't detect this was implemented as an explicitly implemented interface member on a base class -->
+    <attr
+      path="/api/package[@name='androidx.paging']/class[@name='PagedList']"
+      name="skipInvokerMethods"
+      >
+      java/util/SequencedCollection.reversed()Ljava/util/SequencedCollection;
+    </attr>
+
 </metadata>
diff --git a/source/androidx.work/work-runtime/Transforms/Metadata.xml b/source/androidx.work/work-runtime/Transforms/Metadata.xml
@@ -11,6 +11,7 @@
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='setInputData']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='setPeriodStartTime']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='setScheduleRequestedAt']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
+    <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='setId']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
 
     <remove-node
         path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/typeParameters" 

diff --git a/source/com.google.protobuf/protobuf-lite/Transforms/Metadata.xml b/source/com.google.protobuf/protobuf-lite/Transforms/Metadata.xml
@@ -343,4 +343,12 @@
         path="/api/package[@name='com.google.protobuf']/class[@name='LazyStringArrayList']/method[@name='addAll' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='java.util.Collection&lt;? extends java.lang.String&gt;']]"
         />
 
+    <!-- Workaround generator can't detect this was implemented as an explicitly implemented interface member on a base class -->
+    <attr
+        path="/api/package[@name='com.google.protobuf']/class[@name='AbstractProtobufList']"
+        name="skipInvokerMethods"
+        >
+        java/util/SequencedCollection.reversed()Ljava/util/SequencedCollection;
+    </attr>
+
 </metadata>
diff --git a/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml b/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml
@@ -152,6 +152,7 @@
   <remove-node path="/api/package[@name='kotlin.text']/class[@name='StringsKt___StringsKt']/method[@name='filterIndexed' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='kotlin.jvm.functions.Function2&lt;? super java.lang.Integer, ? super java.lang.Character, java.lang.Boolean&gt;']]" />
   <remove-node path="/api/package[@name='kotlin.text']/class[@name='StringsKt___StringsKt']/method[@name='filterNot' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='kotlin.jvm.functions.Function1&lt;? super java.lang.Character, java.lang.Boolean&gt;']]" />
   <remove-node path="/api/package[@name='kotlin.text']/class[@name='StringsKt___StringsKt']/method[@name='onEach' and count(parameter)=2 and parameter[1][@type='S'] and parameter[2][@type='kotlin.jvm.functions.Function1&lt;? super java.lang.Character, kotlin.Unit&gt;']]/typeParameters" />
+  <attr path="/api/package[@name='kotlin.text']/class[@name='StringsKt___StringsKt']/method[@name='onEach' and count(parameter)=2 and parameter[1][@type='S'] and parameter[2][@type='kotlin.jvm.functions.Function1&lt;? super java.lang.Character, kotlin.Unit&gt;']]" name="return">java.lang.CharSequence</attr>
   <attr path="/api/package[@name='kotlin.text']/class[@name='StringsKt___StringsKt']/method[@name='onEach' and count(parameter)=2 and parameter[1][@type='S'] and parameter[2][@type='kotlin.jvm.functions.Function1&lt;? super java.lang.Character, kotlin.Unit&gt;']]/parameter[1]" name="type">java.lang.CharSequence</attr>
   <remove-node path="/api/package[@name='kotlin.text']/class[@name='StringsKt___StringsKt']/method[@name='slice' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='kotlin.ranges.IntRange']]" />
   <remove-node path="/api/package[@name='kotlin.text']/class[@name='StringsKt___StringsKt']/method[@name='take' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int']]" />
@@ -444,4 +445,26 @@
 
     <remove-node path="/api/package[@name='kotlin.collections.builders']/class[@name='AbstractMapBuilderEntrySet']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" />
 
-  </metadata>
+    <!-- Workaround generator can't detect this was implemented as an explicitly implemented interface member on a base class -->
+    <attr
+      path="/api/package[@name='kotlin.collections']/class[@name='AbstractMutableList']"
+      name="skipInvokerMethods"
+      >
+      java/util/SequencedCollection.reversed()Ljava/util/SequencedCollection;
+    </attr>
+
+    <attr
+      path="/api/package[@name='kotlin.collections']/class[@name='AbstractList']"
+      name="skipInvokerMethods"
+      >
+      java/util/SequencedCollection.reversed()Ljava/util/SequencedCollection;
+    </attr>
+
+    <!-- Workaround generator doesn't know that `java.util.IList` provides a DIM for this method -->
+    <attr
+      path="/api/package[@name='kotlin.collections']/class[@name='AbstractList']"
+      name="skipInterfaceMethods"
+      >
+      java/util/SequencedCollection.reversed()Ljava/util/SequencedCollection;
+    </attr>
+</metadata>
diff --git a/tests/common/NuGet.config b/tests/common/NuGet.config
@@ -26,11 +26,13 @@
             <package pattern="Microsoft.AspNetCore.*" />
             <package pattern="Microsoft.Extensions.*" />
             <package pattern="Microsoft.Graphics.*" />
+            <package pattern="Microsoft.IO.*" />
             <package pattern="Microsoft.iOS.*" />
             <package pattern="Microsoft.MacCatalyst.*" />
             <package pattern="Microsoft.Maui.*" />
             <package pattern="Microsoft.NET.*" />
             <package pattern="Microsoft.NETCore.*" />
+            <package pattern="Microsoft.Web.*" />
             <package pattern="Microsoft.Windows.*" />
             <package pattern="Microsoft.WindowsAppSDK" />
             <package pattern="Microsoft.WindowsDesktop.*" />