Skip to content

Commit

Permalink
Merge branch 'main' into dev/grendel/perfetto-integration
Browse files Browse the repository at this point in the history
* main: (26 commits)
  Make APK and shared library alignment configurable (#9046)
  [r8] update proguard rule to keep .NET runtime classes (#9044)
  Explicitly align to 4k (#9041)
  [trimming] preserve custom views and `$(AndroidHttpClientHandlerType)` (#8954)
  Ignore split configs when bundle config moves shared libraries to base.apk (#8987)
  Bump to dotnet/android-tools@1c09dcc (#9026)
  Bump to dotnet/java-interop@ccafbe6 (#9025)
  [Mono.Android-Tests] Fix repo URL in redirect tests (#9035)
  [ci] Update checkout path for nightly build (#9028)
  [ci] Fix android source path for MAUI test job (#9030)
  Link Code of Conduct (#9034)
  [ci] Update sdk-insertions trigger to manual only (#9029)
  Update java-interop and android-tools submodule mentions (#9023)
  LEGO: Merge pull request 9022
  [Xamarin.Android.Build.Tasks] fastdev works with aab files (#8990)
  Use new binutils URL (#9019)
  Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 9686669 (#9011)
  LEGO: Merge pull request 9015
  [api-merge] Update "constant" values to mirror latest API levels (#9004)
  [Mono.Android] Fix wrong value for `ApplicationExitInfoReason.Other` (#9003)
  ...
  • Loading branch information
grendello committed Jun 21, 2024
2 parents 1676bc0 + ddb215b commit c9a25d8
Show file tree
Hide file tree
Showing 184 changed files with 4,610 additions and 2,217 deletions.
2 changes: 1 addition & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xamarin/monodroid:main@93ab95e18077d56d9d55ce7b4069a534e2dea35e
xamarin/monodroid:main@c6aae9e5a154cfbf2c3a94e046fa2c747c3b82e2
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/04-binding-a-java-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body:
- type: markdown
attributes:
value: |
Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/xamarin/java.interop/wiki/Troubleshooting-Android-Bindings-Issues).
Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/dotnet/java-interop/wiki/Troubleshooting-Android-Bindings-Issues).
If you get stuck troubleshooting an issue, please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker.
- type: dropdown
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/sdk-insertion-bump.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: Notify release branch change

on:
workflow_dispatch:
# trigger for main and release branches.
push:
branches:
- main
- 'release/**'
#push:
# branches:
# - main
# - 'release/**'

jobs:
pingRemote:
Expand All @@ -30,6 +31,6 @@ jobs:
token: ${{ secrets.SERVICEACCOUNT_PAT }}
event-type: 'sdk_insertion'
repository: 'xamarin/sdk-insertions'
client-payload: '{"repository": "xamarin/xamarin-android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": ${{ steps.commit_title.outputs.COMMIT_TITLE }} }'
client-payload: '{"repository": "dotnet/android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": ${{ steps.commit_title.outputs.COMMIT_TITLE }} }'


4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
branch = main
[submodule "external/Java.Interop"]
path = external/Java.Interop
url = https://github.com/xamarin/java.interop.git
url = https://github.com/dotnet/java-interop
branch = main
[submodule "external/libunwind"]
path = external/libunwind
Expand All @@ -28,7 +28,7 @@
branch = master
[submodule "external/xamarin-android-tools"]
path = external/xamarin-android-tools
url = https://github.com/xamarin/xamarin-android-tools
url = https://github.com/dotnet/android-tools
branch = main
[submodule "external/xxHash"]
path = external/xxHash
Expand Down
6 changes: 6 additions & 0 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Code of Conduct

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community.

For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
3 changes: 0 additions & 3 deletions Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,6 @@
<PropertyGroup>
<JavacSourceVersion>1.8</JavacSourceVersion>
<JavacTargetVersion>1.8</JavacTargetVersion>
<Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' and Exists($(JAVA_HOME_8_X64)) ">$(JAVA_HOME_8_X64)</Java8SdkDirectory>
<Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' and Exists('$(JavaSdkDirectory)\..\jdk-1.8') ">$([System.IO.Path]::GetFullPath ('$(JavaSdkDirectory)\..\jdk-1.8'))</Java8SdkDirectory>
<Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' ">$(JavaSdkDirectory)</Java8SdkDirectory>
</PropertyGroup>
<PropertyGroup>
<AndroidNdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidNdkDirectory)'))</AndroidNdkFullPath>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/release-notes/5945.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#### Bindings projects

- [GitHub Issue #835](https://github.com/xamarin/java.interop/issues/835):
- [GitHub Issue #835](https://github.com/dotnet/java-interop/issues/835):
Don't throw an `IndexOutOfRangeException` if a Java type ends with `.` or `$`.

- [GitHub Issue #5821](https://github.com/xamarin/xamarin-android/issues/5921)
Expand Down
21 changes: 10 additions & 11 deletions Documentation/release-notes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ items.
Changes for One .NET should have neither label for now because they are not yet
user-facing.

PRs that bump Java.Interop, xamarin-android-tools, or monodroid generally don't
PRs that bump Java.Interop, android-tools, or monodroid generally don't
need to be labeled, but Mono bumps that include changes that could affect
Android users should be labeled.

Expand Down Expand Up @@ -123,7 +123,7 @@ Examples:
```markdown
### Build and deployment performance

- [Java.Interop GitHub PR 596](https://github.com/xamarin/java.interop/pull/596):
- [Java.Interop GitHub PR 596](https://github.com/dotnet/java-interop/pull/596):
Use `File.Exists()` instead of `DirectoryGetFile()` in a few places. This
reduced the time for the `LinkAssembliesNoShrink` task from about 710
milliseconds to about 430 milliseconds for a small test Xamarin.Forms app on
Expand Down Expand Up @@ -191,19 +191,19 @@ Example showing multiple release notes sections for a Java.Interop bump:
```markdown
### Build and deployment performance

- [Java.Interop GitHub PR 440](https://github.com/xamarin/java.interop/pull/440),
[Java.Interop GitHub PR 441](https://github.com/xamarin/java.interop/pull/441),
[Java.Interop GitHub PR 442](https://github.com/xamarin/java.interop/pull/442),
[Java.Interop GitHub PR 448](https://github.com/xamarin/java.interop/pull/448),
[Java.Interop GitHub PR 449](https://github.com/xamarin/java.interop/pull/449),
[Java.Interop GitHub PR 452](https://github.com/xamarin/java.interop/pull/452):
- [Java.Interop GitHub PR 440](https://github.com/dotnet/java-interop/pull/440),
[Java.Interop GitHub PR 441](https://github.com/dotnet/java-interop/pull/441),
[Java.Interop GitHub PR 442](https://github.com/dotnet/java-interop/pull/442),
[Java.Interop GitHub PR 448](https://github.com/dotnet/java-interop/pull/448),
[Java.Interop GitHub PR 449](https://github.com/dotnet/java-interop/pull/449),
[Java.Interop GitHub PR 452](https://github.com/dotnet/java-interop/pull/452):
Optimize several of the build steps for bindings projects. For a large
binding like _Mono.Android.dll_ itself, this reduced the total build time in a
test environment by about 50 seconds.

#### Bindings projects

- [Java.Interop GitHub PR 458](https://github.com/xamarin/java.interop/pull/458):
- [Java.Interop GitHub PR 458](https://github.com/dotnet/java-interop/pull/458):
Bindings projects did not yet automatically generate event handlers for Java
listener interfaces where the _add_ or _set_ method of the interface took two
arguments instead of just one.
Expand Down Expand Up @@ -381,8 +381,7 @@ added to `Documentation/release-notes/images/`.

(For versions before 11.2, the milestone had a slightly different format.)

Complete this step for xamarin-android, Java.Interop, and
xamarin-android-tools.
Complete this step for xamarin-android, Java.Interop, and android-tools.

See also the [_How to make bulk changes on pull requests and issues_][bulk-change]
section for tips on how to complete this step.
Expand Down
5 changes: 5 additions & 0 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ This will create a `api-XX.xml` file in `/src/Mono.Android/Profiles/` that needs
- Add required metadata fixes in `/src/Mono.Android/metadata` until `Mono.Android.csproj` builds
- Check that new package/namespaces are properly cased

### New AndroidManifest.xml Elements

- See `build-tools/manifest-attribute-codegen/README.md` for instructions on surfacing any new
elements or attributes added to `AndroidManifest.xml`.

### ApiCompat

There may be ApiCompat issues that need to be examined. Either fix the assembly with metadata or allow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Projekt pro vytvoření aplikace .NET Android Wear]]></Val>
<Val><![CDATA[Projekt vytvoření aplikace pro Wear OS pomocí .NET pro Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Ein Projekt zum Erstellen einer .NET für Android Wear-Anwendung]]></Val>
<Val><![CDATA[Ein Projekt zum Erstellen einer Wear OS-App mit .NET für Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Proyecto para crear una aplicación .NET para Android Wear]]></Val>
<Val><![CDATA[Un proyecto para crear una aplicación Wear OS con .NET para Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Projet de création d’une application .NET pour Android Wear]]></Val>
<Val><![CDATA[Projet de création d’une application Wear OS à l’aide de .NET pour Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Progetto per la creazione di un'applicazione per Android Wear .NET]]></Val>
<Val><![CDATA[Progetto per la creazione di un'app Wear OS con .NET per Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[.NET for Android Wear アプリケーションを作成するためのプロジェクト]]></Val>
<Val><![CDATA[Android 用 .NET を使用して Wear OS アプリを作成するためのプロジェクト]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Android용 .NET Wear 애플리케이션을 만들기 위한 프로젝트]]></Val>
<Val><![CDATA[Android용 .NET을 사용하여 Wear OS 앱을 만드는 프로젝트입니다.]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Projekt służący do tworzenia aplikacji platformy .NET dla systemu Android Wear]]></Val>
<Val><![CDATA[Projekt tworzenia aplikacji Wear OS przy użyciu platformy .NET dla systemu Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Um projeto para a criação de um aplicativo .NET para Android Wear]]></Val>
<Val><![CDATA[Um projeto para criar um aplicativo Wear OS usando o .NET para Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Проект создания приложения .NET для Android Wear]]></Val>
<Val><![CDATA[Проект для создания приложения Wear OS с помощью .NET для Android]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Android için .NET Wear uygulaması oluşturmak için proje]]></Val>
<Val><![CDATA[Android için .NET kullanarak Wear OS uygulaması oluşturmaya yönelik bir proje]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[用于创建 .NET for Android Wear 应用程序的项目]]></Val>
<Val><![CDATA[用于使用 .NET for Android 创建 Wear OS 应用的项目]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Str Cat="Text">
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[用於建立 Android 版 .NET Wear 應用程式的專案]]></Val>
<Val><![CDATA[使用 Android 版 .NET 建立 Wear OS 應用程式的專案]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ PREPARE_SCENARIO =
PREPARE_CI_PR ?= 0
PREPARE_CI ?= 0
PREPARE_AUTOPROVISION ?= 0
PREPARE_IGNORE_MONO_VERSION ?= 1
PREPARE_AUTOPROVISION_SKIP_MONO ?= 0

_PREPARE_CI_MODE_PR_ARGS = --no-emoji --run-mode=CI
_PREPARE_CI_MODE_ARGS = $(_PREPARE_CI_MODE_PR_ARGS) -a
Expand Down Expand Up @@ -59,6 +59,10 @@ ifneq ($(PREPARE_AUTOPROVISION),0)
_PREPARE_ARGS += --auto-provision=yes --auto-provision-uses-sudo=yes
endif

ifneq ($(PREPARE_AUTOPROVISION_SKIP_MONO),0)
_PREPARE_ARGS += --auto-provision-skip-mono=yes
endif

ifneq ($(PREPARE_SCENARIO),)
_PREPARE_ARGS += -s:"$(PREPARE_SCENARIO)"
endif
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ If you are interested in fixing issues and contributing directly to the code bas
- [Coding Guidelines](http://www.mono-project.com/community/contributing/coding-guidelines/)
- [Submitting pull requests](https://github.com/xamarin/xamarin-android/wiki/Submitting-Bugs,-Feature-Requests,-and-Pull-Requests#pull-requests)

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community. For more information, see the
[.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).

# Feedback

- Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/xamarin.android) or [Microsoft Q&A](https://docs.microsoft.com/en-us/answers/topics/dotnet-android.html).
Expand Down
3 changes: 2 additions & 1 deletion Xamarin.Android.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
}
],
"settings": {
"nxunitExplorer.logpanel": true
"nxunitExplorer.logpanel": true,
"java.compile.nullAnalysis.mode": "disabled"
}
}
3 changes: 3 additions & 0 deletions build-tools/api-merge/ApiDescription.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ public void Merge (XDocument n, string apiLocation)
}
*/

// Yes, "constant" values can change between API levels.
smember.SetAttributeValue ("value", nmember.Attribute ("value")?.Value);

UpdateDeprecatedSince (smember, nmember, platform);

#if KEEP_OLD_WRONG_COMPATIBILITY
Expand Down
1 change: 1 addition & 0 deletions build-tools/automation/azure-pipelines-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ stages:
steps:
- checkout: self
submodules: recursive
path: s/xamarin-android

- template: /build-tools/automation/yaml-templates/commercial-build.yaml
parameters:
Expand Down
12 changes: 6 additions & 6 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ extends:

- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml@self
parameters:
xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
xaSourcePath: $(Build.SourcesDirectory)/android
androidSdkPlatforms: $(DefaultTestSdkPlatforms)
dotnetVersion: 9.0
dotnetQuality: preview
Expand Down Expand Up @@ -383,7 +383,7 @@ extends:
- task: DotNetCoreCLI@2
displayName: Update Android SDK band in Workloads.csproj
inputs:
projects: $(Build.SourcesDirectory)/xamarin-android/Xamarin.Android.sln
projects: $(Build.SourcesDirectory)/android/Xamarin.Android.sln
arguments: -t:UpdateMauiWorkloadsProj -c $(XA.Build.Configuration) --no-restore -v:n -bl:$(Build.StagingDirectory)/logs/update-maui-workloadsproj.binlog

- pwsh: ./build.ps1 --target=dotnet --configuration="$(XA.Build.Configuration)" --nugetsource="$(Build.StagingDirectory)\android-packs" --verbosity=diagnostic
Expand All @@ -399,14 +399,14 @@ extends:
displayName: Install MAUI workload packs
retryCountOnTaskFailure: 3
inputs:
projects: $(Build.SourcesDirectory)/xamarin-android/Xamarin.Android.sln
projects: $(Build.SourcesDirectory)/android/Xamarin.Android.sln
arguments: -t:InstallMaui -p:MauiUseLocalPacks=true -p:MauiWorkloadToInstall=maui -c $(XA.Build.Configuration) --no-restore -v:n -bl:$(Build.StagingDirectory)/logs/install-maui.binlog

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
parameters:
command: new
arguments: maui -o $(Build.StagingDirectory)/MauiTestProj
xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
xaSourcePath: $(Build.SourcesDirectory)/android
displayName: Create MAUI template
continueOnError: false

Expand All @@ -425,7 +425,7 @@ extends:
-f $(DotNetTargetFramework)-android -c Debug
--configfile $(Build.SourcesDirectory)/maui/NuGet.config
-bl:$(Build.StagingDirectory)/logs/MauiTestProj-Debug.binlog
xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
xaSourcePath: $(Build.SourcesDirectory)/android
displayName: Build MAUI template - Debug

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
Expand All @@ -435,7 +435,7 @@ extends:
-f $(DotNetTargetFramework)-android -c Release
--configfile $(Build.SourcesDirectory)/maui/NuGet.config
-bl:$(Build.StagingDirectory)/logs/MauiTestProj-Release.binlog
xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
xaSourcePath: $(Build.SourcesDirectory)/android
displayName: Build MAUI template - Release

- task: CopyFiles@2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
stageName: msbuilddevice_tests
job_name: 'mac_dotnetdevice_tests'
dependsOn: mac_build
agent_count: 8
agent_count: 12
stageCondition: succeeded()
stagePrefix: ''
xaSourcePath: $(System.DefaultWorkingDirectory)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stages:
testOS: macOS
jobName: mac_msbuild_tests
jobDisplayName: macOS > Tests > MSBuild
agentCount: 8
agentCount: 14
xaSourcePath: ${{ parameters.xaSourcePath }}
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
Expand Down
Loading

0 comments on commit c9a25d8

Please sign in to comment.