Skip to content

Commit 31cffe7

Browse files
LoopedBard3LoopedBard3
committed
Disable package replacement to see if that is the issue location.
1 parent 00a8039 commit 31cffe7

File tree

3 files changed

+117
-117
lines changed

3 files changed

+117
-117
lines changed

‎eng/pipelines/coreclr/perf.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -484,28 +484,28 @@ jobs:
484484
# additionalSetupParameters: '--latestdotnet'
485485
# logicalmachine: 'perftiger'
486486

487-
# build maui runtime packs
488-
- template: /eng/pipelines/common/platform-matrix.yml
489-
parameters:
490-
jobTemplate: /eng/pipelines/common/global-build-job.yml
491-
buildConfig: release
492-
runtimeFlavor: mono
493-
platforms:
494-
- Android_x86
495-
- Android_x64
496-
- Android_arm
497-
- Android_arm64
498-
- MacCatalyst_x64
499-
- iOSSimulator_x64
500-
- iOS_arm64
501-
- iOS_arm
502-
jobParameters:
503-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
504-
nameSuffix: Maui_Packs_Mono
505-
isOfficialBuild: false
506-
extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
507-
extraStepsParameters:
508-
name: MonoRuntimePacks
487+
## build maui runtime packs
488+
#- template: /eng/pipelines/common/platform-matrix.yml
489+
# parameters:
490+
# jobTemplate: /eng/pipelines/common/global-build-job.yml
491+
# buildConfig: release
492+
# runtimeFlavor: mono
493+
# platforms:
494+
# - Android_x86
495+
# - Android_x64
496+
# - Android_arm
497+
# - Android_arm64
498+
# - MacCatalyst_x64
499+
# - iOSSimulator_x64
500+
# - iOS_arm64
501+
# - iOS_arm
502+
# jobParameters:
503+
# buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
504+
# nameSuffix: Maui_Packs_Mono
505+
# isOfficialBuild: false
506+
# extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
507+
# extraStepsParameters:
508+
# name: MonoRuntimePacks
509509

510510
# build maui app
511511
- template: /eng/pipelines/common/platform-matrix.yml
@@ -517,14 +517,14 @@ jobs:
517517
- iOS_arm64
518518
jobParameters:
519519
dependsOn:
520-
- Build_Android_arm_release_Maui_Packs_Mono
521-
- Build_Android_arm64_release_Maui_Packs_Mono
522-
- Build_Android_x86_release_Maui_Packs_Mono
523-
- Build_Android_x64_release_Maui_Packs_Mono
524-
- Build_MacCatalyst_x64_release_Maui_Packs_Mono
525-
- Build_iOSSimulator_x64_release_Maui_Packs_Mono
526-
- Build_iOS_arm_release_Maui_Packs_Mono
527-
- Build_iOS_arm64_release_Maui_Packs_Mono
520+
#- Build_Android_arm_release_Maui_Packs_Mono
521+
#- Build_Android_arm64_release_Maui_Packs_Mono
522+
#- Build_Android_x86_release_Maui_Packs_Mono
523+
#- Build_Android_x64_release_Maui_Packs_Mono
524+
#- Build_MacCatalyst_x64_release_Maui_Packs_Mono
525+
#- Build_iOSSimulator_x64_release_Maui_Packs_Mono
526+
#- Build_iOS_arm_release_Maui_Packs_Mono
527+
#- Build_iOS_arm64_release_Maui_Packs_Mono
528528
buildArgs: -s mono -c $(_BuildConfig)
529529
nameSuffix: MACiOSAndroidMaui
530530
isOfficialBuild: false

‎eng/pipelines/coreclr/templates/build-perf-maui-apps.yml

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -19,95 +19,95 @@ parameters:
1919

2020

2121
steps:
22-
- task: DownloadPipelineArtifact@2
23-
displayName: Download runtime packages
24-
inputs:
25-
artifact: 'IntermediateArtifacts'
26-
path: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
27-
patterns: |
28-
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.android-!(*.symbols).nupkg
29-
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.ios-!(*.symbols).nupkg
30-
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.iossimulator-!(*.symbols).nupkg
31-
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-!(*.symbols).nupkg
22+
#- task: DownloadPipelineArtifact@2
23+
# displayName: Download runtime packages
24+
# inputs:
25+
# artifact: 'IntermediateArtifacts'
26+
# path: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
27+
# patterns: |
28+
# IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.android-!(*.symbols).nupkg
29+
# IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.ios-!(*.symbols).nupkg
30+
# IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.iossimulator-!(*.symbols).nupkg
31+
# IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-!(*.symbols).nupkg
3232

33-
# Other artifacts to include once they are being built
34-
# EX. IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg
35-
36-
- task: CopyFiles@2
37-
displayName: Flatten packages
38-
inputs:
39-
sourceFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
40-
contents: '*/Shipping/*.nupkg'
41-
cleanTargetFolder: false
42-
targetFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
43-
flattenFolders: true
33+
# # Other artifacts to include once they are being built
34+
# # EX. IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg
35+
36+
#- task: CopyFiles@2
37+
# displayName: Flatten packages
38+
# inputs:
39+
# sourceFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
40+
# contents: '*/Shipping/*.nupkg'
41+
# cleanTargetFolder: false
42+
# targetFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
43+
# flattenFolders: true
4444

45-
- script: |
46-
for file in *.nupkg
47-
do
48-
mv -v "$file" "${file%.nupkg}.zip"
49-
done
50-
displayName: Change nupkgs to zips
51-
workingDirectory: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
45+
#- script: |
46+
# for file in *.nupkg
47+
# do
48+
# mv -v "$file" "${file%.nupkg}.zip"
49+
# done
50+
# displayName: Change nupkgs to zips
51+
# workingDirectory: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks
5252

5353

54-
#Unzip the nuget packages to make the actual runtimes accessible
55-
- task: ExtractFiles@1
56-
displayName: Extract android-arm runtime
57-
inputs:
58-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm.*.zip
59-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm
60-
overwriteExistingFiles: true
61-
cleanDestinationFolder: false
62-
- task: ExtractFiles@1
63-
displayName: Extract android-arm64 runtime
64-
inputs:
65-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm64.*.zip
66-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm64
67-
overwriteExistingFiles: true
68-
cleanDestinationFolder: false
69-
- task: ExtractFiles@1
70-
displayName: Extract android-x86 runtime
71-
inputs:
72-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x86.*.zip
73-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x86
74-
overwriteExistingFiles: true
75-
cleanDestinationFolder: false
76-
- task: ExtractFiles@1
77-
displayName: Extract android-x64 runtime
78-
inputs:
79-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64.*.zip
80-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64
81-
overwriteExistingFiles: true
82-
cleanDestinationFolder: false
83-
- task: ExtractFiles@1
84-
displayName: Extract ios-arm runtime
85-
inputs:
86-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm.*.zip
87-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm
88-
overwriteExistingFiles: true
89-
cleanDestinationFolder: false
90-
- task: ExtractFiles@1
91-
displayName: Extract ios-arm64 runtime
92-
inputs:
93-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm64.*.zip
94-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm64
95-
overwriteExistingFiles: true
96-
cleanDestinationFolder: false
97-
- task: ExtractFiles@1
98-
displayName: Extract maccatalyst-x64 runtime
99-
inputs:
100-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64.*.zip
101-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64
102-
overwriteExistingFiles: true
103-
cleanDestinationFolder: false
104-
- task: ExtractFiles@1
105-
displayName: Extract iossimulator-x64 runtime
106-
inputs:
107-
archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64.*.zip
108-
destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64
109-
overwriteExistingFiles: true
110-
cleanDestinationFolder: false
54+
##Unzip the nuget packages to make the actual runtimes accessible
55+
#- task: ExtractFiles@1
56+
# displayName: Extract android-arm runtime
57+
# inputs:
58+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm.*.zip
59+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm
60+
# overwriteExistingFiles: true
61+
# cleanDestinationFolder: false
62+
#- task: ExtractFiles@1
63+
# displayName: Extract android-arm64 runtime
64+
# inputs:
65+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm64.*.zip
66+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm64
67+
# overwriteExistingFiles: true
68+
# cleanDestinationFolder: false
69+
#- task: ExtractFiles@1
70+
# displayName: Extract android-x86 runtime
71+
# inputs:
72+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x86.*.zip
73+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x86
74+
# overwriteExistingFiles: true
75+
# cleanDestinationFolder: false
76+
#- task: ExtractFiles@1
77+
# displayName: Extract android-x64 runtime
78+
# inputs:
79+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64.*.zip
80+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64
81+
# overwriteExistingFiles: true
82+
# cleanDestinationFolder: false
83+
#- task: ExtractFiles@1
84+
# displayName: Extract ios-arm runtime
85+
# inputs:
86+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm.*.zip
87+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm
88+
# overwriteExistingFiles: true
89+
# cleanDestinationFolder: false
90+
#- task: ExtractFiles@1
91+
# displayName: Extract ios-arm64 runtime
92+
# inputs:
93+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm64.*.zip
94+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm64
95+
# overwriteExistingFiles: true
96+
# cleanDestinationFolder: false
97+
#- task: ExtractFiles@1
98+
# displayName: Extract maccatalyst-x64 runtime
99+
# inputs:
100+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64.*.zip
101+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64
102+
# overwriteExistingFiles: true
103+
# cleanDestinationFolder: false
104+
#- task: ExtractFiles@1
105+
# displayName: Extract iossimulator-x64 runtime
106+
# inputs:
107+
# archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64.*.zip
108+
# destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64
109+
# overwriteExistingFiles: true
110+
# cleanDestinationFolder: false
111111

112112
- script: |
113113
curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh'

‎src/tests/Common/maui/MauiScenario.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Message Text="Used runtime pack: %(ResolvedRuntimePack.PackageDirectory)" Importance="high" />
44
</Target>
55

6-
<!--Use local targeting pack for NetCoreAppCurrent.-->
6+
<!--Use local targeting pack for NetCoreAppCurrent.--><!--
77
<Target Name="UpdateTargetingAndRuntimePack"
88
AfterTargets="ResolveFrameworkReferences">
99
<PropertyGroup>
@@ -27,5 +27,5 @@
2727
<ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
2828
Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'iossimulator-x64'" />
2929
</ItemGroup>
30-
</Target>
30+
</Target>-->
3131
</Project>

0 commit comments

Comments
 (0)