Skip to content

Commit 9b1770f

Browse files
authored
[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 3bc108a commit 9b1770f

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
@@ -340,7 +340,7 @@ extends:
340340

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

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

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

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

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

441441
- task: CopyFiles@2

0 commit comments

Comments
 (0)