Skip to content

Commit bfcde14

Browse files
shimingsgshimingsg
authored
Merge branch 'main' into AddCreateTestSuiteCommandToGCInfra
2 parents bc272ba + ade73e0 commit bfcde14

File tree

97 files changed

+18258
-1455
lines changed

Some content is hidden

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

97 files changed

+18258
-1455
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.

‎.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@
1212
**/.pytest_cache/
1313

1414
## VSCode .gitignore (included from https://github.com/github/gitignore/blob/master/Global/VisualStudioCode.gitignore
15-
.vscode/
15+
.vscode/*
1616
!.vscode/settings.json
1717
!.vscode/tasks.json
1818
!.vscode/launch.json
1919
!.vscode/extensions.json
20+
!.vscode/*.code-snippets
21+
!*.code-workspace
22+
23+
# Built Visual Studio Code Extensions
24+
*.vsix
2025

2126
## Ignore Visual Studio temporary files, build results, and
2227
## files generated by popular Visual Studio add-ons.

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

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

‎.vscode/settings.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
"**/packages/": true,
1111
"/tools/": true,
1212
},
13-
"python.analysis.typeCheckingMode": "strict",
14-
"python.analysis.diagnosticSeverityOverrides": {
15-
"reportMissingParameterType": "none",
16-
"reportUnnecessaryComparison": "information",
17-
"reportUnnecessaryIsInstance": "information",
18-
"reportUnusedVariable": "information",
19-
"reportMissingTypeStubs": "information"
20-
},
21-
"python.analysis.extraPaths": ["scripts"],
22-
"python.analysis.diagnosticMode": "workspace"
13+
"python.analysis.typeCheckingMode": "standard",
14+
"python.analysis.extraPaths": ["scripts"]
2315
}

‎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-8db145f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-8db145fa/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-df01702" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-df017025/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-7aba960" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-7aba9600/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-bb179c2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-bb179c27/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-8db661c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-8db661ce/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: 1 addition & 1 deletion
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`.

‎eng/Version.Details.xml

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
</Dependency>
3232
</ProductDependencies>
3333
<ToolsetDependencies>
34-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25268.1">
34+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25401.2">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
36+
<Sha>40693ae2ee51e447f6ca96d07bc1ba779dcb9b9c</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25268.1">
38+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25401.2">
3939
<Uri>https://github.com/dotnet/arcade</Uri>
40-
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
40+
<Sha>40693ae2ee51e447f6ca96d07bc1ba779dcb9b9c</Sha>
4141
</Dependency>
4242
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="10.0.0-prerelease.25262.1">
4343
<Uri>https://github.com/dotnet/xharness</Uri>
@@ -55,41 +55,60 @@
5555
Mapping_Microsoft.tvOS.Sdk:default
5656
-->
5757
<!-- Dependencies for .NET MAUI workload -->
58-
<Dependency Name="Microsoft.Maui.Controls" Version="9.0.80-ci.main.25270.2">
58+
<Dependency Name="Microsoft.Maui.Controls" Version="10.0.0-ci.net10.25404.10">
5959
<Sha>79c97a00bbc6d9710f46cc644154505bf01f3c51</Sha>
6060
<Uri>https://github.com/dotnet/maui</Uri>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.103-servicing.25065.25" CoherentParentDependency="Microsoft.Maui.Controls">
63-
<Sha>049799c39d766c58ef6388865d5f5ed273b6a75e</Sha>
64-
<Uri>https://github.com/dotnet/sdk</Uri>
62+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.7.25380.108">
63+
<Sha>30000d883e06c122311a66894579bc12329a09d4</Sha>
64+
<Uri>https://github.com/dotnet/dotnet</Uri>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
67-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
68-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.100-preview.7.25380.108" CoherentParentDependency="Microsoft.NET.Sdk">
67+
<Sha>30000d883e06c122311a66894579bc12329a09d4</Sha>
68+
<Uri>https://github.com/dotnet/dotnet</Uri>
6969
</Dependency>
7070
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
7171
<Sha>4c9d1b112c16716c2479e054e9ad4db8b5b8c70c</Sha>
7272
<Uri>https://github.com/dotnet/emsdk</Uri>
7373
</Dependency>
74-
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.60" CoherentParentDependency="Microsoft.Maui.Controls">
75-
<Sha>8db145fa59226e66e81ae5b8a8b116d225e4bff2</Sha>
74+
<!-- Previous .NET Android version(s) -->
75+
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.92">
7676
<Uri>https://github.com/dotnet/android</Uri>
77+
<Sha>be1cab92326783479054e72990da08008e5be819</Sha>
7778
</Dependency>
78-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.2" Version="18.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
79-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
80-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
79+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_18.5" Version="18.5.10603-net10-p7">
80+
<Uri>https://github.com/dotnet/macios</Uri>
81+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
8182
</Dependency>
82-
<Dependency Name="Microsoft.macOS.Sdk.net9.0_15.2" Version="15.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
83-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
84-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
83+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_15.5" Version="15.5.10603-net10-p7">
84+
<Uri>https://github.com/dotnet/macios</Uri>
85+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
8586
</Dependency>
86-
<Dependency Name="Microsoft.iOS.Sdk.net9.0_18.2" Version="18.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
87-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
88-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
87+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_18.5" Version="18.5.10603-net10-p7">
88+
<Uri>https://github.com/dotnet/macios</Uri>
89+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
8990
</Dependency>
90-
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_18.2" Version="18.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
91-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
92-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
91+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_18.5" Version="18.5.10603-net10-p7">
92+
<Uri>https://github.com/dotnet/macios</Uri>
93+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
94+
</Dependency>
95+
<!-- Previous .NET iOS version(s) -->
96+
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
97+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9216" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_18.5">
98+
<Uri>https://github.com/dotnet/macios</Uri>
99+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
100+
</Dependency>
101+
<Dependency Name="Microsoft.macOS.Sdk.net9.0_15.5" Version="15.5.9216" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_15.5">
102+
<Uri>https://github.com/dotnet/macios</Uri>
103+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
104+
</Dependency>
105+
<Dependency Name="Microsoft.iOS.Sdk.net9.0_18.5" Version="18.5.9216" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_18.5">
106+
<Uri>https://github.com/dotnet/macios</Uri>
107+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
108+
</Dependency>
109+
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_18.5" Version="18.5.9216" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_18.5">
110+
<Uri>https://github.com/dotnet/macios</Uri>
111+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
93112
</Dependency>
94113
</ToolsetDependencies>
95114
</Dependencies>

‎eng/common/build.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Param(
2121
[switch] $publish,
2222
[switch] $clean,
2323
[switch][Alias('pb')]$productBuild,
24+
[switch]$fromVMR,
2425
[switch][Alias('bl')]$binaryLog,
2526
[switch][Alias('nobl')]$excludeCIBinarylog,
2627
[switch] $ci,
@@ -74,6 +75,7 @@ function Print-Usage() {
7475
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7576
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
7677
Write-Host " -buildCheck Sets /check msbuild parameter"
78+
Write-Host " -fromVMR Set when building from within the VMR"
7779
Write-Host ""
7880

7981
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -127,7 +129,8 @@ function Build {
127129
/p:Deploy=$deploy `
128130
/p:Test=$test `
129131
/p:Pack=$pack `
130-
/p:DotNetBuildRepo=$productBuild `
132+
/p:DotNetBuild=$productBuild `
133+
/p:DotNetBuildFromVMR=$fromVMR `
131134
/p:IntegrationTest=$integrationTest `
132135
/p:PerformanceTest=$performanceTest `
133136
/p:Sign=$sign `

0 commit comments

Comments
 (0)