Skip to content

Commit bdf7ed0

Browse files
hoyosjssteveisokCopilot
authored
Separate debuggee/tracee build from product build (dotnet#5767)
- New Debuggees.proj - moves debuggee and tracee projects out of the main build traversal into a dedicated project built with the test SDK instead of the global.json Arcade SDK. - Runtime installation refactored - runtimes are now installed via dirs/test.proj instead of from the main build script; eng/installruntimes.* scripts and InstallRuntimes.proj updated accordingly. - Pipeline improvements (build.yml) - reorders post-test steps (publish test results first), replaces CopyFiles@2 with a pwsh move + tar.gz step to avoid ENOSPC failures on mac hosts. - Test disables with open issues - disables DumpStack/EEStack on macOS and dumpobj verification on Alpine for known platform-specific failures; updates several script regexes (DumpGen, GCTests, Overflow, StackTests, WebApp) for compatibility. - Minor code changes - call out issues in DumpAsync for runtime-async, event pipe log/trace test improvements, test helper adjustments for the new build step model, and some react to new payload shapes in newer versions of Logging EventSources. --------- Co-authored-by: Steve Pfister <stpfiste@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 11411fa commit bdf7ed0

33 files changed

Lines changed: 525 additions & 294 deletions

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<NetCoreAppMinVersion>8.0</NetCoreAppMinVersion>
7070
<NetCoreAppMinTargetFramework>net$(NetCoreAppMinVersion)</NetCoreAppMinTargetFramework>
7171
<!-- This is the list of TFMs we build our debuggees and tracees as. -->
72-
<SupportedSubProcessTargetFrameworks>net8.0;net9.0;net10.0</SupportedSubProcessTargetFrameworks>
72+
<SupportedSubProcessTargetFrameworks>net8.0;net9.0;net10.0;net11.0</SupportedSubProcessTargetFrameworks>
7373
<!-- This is the list of TFMs we build our unit tests as. -->
7474
<SupportedXUnitTestTargetFrameworks>net8.0</SupportedXUnitTestTargetFrameworks>
7575
</PropertyGroup>

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<!-- Begin: Package sources from dotnet-runtime -->
1414
<!-- End: Package sources from dotnet-runtime -->
1515
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
16+
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
17+
<add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
1618
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
1719
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
1820
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />

‎eng/AuxMsbuildFiles/SdkPackOverrides.targets‎

Lines changed: 74 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,137 +5,189 @@
55
<RuntimeVersion80>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('Runtime'))</RuntimeVersion80>
66
<RuntimeVersion90>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('Runtime'))</RuntimeVersion90>
77
<RuntimeVersion10>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net10.0')->Metadata('Runtime'))</RuntimeVersion10>
8+
<RuntimeVersion11>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net11.0')->Metadata('Runtime'))</RuntimeVersion11>
89

910
<AspNetVersion80>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('AspNet'))</AspNetVersion80>
1011
<AspNetVersion90>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('AspNet'))</AspNetVersion90>
1112
<AspNetVersion10>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net10.0')->Metadata('AspNet'))</AspNetVersion10>
13+
<AspNetVersion11>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net11.0')->Metadata('AspNet'))</AspNetVersion11>
1214
</PropertyGroup>
1315

14-
<ItemGroup>
16+
<Message Importance="High" Text="OverrideTestingVersions: RuntimeTestVersions='@(RuntimeTestVersions)'" />
17+
18+
<!-- Skip overrides when RuntimeTestVersions is not populated (e.g. test-time CLI builds
19+
where eng/Versions.props is not imported). The SDK's built-in versions are used instead. -->
20+
<ItemGroup Condition="'@(RuntimeTestVersions)' != ''">
1521
<!--
1622
CrossGen2 Pack
1723
-->
18-
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
24+
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
1925
<Crossgen2PackVersion>$(RuntimeVersion80)</Crossgen2PackVersion>
2026
</KnownCrossgen2Pack>
2127

22-
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
28+
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
2329
<Crossgen2PackVersion>$(RuntimeVersion90)</Crossgen2PackVersion>
2430
</KnownCrossgen2Pack>
2531

26-
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
32+
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
2733
<Crossgen2PackVersion>$(RuntimeVersion10)</Crossgen2PackVersion>
2834
</KnownCrossgen2Pack>
2935

36+
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
37+
<Crossgen2PackVersion>$(RuntimeVersion11)</Crossgen2PackVersion>
38+
</KnownCrossgen2Pack>
39+
3040
<!--
3141
Microsoft.NETCore.App Runtimes
3242
-->
33-
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
43+
<KnownFrameworkReference Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
3444
<TargetingPackVersion>$(RuntimeVersion80)</TargetingPackVersion>
3545
<LatestRuntimeFrameworkVersion>$(RuntimeVersion80)</LatestRuntimeFrameworkVersion>
3646
</KnownFrameworkReference>
3747

38-
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
48+
<KnownFrameworkReference Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
3949
<TargetingPackVersion>$(RuntimeVersion90)</TargetingPackVersion>
4050
<LatestRuntimeFrameworkVersion>$(RuntimeVersion90)</LatestRuntimeFrameworkVersion>
4151
</KnownFrameworkReference>
4252

43-
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
53+
<KnownFrameworkReference Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
4454
<TargetingPackVersion>$(RuntimeVersion10)</TargetingPackVersion>
4555
<LatestRuntimeFrameworkVersion>$(RuntimeVersion10)</LatestRuntimeFrameworkVersion>
4656
</KnownFrameworkReference>
4757

48-
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
58+
<KnownFrameworkReference Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
59+
<TargetingPackVersion>$(RuntimeVersion11)</TargetingPackVersion>
60+
<LatestRuntimeFrameworkVersion>$(RuntimeVersion11)</LatestRuntimeFrameworkVersion>
61+
</KnownFrameworkReference>
62+
63+
<KnownAppHostPack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
4964
<AppHostPackVersion>$(RuntimeVersion80)</AppHostPackVersion>
5065
</KnownAppHostPack>
5166

52-
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
67+
<KnownAppHostPack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
5368
<AppHostPackVersion>$(RuntimeVersion90)</AppHostPackVersion>
5469
</KnownAppHostPack>
5570

56-
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
71+
<KnownAppHostPack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
5772
<AppHostPackVersion>$(RuntimeVersion10)</AppHostPackVersion>
5873
</KnownAppHostPack>
5974

60-
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
75+
<KnownAppHostPack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
76+
<AppHostPackVersion>$(RuntimeVersion11)</AppHostPackVersion>
77+
</KnownAppHostPack>
78+
79+
<KnownRuntimePack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
6180
<LatestRuntimeFrameworkVersion>$(RuntimeVersion80)</LatestRuntimeFrameworkVersion>
6281
</KnownRuntimePack>
6382

64-
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
83+
<KnownRuntimePack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
6584
<LatestRuntimeFrameworkVersion>$(RuntimeVersion90)</LatestRuntimeFrameworkVersion>
6685
</KnownRuntimePack>
6786

68-
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
87+
<KnownRuntimePack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
6988
<LatestRuntimeFrameworkVersion>$(RuntimeVersion10)</LatestRuntimeFrameworkVersion>
7089
</KnownRuntimePack>
7190

91+
<KnownRuntimePack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
92+
<LatestRuntimeFrameworkVersion>$(RuntimeVersion11)</LatestRuntimeFrameworkVersion>
93+
</KnownRuntimePack>
94+
7295
<!--
7396
Microsoft.AspNetCore.App Runtimes
7497
-->
75-
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
98+
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
7699
<TargetingPackVersion>$(AspNetVersion80)</TargetingPackVersion>
77100
<LatestRuntimeFrameworkVersion>$(AspNetVersion80)</LatestRuntimeFrameworkVersion>
78101
</KnownFrameworkReference>
79102

80-
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
103+
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
81104
<TargetingPackVersion>$(AspNetVersion90)</TargetingPackVersion>
82105
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
83106
</KnownFrameworkReference>
84107

85-
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
108+
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
86109
<TargetingPackVersion>$(AspNetVersion10)</TargetingPackVersion>
87110
<LatestRuntimeFrameworkVersion>$(AspNetVersion10)</LatestRuntimeFrameworkVersion>
88111
</KnownFrameworkReference>
89112

90-
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
113+
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
114+
<TargetingPackVersion>$(AspNetVersion11)</TargetingPackVersion>
115+
<LatestRuntimeFrameworkVersion>$(AspNetVersion11)</LatestRuntimeFrameworkVersion>
116+
</KnownFrameworkReference>
117+
118+
<KnownAppHostPack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
91119
<AppHostPackVersion>$(AspNetVersion80)</AppHostPackVersion>
92120
</KnownAppHostPack>
93121

94-
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
122+
<KnownAppHostPack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
95123
<AppHostPackVersion>$(AspNetVersion90)</AppHostPackVersion>
96124
</KnownAppHostPack>
97125

98-
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
126+
<KnownAppHostPack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
99127
<AppHostPackVersion>$(AspNetVersion10)</AppHostPackVersion>
100128
</KnownAppHostPack>
101129

102-
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
130+
<KnownAppHostPack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
131+
<AppHostPackVersion>$(AspNetVersion11)</AppHostPackVersion>
132+
</KnownAppHostPack>
133+
134+
<KnownRuntimePack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
103135
<LatestRuntimeFrameworkVersion>$(AspNetVersion80)</LatestRuntimeFrameworkVersion>
104136
</KnownRuntimePack>
105137

106-
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
138+
<KnownRuntimePack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
107139
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
108140
</KnownRuntimePack>
109141

110-
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
142+
<KnownRuntimePack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
111143
<LatestRuntimeFrameworkVersion>$(AspNetVersion10)</LatestRuntimeFrameworkVersion>
112144
</KnownRuntimePack>
113145

146+
<KnownRuntimePack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
147+
<LatestRuntimeFrameworkVersion>$(AspNetVersion11)</LatestRuntimeFrameworkVersion>
148+
</KnownRuntimePack>
149+
114150
<KnownILCompilerPack
151+
Update="Microsoft.NET.ILCompiler"
115152
Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
116153
<ILCompilerPackVersion>$(RuntimeVersion80)</ILCompilerPackVersion>
117154
</KnownILCompilerPack>
118155
<KnownILCompilerPack
156+
Update="Microsoft.NET.ILCompiler"
119157
Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
120158
<ILCompilerPackVersion>$(RuntimeVersion90)</ILCompilerPackVersion>
121159
</KnownILCompilerPack>
122160
<KnownILCompilerPack
161+
Update="Microsoft.NET.ILCompiler"
123162
Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
124163
<ILCompilerPackVersion>$(RuntimeVersion10)</ILCompilerPackVersion>
125164
</KnownILCompilerPack>
165+
<KnownILCompilerPack
166+
Update="Microsoft.NET.ILCompiler"
167+
Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
168+
<ILCompilerPackVersion>$(RuntimeVersion11)</ILCompilerPackVersion>
169+
</KnownILCompilerPack>
126170

127171
<KnownILLinkPack
172+
Update="Microsoft.NET.ILLink.Tasks"
128173
Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
129174
<ILLinkPackVersion>$(RuntimeVersion80)</ILLinkPackVersion>
130175
</KnownILLinkPack>
131176
<KnownILLinkPack
177+
Update="Microsoft.NET.ILLink.Tasks"
132178
Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
133179
<ILLinkPackVersion>$(RuntimeVersion90)</ILLinkPackVersion>
134180
</KnownILLinkPack>
135181
<KnownILLinkPack
182+
Update="Microsoft.NET.ILLink.Tasks"
136183
Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
137184
<ILLinkPackVersion>$(RuntimeVersion10)</ILLinkPackVersion>
138185
</KnownILLinkPack>
186+
<KnownILLinkPack
187+
Update="Microsoft.NET.ILLink.Tasks"
188+
Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
189+
<ILLinkPackVersion>$(RuntimeVersion11)</ILLinkPackVersion>
190+
</KnownILLinkPack>
139191
</ItemGroup>
140192
</Target>
141193
</Project>

0 commit comments

Comments
 (0)