Skip to content

Commit c7b3d1b

Browse files
committed
[ci] Fix android source path for MAUI test job (#9030)
Other test jobs use `s/` or `s/xamarin-android` as a checkout path.
1 parent fa1b801 commit c7b3d1b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ extends:
347347

348348
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml@self
349349
parameters:
350-
xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
350+
xaSourcePath: $(Build.SourcesDirectory)/android
351351
androidSdkPlatforms: $(DefaultTestSdkPlatforms)
352352

353353
- task: NuGetAuthenticate@1
@@ -388,7 +388,7 @@ extends:
388388
- task: DotNetCoreCLI@2
389389
displayName: Update Android SDK band in Workloads.csproj
390390
inputs:
391-
projects: $(Build.SourcesDirectory)/xamarin-android/Xamarin.Android.sln
391+
projects: $(Build.SourcesDirectory)/android/Xamarin.Android.sln
392392
arguments: -t:UpdateMauiWorkloadsProj -c $(XA.Build.Configuration) --no-restore -v:n -bl:$(Build.StagingDirectory)/logs/update-maui-workloadsproj.binlog
393393

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

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

@@ -430,7 +430,7 @@ extends:
430430
-f $(DotNetTargetFramework)-android -c Debug
431431
--configfile $(Build.SourcesDirectory)/maui/NuGet.config
432432
-bl:$(Build.StagingDirectory)/logs/MauiTestProj-Debug.binlog
433-
xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
433+
xaSourcePath: $(Build.SourcesDirectory)/android
434434
displayName: Build MAUI template - Debug
435435

436436
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
@@ -440,7 +440,7 @@ extends:
440440
-f $(DotNetTargetFramework)-android -c Release
441441
--configfile $(Build.SourcesDirectory)/maui/NuGet.config
442442
-bl:$(Build.StagingDirectory)/logs/MauiTestProj-Release.binlog
443-
xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
443+
xaSourcePath: $(Build.SourcesDirectory)/android
444444
displayName: Build MAUI template - Release
445445

446446
- task: CopyFiles@2

0 commit comments

Comments
 (0)