Skip to content

Commit ecac0ca

Browse files
radicalradical
committed
Merge remote-tracking branch 'origin/main' into darc-main-a78401f7-71cf-4b70-b4fd-407118bf3454
2 parents d09d539 + 78a625d commit ecac0ca

File tree

677 files changed

+16838
-13107
lines changed

Some content is hidden

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

677 files changed

+16838
-13107
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.22469.1",
18+
"version": "1.0.0-prerelease.22473.1",
1919
"commands": [
2020
"xharness"
2121
]
2222
},
2323
"microsoft.visualstudio.slngen.tool": {
24-
"version": "8.1.6",
24+
"version": "8.5.17",
2525
"commands": [
2626
"slngen"
2727
]

‎.github/fabricbot.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@
7474
"dotnet/area-system-text-regularexpressions"
7575
]
7676
},
77+
{
78+
"labels": [
79+
"area-System.Transactions"
80+
],
81+
"mentionees": [
82+
"roji"
83+
]
84+
},
7785
{
7886
"labels": [
7987
"area-GC-mono"

‎Build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Import Project="$(RepositoryEngineeringDir)SubsetValidation.targets" />
1111

1212
<!-- Upfront restore hooks -->
13-
<Import Project="$(RepositoryEngineeringDir)restore\docs.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
13+
<Import Project="$(RepositoryEngineeringDir)restore\docs.targets" />
1414
<Import Project="$(RepositoryEngineeringDir)restore\optimizationData.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
1515

1616
<Target Name="BuildLocalTasks"

‎Directory.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<TargetOS Condition="'$(TargetOS)' == ''">$(_hostOS)</TargetOS>
2323
<TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
2424
<TargetsAppleMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'">true</TargetsAppleMobile>
25-
<TargetsLinuxBionic Condition="$(OutputRid.StartsWith('linux-bionic'))">true</TargetsLinuxBionic>
2625
</PropertyGroup>
2726

2827
<!-- Platform property is required by RepoLayout.props in Arcade SDK. -->
@@ -200,6 +199,7 @@
200199

201200
<OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
202201
<OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid>
202+
<TargetsLinuxBionic Condition="$(OutputRid.StartsWith('linux-bionic'))">true</TargetsLinuxBionic>
203203
</PropertyGroup>
204204

205205
<PropertyGroup Label="CalculateTargetOSName" Condition="'$(SkipInferTargetOSName)' != 'true'">
@@ -274,7 +274,6 @@
274274
<PackageProjectUrl>https://dot.net</PackageProjectUrl>
275275
<Owners>microsoft,dotnetframework</Owners>
276276
<IncludeSymbols>true</IncludeSymbols>
277-
<RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
278277
<LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
279278
<PackageLicenseExpression>MIT</PackageLicenseExpression>
280279
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

‎docs/area-owners.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
{
9898
"lead": "dotnet/dnr-codeflow",
9999
"owners": [
100-
"danmoseley",
101100
"jeffschwMSFT",
102101
"marek-safar",
103102
"dotnet/dnr-codeflow"
@@ -503,10 +502,9 @@
503502
"label": "area-Interop-mono"
504503
},
505504
{
506-
"lead": "danmoseley",
505+
"lead": "jeffhandley",
507506
"pod": "eric-jeff",
508507
"owners": [
509-
"danmoseley",
510508
"ericstj",
511509
"jeffhandley",
512510
"dotnet/area-meta"
@@ -1297,9 +1295,9 @@
12971295
"label": "area-System.ServiceProcess"
12981296
},
12991297
{
1300-
"lead": "danmoseley",
1298+
"lead": "jeffhandley",
13011299
"owners": [
1302-
"danmoseley"
1300+
"jeffhandley"
13031301
],
13041302
"label": "area-System.Speech"
13051303
},
@@ -1402,7 +1400,8 @@
14021400
{
14031401
"lead": "HongGit",
14041402
"owners": [
1405-
"HongGit"
1403+
"HongGit",
1404+
"roji"
14061405
],
14071406
"label": "area-System.Transactions"
14081407
},

‎docs/area-owners.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
4949
| area-Infrastructure-mono | @steveisok | @directhex | |
5050
| area-Interop-coreclr | @jeffschwMSFT | @jeffschwMSFT @AaronRobinsonMSFT | |
5151
| area-Interop-mono | @marek-safar | @lambdageek | |
52-
| area-Meta | @danmoseley | @dotnet/area-meta | Cross-cutting concerns that span many or all areas, including project-wide code/test patterns and documentation. |
52+
| area-Meta | @jeffhandley | @dotnet/area-meta | Cross-cutting concerns that span many or all areas, including project-wide code/test patterns and documentation. |
5353
| area-Microsoft.CSharp | @jaredpar | @cston @333fred | Archived component - limited churn/contributions (see [#27790](https://github.com/dotnet/runtime/issues/27790)) |
5454
| area-Microsoft.VisualBasic | @jaredpar | @cston @333fred | Archived component - limited churn/contributions (see [#27790](https://github.com/dotnet/runtime/issues/27790)) |
5555
| area-Microsoft.Win32 | @ericstj | @dotnet/area-microsoft-win32 | Including System.Windows.Extensions |
@@ -121,7 +121,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
121121
| area-System.ServiceModel | @HongGit | @HongGit @mconnew | Repo: https://github.com/dotnet/WCF<br>Packages:<ul><li>System.ServiceModel.Primitives</li><li>System.ServiceModel.Http</li><li>System.ServiceModel.NetTcp</li><li>System.ServiceModel.Duplex</li><li>System.ServiceModel.Security</li></ul> |
122122
| area-System.ServiceModel.Syndication | @HongGit | @StephenMolloy @HongGit | |
123123
| area-System.ServiceProcess | @ericstj | @dotnet/area-system-serviceprocess | |
124-
| area-System.Speech | @danmoseley | @danmoseley | |
124+
| area-System.Speech | @jeffhandley | @jeffhandley | |
125125
| area-System.Text.Encoding | @jeffhandley | @dotnet/area-system-text-encoding | |
126126
| area-System.Text.Encodings.Web | @jeffhandley | @dotnet/area-system-text-encodings-web | |
127127
| area-System.Text.Json | @jeffhandley | @dotnet/area-system-text-json | |
@@ -130,7 +130,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
130130
| area-System.Threading.Channels | @ericstj | @dotnet/area-system-threading-channels | Consultants: @stephentoub |
131131
| area-System.Threading.RateLimiting | @rafikiassumani-msft | @BrennanConroy @halter73 | Consultants: @eerhardt |
132132
| area-System.Threading.Tasks | @ericstj | @dotnet/area-system-threading-tasks | Consultants: @stephentoub |
133-
| area-System.Transactions | @HongGit | @HongGit | |
133+
| area-System.Transactions | @HongGit | @HongGit | Consultants: @roji |
134134
| area-System.Xml | @jeffhandley | @dotnet/area-system-xml | |
135135
| area-Threading-mono | @SamMonoRT | @lambdageek | |
136136
| area-TieredCompilation-coreclr | @mangod9 | @kouvel | |

0 commit comments

Comments
 (0)