Maui File location and target runtime updates (dotnet#60784)

* Update the file location and android runtimes. The Maui android architecture targets are being updated to include all android targets. * Updated the targets and props copy location. * Add in the correct depends on for the maui build. * The initial file move did not actually delete the folder being moved, delete it.
naricc · Oct 22, 2021 · 3159d62 · 3159d62
1 parent 18f3f56
commit 3159d62
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml
@@ -492,6 +492,8 @@ jobs:
       runtimeFlavor: mono
       platforms:
       - Android_x86
+      - Android_x64
+      - Android_arm
       - Android_arm64
       jobParameters:
         buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
@@ -518,8 +520,10 @@ jobs:
       - iOS_arm64
       jobParameters:
         dependsOn:
+          - Build_Android_arm_release_Maui_Packs_Mono
           - Build_Android_arm64_release_Maui_Packs_Mono
           - Build_Android_x86_release_Maui_Packs_Mono
+          - Build_Android_x64_release_Maui_Packs_Mono
         buildArgs: -s mono -c $(_BuildConfig)
         nameSuffix: MACiOSAndroidMaui
         isOfficialBuild: false

diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml
@@ -50,7 +50,14 @@ steps:
     workingDirectory: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
     
 
-  # #Unzip the nuget packages to make the actual runtimes accessible
+  #Unzip the nuget packages to make the actual runtimes accessible
+  - task: ExtractFiles@1
+    displayName: Extract android-arm runtime
+    inputs:
+        archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm.*.zip
+        destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm
+        overwriteExistingFiles: true
+        cleanDestinationFolder: false
   - task: ExtractFiles@1
     displayName: Extract android-arm64 runtime
     inputs:
@@ -65,6 +72,13 @@ steps:
         destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x86
         overwriteExistingFiles: true
         cleanDestinationFolder: false
+  - task: ExtractFiles@1
+    displayName: Extract android-x64 runtime
+    inputs:
+        archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64.*.zip
+        destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64
+        overwriteExistingFiles: true
+        cleanDestinationFolder: false
 
   - script: |
       curl -o ./rollback.json 'maui.blob.core.windows.net/metadata/rollbacks/main.json'
@@ -76,8 +90,8 @@ steps:
   - script: |
       ./dotnet.sh new maui -n MauiTesting
       cd MauiTesting
-      cp $(Build.SourcesDirectory)/src/maui/MauiScenario.props ./Directory.Build.props
-      cp $(Build.SourcesDirectory)/src/maui/MauiScenario.targets ./Directory.Build.targets
+      cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.props ./Directory.Build.props
+      cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.targets ./Directory.Build.targets
     displayName: Setup MAUI Project
     workingDirectory: $(Build.SourcesDirectory)
 

diff --git a/src/maui/MauiScenario.props → src/tests/Common/maui/MauiScenario.props b/src/maui/MauiScenario.props → src/tests/Common/maui/MauiScenario.props
diff --git a/src/maui/MauiScenario.targets → src/tests/Common/maui/MauiScenario.targets b/src/maui/MauiScenario.targets → src/tests/Common/maui/MauiScenario.targets
@@ -10,10 +10,14 @@
         <MicrosoftNetCoreAppRuntimePackDir>./ArtifactPacks</MicrosoftNetCoreAppRuntimePackDir>
     </PropertyGroup>
     <ItemGroup>
+      <ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.android-arm"
+                             Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'android-arm'" />
       <ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.android-arm64"
                              Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'android-arm64'" />
       <ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.android-x86"
                              Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'android-x86'" />
+      <ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.android-x64"
+                             Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'android-x64'" />
     </ItemGroup>
   </Target>
 </Project>