Skip to content

Commit 9d7bc94

Browse files
buyaa-nbuyaa-n
committed
Merge branch 'main' of https://github.com/dotnet/runtime into unify-type-inst
2 parents 678afbb + d32b27a commit 9d7bc94

File tree

1,156 files changed

+33654
-14872
lines changed

Some content is hidden

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

1,156 files changed

+33654
-14872
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.23102.1",
18+
"version": "1.0.0-prerelease.23113.1",
1919
"commands": [
2020
"xharness"
2121
]

‎.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
/src/mono/mono/mini/*type-check* @lambdageek
4747
/src/mono/mono/mini/debugger-agent.c @vargaz @thaystg @lambdageek
4848
/src/mono/mono/mini/interp/* @BrzVlad @vargaz @kotlarmilos
49+
/src/mono/mono/mini/interp/*jiterp* @kg
4950

5051
/src/mono/mono/profiler @BrzVlad @lambdageek
5152
/src/mono/mono/sgen @BrzVlad @lambdageek @naricc
@@ -62,7 +63,7 @@
6263
/src/native/public/mono @marek-safar @lambdageek
6364

6465
/src/libraries/sendtohelix-wasm.targets @radical
65-
/src/mono/wasm @lewing @pavelsavara
66+
/src/mono/wasm @lewing @pavelsavara @kg
6667
/src/mono/wasm/debugger @thaystg @radical
6768
/src/mono/wasm/build @radical
6869
/src/mono/sample/wasm @lewing @pavelsavara

‎.github/fabricbot.json

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14847,6 +14847,17 @@
1484714847
}
1484814848
}
1484914849
]
14850+
},
14851+
{
14852+
"operator": "not",
14853+
"operands": [
14854+
{
14855+
"name": "hasLabel",
14856+
"parameters": {
14857+
"label": "needs-area-label"
14858+
}
14859+
}
14860+
]
1485014861
}
1485114862
]
1485214863
},
@@ -14913,6 +14924,12 @@
1491314924
"parameters": {
1491414925
"label": "area-Meta"
1491514926
}
14927+
},
14928+
{
14929+
"name": "hasLabel",
14930+
"parameters": {
14931+
"label": "needs-area-label"
14932+
}
1491614933
}
1491714934
]
1491814935
},
@@ -14946,6 +14963,12 @@
1494614963
"parameters": {
1494714964
"label": "area-Meta"
1494814965
}
14966+
},
14967+
{
14968+
"name": "labelAdded",
14969+
"parameters": {
14970+
"label": "needs-area-label"
14971+
}
1494914972
}
1495014973
]
1495114974
}
@@ -15024,6 +15047,12 @@
1502415047
"parameters": {
1502515048
"label": "area-Meta"
1502615049
}
15050+
},
15051+
{
15052+
"name": "hasLabel",
15053+
"parameters": {
15054+
"label": "needs-area-label"
15055+
}
1502715056
}
1502815057
]
1502915058
},
@@ -15522,6 +15551,17 @@
1552215551
}
1552315552
}
1552415553
]
15554+
},
15555+
{
15556+
"operator": "not",
15557+
"operands": [
15558+
{
15559+
"name": "hasLabel",
15560+
"parameters": {
15561+
"label": "needs-area-label"
15562+
}
15563+
}
15564+
]
1552515565
}
1552615566
]
1552715567
}
@@ -15570,6 +15610,12 @@
1557015610
"parameters": {
1557115611
"label": "area-Meta"
1557215612
}
15613+
},
15614+
{
15615+
"name": "hasLabel",
15616+
"parameters": {
15617+
"label": "needs-area-label"
15618+
}
1557315619
}
1557415620
]
1557515621
},
@@ -15707,6 +15753,12 @@
1570715753
"parameters": {
1570815754
"label": "area-Meta"
1570915755
}
15756+
},
15757+
{
15758+
"name": "hasLabel",
15759+
"parameters": {
15760+
"label": "needs-area-label"
15761+
}
1571015762
}
1571115763
]
1571215764
},
@@ -15805,6 +15857,12 @@
1580515857
"parameters": {
1580615858
"label": "area-Meta"
1580715859
}
15860+
},
15861+
{
15862+
"name": "hasLabel",
15863+
"parameters": {
15864+
"label": "needs-area-label"
15865+
}
1580815866
}
1580915867
]
1581015868
},
@@ -15917,6 +15975,12 @@
1591715975
"parameters": {
1591815976
"label": "area-Meta"
1591915977
}
15978+
},
15979+
{
15980+
"name": "hasLabel",
15981+
"parameters": {
15982+
"label": "needs-area-label"
15983+
}
1592015984
}
1592115985
]
1592215986
},
@@ -17224,4 +17288,4 @@
1722417288
}
1722517289
}
1722617290
}
17227-
]
17291+
]

‎Directory.Build.props

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
For offline builds we still set OfficialBuildId but we need to build all the packages for a single
88
leg only, so we also take DotNetBuildFromSource into account. -->
99
<BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' and '$(OfficialBuildId)' != '' and '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
10+
<!-- When doing a source build, we want to build the various text-only manifests in
11+
all cases, rather than ordinarily where we build them during mobile or wasm
12+
build legs. This makes the manifests available on source-only builds. -->
13+
<ForceBuildMobileManifests Condition="'$(DotNetBuildFromSource)' == 'true'">true</ForceBuildMobileManifests>
1014
</PropertyGroup>
1115

1216
<PropertyGroup Label="CalculateTargetOS">
@@ -41,7 +45,26 @@
4145
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
4246
<Platform Condition="'$(Platform)' == '' and '$(InferPlatformFromTargetArchitecture)' == 'true'">$(TargetArchitecture)</Platform>
4347
</PropertyGroup>
44-
48+
49+
<PropertyGroup Label="SetOSTargetMinVersions">
50+
<!--
51+
Minimum target OS versions, keep in sync with:
52+
- eng/native/configurecompiler.cmake
53+
- eng/native/build-commons.sh
54+
- src/native/libs/build-native.sh
55+
- src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs
56+
- src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml
57+
- src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml
58+
-->
59+
<AndroidApiLevelMin>21</AndroidApiLevelMin>
60+
<iOSVersionMin>11.0</iOSVersionMin>
61+
<tvOSVersionMin>11.0</tvOSVersionMin>
62+
<watchOSVersionMin>2.0</watchOSVersionMin>
63+
<watchOS64_32VersionMin>5.1</watchOS64_32VersionMin>
64+
<macOSVersionMin>10.15</macOSVersionMin>
65+
<macOSVersionMin Condition="('$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst') and '$(TargetArchitecture)' == 'arm64'">11.0</macOSVersionMin>
66+
</PropertyGroup>
67+
4568
<PropertyGroup>
4669
<!-- Set OutDirName (Arcade specific property that must be set before the Arcade SDK is imported) to change the BaseOutputPath and
4770
BaseIntermediateOutputPath properties to include the ref subfolder. -->
@@ -129,7 +152,7 @@
129152
<MonoAOTCompilerTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))</MonoAOTCompilerTasksAssemblyPath>
130153
<MonoTargetsTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll'))</MonoTargetsTasksAssemblyPath>
131154
<TestExclusionListTasksAssemblyPath>$([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll'))</TestExclusionListTasksAssemblyPath>
132-
<CoreCLRToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</CoreCLRToolPath>
155+
<CoreCLRToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfiguration)'))</CoreCLRToolPath>
133156
<ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true' or '$(BuildArchitecture)' == 's390x' or '$(BuildArchitecture)' == 'ppc64le'">$(CoreCLRToolPath)</ILAsmToolPath>
134157

135158
<WasmtimeDir>$([MSBuild]::NormalizeDirectory($(ArtifactsObjDir), 'wasmtime'))</WasmtimeDir>
@@ -150,11 +173,14 @@
150173

151174
<PropertyGroup Label="CalculateOS">
152175
<!-- Default to portable build if not explicitly set -->
176+
<PortableBuild Condition="'$(PortableBuild)' == '' and '$(DotNetBuildFromSource)' == 'true'">false</PortableBuild>
153177
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
154178

179+
<_hostRid Condition="'$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</_hostRid>
180+
<_hostRid Condition="'$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostRid>
181+
155182
<_parseDistroRid>$(__DistroRid)</_parseDistroRid>
156-
<_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</_parseDistroRid>
157-
<_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_parseDistroRid>
183+
<_parseDistroRid Condition="'$(_parseDistroRid)' == ''">$(_hostRid)</_parseDistroRid>
158184
<_distroRidIndex>$(_parseDistroRid.LastIndexOf('-'))</_distroRidIndex>
159185

160186
<_runtimeOS>$(RuntimeOS)</_runtimeOS>
@@ -183,6 +209,7 @@
183209

184210
<_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux</_runtimeOS>
185211
<_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS>
212+
<_runtimeOS Condition="'$(RuntimeOS)' == '' and '$(DotNetBuildFromSource)' == 'true'">$(_portableOS)</_runtimeOS>
186213

187214
<_packageLibc Condition="$(_runtimeOS.Contains('musl'))">-musl</_packageLibc>
188215
<_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS)$(_packageLibc)</_packageOS>
@@ -215,6 +242,7 @@
215242

216243
<PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
217244

245+
<OutputRid Condition="'$(OutputRid)' == '' and '$(DotNetBuildFromSource)' == 'true'">$(_hostRid)</OutputRid>
218246
<OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
219247
<OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid>
220248
<TargetsLinuxBionic Condition="$(OutputRid.StartsWith('linux-bionic'))">true</TargetsLinuxBionic>
@@ -257,6 +285,8 @@
257285

258286
<!--Feature switches -->
259287
<PropertyGroup>
288+
<NoPgoOptimize Condition="'$(NoPgoOptimize)' == '' and '$(DotNetBuildFromSource)' == 'true'">true</NoPgoOptimize>
289+
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(DotNetBuildFromSource)' == 'true'">false</EnableNgenOptimization>
260290
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and ('$(Configuration)' == 'Release' or '$(Configuration)' == 'Checked')">true</EnableNgenOptimization>
261291
<!-- Enable NuGet static graph evaluation to optimize incremental restore -->
262292
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
@@ -323,7 +353,7 @@
323353
<!-- Always pass portable to override arcade sdk which uses embedded for local builds -->
324354
<DebugType>portable</DebugType>
325355
<DebugSymbols>true</DebugSymbols>
326-
<!-- Default to discarding symbols if not explicitly set -->
356+
<KeepNativeSymbols Condition="'$(KeepNativeSymbols)' == '' and '$(DotNetBuildFromSource)' == 'true'">true</KeepNativeSymbols>
327357
<KeepNativeSymbols Condition="'$(KeepNativeSymbols)' == ''">false</KeepNativeSymbols>
328358
<!-- Used for launchSettings.json and runtime config files. -->
329359
<AppDesignerFolder>Properties</AppDesignerFolder>

‎docs/area-owners.json

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,36 @@
6969
"vargaz"
7070
],
7171
"label": "os-tvos"
72+
},
73+
{
74+
"lead": "lewing",
75+
"owners": [
76+
"pavelsavara"
77+
],
78+
"label": "os-wasi"
79+
}
80+
],
81+
"trimming": [
82+
{
83+
"lead": "",
84+
"owners": [
85+
"eerhardt",
86+
"vitek-karas",
87+
"LakshanF",
88+
"sbomer",
89+
"joperezr",
90+
"marek-safar"
91+
],
92+
"label": "linkable-framework"
93+
},
94+
{
95+
"lead": "",
96+
"owners": [
97+
"eerhardt",
98+
"SamMonoRT",
99+
"marek-safar"
100+
],
101+
"label": "size-reduction"
72102
}
73103
],
74104
"areas": [
@@ -137,6 +167,13 @@
137167
],
138168
"label": "area-Codegen-Interpreter-mono"
139169
},
170+
{
171+
"lead": "SamMonoRT",
172+
"owners": [
173+
"fanyang-mono"
174+
],
175+
"label": "area-Codegen-Intrinsic-mono"
176+
},
140177
{
141178
"lead": "SamMonoRT",
142179
"owners": [
@@ -436,7 +473,7 @@
436473
"TIHan",
437474
"dotnet/jit-contrib"
438475
],
439-
"label": "area-ILVerification"
476+
"label": "area-Tools-ILVerification"
440477
},
441478
{
442479
"lead": "agocke",
@@ -540,7 +577,8 @@
540577
"lead": "agocke",
541578
"owners": [
542579
"jkotas",
543-
"MichalStrehovsky"
580+
"MichalStrehovsky",
581+
"dotnet/ilc-contrib"
544582
],
545583
"label": "area-NativeAOT-coreclr"
546584
},
@@ -1218,7 +1256,7 @@
12181256
"owners": [
12191257
"lambdageek"
12201258
],
1221-
"label": "area-System.Reflection-mono"
1259+
"label": "area-VM-reflection-mono"
12221260
},
12231261
{
12241262
"lead": "ericstj",
@@ -1473,9 +1511,9 @@
14731511
"label": "area-System.Threading.Tasks"
14741512
},
14751513
{
1476-
"lead": "HongGit",
1514+
"lead": "ajcvickers",
14771515
"owners": [
1478-
"HongGit"
1516+
"roji"
14791517
],
14801518
"label": "area-System.Transactions"
14811519
},
@@ -1498,7 +1536,7 @@
14981536
"owners": [
14991537
"lambdageek"
15001538
],
1501-
"label": "area-Threading-mono"
1539+
"label": "area-VM-threading-mono"
15021540
},
15031541
{
15041542
"lead": "mangod9",
@@ -1510,7 +1548,7 @@
15101548
{
15111549
"lead": "agocke",
15121550
"owners": [
1513-
"sbomer"
1551+
"dotnet/illink"
15141552
],
15151553
"label": "area-Tools-ILLink"
15161554
},
@@ -1559,6 +1597,13 @@
15591597
"lambdageek"
15601598
],
15611599
"label": "area-VM-meta-mono"
1600+
},
1601+
{
1602+
"lead": "lewing",
1603+
"owners": [
1604+
"dotnet/net-sdk-workload-contributors"
1605+
],
1606+
"label": "area-Workloads"
15621607
}
15631608
]
15641609
}

0 commit comments

Comments
 (0)