Skip to content

Commit b5dbf47

Browse files
kzrnmkzrnm
committed
Merge branch 'main' into BigIntegerParsePowOf10
2 parents acb565e + aff061b commit b5dbf47

File tree

955 files changed

+37455
-31322
lines changed

Some content is hidden

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

955 files changed

+37455
-31322
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.24077.1",
18+
"version": "9.0.0-prerelease.24112.1",
1919
"commands": [
2020
"xharness"
2121
]

‎.github/fabricbot.json

+63-74
Original file line numberDiff line numberDiff line change
@@ -892,8 +892,7 @@
892892
},
893893
"eventType": "issue",
894894
"eventNames": [
895-
"issues",
896-
"project_card"
895+
"issues"
897896
],
898897
"actions": [
899898
{
@@ -927,14 +926,17 @@
927926
"parameters": {
928927
"label": "breaking-change"
929928
}
929+
},
930+
{
931+
"name": "isPr",
932+
"parameters": {}
930933
}
931934
]
932935
},
933936
"eventType": "pull_request",
934937
"eventNames": [
935938
"pull_request",
936-
"issues",
937-
"project_card"
939+
"issues"
938940
],
939941
"actions": [
940942
{
@@ -1106,6 +1108,10 @@
11061108
}
11071109
]
11081110
},
1111+
{
1112+
"name": "isPr",
1113+
"parameters": {}
1114+
},
11091115
{
11101116
"name": "isOpen",
11111117
"parameters": {}
@@ -1115,8 +1121,7 @@
11151121
"eventType": "pull_request",
11161122
"eventNames": [
11171123
"pull_request",
1118-
"issues",
1119-
"project_card"
1124+
"issues"
11201125
],
11211126
"taskName": "[Linkable-framework workgroup] Add linkable-framework label to new Prs that touch files with *ILLink* that not have it already",
11221127
"actions": [
@@ -1166,6 +1171,10 @@
11661171
}
11671172
]
11681173
},
1174+
{
1175+
"name": "isPr",
1176+
"parameters": {}
1177+
},
11691178
{
11701179
"name": "isOpen",
11711180
"parameters": {}
@@ -1181,8 +1190,7 @@
11811190
"eventType": "pull_request",
11821191
"eventNames": [
11831192
"pull_request",
1184-
"issues",
1185-
"project_card"
1193+
"issues"
11861194
],
11871195
"taskName": "[Linkable-framework workgroup] Add linkable-framework label to Prs that get changes pushed where they touch *ILLInk* files",
11881196
"actions": [
@@ -1195,53 +1203,6 @@
11951203
]
11961204
}
11971205
},
1198-
{
1199-
"taskType": "trigger",
1200-
"capabilityId": "IssueResponder",
1201-
"subCapability": "PullRequestResponder",
1202-
"version": "1.0",
1203-
"config": {
1204-
"conditions": {
1205-
"operator": "and",
1206-
"operands": [
1207-
{
1208-
"name": "isActivitySender",
1209-
"parameters": {
1210-
"user": "dotnet-maestro[bot]"
1211-
}
1212-
},
1213-
{
1214-
"name": "isAction",
1215-
"parameters": {
1216-
"action": "opened"
1217-
}
1218-
},
1219-
{
1220-
"name": "titleContains",
1221-
"parameters": {
1222-
"titlePattern": "dotnet-optimization"
1223-
}
1224-
}
1225-
]
1226-
},
1227-
"eventType": "pull_request",
1228-
"eventNames": [
1229-
"pull_request",
1230-
"issues",
1231-
"project_card"
1232-
],
1233-
"taskName": "Auto-approve maestro PRs",
1234-
"actions": [
1235-
{
1236-
"name": "approvePullRequest",
1237-
"parameters": {
1238-
"comment": "Auto-approve dotnet-optimization PR"
1239-
}
1240-
}
1241-
]
1242-
},
1243-
"disabled": true
1244-
},
12451206
{
12461207
"taskType": "trigger",
12471208
"capabilityId": "IssueResponder",
@@ -1261,8 +1222,7 @@
12611222
},
12621223
"eventType": "issue",
12631224
"eventNames": [
1264-
"issues",
1265-
"project_card"
1225+
"issues"
12661226
],
12671227
"taskName": "Manual Issue Cleanup",
12681228
"actions": [
@@ -1485,10 +1445,6 @@
14851445
"parameters": {
14861446
"action": "reopened"
14871447
}
1488-
},
1489-
{
1490-
"name": "removedFromMilestone",
1491-
"parameters": {}
14921448
}
14931449
]
14941450
},
@@ -1553,7 +1509,7 @@
15531509
}
15541510
},
15551511
{
1556-
"name": "addedToMilestone",
1512+
"name": "isInMilestone",
15571513
"parameters": {}
15581514
}
15591515
]
@@ -1656,6 +1612,10 @@
16561612
"action": "opened"
16571613
}
16581614
},
1615+
{
1616+
"name": "isPr",
1617+
"parameters": {}
1618+
},
16591619
{
16601620
"operator": "and",
16611621
"operands": [
@@ -1670,17 +1630,6 @@
16701630
}
16711631
]
16721632
},
1673-
{
1674-
"operator": "not",
1675-
"operands": [
1676-
{
1677-
"name": "activitySenderHasPermissions",
1678-
"parameters": {
1679-
"permissions": "maintain"
1680-
}
1681-
}
1682-
]
1683-
},
16841633
{
16851634
"operator": "not",
16861635
"operands": [
@@ -1832,6 +1781,10 @@
18321781
}
18331782
]
18341783
},
1784+
{
1785+
"name": "isPr",
1786+
"parameters": {}
1787+
},
18351788
{
18361789
"name": "isAction",
18371790
"parameters": {
@@ -1908,6 +1861,10 @@
19081861
}
19091862
]
19101863
},
1864+
{
1865+
"name": "isIssue",
1866+
"parameters": {}
1867+
},
19111868
{
19121869
"name": "isOpen",
19131870
"parameters": {}
@@ -1965,6 +1922,10 @@
19651922
"label": "untriaged"
19661923
}
19671924
},
1925+
{
1926+
"name": "isIssue",
1927+
"parameters": {}
1928+
},
19681929
{
19691930
"name": "isOpen",
19701931
"parameters": {}
@@ -1996,6 +1957,10 @@
19961957
"conditions": {
19971958
"operator": "and",
19981959
"operands": [
1960+
{
1961+
"name": "isPr",
1962+
"parameters": {}
1963+
},
19991964
{
20001965
"name": "isAction",
20011966
"parameters": {
@@ -2055,6 +2020,10 @@
20552020
"label": "needs-author-action"
20562021
}
20572022
},
2023+
{
2024+
"name": "isPr",
2025+
"parameters": {}
2026+
},
20582027
{
20592028
"name": "isOpen",
20602029
"parameters": {}
@@ -2106,6 +2075,10 @@
21062075
"action": "submitted"
21072076
}
21082077
},
2078+
{
2079+
"name": "isPr",
2080+
"parameters": {}
2081+
},
21092082
{
21102083
"name": "isOpen",
21112084
"parameters": {}
@@ -2457,6 +2430,10 @@
24572430
"parameters": {
24582431
"label": "no-recent-activity"
24592432
}
2433+
},
2434+
{
2435+
"name": "isIssue",
2436+
"parameters": {}
24602437
}
24612438
]
24622439
}
@@ -2491,6 +2468,10 @@
24912468
"conditions": {
24922469
"operator": "and",
24932470
"operands": [
2471+
{
2472+
"name": "isPr",
2473+
"parameters": {}
2474+
},
24942475
{
24952476
"name": "isOpen",
24962477
"parameters": {}
@@ -2551,6 +2532,10 @@
25512532
"label": "no-recent-activity"
25522533
}
25532534
},
2535+
{
2536+
"name": "isPr",
2537+
"parameters": {}
2538+
},
25542539
{
25552540
"name": "isOpen",
25562541
"parameters": {}
@@ -2594,6 +2579,10 @@
25942579
"label": "no-recent-activity"
25952580
}
25962581
},
2582+
{
2583+
"name": "isPr",
2584+
"parameters": {}
2585+
},
25972586
{
25982587
"name": "isOpen",
25992588
"parameters": {}
@@ -2946,4 +2935,4 @@
29462935
]
29472936
}
29482937
}
2949-
]
2938+
]

‎Directory.Build.props

+1-7
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
9797
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
9898

99-
<!-- when this is updated, make sure to keep $(_TargetFrameworkForNETCoreTasks)
99+
<!-- when this is updated, make sure to keep $(_NetCoreAppToolCurrent)
100100
in src/mono/wasm/build/WasmApp.LocalBuild.props
101101
and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
102102
<NetCoreAppToolCurrentVersion>9.0</NetCoreAppToolCurrentVersion>
@@ -117,12 +117,6 @@
117117
<!-- Important: Set this to the GA version (or a close approximation) during servicing and adjust the TFM property below. -->
118118
<ApiCompatNetCoreAppBaselineVersion>8.0.0</ApiCompatNetCoreAppBaselineVersion>
119119
<ApiCompatNetCoreAppBaselineTFM>net8.0</ApiCompatNetCoreAppBaselineTFM>
120-
121-
<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
122-
<!-- Don't build for NETFramework during source-build. -->
123-
<TargetFrameworkForNETFrameworkTasks Condition="'$(DotNetBuildFromSource)' == 'true'" />
124-
125-
<TargetFrameworkForNETCoreTasks>$(NetCoreAppToolCurrent)</TargetFrameworkForNETCoreTasks>
126120
</PropertyGroup>
127121

128122
<PropertyGroup Label="CalculateConfiguration">

‎Directory.Build.targets

+6
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@
8585
<GenerateRequiresPreviewFeaturesAttribute Condition="'$(TargetFrameworkMoniker)' == '$(NetCoreAppCurrentTargetFrameworkMoniker)'">true</GenerateRequiresPreviewFeaturesAttribute>
8686
</PropertyGroup>
8787

88+
<PropertyGroup>
89+
<!-- when building from source we need to use the current version of MetadataLoadContext as the toolset version, but source-build imports
90+
another props file which overrides the SystemReflectionMetadataLoadContextVersion from Version.props so we can't set it there -->
91+
<SystemReflectionMetadataLoadContextToolsetVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(SystemReflectionMetadataLoadContextVersion)</SystemReflectionMetadataLoadContextToolsetVersion>
92+
</PropertyGroup>
93+
8894
<Target Name="ValidateTargetOSLowercase"
8995
Condition="!$(TargetOS.Equals($(TargetOS.ToLower()), StringComparison.InvariantCulture))">
9096
<Error Text="The passed-in TargetOS property value '$(TargetOS)' must be lowercase." />

‎docs/area-owners.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
9696
| area-System.Formats.Tar | @jeffhandley | @dotnet/area-system-formats-tar | |
9797
| area-System.Globalization | @ericstj | @dotnet/area-system-globalization | |
9898
| area-System.IO | @jeffhandley | @dotnet/area-system-io | |
99-
| area-System.IO.Compression | @jeffhandley | @dotnet/area-system-io-compression | Included:<ul><li>System.Formats.Tar</li><li>System.IO.Packaging</li></ul> |
99+
| area-System.IO.Compression | @ericstj | @dotnet/area-system-io-compression | Included:<ul><li>System.Formats.Tar</li><li>System.IO.Packaging</li></ul> |
100100
| area-System.IO.Hashing | @jeffhandley | @dotnet/area-system-io-hashing | APIs within the System.IO.Hashing namespace, which align more with cryptography than with I/O |
101101
| area-System.IO.Pipelines | @adityamandaleeka | @davidfowl @halter73 | |
102102
| area-System.IO.Ports | @jeffhandley | @dotnet/area-system-io-ports | |

0 commit comments

Comments
 (0)