Skip to content

Commit

Permalink
[ci] Fix android source path for MAUI test job (#9030)
Browse files Browse the repository at this point in the history
Other test jobs use `s/` or `s/xamarin-android` as a checkout path.
  • Loading branch information
pjcollins committed Jun 14, 2024
1 parent fa1b801 commit c7b3d1b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,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)

- task: NuGetAuthenticate@1
Expand Down Expand Up @@ -388,7 +388,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 @@ -404,14 +404,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 @@ -430,7 +430,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 @@ -440,7 +440,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

0 comments on commit c7b3d1b

Please sign in to comment.