8000 Comparing 35.0.92...35.0.101 · dotnet/android · GitHub
[go: up one dir, main page]

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: 35.0.92
Choose a base ref
...
head repository: dotnet/android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35.0.101
Choose a head ref
  • 9 commits
  • 17 files changed
  • 3 contributors

Commits on Jul 30, 2025

  1. [xabt] suppress XA0101 for Razor class libraries (#10350)

    Context: https://github.com/dotnet/sdk/blob/1ed2f8e9751753a1d249d129884a669363c1b832/src/StaticWebAssetsSdk/Sdk/Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props#L30-L31
    Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2533207
    
    1. Create a `dotnet new maui-blazor-web` project.
    
    2. Open the `*.Shared.csproj`, the Razor class library project.
    
    3. Change the `$(TargetFramework)` from `net9.0` to `net9.0-android`.
    
    4. Build the project.
    
    Get the warnings:
    
        hellomauiblazor.Shared net9.0-android succeeded with 11 warning(s) (0.4s) → hellomauiblazor.Shared\bin\Debug\net9.0-android\hellomauiblazor.Shared.dll
        wwwroot\app.css : warning XA0101: @(Content) build action is not supported
        wwwroot\bootstrap\bootstrap.min.css : warning XA0101: @(Content) build action is not supported
        wwwroot\bootstrap\bootstrap.min.css.map : warning XA0101: @(Content) build action is not supported
        wwwroot\favicon.png : warning XA0101: @(Content) build action is not supported
        Layout\MainLayout.razor : warning XA0101: @(Content) build action is not supported
        Layout\NavMenu.razor : warning XA0101: @(Content) build action is not supported
        Pages\Counter.razor : warning XA0101: @(Content) build action is not supported
        Pages\Home.razor : warning XA0101: @(Content) build action is not supported
        Pages\Weather.razor : warning XA0101: @(Content) build action is not supported
        Routes.razor : warning XA0101: @(Content) build action is not supported
        _Imports.razor : warning XA0101: @(Content) build action is not supported
    
    Reviewing the code in the .NET SDK for Razor projects, they include
    most of these files such as:
    
        <!-- Publish everything under wwwroot, all JSON files, all config files and all Razor files -->
        <Content Include="wwwroot\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
    
    `%(ExcludeFromSingleFile)` looks like a useful metadata here, as
    Android is basically "single file mode" no matter what. We set
    `$(EnableSingleFileAnalyzers)=true` by default, so we consider mobile
    a "single file" platform.
    
    Let's suppress the `XA0101` warning for files that have
    `%(ExcludeFromSingleFile)` metadata, as this seems actually
    appropriate and solves the warnings in Razor class libraries.
    jonathanpeppers committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    29864d3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dcfbd65 View commit details
    Browse the repository at this point in the history
  3. Update CODEOWNERS (#10140)

    I think we can reduce this list to just be `*`.
    jonathanpeppers committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    1f2bc54 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2025

  1. [xabt] Compute $DOTNET_DiagnosticPorts using MSBuild properties (#1…

    …0351)
    
    If you run `dotnet-trace collect --dsrouter android`, it says:
    
        Start an application on android device with ONE of the following environment variables set:
        [Default Tracing]
        DOTNET_DiagnosticPorts=127.0.0.1:9000,nosuspend,connect
        [Startup Tracing]
        DOTNET_DiagnosticPorts=127.0.0.1:9000,suspend,connect
    
    Setting `$DOTNET_DiagnosticPorts` is non-trivial, so as a step to
    simplify this, we are adding multiple MSBuild properties to configure
    this value.
    
    This would allow the log message to say:
    
        Build and run an Android application such as:
        [Default Tracing]
        dotnet build -t:Run -c Release -p:DiagnosticAddress=127.0.0.1 -p:DiagnosticPort=9000 -p:DiagnosticSuspend=false -p:DiagnosticListenMode=connect
        [Startup Tracing]
        dotnet build -t:Run -c Release -p:DiagnosticAddress=127.0.0.1 -p:DiagnosticPort=9000 -p:DiagnosticSuspend=true -p:DiagnosticListenMode=connect
    
    You could also set `$(DiagnosticConfiguration)`, but you would need to
    escape the `,` character with `%2c`.
    
    Setting any of the new properties also implicitly means that
    `$(AndroidEnableProfiler)` is set to `true`.
    jonathanpeppers committed Aug 1, 2025
    Configuration menu
    Copy the full SHA
    dd397d5 View commit details
    Browse the repository at this point in the history
  2. [Xamarin.Android.Build.Tasks] $DOTNET_MODIFIABLE_ASSEMBLIES & FastDev (

    …#9451)
    
    Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=10431207&view=ms.vss-test-web.build-test-results-tab&runId=114098346&resultId=100000&paneView=debug
    
    The `FastDeployEnvironmentFiles(false)` test fails on PRs from forks,
    because the "Fast Deployment" feature is not included in OSS builds:
    
    	The Environment variable "DOTNET_MODIFIABLE_ASSEMBLIES" was not set.
    	Expected: String containing "DOTNET_MODIFIABLE_ASSEMBLIES=Debug"
    	But was:  "--------- beginning of main …
    
    The problem appears to be related to target ordering:
    
      * `_GetGenerateJavaStubsInputs` : uses `@(AndroidEnvironment)` to
        set `@(_EnvironmentFiles)`
    
      * `_GetGenerateJavaStubs` : must have same `Inputs` as
        `_GeneratePackageManagerJava`
    
      * `_GeneratePackageManagerJava`: actually uses `@(_EnvironmentFiles)`
    
      * `_GenerateEnvironmentFiles` : creates a new
        `@(AndroidEnvironment)` file that won't be used!
    
    But when using either a `Release` build or `Debug` build with
    `FastDev` enabled, everything works fine.
    
    To fix this, rework the target ordering:
    
      * `_GetGenerateJavaStubsInputs` depends on
        `_GenerateEnvironmentFiles`
    
        Unfortunately, this is now a circular dependency that causes an
        MSBuild error.
    
      * Break the cycle by updating `_GenerateEnvironmentFiles` to no
        longer depend upon `_ReadAndroidManifest`.
    
        It does not appear that `_ReadAndroidManifest` is needed by
        `_GenerateEnvironmentFiles`, as no properties created there are
        used.
    jonathanpeppers committed Aug 1, 2025
    Configuration menu
    Copy the full SHA
    d632706 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2025

  1. [release/9.0.1xx] [build] update $(ProductVersion) to align with An…

    …droid 15 (#10378)
    
    Context: dotnet/maui#30948
    
    I don't think this will solve dotnet/maui#30948, but it will at least reduce
    confusion if we put a 15.x version number on our .NET 9 MSBuild task assemblies.
    jonathanpeppers authored Aug 6, 2025
    Configuration menu
    Copy the full SHA
    fa454c9 View commit details
    Browse the repository at this point in the history
  2. [xabt] Xamarin.Android.Build.Tasks.dll should be strong-named (#10377)

    Fixes: dotnet/maui#30948
    
    MSBuild task assemblies can run on .NET framework when building inside
    Visual Studio.
    
    If you have a .NET 8, .NET 9, and .NET 10 project in the same
    solution, the best way to support this is to strong name *and* version
    your assembly so that .NET framework can load multiple copies of it.
    This can also happen if you update the `$(TargetFramework)` while a
    project is open.
    
    Unfortunately, #30948 uncovered an issue when .NET 9 and .NET 10:
    
    * .NET 8 `Xamarin.Android.Build.Tasks.dll`: strong named
    * .NET 9 `Xamarin.Android.Build.Tasks.dll`: *not* strong named
    * .NET 10 `Xamarin.Android.Build.Tasks.dll`: *not* strong named
    
    I suspect this went wrong in 003f5d1, but we didn't notice it until
    now because .NET 8 was strong-named and .NET 9 was not.
    
    To fix this, we simply need to set `$(SignAssembly)` to `true`.
    
    Prior to 003f5d1, this was set to false because the ILRepack process
    signed at the end of the repacking. When ILRepack was removed, we
    forgot to enable strong name signing! Whoops!
    jonathanpeppers committed Aug 6, 2025
    Configuration menu
    Copy the full SHA
    2fc44eb View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2025

  1. Bump to dotnet/sdk@fffbe68733 9.0.305-servicing.25408.10 (#10398)

    Changes: dotnet/sdk@5f2d07c...fffbe68
    
    Updates: From 9.0.304-servicing.25365.6 to 9.0.305-servicing.25408.10 Microsoft.NET.Sdk
    
    Other changes:
    
    * Add NuGet feeds via:
    
        darc update-dependencies --name Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-8.0.100 --id 278395
    
    Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
    dotnet-maestro[bot] and jonathanpeppers authored Aug 12, 2025
    Configuration menu
    Copy the full SHA
    629a84a View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2025

  1. Bump to dotnet/sdk@cf275d46ba 9.0.305-servicing.25417.7 (#10421)

    Changes: dotnet/sdk@fffbe68...cf275d4
    
    Updates: From 9.0.305-servicing.25408.10 to 9.0.305-servicing.25417.7 Microsoft.NET.Sdk
    dotnet-maestro[bot] authored Aug 18, 2025
    Configuration menu
    Copy the full SHA
    a618557 View commit details
    Browse the repository at this point in the history
Loading
0