Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mono.Android] Bind Android 12L Beta 1. #6601

Merged
merged 18 commits into from
Jan 14, 2022
Merged

[Mono.Android] Bind Android 12L Beta 1. #6601

merged 18 commits into from
Jan 14, 2022

Commits on Jan 4, 2022

  1. Configuration menu
    Copy the full SHA
    eb6da19 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2022

  1. Drop API 31 packs & remove android-32 workload

    You should still be able to target `net6.0-android31`, as I hardcoded
    the version to what is released on NuGet.org:
    
    https://www.nuget.org/packages/Microsoft.Android.Ref.31/31.0.101-preview.11.117
    
    With these changes `net6.0-android31` resolves from:
    
        ~\.nuget\packages\microsoft.android.ref.31\31.0.101-preview.11.117\ref\net6.0\Mono.Android.dll
    
    But with `net6.0-android` (defaults to 32 now), you get:
    
        dotnet\packs\Microsoft.Android.Ref.32\*\ref\net6.0\Mono.Android.dll
    
    I also removed `%(DefaultRuntimeFrameworkVersion)` from
    `@(KnownFrameworkReference)` as it is not needed.
    jonathanpeppers committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    38fddb7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    44b46d3 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. Bump to build-tools 32.0.0

    Any app project build was hitting the warning:
    
        Xamarin.Android.Aapt2.targets(157,3): warning APT2000: aapt2 W 01-05 23:58:06  8352 43857 LoadedArsc.cpp:657] Unknown chunk type '200'.
    
    And so any MSBuild test that asserts no warnings would fail.
    
    I think we need to get a new version of `aapt2` to fix this.
    jonathanpeppers committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    b6dbc98 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa1414c View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. Configuration menu
    Copy the full SHA
    09bab03 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2022

  1. [tests] drop SupportedOSPlatformVersion(32) test

    Apps with the `AndroidManifest.xml`:
    
        <uses-sdk android:minSdkVersion="32" android:targetSdkVersion="32" />
    
    Passes `--min-api 32` to d8/r8.
    
    This emits the warning:
    
        D8 : warning : An API level of 32 is not supported by this compiler. Please use an API level of 31 or earlier
    
    Let's remove this test case for now.
    jonathanpeppers committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    4879ac0 View commit details
    Browse the repository at this point in the history
  2. Install build-tools 30.0.3 alongside 32.0.0

    Otherwise, builds using `AndroidDexTool=dx` fail with:
    
        COMPILETODALVIK : error : Unable to access jarfile C:\Users\jopepper\android-toolchain\sdk\build-tools\32.0.0\\lib\dx.jar
    
    It looks like we have existing logic falling back to older `build-tools` when you install them side-by-side.
    jonathanpeppers committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    22c5ecd View commit details
    Browse the repository at this point in the history
  3. [One .NET] keep API 31 the default

    * The default `$(TargetPlatformVersion)` is 32.0
    * Keep the `Microsoft.Android.Ref.31` packs in our workload, hardcoded to the previous release on NuGet.org.
    * Import `Microsoft.Android.Sdk.SupportedPlatforms.targets` *before* `Microsoft.Android.Sdk.BundledVersions.targets`
    jonathanpeppers committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    20220e3 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. [tests] temporarily hardcode targetSdkVersion="31" in .NET tests

    We get an XA1008 when targetSdkVersion="32" and $(TargetPlatformVersion)=31.0 otherwise. This causes various MSBuild tests to fail that assert no warnings.
    jonathanpeppers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    0f92ce4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2103268 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2022

  1. Configuration menu
    Copy the full SHA
    bba5393 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cade0cb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5f66c36 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    18bffbb View commit details
    Browse the repository at this point in the history
  5. <TargetFrameworkVersion>$(AndroidLatestStableFrameworkVersion)</Targe…

    …tFrameworkVersion>
    
    We have to declare this after importing Configuration.props.
    jonathanpeppers committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    bedecc2 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. Review feedback

    * Renamed `$(AndroidTargetDotNetApiLevel)` -> `$(AndroidDefaultTargetDotnetApiLevel)`
    * Put this value in `XABuildConfig`, so we can use it in tests
    * Updated several places to use `XABuildConfig` instead of 31 hardcoded inline
    jonathanpeppers committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    702df8c View commit details
    Browse the repository at this point in the history
  2. Didn't hit build!

    jonathanpeppers committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    f24ea83 View commit details
    Browse the repository at this point in the history