Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7569d7e
[Xamarin.Android.Tools.AndroidSdk] Harden process execution
simonrozsival Oct 2, 2026
5c9d9e6
[tests] Require .NET 11 for Android SDK fixture execution
simonrozsival Oct 2, 2026
b81b766
[tests] Build SDK discovery tools on the .NET 11 CI host
simonrozsival Oct 2, 2026
22d1772
[tests] Remove apkdiff facade and align native harness hosts
simonrozsival Oct 2, 2026
58400b1
[tests] Dispose apkdiff redirected readers after native capture
simonrozsival Oct 2, 2026
4f6c105
[tooling] Remove process facade and use native .NET 11 APIs
simonrozsival Oct 2, 2026
51ffae4
[Xamarin.Android.Build.Tasks] Fix .NET 11 nullable contracts
simonrozsival Oct 2, 2026
cc60347
[build] Align strict host platform contracts with .NET 11
simonrozsival Oct 2, 2026
9e6d4ba
[tests] Observe emulator readiness before checking launch arguments
simonrozsival Oct 2, 2026
463e1a4
[tests] Keep SDK fixtures on true .NET 11 under the CI SDK
simonrozsival Oct 3, 2026
592d1d8
[build] Keep native tooling on genuine .NET 11 frameworks
simonrozsival Oct 3, 2026
29195bf
[tests] Pin native harness references to the .NET 11 runtime
simonrozsival Oct 3, 2026
1c89261
[build] Merge main and preserve native tooling closure
simonrozsival Oct 4, 2026
7ffea98
[tests] Declare LZ4 at the linked assembly inspection owners
simonrozsival Oct 4, 2026
fd78f11
[ci] Run SDK fixtures with the provisioned pinned host
simonrozsival Oct 4, 2026
801a942
[docs] Clarify the native SDK fixture host requirement
simonrozsival Oct 4, 2026
418f69e
[build] Isolate provisioned SDK preparation from its parent host
simonrozsival Oct 4, 2026
fc2ee12
[ci] Run native Java.Interop consumers on the pinned SDK
simonrozsival Oct 4, 2026
cb045ab
[tests] Preserve apkdiff diagnostics and status at the EOF deadline
simonrozsival Oct 5, 2026
22a26ca
[tests] Preserve APKDiff diagnostic culture at both owners
simonrozsival Oct 5, 2026
b6cb541
[build] Merge current native typemap retirements from main
simonrozsival Oct 5, 2026
58dddf4
[build] Retire framework-provided tooling package entries
simonrozsival Oct 5, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

### Shared Android tooling

The in-tree Android tools libraries include SDK/JDK discovery (`AndroidSdkInfo`, `JdkInfo`, SDK manifest parsing, `AdbRunner`, `EmulatorRunner`) and MSBuild task infrastructure (`AndroidTask`, `AndroidToolTask`, `AsyncTask`, `Files`, `ProcessUtils`, `FileUtil`, `MemoryStreamPool`). They target `netstandard2.0` and/or modern .NET, so verify API availability across all target frameworks before using newer BCL APIs. Prefer `ANDROID_HOME` for new Android SDK environment handling; `ANDROID_SDK_ROOT` is deprecated and should only remain for compatibility.
The in-tree Android SDK tools (`AndroidSdkInfo`, `JdkInfo`, `AdbRunner`, `EmulatorRunner`) require .NET 11. Call purpose-built native process APIs at their actual owners instead of adding a generic execution facade. Shared BaseTasks (`AndroidTask`, `AndroidToolTask`, `AsyncTask`, `Files`, `MemoryStreamPool`) still support their own target frameworks; verify API availability per owner. Prefer `ANDROID_HOME` for new Android SDK environment handling; `ANDROID_SDK_ROOT` is deprecated and should only remain for compatibility.

Useful focused checks:
```sh
dotnet build src/Microsoft.Android.Build.BaseTasks/Microsoft.Android.Build.BaseTasks.csproj
dotnet build src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj
dotnet test tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj -p:AndroidToolsDisableMultiTargeting=false -p:DotNetTargetFrameworkVersion=10.0
dotnet test tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj
dotnet test tests/Microsoft.Android.Build.BaseTasks-Tests/Microsoft.Android.Build.BaseTasks-Tests.csproj
```

Expand Down
4 changes: 2 additions & 2 deletions .github/skills/code-review/references/csharp-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ General C# guidance applicable to any .NET repository.

| Check | What to look for |
|-------|-----------------|
| **Oldest TFM must compile** | Code under `src/Microsoft.Android.Build.BaseTasks/` and `src/Xamarin.Android.Tools.AndroidSdk/` may target `netstandard2.0` and modern .NET. Verify every API and overload against the oldest target framework; common traps include cancellation-token overloads such as `HttpContent.ReadAsStringAsync(CancellationToken)`, modern `ProcessStartInfo.ArgumentList` usage without the existing fallback helpers, and newer language/BCL features that need `#if` guards or polyfills. |
| **Prefer existing compatibility helpers** | Use repository helpers such as `ProcessUtils`, `FileUtil`, and nullable extension methods instead of direct modern-BCL calls when they provide `netstandard2.0` fallbacks or better annotations. |
| **Verify the owner's target framework** | BaseTasks still support `netstandard2.0`; the Android SDK tools require .NET 11. Check APIs against each actual owner rather than imposing unrelated product/legacy constraints. |
| **Prefer purpose-built APIs** | SDK command owners should use native execution, capture, and streaming APIs directly. Do not introduce older-runtime adapters or a generic process facade. Keep compatible APIs only where the actual project still targets older frameworks. |

---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ and merge conflicts.
| Check | What to look for |
|-------|-----------------|
| **Use existing utilities** | Check `MonoAndroidHelper`, `FileUtil`, `PathUtil`, `ITaskItemExtensions`, and other utilities before writing new helpers. Duplicating existing logic is the most expensive AI pattern. |
| **Use Android tools utilities** | In the shared Android tooling under `src/`, process execution should go through `ProcessUtils`, file extraction/download/checksum/path helpers through `FileUtil`, and repeated buffers/streams through `ObjectPool<T>` or `MemoryStreamPool` where applicable. |
| **Use owner-specific utilities** | Use purpose-built .NET 11 process APIs at the SDK tool/command owner, not a generic execution facade. Reuse `FileUtil` for file extraction/download/checksum/path helpers and existing pools for repeated buffers/streams where applicable. |
| **`Log.LogDebugMessage` for diagnostics** | Use `Log.LogDebugMessage(…)` for verbose/debug output, not `Console.WriteLine` or `Debug.WriteLine`. Don't spam logcat with messages that fire on every type lookup miss. (Postmortem `#9`) |
| **Android tools logger delegate** | SDK/JDK discovery helpers in `src/Xamarin.Android.Tools.AndroidSdk/` commonly use `Action<TraceLevel, string>? logger` (see `AndroidSdkInfo.DefaultConsoleLogger`) so callers can route diagnostics into MSBuild or IDE logs. Don't replace this with `Console.WriteLine` or `Debug.WriteLine`. |
| **Return `IReadOnlyList<T>`** | Public methods should return `IReadOnlyList<T>` or `IReadOnlyCollection<T>` instead of mutable `List<T>`. |
Expand Down
3 changes: 2 additions & 1 deletion .github/skills/read-assembly-store/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ description: Inspect and list managed assemblies in .NET for Android APK, AAB, l

# Read Assembly Store

Inspect the package locally with the bundled C# file-based app. Never upload customer packages or extracted code.
Inspect the package locally with the bundled C# file-based app using a .NET 11 SDK.
Never upload customer packages or extracted code.

## Workflow

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
<PropertyGroup>
<Company>Microsoft Corporation</Company>
<Copyright>2026 Microsoft Corporation</Copyright>
<TargetFrameworks>$(DotNetStableTargetFramework);$(DotNetTargetFramework)</TargetFrameworks>
<TargetFramework>net11.0</TargetFramework>
<RuntimeFrameworkVersion>11.0.0-rtm.26479.103</RuntimeFrameworkVersion>
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json</RestoreAdditionalProjectSources>
<AssemblyName>Xamarin.Android.AssemblyStore</AssemblyName>
<RootNamespace>Xamarin.Android.AssemblyStore</RootNamespace>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(RuntimeFrameworkVersion)" />
<PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" />
<PackageReference Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
<PackageReference Include="ELFSharp" Version="$(ELFSharpVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
<Import Project="..\..\..\..\..\build-tools\scripts\NUnitReferences.projitems" />

<PropertyGroup>
<TargetFrameworks>$(DotNetStableTargetFramework);$(DotNetTargetFramework)</TargetFrameworks>
<TargetFramework>net11.0</TargetFramework>
<RuntimeFrameworkVersion>11.0.0-rtm.26479.103</RuntimeFrameworkVersion>
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json</RestoreAdditionalProjectSources>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<RootNamespace>Xamarin.Android.AssemblyStore.Tests</RootNamespace>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="$(RuntimeFrameworkVersion)" />
<PackageReference Include="K4os.Compression.LZ4" Version="$(LZ4PackageVersion)" />
</ItemGroup>

Expand Down
6 changes: 5 additions & 1 deletion .github/skills/tests/references/test-catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Mapping of test area keywords to assemblies, filters, and build prerequisites.
- **Full-build** — Requires the local SDK (`dotnet-local.sh`). Build with `./dotnet-local.sh build Microsoft.Android.slnx -c Debug` or `make prepare && make all`.
- **Device**: Whether an Android device/emulator is required.

The native process harnesses, SDK fixtures, and `vswhere` select the
`11.0.0-rtm.26479.103` runtime and targeting pack explicitly. This keeps the pinned
.NET 12 CI SDK from silently raising the requirement behind their `net11.0` paths.

---

## Standalone Tests — No Local SDK Required
Expand All @@ -34,7 +38,7 @@ These tests can be run immediately with `dotnet test` on the `.csproj`, even if
| **generator** | `external/Java.Interop/tests/generator-Tests/` | `dotnet test external/Java.Interop/tests/generator-Tests/generator-Tests.csproj -v minimal` |
| **bytecode** | `external/Java.Interop/tests/Xamarin.Android.Tools.Bytecode-Tests/` | `dotnet test external/Java.Interop/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj -v minimal` ⚠️ Requires `javac` |
| **base tasks** | `tests/Microsoft.Android.Build.BaseTasks-Tests/` | `dotnet test tests/Microsoft.Android.Build.BaseTasks-Tests/Microsoft.Android.Build.BaseTasks-Tests.csproj -v minimal` |
| **android sdk tools** | `tests/Xamarin.Android.Tools.AndroidSdk-Tests/` | `dotnet test tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj -v minimal -p:AndroidToolsDisableMultiTargeting=false -p:DotNetTargetFrameworkVersion=10.0` |
| **android sdk tools (.NET 11)** | `tests/Xamarin.Android.Tools.AndroidSdk-Tests/` | `dotnet test tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj -v minimal` |

---

Expand Down
14 changes: 7 additions & 7 deletions build-tools/automation/azure-pipelines-internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ extends:
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml@self
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux BuildTest
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = BuildTest"

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
Expand Down Expand Up @@ -297,19 +297,19 @@ extends:
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml@self
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux PackagingTest
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = PackagingTest"

- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml@self
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux XASdkTests
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = XASdkTests & Name != XamarinLegacySdk"

- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml@self
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux AndroidDependenciesTests
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = AndroidDependenciesTests"

- task: ShellScript@2
Expand Down Expand Up @@ -692,7 +692,7 @@ extends:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml@self
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
testFilter: ''
testRunTitle: Xamarin.Android.Build.Tests - macOS
retryFailedTests: false
Expand Down Expand Up @@ -744,7 +744,7 @@ extends:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml@self
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
testFilter: ''
testRunTitle: Xamarin.Android.Build.Tests - Windows
retryFailedTests: false
Expand Down Expand Up @@ -806,7 +806,7 @@ extends:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml@self
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/net11.0/MSBuildDeviceIntegration.dll
testFilter: $(ExcludedNightlyNUnitCategories)
testRunTitle: MSBuildDeviceIntegration On Device - macOS

Expand Down
6 changes: 3 additions & 3 deletions build-tools/automation/azure-pipelines-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ stages:
- template: run-nunit-tests.yaml
parameters:
testRunTitle: SystemApplicationTests On Device - macOS
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/net11.0/MSBuildDeviceIntegration.dll
dotNetTestExtraArgs: --filter "Name=SystemApplicationTests"


Expand Down Expand Up @@ -206,7 +206,7 @@ stages:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/net11.0/MSBuildDeviceIntegration.dll
testFilter: method == CheckTimeZoneInfoIsCorrectWithSlicer
testRunTitle: CheckTimeZoneInfoIsCorrectNode On Device - macOS

Expand Down Expand Up @@ -258,7 +258,7 @@ stages:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/net11.0/MSBuildDeviceIntegration.dll
testFilter: method == CheckLocalizationIsCorrectWithSlicer
testRunTitle: CheckLocalizationIsCorrect On Device - macOS

Expand Down
14 changes: 7 additions & 7 deletions build-tools/automation/azure-pipelines-public.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ stages:
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux BuildTest
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = BuildTest"

- template: /build-tools/automation/yaml-templates/upload-results.yaml
Expand Down Expand Up @@ -236,19 +236,19 @@ stages:
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux PackagingTest
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = PackagingTest"

- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux XASdkTests
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = XASdkTests & Name != XamarinLegacySdk"

- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: Xamarin.Android.Build.Tests - Linux AndroidDependenciesTests
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "Name = AndroidDependenciesTests"

- task: ShellScript@2
Expand Down Expand Up @@ -305,7 +305,7 @@ stages:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
testFilter: ''
testRunTitle: Xamarin.Android.Build.Tests - macOS
retryFailedTests: false
Expand Down Expand Up @@ -357,7 +357,7 @@ stages:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
testFilter: ''
testRunTitle: Xamarin.Android.Build.Tests - Windows
retryFailedTests: false
Expand Down Expand Up @@ -418,7 +418,7 @@ stages:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/net11.0/MSBuildDeviceIntegration.dll
testFilter: $(ExcludedNightlyNUnitCategories)
testRunTitle: MSBuildDeviceIntegration On Device - macOS

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ steps:
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: Smoke MSBuild Tests - Windows Dotnet Build
testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\$(DotNetStableTargetFramework)\Xamarin.Android.Build.Tests.dll
testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\net11.0\Xamarin.Android.Build.Tests.dll
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests"

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/net11.0/Xamarin.Android.Build.Tests.dll
testFilter: ${{ parameters.testFilter }}
testRunTitle: Xamarin.Android.Build.Tests - ${{ parameters.testOS }}
retryFailedTests: false
Expand Down
Loading
Loading