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

Jump to bottom

Maui File location and target runtime updates #60784

Merged
merged 4 commits into from
Oct 22, 2021
Merged

Maui File location and target runtime updates #60784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
831e34b
Update the file location and android runtimes. The Maui android archi…
LoopedBard3 Oct 22, 2021
6d39210
Updated the targets and props copy location.
LoopedBard3 Oct 22, 2021
c79ac48
Add in the correct depends on for the maui build.
LoopedBard3 Oct 22, 2021
3a48b15
The initial file move did not actually delete the folder being moved,…
LoopedBard3 Oct 22, 2021
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
4 changes: 4 additions & 0 deletions eng/pipelines/coreclr/perf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
20 changes: 17 additions & 3 deletions eng/pipelines/coreclr/templates/build-perf-maui-apps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand All @@ -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)

Expand Down
0 src/maui/MauiScenario.props → src/tests/Common/maui/MauiScenario.props
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions src/maui/MauiScenario.targets → src/tests/Common/maui/MauiScenario.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>