Skip to content

Commit 60e9ced

Browse files
authored
Merge branch 'main' into EnableGCInfraOnLinux
2 parents 7852478 + 05d29ee commit 60e9ced

File tree

124 files changed

+19202
-1302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+19202
-1302
lines changed

.config/dotnet-tools.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

.config/settings.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

.vault-config/dotnet-perf-keyvault.yaml

Lines changed: 0 additions & 61 deletions
This file was deleted.

NuGet.config

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,11 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-android -->
10-
<add key="darc-pub-dotnet-android-2e81a04" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-2e81a040/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-android-be1cab9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-be1cab92/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-android -->
12-
<!-- Begin: Package sources from dotnet-runtime -->
13-
<add key="darc-pub-dotnet-runtime-d9d0ae0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d9d0ae01/nuget/v3/index.json" />
14-
<!-- End: Package sources from dotnet-runtime -->
15-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
16-
<add key="darc-pub-dotnet-windowsdesktop-5594434" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-55944340/nuget/v3/index.json" />
17-
<!-- End: Package sources from dotnet-windowsdesktop -->
18-
<!-- Begin: Package sources from xamarin-xamarin-macios -->
19-
<add key="darc-pub-xamarin-xamarin-macios-b660cc6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-b660cc67/nuget/v3/index.json" />
20-
<!-- End: Package sources from xamarin-xamarin-macios -->
21-
<!-- Begin: Package sources from dotnet-aspnetcore -->
22-
<add key="darc-pub-dotnet-aspnetcore-cd7e571" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-cd7e571b/nuget/v3/index.json" />
23-
<!-- End: Package sources from dotnet-aspnetcore -->
24-
<!-- Begin: Package sources from dotnet-emsdk -->
25-
<add key="darc-pub-dotnet-emsdk-d8e8567" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d8e8567a/nuget/v3/index.json" />
26-
<!-- End: Package sources from dotnet-emsdk -->
27-
<!-- Begin: Package sources from dotnet-maui -->
28-
<!-- End: Package sources from dotnet-maui -->
12+
<!-- Begin: Package sources from dotnet-macios -->
13+
<add key="darc-pub-dotnet-macios-8071534" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-80715342/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-macios -->
2915
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3016
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
3117
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
@@ -41,6 +27,21 @@
4127
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
4228
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
4329
<add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
30+
31+
<!-- Added manually for .NET 8 MAUI -->
32+
<add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" />
33+
<!-- Added manually for dotnet/runtime 8.0.18 -->
34+
<add key="darc-pub-dotnet-runtime-c0390586" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c0390586/nuget/v3/index.json" />
35+
<!-- Added manually for dotnet/runtime 9.0.8 -->
36+
<add key="darc-pub-dotnet-runtime-b4fb3656" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-89d42fdf/nuget/v3/index.json" />
37+
<!-- Added manually for .NET 9 Android -->
38+
<add key="darc-pub-dotnet-android-1719a35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1719a35b/nuget/v3/index.json" />
39+
<!-- Added manually for .NET 8 Android -->
40+
<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" />
41+
<!-- Added manually for .NET 9 macios -->
42+
<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" />
43+
<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" />
44+
<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" />
4445
</packageSources>
4546
<disabledPackageSources>
4647
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->

azure-pipelines.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -67,29 +67,3 @@ jobs:
6767
jobParameters:
6868
${{ if parameters.onlySanityCheck }}:
6969
onlySanityCheck: true
70-
71-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule', 'Manual')) }}:
72-
# Secret Sync
73-
- job: Synchronize
74-
pool:
75-
name: NetCore1ESPool-Internal-NoMSI
76-
demands: ImageOverride -equals 1es-windows-2019
77-
steps:
78-
- task: UseDotNet@2
79-
displayName: Install .NET 6.0
80-
inputs:
81-
version: 6.x
82-
83-
- task: DeleteFiles@1
84-
inputs:
85-
Contents: global.json
86-
87-
- script: dotnet tool restore
88-
89-
- task: AzureCLI@2
90-
inputs:
91-
azureSubscription: .NET Performance (790c4451-dad9-4fda-af8b-10bd9ca328fa)
92-
scriptType: ps
93-
scriptLocation: inlineScript
94-
inlineScript: |
95-
Get-ChildItem .vault-config/*.yaml |% { dotnet secret-manager synchronize $_}

docs/android-startup-scenarios.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Prereqs
55

66
- Ensure `python` is installed and available. Any currently supported `python` 3.* version should work. Downloads are available at https://www.python.org/downloads/.
7-
- Ensure `dotnet` is installed and available with the `dotnet` command for easy xharness installation. Any supported .NET Core version should work. [Dotnet Download](https://dotnet.microsoft.com/en-us/download) or [Daily Dotnet Download](https://github.com/dotnet/sdk/blob/main/documentation/package-table.md).
7+
- Ensure `dotnet` is installed and available with the `dotnet` command for easy xharness installation. Any supported .NET Core version should work. [Dotnet Download](https://dotnet.microsoft.com/en-us/download) or [Daily Dotnet Download](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md).
88
- Ensure `xharness` is installed and available with the `xharness` command. The current version in use can be found in the `eng/performance/maui_scenarios_android.proj` file at line 7 (under the tag `MicrosoftDotNetXHarnessCLIVersion`), although any recent version should work. [XHarness Install Instructions](https://github.com/dotnet/xharness?tab=readme-ov-file#installation-and-usage).
99
- Have an Android app APK available for testing.
1010
- Have an Android Device (with developer mode enabled) or emulator connected to computer, and viewable with `xharness android device` or `xharness android adb -- devices -l`.
@@ -28,7 +28,7 @@
2828
4. Run the test:
2929

3030
```sh
31-
python test.py devicestartup --device-type android --package-path <path-to-apk> --package-name <apk-package-name> [--disable-animations] [--use-fully-drawn-time --fully-drawn-extra-delay <delay-in-sec>]
31+
python test.py devicestartup --device-type android --package-path <path-to-apk> --package-name <apk-package-name> [--disable-animations] [--use-fully-drawn-time --fully-drawn-extra-delay <delay-in-sec>] [--trace-perfetto]
3232
```
3333

3434
* Refer to the [Notes](./android-startup-scenarios.md#notes) below about specifying --use-fully-drawn-time --fully-drawn-extra-delay parameters.
@@ -62,3 +62,4 @@
6262
- Specific example command such as when using the runtime android example app: `python test.py devicestartup --device-type android --package-path HelloAndroid.apk --package-name net.dot.HelloAndroid`.
6363
- Other example commands and additional logic can be found in the `maui_scenarios_android.proj` and `runner.py` files in the `performance` repository.
6464
- If using `[--use-fully-drawn-time --fully-drawn-extra-delay <delay in sec>]` arguments, the Android app must have reportFullyDrawn() called on a ComponentActivity. Reference: https://developer.android.com/topic/performance/vitals/launch-time#retrieve-TTFD.
65+
- `[--trace-perfetto]` will take a perfetto trace after the execution of the normal startup testing to ensure it does not impact results. The resulting trace will then be saved off of the android device and into `tracedir` in the same directory as test.py. If running in a pipeline, this file should also be uploaded as a result.

0 commit comments

Comments
 (0)