Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] Fix android source path for MAUI test job #9030

Merged
merged 1 commit into from
Jun 14, 2024
+6 −6
Merged

[ci] Fix android source path for MAUI test job #9030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
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
Loading