Skip to content

Commit ec9562f

Browse files
jonathanpeppersjonathanpeppers
authored
Merge branch 'main' into dev/grendel/test-runtimes-11
2 parents f6d57a2 + 3577f05 commit ec9562f

File tree

10 files changed

+176
-50
lines changed

10 files changed

+176
-50
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
1717
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
1818
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
19+
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
20+
<add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
1921
<!-- This is for packages needed by debugger-libs -->
2022
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
2123
<!-- Added manually for dotnet/runtime 9.0.5 -->

‎build-tools/automation/yaml-templates/diagnose-hanging-processes.yaml‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
steps:
2+
- bash: |
3+
echo "=========================================="
4+
echo "Diagnosing potentially hanging processes"
5+
echo "=========================================="
6+
echo ""
7+
echo "All running processes:"
8+
ps aux || true
9+
echo ""
10+
echo "=========================================="
11+
echo "MSBuild processes:"
12+
ps aux | grep -i msbuild || echo "No MSBuild processes found"
13+
echo ""
14+
echo "=========================================="
15+
echo "dotnet processes:"
16+
ps aux | grep -i dotnet || echo "No dotnet processes found"
17+
echo ""
18+
echo "=========================================="
19+
echo "adb processes:"
20+
ps aux | grep -i adb || echo "No adb processes found"
21+
echo ""
22+
echo "=========================================="
23+
echo "Java processes:"
24+
ps aux | grep -i java || echo "No Java processes found"
25+
echo ""
26+
echo "=========================================="
27+
echo "nunit processes:"
28+
ps aux | grep -i nunit || echo "No nunit processes found"
29+
echo ""
30+
echo "=========================================="
31+
echo "Process tree:"
32+
pstree -p $$ 2>/dev/null || echo "pstree not available"
33+
echo ""
34+
echo "=========================================="
35+
echo "Open files by dotnet processes:"
36+
lsof -c dotnet 2>/dev/null | head -100 || echo "lsof not available or no dotnet processes"
37+
echo ""
38+
echo "=========================================="
39+
echo "Open files by MSBuild processes:"
40+
lsof -c MSBuild 2>/dev/null | head -100 || echo "lsof not available or no MSBuild processes"
41+
echo ""
42+
echo "=========================================="
43+
echo "Network connections:"
44+
netstat -an 2>/dev/null | grep ESTABLISHED | head -50 || echo "netstat not available"
45+
echo ""
46+
echo "=========================================="
47+
echo "Disk usage:"
48+
df -h || true
49+
echo ""
50+
echo "=========================================="
51+
echo "Memory usage:"
52+
vm_stat 2>/dev/null || free -h 2>/dev/null || true
53+
echo ""
54+
echo "=========================================="
55+
echo "Recent system messages (last 50 lines):"
56+
tail -50 /var/log/system.log 2>/dev/null || dmesg 2>/dev/null | tail -50 || echo "System logs not accessible"
57+
echo ""
58+
echo "=========================================="
59+
displayName: diagnose hanging processes (macOS/Linux)
60+
condition: and(always(), in(variables['agent.os'], 'Darwin', 'Linux'))
61+
continueOnError: true
62+
63+
- powershell: |
64+
Write-Host "=========================================="
65+
Write-Host "Diagnosing potentially hanging processes"
66+
Write-Host "=========================================="
67+
Write-Host ""
68+
Write-Host "All running processes:"
69+
Get-Process | Format-Table -AutoSize
70+
Write-Host ""
71+
Write-Host "=========================================="
72+
Write-Host "MSBuild processes:"
73+
Get-Process -Name *MSBuild* -ErrorAction SilentlyContinue | Format-Table -AutoSize
74+
if (-not $?) { Write-Host "No MSBuild processes found" }
75+
Write-Host ""
76+
Write-Host "=========================================="
77+
Write-Host "dotnet processes:"
78+
Get-Process -Name dotnet* -ErrorAction SilentlyContinue | Format-Table -AutoSize
79+
if (-not $?) { Write-Host "No dotnet processes found" }
80+
Write-Host ""
81+
Write-Host "=========================================="
82+
Write-Host "adb processes:"
83+
Get-Process -Name adb* -ErrorAction SilentlyContinue | Format-Table -AutoSize
84+
if (-not $?) { Write-Host "No adb processes found" }
85+
Write-Host ""
86+
Write-Host "=========================================="
87+
Write-Host "Java processes:"
88+
Get-Process -Name java* -ErrorAction SilentlyContinue | Format-Table -AutoSize
89+
if (-not $?) { Write-Host "No Java processes found" }
90+
Write-Host ""
91+
Write-Host "=========================================="
92+
Write-Host "nunit processes:"
93+
Get-Process -Name *nunit* -ErrorAction SilentlyContinue | Format-Table -AutoSize
94+
if (-not $?) { Write-Host "No nunit processes found" }
95+
Write-Host ""
96+
Write-Host "=========================================="
97+
Write-Host "Network connections (ESTABLISHED):"
98+
netstat -ano | Select-String "ESTABLISHED" | Select-Object -First 50
99+
Write-Host ""
100+
Write-Host "=========================================="
101+
Write-Host "Disk usage:"
102+
Get-PSDrive -PSProvider FileSystem | Format-Table -AutoSize
103+
Write-Host ""
104+
Write-Host "=========================================="
105+
Write-Host "Memory usage:"
106+
Get-CimInstance Win32_OperatingSystem | Select-Object FreePhysicalMemory, TotalVisibleMemorySize | Format-List
107+
Write-Host ""
108+
Write-Host "=========================================="
109+
Write-Host "Recent Application Event Log errors (last 20):"
110+
Get-EventLog -LogName Application -EntryType Error -Newest 20 -ErrorAction SilentlyContinue | Format-Table -AutoSize
111+
Write-Host ""
112+
Write-Host "=========================================="
113+
displayName: diagnose hanging processes (Windows)
114+
condition: and(always(), eq(variables['agent.os'], 'Windows_NT'))
115+
continueOnError: true

‎build-tools/automation/yaml-templates/run-nunit-tests.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ steps:
2222
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
2323
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
2424

25+
- template: /build-tools/automation/yaml-templates/diagnose-hanging-processes.yaml
26+
2527
- template: /build-tools/automation/yaml-templates/kill-processes.yaml

‎build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ steps:
4848
ignoreLASTEXITCODE: true
4949
workingDirectory: ${{ parameters.xaSourcePath }}
5050
51+
- template: /build-tools/automation/yaml-templates/diagnose-hanging-processes.yaml
52+
5153
- pwsh: |
5254
$(Agent.ToolsDirectory)/dotnet-test-slicer `
5355
retry `

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.101-servicing.25563.104">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.3.25578.104">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
5+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.1-servicing.25563.104">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.3.25578.104">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
9+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.1">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25578.104">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
13+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25563.104">
15+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25578.104">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
17+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
1818
</Dependency>
1919
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-10.0.100" Version="10.0.101">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -40,13 +40,13 @@
4040
</Dependency>
4141
</ProductDependencies>
4242
<ToolsetDependencies>
43-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25563.104">
43+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25578.104">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
45+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
4646
</Dependency>
47-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.101">
47+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25578.104">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
49+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
5050
</Dependency>
5151
</ToolsetDependencies>
5252
</Dependencies>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>10.0.101-servicing.25563.104</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>10.0.100-rc.3.25578.104</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkPackageVersion>10.0.1-servicing.25563.104</MicrosoftNETILLinkPackageVersion>
7-
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETILLinkPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCoreAppRefPackageVersion>
88
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
9-
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
9+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
1010
<MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>10.0.101</MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>
1111
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.101</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
1212
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
1313
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
14-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
15-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25563.104</MicrosoftDotNetCecilPackageVersion>
14+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25578.104</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
15+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25578.104</MicrosoftDotNetCecilPackageVersion>
1616
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
1717
<!-- Previous .NET Android version -->
1818
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.105</MicrosoftNETSdkAndroidManifest90100PackageVersion>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
148148
"Humanizer.dll",
149149
"es/Humanizer.resources.dll",
150150
"System.Collections.dll",
151-
"System.Collections.Concurrent.dll",
152151
"System.Text.RegularExpressions.dll",
153152
};
154153

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,40 @@
88
"Size": 397616
99
},
1010
"lib/arm64-v8a/libassemblies.arm64-v8a.blob.so": {
11-
"Size": 3031896
11+
"Size": 3124664
1212
},
1313
"lib/arm64-v8a/libclrjit.so": {
14-
"Size": 3191312
14+
"Size": 3180136
1515
},
1616
"lib/arm64-v8a/libcoreclr.so": {
17-
"Size": 6213712
17+
"Size": 5835752
1818
},
1919
"lib/arm64-v8a/libmonodroid.so": {
20-
"Size": 1369248
20+
"Size": 1375432
2121
},
2222
"lib/arm64-v8a/libmscordaccore.so": {
23-
"Size": 2632624
23+
"Size": 2534624
2424
},
2525
"lib/arm64-v8a/libmscordbi.so": {
26-
"Size": 1942040
26+
"Size": 1909056
2727
},
2828
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
29-
"Size": 71952
29+
"Size": 71936
3030
},
3131
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
32-
"Size": 759304
32+
"Size": 758968
3333
},
3434
"lib/arm64-v8a/libSystem.Native.so": {
35-
"Size": 104112
35+
"Size": 105408
3636
},
3737
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
38-
"Size": 165568
38+
"Size": 165536
3939
},
4040
"lib/arm64-v8a/libxamarin-app.so": {
41-
"Size": 20088
41+
"Size": 20128
4242
},
4343
"META-INF/BNDLTOOL.RSA": {
44-
"Size": 1211
44+
"Size": 1221
4545
},
4646
"META-INF/BNDLTOOL.SF": {
4747
"Size": 2306
@@ -74,5 +74,5 @@
7474
"Size": 1904
7575
}
7676
},
77-
"PackageSize": 9107237
77+
"PackageSize": 9049893
7878
}

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"Size": 6652
66
},
77
"classes.dex": {
8-
"Size": 9449132
8+
"Size": 9448760
99
},
1010
"classes2.dex": {
1111
"Size": 156448
@@ -32,37 +32,37 @@
3232
"Size": 2396
3333
},
3434
"lib/arm64-v8a/libassemblies.arm64-v8a.blob.so": {
35-
"Size": 13826528
35+
"Size": 14221080
3636
},
3737
"lib/arm64-v8a/libclrjit.so": {
38-
"Size": 3191312
38+
"Size": 3180136
3939
},
4040
"lib/arm64-v8a/libcoreclr.so": {
41-
"Size": 6213712
41+
"Size": 5835752
4242
},
4343
"lib/arm64-v8a/libmonodroid.so": {
44-
"Size": 1369248
44+
"Size": 1375432
4545
},
4646
"lib/arm64-v8a/libmscordaccore.so": {
47-
"Size": 2632624
47+
"Size": 2534624
4848
},
4949
"lib/arm64-v8a/libmscordbi.so": {
50-
"Size": 1942040
50+
"Size": 1909056
5151
},
5252
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
53-
"Size": 71952
53+
"Size": 71936
5454
},
5555
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
56-
"Size": 759304
56+
"Size": 758968
5757
},
5858
"lib/arm64-v8a/libSystem.Native.so": {
59-
"Size": 104112
59+
"Size": 105408
6060
},
6161
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
62-
"Size": 165568
62+
"Size": 165536
6363
},
6464
"lib/arm64-v8a/libxamarin-app.so": {
65-
"Size": 147176
65+
"Size": 147200
6666
},
6767
"META-INF/androidx.activity_activity.version": {
6868
"Size": 6
@@ -215,7 +215,7 @@
215215
"Size": 6
216216
},
217217
"META-INF/BNDLTOOL.RSA": {
218-
"Size": 1211
218+
"Size": 1221
219219
},
220220
"META-INF/BNDLTOOL.SF": {
221221
"Size": 90357
@@ -2285,5 +2285,5 @@
22852285
"Size": 812848
22862286
}
22872287
},
2288-
"PackageSize": 22578118
2288+
"PackageSize": 22619078
22892289
}

0 commit comments

Comments
 (0)