Skip to content

Commit 9ffea98

Browse files
medhatiwarimedhatiwari
authored
Merge branch 'dotnet:main' into filterattribute
2 parents 11a9cfd + 8fac1c5 commit 9ffea98

File tree

350 files changed

+5729
-6892
lines changed

Some content is hidden

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

350 files changed

+5729
-6892
lines changed

‎docs/area-owners.md‎

Lines changed: 41 additions & 41 deletions
Large diffs are not rendered by default.

‎docs/design/datacontracts/debug_interface_globals.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Debug Interface Globals
2+
3+
The following document lists the global variables that are used directly in the debug interface managed code (SOSDacImpl.cs, etc.)
4+
5+
Global variables used
6+
| Global Name | Type | Purpose |
7+
| --- | --- | --- |
8+
| StringMethodTable | TargetPointer | Identify where the string MethodTable exists |
9+
| ObjectMethodTable | TargetPointer | Identify where the object MethodTable exists |
10+
| SystemDomain | TargetPointer | Identify where the SystemDomain exists |
11+
| DirectorySeparator | TargetPointer | Identify where the directory separator exists |
12+
| FeatureCOMInterop | TargetPointer | Identify where the flag for FeatureCOMInterop exists |
13+
| StressLog | TargetPointer | Identify where the StressLog exists |
14+
| AppDomain | TargetPointer | Identify where the AppDomain exists |
15+
| ObjectArrayMethodTable | TargetPointer | Identify where the ObjectArrayMethodTable exists |
16+
| ExceptionMethodTable | TargetPointer | Identify where the ExceptionMethodTable exists |
17+
| FreeObjectMethodTable | TargetPointer | Identify where the FreeObjectMethodTable exists |
18+
| SOSBreakingChangeVersion | TargetPointer | Identify where the SOSBreakingChangeVersion exists |
19+
| DacNotificationFlags | TargetPointer | Identify where the DacNotificationFlags exists |
20+
| MaxClrNotificationArgs | uint32 | Identify the maximum number of CLR notification arguments |
21+
| ClrNotificationArguments | TargetPointer | Identify where the ClrNotificationArguments exists |
22+
| DefaultADID | uint | Identify the default AppDomain ID |

‎docs/project/list-of-diagnostics.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ The PR that reveals the implementation of the `<IncludeInternalObsoleteAttribute
116116
| __`SYSLIB0059`__ | SystemEvents.EventsThreadShutdown callbacks are not run before the process exits. Use AppDomain.ProcessExit instead. |
117117
| __`SYSLIB0060`__ | The constructors on Rfc2898DeriveBytes are obsolete. Use the static Pbkdf2 method instead. |
118118
| __`SYSLIB0061`__ | The Queryable MinBy and MaxBy taking an IComparer\<TSource\> are obsolete. Use the new ones that take an IComparer\<TKey\>. |
119+
| __`SYSLIB0062`__ | XSLT Script blocks are not supported. |
119120

120121
## Analyzer Warnings
121122

‎docs/workflow/requirements/windows-requirements.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ It is highly recommended to use the *Workloads* approach, as that installs the f
4646
- .NET desktop development
4747
- Desktop development with C++
4848

49-
To build the tests and do ARM32/ARM64 development, you'll need some additional components. You can find them by clicking on the *Individual components* tab in the *Visual Studio Installer*:
49+
To build the tests and do ARM64 development, you'll need some additional components. You can find them by clicking on the *Individual components* tab in the *Visual Studio Installer*:
5050

51-
- For ARM stuff: *MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)* for Arm64, and *MSVC v143 - VS 2022 C++ ARM build tools (Latest)* for Arm32.
51+
- For Arm64: *MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)*
5252
- For building tests: *C++/CLI support for v143 build tools (Latest)*
5353

5454
Alternatively, there is also a `.vsconfig` file included at the root of the runtime repo. It includes all the necessary components required, outlined in a JSON format that Visual Studio can read and parse. You can boot up Visual Studio directly and [import this `.vsconfig` file](https://learn.microsoft.com/visualstudio/install/import-export-installation-configurations?view=vs-2022#import-a-configuration) instead of installing the workloads yourself. It is worth mentioning however, that while we are very careful in maintaining this file up-to-date, sometimes it might get a tad obsolete and miss important components. So, it is always a good idea to double check that the full workloads are installed.

‎docs/workflow/testing/using-dev-shipping-packages.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,9 @@ Console.WriteLine($"The location of System.Private.CoreLib.dll is '{typeof(objec
118118
The following command will build and publish your app:
119119

120120
```cmd
121-
dotnet publish -r win-x64
121+
dotnet publish --self-contained
122122
```
123123

124-
Adjust the `win-x64` to match your machine's OS and architecture.
125-
126124
Running this little app should yield an output like the following:
127125

128126
```text

‎eng/Versions.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
<FlagNetStandard1XDependencies Condition="'$(FlagNetStandard1XDependencies)' == ''">true</FlagNetStandard1XDependencies>
2929
<!-- Runtime controls its dependency graph via Traversal projects and doesn't want or need Arcade's ExcludeFrom infrastructure. -->
3030
<DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
31-
<!-- Use SDK compilers in full VMR builds. -->
32-
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildOrchestrator)' != 'true'">true</UsingToolMicrosoftNetCompilers>
31+
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
3332
</PropertyGroup>
3433
<ItemGroup>
3534
<WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />

‎eng/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ initDistroRid()
150150

151151
showSubsetHelp()
152152
{
153-
"$scriptroot/common/build.sh" "-restore" "-build" "/p:Subset=help" "/clp:nosummary /tl:false"
153+
"$scriptroot/common/build.sh" "-restore" "-build" "/p:Subset=help" "/clp:nosummary" "/tl:false"
154154
}
155155

156156
arguments=()

‎eng/pipelines/coreclr/templates/helix-queues-setup.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,37 +63,37 @@ jobs:
6363
# Linux arm
6464
- ${{ if eq(parameters.platform, 'linux_arm') }}:
6565
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
66-
- (Debian.13.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
66+
- (Debian.13.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
6767
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
68-
- (Debian.13.Arm32)AzureLinux.3.Arm64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
68+
- (Debian.13.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
6969

7070
# Linux arm64
7171
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
7272
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
73-
- AzureLinux.3.Arm64.Open
73+
- (AzureLinux.3.0.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
7474
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
75-
- AzureLinux.3.Arm64
75+
- (AzureLinux.3.0.ArmArch)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
7676

7777
# Linux musl x64
7878
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
7979
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
80-
- (Alpine.322.Amd64.Open)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
80+
- (Alpine.322.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
8181
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
82-
- (Alpine.322.Amd64)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
82+
- (Alpine.322.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
8383

8484
# Linux musl arm32
8585
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
8686
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
87-
- (Alpine.322.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
87+
- (Alpine.322.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
8888
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
89-
- (Alpine.322.Arm32)AzureLinux.3.Arm64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
89+
- (Alpine.322.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
9090

9191
# Linux musl arm64
9292
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
9393
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
94-
- (Alpine.322.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
94+
- (Alpine.322.Arm64.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
9595
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
96-
- (Alpine.322.Arm64)AzureLinux.3.Arm64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
96+
- (Alpine.322.Arm64)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
9797

9898
# Linux x64
9999
- ${{ if eq(parameters.platform, 'linux_x64') }}:

‎eng/pipelines/installer/helix-queues-setup.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,24 @@ jobs:
2525

2626
# Linux arm
2727
- ${{ if eq(parameters.platform, 'linux_arm') }}:
28-
- (Debian.13.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
28+
- (Debian.13.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
2929

3030
# Linux arm64
3131
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
32-
- (Ubuntu.2510.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
32+
- (Ubuntu.2510.Arm64.Open)Ubuntu.2204.Armarch[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
3333

3434
# Linux musl x64
3535
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
3636
- (Alpine.322.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
3737

3838
# Linux musl arm64
3939
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
40-
- (Alpine.322.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
40+
- (Alpine.322.Arm64.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
4141

4242
# Linux x64
4343
- ${{ if eq(parameters.platform, 'linux_x64') }}:
4444
- AzureLinux.3.Amd64.Open
45+
- Ubuntu.2204.Amd64.Open
4546

4647
# OSX arm64
4748
- ${{ if eq(parameters.platform, 'osx_arm64') }}:

‎eng/pipelines/libraries/helix-queues-setup.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@ jobs:
2626
# Linux arm
2727
- ${{ if eq(parameters.platform, 'linux_arm') }}:
2828
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
29-
- (Debian.13.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
29+
- (Debian.13.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
3030

3131
# Linux arm64
3232
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
3333
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
34-
- (Ubuntu.2510.ArmArch.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
34+
- (Ubuntu.2510.ArmArch.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
3535
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
36-
- (AzureLinux.3.0.ArmArch.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
36+
- (AzureLinux.3.0.ArmArch.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
3737

3838
# Linux musl x64
3939
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
4040
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
41-
- (Alpine.Edge.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-edge-helix-amd64
41+
- (Alpine.edge.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-edge-helix-amd64
4242
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
4343
- (Alpine.322.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
4444

4545
# Linux musl arm64
4646
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
4747
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
48-
- (Alpine.322.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
48+
- (Alpine.322.Arm64.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
4949

5050
# Linux x64
5151
- ${{ if eq(parameters.platform, 'linux_x64') }}:

0 commit comments

Comments
 (0)