Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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: 1 addition & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
<!-- Added manually for .NET 8 Android -->
<add key="darc-pub-dotnet-android-cdb777a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-cdb777a0/nuget/v3/index.json" />
<!-- Added manually for .NET 9 macios -->
<add key="darc-pub-dotnet-macios-0e1a194" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-0e1a194-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-af20d0b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-af20d0b6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-8d30875" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-8d308759/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
Expand Down
52 changes: 17 additions & 35 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,56 +77,38 @@
<Sha>1dcfb6f8779c33b6f768c996495cb90ecd729329</Sha>
</Dependency>
<!-- .NET 11 iOS version(s) -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
<Dependency Name="Microsoft.MacCatalyst.Sdk.net11.0_26.2" Version="26.2.11244-ci.net11-0">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
<Sha>72f6ce856be41316c4d54d8d0cb3e90cd8b1a2ae</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
<Dependency Name="Microsoft.macOS.Sdk.net11.0_26.2" Version="26.2.11244-ci.net11-0">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
<Sha>72f6ce856be41316c4d54d8d0cb3e90cd8b1a2ae</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
<Dependency Name="Microsoft.iOS.Sdk.net11.0_26.2" Version="26.2.11244-ci.net11-0">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
<Sha>72f6ce856be41316c4d54d8d0cb3e90cd8b1a2ae</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
<Dependency Name="Microsoft.tvOS.Sdk.net11.0_26.2" Version="26.2.11244-ci.net11-0">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
<Sha>72f6ce856be41316c4d54d8d0cb3e90cd8b1a2ae</Sha>
</Dependency>
<!-- .NET 10 iOS version(s) -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_18.5" Version="18.5.10824-net10-rc.2" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_26.1">
<!-- Previous .NET iOS version(s) -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net11.0_26.2">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk.net10.0_15.5" Version="15.5.10824-net10-rc.2" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_26.1">
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.macOS.Sdk.net11.0_26.2">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk.net10.0_18.5" Version="18.5.10824-net10-rc.2" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_26.1">
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.iOS.Sdk.net11.0_26.2">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_18.5" Version="18.5.10824-net10-rc.2" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_26.1">
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.2" Version="26.2.10192" CoherentParentDependency="Microsoft.tvOS.Sdk.net11.0_26.2">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
</Dependency>
<!-- .NET 9 iOS version(s) -->
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9754" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9754" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9754" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9754" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
<Sha>8d3087594c224f1a5a2d6f9fdd2ca01d02e370ca</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/performance/maui_scenarios_android.proj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<!-- Mono AOT -->
<_MSBuildArgs Condition="'$(CodegenType)' == 'AOT'">$(_MSBuildArgs);/p:RunAOTCompilation=true;/p:AndroidEnableProfiledAot=false</_MSBuildArgs>
<!-- CoreCLR JIT -->
<_MSBuildArgs Condition="'$(CodegenType)' == 'JIT'">$(_MSBuildArgs);/p:PublishReadyToRun=false;/p:PublishReadyToRunComposite=false</_MSBuildArgs>
<_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr' and '$(CodegenType)' == 'JIT'">$(_MSBuildArgs);/p:PublishReadyToRun=false;/p:PublishReadyToRunComposite=false</_MSBuildArgs>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to add constraints like this, I suggest adding mono condition for aot and coreclr condition for r2r

<!-- CoreCLR R2R -->
<_MSBuildArgs Condition="'$(CodegenType)' == 'R2R'">$(_MSBuildArgs);/p:PublishReadyToRun=true;/p:PublishReadyToRunComposite=false</_MSBuildArgs>
<!-- CoreCLR R2R composite -->
Expand Down Expand Up @@ -71,7 +71,7 @@

<ItemGroup>
<PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
<Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -r android-arm64 --self-contained --msbuild=&quot;$(_MSBuildArgs)&quot; --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)\%(PreparePayloadWorkItem.ScenarioDirectoryName).$(RunConfigsString).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
<Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -r android-arm64 --self-contained -c $(BuildConfig) --msbuild=&quot;$(_MSBuildArgs)&quot; --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)\%(PreparePayloadWorkItem.ScenarioDirectoryName).$(RunConfigsString).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
</PreparePayloadWorkItem>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/performance/maui_scenarios_ios.proj
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<ItemGroup>
<PreparePayloadWorkItem Include="@(MAUIiOSScenario)">
<Command>sudo xcode-select -s /Applications/Xcode_26.1.1.app; $(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c Release -r ios-arm64 --msbuild=&quot;$(_MSBuildArgs)&quot; --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)/%(PreparePayloadWorkItem.ScenarioDirectoryName).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName); cd ../; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
<Command>sudo xcode-select -s /Applications/Xcode_26.2.app; $(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c $(BuildConfig) -r ios-arm64 --msbuild=&quot;$(_MSBuildArgs)&quot; --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)/%(PreparePayloadWorkItem.ScenarioDirectoryName).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName); cd ../; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
</PreparePayloadWorkItem>
</ItemGroup>
Expand Down
123 changes: 95 additions & 28 deletions eng/pipelines/sdk-perf-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ jobs:
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (Mono ProfiledAOT)
# Maui Android scenario benchmarks (Mono ProfiledAOT) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -390,30 +390,12 @@ jobs:
- main
runtimeFlavor: mono
codeGenType: ProfiledAOT
buildConfig: Release
additionalJobIdentifier: Mono
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (Mono AOT)
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
buildMachines:
- win-x64-android-arm64-pixel
- win-x64-android-arm64-galaxy
isPublic: false
jobParameters:
runKind: maui_scenarios_android
projectFileName: maui_scenarios_android.proj
channels:
- main
runtimeFlavor: mono
codeGenType: AOT
additionalJobIdentifier: Mono
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (CoreCLR JIT)
# Maui Android scenario benchmarks (CoreCLR JIT) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -428,11 +410,12 @@ jobs:
- main
runtimeFlavor: coreclr
codeGenType: JIT
buildConfig: Release
additionalJobIdentifier: CoreCLR
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (CoreCLR R2R)
# Maui Android scenario benchmarks (CoreCLR R2R) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -447,11 +430,12 @@ jobs:
- main
runtimeFlavor: coreclr
codeGenType: R2R
buildConfig: Release
additionalJobIdentifier: CoreCLR
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (CoreCLR R2R Composite)
# Maui Android scenario benchmarks (CoreCLR R2R Composite) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -466,11 +450,12 @@ jobs:
- main
runtimeFlavor: coreclr
codeGenType: R2RComposite
buildConfig: Release
additionalJobIdentifier: CoreCLR
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (CoreCLR NativeAOT)
# Maui Android scenario benchmarks (CoreCLR NativeAOT) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -485,11 +470,12 @@ jobs:
- main
runtimeFlavor: coreclr
codeGenType: NativeAOT
buildConfig: Release
additionalJobIdentifier: CoreCLR
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui iOS Mono scenario benchmarks
# Maui iOS scenario benchmarks (Mono FullAOT) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -503,11 +489,12 @@ jobs:
- main
runtimeFlavor: mono
codeGenType: FullAOT
buildConfig: Release
additionalJobIdentifier: Mono
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui iOS CoreCLR scenario benchmarks
# Maui iOS scenario benchmarks (CoreCLR Interpreter) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -521,11 +508,12 @@ jobs:
- main
runtimeFlavor: coreclr
codeGenType: Interpreter
buildConfig: Release
additionalJobIdentifier: CoreCLR
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui iOS Native AOT scenario benchmarks
# Maui iOS scenario benchmarks (CoreCLR NativeAOT) - Release
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
Expand All @@ -539,10 +527,89 @@ jobs:
- main
runtimeFlavor: coreclr
codeGenType: NativeAOT
buildConfig: Release
additionalJobIdentifier: CoreCLR
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (Mono - Default) - Debug
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
buildMachines:
- win-x64-android-arm64-pixel
- win-x64-android-arm64-galaxy
isPublic: false
jobParameters:
runKind: maui_scenarios_android
projectFileName: maui_scenarios_android.proj
channels:
- main
runtimeFlavor: mono
codeGenType: Default
buildConfig: Debug
additionalJobIdentifier: Mono_Debug
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui Android scenario benchmarks (CoreCLR - Default) - Debug
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
buildMachines:
- win-x64-android-arm64-pixel
- win-x64-android-arm64-galaxy
isPublic: false
jobParameters:
runKind: maui_scenarios_android
projectFileName: maui_scenarios_android.proj
channels:
- main
runtimeFlavor: coreclr
codeGenType: Default
buildConfig: Debug
additionalJobIdentifier: CoreCLR_Debug
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui iOS scenario benchmarks (Mono - Default) - Debug
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
buildMachines:
- osx-x64-ios-arm64
isPublic: false
jobParameters:
runKind: maui_scenarios_ios
projectFileName: maui_scenarios_ios.proj
channels:
- main
runtimeFlavor: mono
codeGenType: Default
buildConfig: Debug
additionalJobIdentifier: Mono_Debug
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui iOS scenario benchmarks (CoreCLR - Default) - Debug
- template: /eng/pipelines/templates/build-machine-matrix.yml
parameters:
jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
buildMachines:
- osx-x64-ios-arm64
isPublic: false
jobParameters:
runKind: maui_scenarios_ios
projectFileName: maui_scenarios_ios.proj
channels:
- main
runtimeFlavor: coreclr
codeGenType: Default
buildConfig: Debug
additionalJobIdentifier: CoreCLR_Debug
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

# Maui scenario benchmarks
- ${{ if false }}:
- template: /eng/pipelines/templates/build-machine-matrix.yml
Expand Down Expand Up @@ -848,4 +915,4 @@ jobs:
- 9.0
- 8.0
${{ each parameter in parameters.jobParameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
Loading
Loading