Skip to content

Commit

Permalink
Merge branch 'main' into BigIntegerParsePowOf10
Browse files Browse the repository at this point in the history
  • Loading branch information
@kzrnm
kzrnm committed Feb 15, 2024
2 parents acb565e + aff061b commit b5dbf47
Show file tree
Hide file tree
Showing 955 changed files with 37,455 additions and 31,322 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "9.0.0-prerelease.24077.1",
"version": "9.0.0-prerelease.24112.1",
"commands": [
"xharness"
]
Expand Down
137 changes: 63 additions & 74 deletions .github/fabricbot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -892,8 +892,7 @@
},
"eventType": "issue",
"eventNames": [
"issues",
"project_card"
"issues"
],
"actions": [
{
Expand Down Expand Up @@ -927,14 +926,17 @@
"parameters": {
"label": "breaking-change"
}
},
{
"name": "isPr",
"parameters": {}
}
]
},
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
"issues"
],
"actions": [
{
Expand Down Expand Up @@ -1106,6 +1108,10 @@
}
]
},
{
"name": "isPr",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand All @@ -1115,8 +1121,7 @@
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
"issues"
],
"taskName": "[Linkable-framework workgroup] Add linkable-framework label to new Prs that touch files with *ILLink* that not have it already",
"actions": [
Expand Down Expand Up @@ -1166,6 +1171,10 @@
}
]
},
{
"name": "isPr",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand All @@ -1181,8 +1190,7 @@
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
"issues"
],
"taskName": "[Linkable-framework workgroup] Add linkable-framework label to Prs that get changes pushed where they touch *ILLInk* files",
"actions": [
Expand All @@ -1195,53 +1203,6 @@
]
}
},
{
"taskType": "trigger",
"capabilityId": "IssueResponder",
"subCapability": "PullRequestResponder",
"version": "1.0",
"config": {
"conditions": {
"operator": "and",
"operands": [
{
"name": "isActivitySender",
"parameters": {
"user": "dotnet-maestro[bot]"
}
},
{
"name": "isAction",
"parameters": {
"action": "opened"
}
},
{
"name": "titleContains",
"parameters": {
"titlePattern": "dotnet-optimization"
}
}
]
},
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
],
"taskName": "Auto-approve maestro PRs",
"actions": [
{
"name": "approvePullRequest",
"parameters": {
"comment": "Auto-approve dotnet-optimization PR"
}
}
]
},
"disabled": true
},
{
"taskType": "trigger",
"capabilityId": "IssueResponder",
Expand All @@ -1261,8 +1222,7 @@
},
"eventType": "issue",
"eventNames": [
"issues",
"project_card"
"issues"
],
"taskName": "Manual Issue Cleanup",
"actions": [
Expand Down Expand Up @@ -1485,10 +1445,6 @@
"parameters": {
"action": "reopened"
}
},
{
"name": "removedFromMilestone",
"parameters": {}
}
]
},
Expand Down Expand Up @@ -1553,7 +1509,7 @@
}
},
{
"name": "addedToMilestone",
"name": "isInMilestone",
"parameters": {}
}
]
Expand Down Expand Up @@ -1656,6 +1612,10 @@
"action": "opened"
}
},
{
"name": "isPr",
"parameters": {}
},
{
"operator": "and",
"operands": [
Expand All @@ -1670,17 +1630,6 @@
}
]
},
{
"operator": "not",
"operands": [
{
"name": "activitySenderHasPermissions",
"parameters": {
"permissions": "maintain"
}
}
]
},
{
"operator": "not",
"operands": [
Expand Down Expand Up @@ -1832,6 +1781,10 @@
}
]
},
{
"name": "isPr",
"parameters": {}
},
{
"name": "isAction",
"parameters": {
Expand Down Expand Up @@ -1908,6 +1861,10 @@
}
]
},
{
"name": "isIssue",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand Down Expand Up @@ -1965,6 +1922,10 @@
"label": "untriaged"
}
},
{
"name": "isIssue",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand Down Expand Up @@ -1996,6 +1957,10 @@
"conditions": {
"operator": "and",
"operands": [
{
"name": "isPr",
"parameters": {}
},
{
"name": "isAction",
"parameters": {
Expand Down Expand Up @@ -2055,6 +2020,10 @@
"label": "needs-author-action"
}
},
{
"name": "isPr",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand Down Expand Up @@ -2106,6 +2075,10 @@
"action": "submitted"
}
},
{
"name": "isPr",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand Down Expand Up @@ -2457,6 +2430,10 @@
"parameters": {
"label": "no-recent-activity"
}
},
{
"name": "isIssue",
"parameters": {}
}
]
}
Expand Down Expand Up @@ -2491,6 +2468,10 @@
"conditions": {
"operator": "and",
"operands": [
{
"name": "isPr",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand Down Expand Up @@ -2551,6 +2532,10 @@
"label": "no-recent-activity"
}
},
{
"name": "isPr",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand Down Expand Up @@ -2594,6 +2579,10 @@
"label": "no-recent-activity"
}
},
{
"name": "isPr",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
Expand Down Expand Up @@ -2946,4 +2935,4 @@
]
}
}
]
]
8 changes: 1 addition & 7 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>

<!-- when this is updated, make sure to keep $(_TargetFrameworkForNETCoreTasks)
<!-- when this is updated, make sure to keep $(_NetCoreAppToolCurrent)
in src/mono/wasm/build/WasmApp.LocalBuild.props
and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
<NetCoreAppToolCurrentVersion>9.0</NetCoreAppToolCurrentVersion>
Expand All @@ -117,12 +117,6 @@
<!-- Important: Set this to the GA version (or a close approximation) during servicing and adjust the TFM property below. -->
<ApiCompatNetCoreAppBaselineVersion>8.0.0</ApiCompatNetCoreAppBaselineVersion>
<ApiCompatNetCoreAppBaselineTFM>net8.0</ApiCompatNetCoreAppBaselineTFM>

<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
<!-- Don't build for NETFramework during source-build. -->
<TargetFrameworkForNETFrameworkTasks Condition="'$(DotNetBuildFromSource)' == 'true'" />

<TargetFrameworkForNETCoreTasks>$(NetCoreAppToolCurrent)</TargetFrameworkForNETCoreTasks>
</PropertyGroup>

<PropertyGroup Label="CalculateConfiguration">
Expand Down
6 changes: 6 additions & 0 deletions Directory.Build.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@
<GenerateRequiresPreviewFeaturesAttribute Condition="'$(TargetFrameworkMoniker)' == '$(NetCoreAppCurrentTargetFrameworkMoniker)'">true</GenerateRequiresPreviewFeaturesAttribute>
</PropertyGroup>

<PropertyGroup>
<!-- when building from source we need to use the current version of MetadataLoadContext as the toolset version, but source-build imports
another props file which overrides the SystemReflectionMetadataLoadContextVersion from Version.props so we can't set it there -->
<SystemReflectionMetadataLoadContextToolsetVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(SystemReflectionMetadataLoadContextVersion)</SystemReflectionMetadataLoadContextToolsetVersion>
</PropertyGroup>

<Target Name="ValidateTargetOSLowercase"
Condition="!$(TargetOS.Equals($(TargetOS.ToLower()), StringComparison.InvariantCulture))">
<Error Text="The passed-in TargetOS property value '$(TargetOS)' must be lowercase." />
Expand Down
2 changes: 1 addition & 1 deletion docs/area-owners.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
| area-System.Formats.Tar | @jeffhandley | @dotnet/area-system-formats-tar | |
| area-System.Globalization | @ericstj | @dotnet/area-system-globalization | |
| area-System.IO | @jeffhandley | @dotnet/area-system-io | |
| area-System.IO.Compression | @jeffhandley | @dotnet/area-system-io-compression | Included:<ul><li>System.Formats.Tar</li><li>System.IO.Packaging</li></ul> |
| area-System.IO.Compression | @ericstj | @dotnet/area-system-io-compression | Included:<ul><li>System.Formats.Tar</li><li>System.IO.Packaging</li></ul> |
| 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 |
| area-System.IO.Pipelines | @adityamandaleeka | @davidfowl @halter73 | |
| area-System.IO.Ports | @jeffhandley | @dotnet/area-system-io-ports | |
Expand Down
Loading

0 comments on commit b5dbf47

Please sign in to comment.