Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dotnet/android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f90e889
Choose a base ref
...
head repository: dotnet/android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 68aebb0
Choose a head ref
  • 2 commits
  • 23 files changed
  • 2 contributors

Commits on Oct 20, 2025

  1. [xabt] additional fixes for non-integer API levels (#10536)

    We found the following errors with many `javac` errors:
    
        class MyTextObjectFont : Android.Graphics.Pdf.Component.PdfPageTextObjectFont
        {
            public MyTextObjectFont(Android.Graphics.Pdf.Component.PdfPageTextObjectFont font) : base(font)
            {
            }
        }
    
    Such as:
    
        obj\Debug\net10.0-android36.1\android\src\crc643b87557a63e7c027\MainActivity_MyTextObjectFont.java(5,40): error JAVAC0000:  error: package android.graphics.pdf.component does not exist
            extends android.graphics.pdf.component.PdfPageTextObjectFont
    
    This appears to be caused by the use of:
    
        "C:\Program Files (x86)\Android\android-sdk\platforms\android-36\android.jar"
    
    When the build *should* be using:
    
        "C:\Program Files (x86)\Android\android-sdk\platforms\android-36.1\android.jar"
    
    Update various MSBuild logic to handle non-integer API levels.
    
    **API Level Property Standardization**
    
    * Replaced `AndroidSdkPlatform` with `AndroidApiLevel` in all relevant
      MSBuild targets and task classes, including `Aapt2Link`,
      `GenerateMainAndroidManifest`, `GetJavaPlatformJar`, and others.
    
    **Parsing and Usage Improvements**
    
    * Updated logic to parse `AndroidApiLevel` using
      `MonoAndroidHelper.TryParseApiLevel` where necessary, supporting
      both major and minor versions and defaulting to sensible values when
      parsing fails.
    
    **Code Cleanup and Refactoring**
    
    * Removed unused or obsolete parameters and code paths related to
      `AndroidSdkPlatform` in several classes and methods, such as
      `GenerateJavaStubs` and `JCWGenerator`.
    * Updated test cases for `CheckGoogleSdkRequirements` to use
      `AndroidApiLevel` instead of `TargetFrameworkVersion`, and corrected
      assertions for warnings and errors.
    
    **MSBuild Targets Updates**
    
    * Modified MSBuild target files to use the new `AndroidApiLevel`
      property, ensuring that all build steps and tooling reference the
      correct property name.
    jonathanpeppers committed Oct 20, 2025
    Configuration menu
    Copy the full SHA
    70e2288 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2025

  1. Bump to dotnet/dotnet@50d79701f2 10.0.100-rtm.25520.117 (#10548)

    Changes: dotnet/dotnet@0b60d26...50d7970
    
    - **Updates**:
      - From [10.0.0-beta.25512.102 to 10.0.0-beta.25520.117][2]
         - Microsoft.DotNet.Build.Tasks.Feed
      - From [0.11.5-alpha.25512.102 to 0.11.5-alpha.25520.117][2]
         - Microsoft.DotNet.Cecil
      - From [10.0.0-rtm.25512.102 to 10.0.0][2]
         - Microsoft.NET.ILLink.Tasks
         - Microsoft.NETCore.App.Ref
      - From [10.0.100-rtm.25512.102 to 10.0.100-rtm.25520.117][2]
         - Microsoft.NET.Sdk
      - From [10.0.100-rtm.25512.102 to 10.0.100][2]
         - Microsoft.TemplateEngine.Authoring.Tasks
    
    [2]: dotnet/dotnet@0b60d26...50d7970
    
    Other changes:
    
    * Track runtime workload manifests at dotnet/dotnet
    
    * Feeds for dotnet/runtime 9.0.11
    
    * Track `Microsoft.NET.ILLink` instead of `Microsoft.NET.ILLink.Tasks`
    
    Co-authored-by: Jonathan Peppers <[email protected]>
    dotnet-maestro[bot] and jonathanpeppers authored Oct 22, 2025
    Configuration menu
    Copy the full SHA
    68aebb0 View commit details
    Browse the repository at this point in the history
Loading