Skip to content

Commit 3de9649

Browse files
directhexdirecthex
committed
Merge remote-tracking branch 'origin/main' into joshield/split-runtime-extra-platforms
2 parents 627954c + e574380 commit 3de9649

File tree

972 files changed

+21978
-15529
lines changed

Some content is hidden

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

972 files changed

+21978
-15529
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.22451.1",
18+
"version": "1.0.0-prerelease.22456.1",
1919
"commands": [
2020
"xharness"
2121
]

‎.github/fabricbot.json‎

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,8 @@
15061506
{
15071507
"name": "isInProject",
15081508
"parameters": {
1509-
"projectName": "WCF Owned Areas",
1510-
"isOrgProject": false
1509+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1510+
"isOrgProject": true
15111511
}
15121512
}
15131513
]
@@ -1530,6 +1530,12 @@
15301530
"label": "area-System.Runtime.Caching"
15311531
}
15321532
},
1533+
{
1534+
"name": "labelAdded",
1535+
"parameters": {
1536+
"label": "area-System.ServiceModel"
1537+
}
1538+
},
15331539
{
15341540
"name": "labelAdded",
15351541
"parameters": {
@@ -1568,6 +1574,12 @@
15681574
"label": "area-System.Runtime.Caching"
15691575
}
15701576
},
1577+
{
1578+
"name": "hasLabel",
1579+
"parameters": {
1580+
"label": "area-System.ServiceModel"
1581+
}
1582+
},
15711583
{
15721584
"name": "hasLabel",
15731585
"parameters": {
@@ -1598,9 +1610,8 @@
15981610
{
15991611
"name": "addToProject",
16001612
"parameters": {
1601-
"projectName": "WCF Owned Areas",
1602-
"isOrgProject": false,
1603-
"columnName": "Needs Triage"
1613+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1614+
"isOrgProject": true
16041615
}
16051616
}
16061617
]
@@ -1625,7 +1636,8 @@
16251636
{
16261637
"name": "isInProject",
16271638
"parameters": {
1628-
"projectName": "WCF Owned Areas"
1639+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1640+
"isOrgProject": true
16291641
}
16301642
}
16311643
]
@@ -1648,6 +1660,12 @@
16481660
"label": "area-System.Runtime.Caching"
16491661
}
16501662
},
1663+
{
1664+
"name": "labelAdded",
1665+
"parameters": {
1666+
"label": "area-System.ServiceModel"
1667+
}
1668+
},
16511669
{
16521670
"name": "labelAdded",
16531671
"parameters": {
@@ -1680,6 +1698,12 @@
16801698
"label": "area-System.Runtime.Caching"
16811699
}
16821700
},
1701+
{
1702+
"name": "hasLabel",
1703+
"parameters": {
1704+
"label": "area-System.ServiceModel"
1705+
}
1706+
},
16831707
{
16841708
"name": "hasLabel",
16851709
"parameters": {
@@ -1717,8 +1741,8 @@
17171741
{
17181742
"name": "addToProject",
17191743
"parameters": {
1720-
"projectName": "WCF Owned Areas",
1721-
"columnName": "Open PRs"
1744+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1745+
"isOrgProject": true
17221746
}
17231747
}
17241748
]
@@ -1743,8 +1767,8 @@
17431767
{
17441768
"name": "isInProject",
17451769
"parameters": {
1746-
"projectName": "WCF Owned Areas",
1747-
"isOrgProject": false
1770+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1771+
"isOrgProject": true
17481772
}
17491773
}
17501774
]
@@ -1767,6 +1791,12 @@
17671791
"label": "area-System.Runtime.Caching"
17681792
}
17691793
},
1794+
{
1795+
"name": "labelAdded",
1796+
"parameters": {
1797+
"label": "area-System.ServiceModel"
1798+
}
1799+
},
17701800
{
17711801
"name": "labelAdded",
17721802
"parameters": {
@@ -1805,6 +1835,12 @@
18051835
"label": "area-System.Runtime.Caching"
18061836
}
18071837
},
1838+
{
1839+
"name": "hasLabel",
1840+
"parameters": {
1841+
"label": "area-System.ServiceModel"
1842+
}
1843+
},
18081844
{
18091845
"name": "hasLabel",
18101846
"parameters": {
@@ -1835,9 +1871,8 @@
18351871
{
18361872
"name": "addToProject",
18371873
"parameters": {
1838-
"projectName": "WCF Owned Areas",
1839-
"isOrgProject": false,
1840-
"columnName": "Needs Triage"
1874+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1875+
"isOrgProject": true
18411876
}
18421877
}
18431878
]
@@ -1862,7 +1897,8 @@
18621897
{
18631898
"name": "isInProject",
18641899
"parameters": {
1865-
"projectName": "WCF Owned Areas"
1900+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
1901+
"isOrgProject": true
18661902
}
18671903
}
18681904
]
@@ -1885,6 +1921,12 @@
18851921
"label": "area-System.Runtime.Caching"
18861922
}
18871923
},
1924+
{
1925+
"name": "labelAdded",
1926+
"parameters": {
1927+
"label": "area-System.ServiceModel"
1928+
}
1929+
},
18881930
{
18891931
"name": "labelAdded",
18901932
"parameters": {
@@ -1917,6 +1959,12 @@
19171959
"label": "area-System.Runtime.Caching"
19181960
}
19191961
},
1962+
{
1963+
"name": "hasLabel",
1964+
"parameters": {
1965+
"label": "area-System.ServiceModel"
1966+
}
1967+
},
19201968
{
19211969
"name": "hasLabel",
19221970
"parameters": {
@@ -1954,8 +2002,8 @@
19542002
{
19552003
"name": "addToProject",
19562004
"parameters": {
1957-
"projectName": "WCF Owned Areas",
1958-
"columnName": "Open PRs"
2005+
"projectName": "Tellurium (WCF, Serialization, Etc.)",
2006+
"isOrgProject": true
19592007
}
19602008
}
19612009
]

‎docs/coding-guidelines/adding-api-guidelines.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ the implementation without compat concerns in future releases.
2424

2525
### Determine target framework
2626

27-
`net7.0` is the target framework version currently under development and the new apis
28-
should be added to `net7.0`. [More Information on TargetFrameworks](https://docs.microsoft.com/en-us/dotnet/standard/frameworks)
27+
`net8.0` is the target framework version currently under development and the new apis
28+
should be added to `net8.0`. [More Information on TargetFrameworks](https://docs.microsoft.com/en-us/dotnet/standard/frameworks)
2929

3030
## Making the changes in repo
3131

‎docs/coding-guidelines/project-guidelines.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Below is a list of all the various options we pivot the project builds on:
2525
## Individual build properties
2626
The following are the properties associated with each build pivot
2727

28-
- `$(BuildTargetFramework) -> Any .NETCoreApp or .NETFramework TFM, e.g. net7.0`
28+
- `$(BuildTargetFramework) -> Any .NETCoreApp or .NETFramework TFM, e.g. net8.0`
2929
- `$(TargetOS) -> Windows | Linux | OSX | FreeBSD | [defaults to running OS when empty]`
3030
- `$(Configuration) -> Release | [defaults to Debug when empty]`
3131
- `$(TargetArchitecture) - x86 | x64 | arm | arm64 | [defaults to x64 when empty]`
@@ -60,7 +60,7 @@ A cross-targeting project which targets specific platform with `$(NetCoreAppCurr
6060
A full or individual project build is centered around BuildTargetFramework, TargetOS, Configuration and TargetArchitecture.
6161

6262
1. `$(BuildTargetFramework), $(TargetOS), $(Configuration), $(TargetArchitecture)` can individually be passed in to change the default values.
63-
2. If nothing is passed to the build then we will default value of these properties from the environment. Example: `net7.0-[TargetOS Running On]-Debug-x64`.
63+
2. If nothing is passed to the build then we will default value of these properties from the environment. Example: `net8.0-[TargetOS Running On]-Debug-x64`.
6464
3. When building an individual project (either from the CLI or an IDE), all target frameworks are built.
6565

6666
We also have `RuntimeOS` which can be passed to customize the specific OS and version needed for native package builds as well as package restoration. If not passed it will default based on the OS you are running on.

0 commit comments

Comments
 (0)