Skip to content

Commit 19dce8d

Browse files
SwapnilGaikwadSwapnilGaikwad
committed
Merge main
2 parents 2c040a7 + 9fa1235 commit 19dce8d

File tree

1,069 files changed

+33610
-21439
lines changed

Some content is hidden

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

1,069 files changed

+33610
-21439
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": "9.0.0-prerelease.24208.1",
18+
"version": "9.0.0-prerelease.24224.1",
1919
"commands": [
2020
"xharness"
2121
]

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 5
8+
labels:
9+
- area-codeflow
10+
ignore:
11+
- dependency-name: "actions/checkout"
12+
update-types: ["version-update:semver-patch","version-update:semver-minor"]

‎.github/workflows/aspnetcore-sync.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
runs-on: windows-latest
1717
steps:
1818
- name: Checkout aspnetcore
19-
uses: actions/checkout@v2.0.0
19+
uses: actions/checkout@v4
2020
with:
2121
# Test this script using changes in a fork
2222
repository: 'dotnet/aspnetcore'
2323
path: aspnetcore
2424
ref: main
2525
- name: Checkout runtime
26-
uses: actions/checkout@v2.0.0
26+
uses: actions/checkout@v4
2727
with:
2828
# Test this script using changes in a fork
2929
repository: 'dotnet/runtime'
@@ -42,7 +42,7 @@ jobs:
4242
mkdir ..\artifacts
4343
git status > ..\artifacts\status.txt
4444
git diff > ..\artifacts\diff.txt
45-
- uses: actions/upload-artifact@v1
45+
- uses: actions/upload-artifact@v4
4646
with:
4747
name: results
4848
path: artifacts
@@ -57,7 +57,7 @@ jobs:
5757
- name: Send PR
5858
if: steps.check.outputs.changed == 'true'
5959
# https://github.com/marketplace/actions/create-pull-request
60-
uses: dotnet/actions-create-pull-request@v3
60+
uses: dotnet/actions-create-pull-request@v4
6161
with:
6262
token: ${{ secrets.GITHUB_TOKEN }}
6363
path: .\runtime

‎.github/workflows/bump-chrome-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
- name: Setup Branch
2121
run: |
2222
git config user.name github-actions[bot]
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Create PR
4949
if: steps.check_changes.outputs.has_changes == 'true'
50-
uses: actions/github-script@v6
50+
uses: actions/github-script@v7
5151
with:
5252
script: |
5353
const { CHROME_LINUX_VER, CHROME_WIN_VER } = process.env;

‎Directory.Build.props‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,22 @@
5656
- eng/native/configurecompiler.cmake
5757
- eng/native/build-commons.sh
5858
- src/native/libs/build-native.sh
59-
- src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs
59+
- src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ObjectWriter/MachObjectWriter.cs
6060
- src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
61+
- src/mono/mono/tools/offsets-tool/offsets-tool.py
62+
- src/mono/msbuild/apple/build/AppleBuild.targets
6163
- src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml
6264
- src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml
65+
- src/tasks/AotCompilerTask/MonoAOTCompiler.props
66+
- src/tasks/AppleAppBuilder/Xcode.cs
6367
- src/tasks/MobileBuildTasks/Apple/AppleProject.cs
6468
- dotnet/installer repo > src/redist/targets/GeneratePKG.targets
6569
-->
6670
<AndroidApiLevelMin>21</AndroidApiLevelMin>
67-
<iOSVersionMin>11.0</iOSVersionMin>
68-
<tvOSVersionMin>11.0</tvOSVersionMin>
69-
<macOSVersionMin>10.15</macOSVersionMin>
70-
<macOSVersionMin Condition="('$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst') and '$(TargetArchitecture)' == 'arm64'">11.0</macOSVersionMin>
71+
<iOSVersionMin>12.2</iOSVersionMin>
72+
<tvOSVersionMin>12.2</tvOSVersionMin>
73+
<macOSVersionMin>12.0</macOSVersionMin>
74+
<MacCatalystVersionMin>15.0</MacCatalystVersionMin>
7175
</PropertyGroup>
7276

7377
<PropertyGroup>
@@ -180,7 +184,9 @@
180184
<TestExclusionListTasksAssemblyPath>$([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll'))</TestExclusionListTasksAssemblyPath>
181185
<CoreCLRToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfiguration)'))</CoreCLRToolPath>
182186
<ILAsmToolPath Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(BuildArchitecture)' == 's390x' or '$(BuildArchitecture)' == 'ppc64le'">$(CoreCLRToolPath)</ILAsmToolPath>
187+
<!-- force download temmporarily https://github.com/dotnet/runtime/issues/101528
183188
<WasmtimeDir Condition="'$(WasmtimeDir)' == '' and '$(WASMTIME_PATH)' != '' and Exists($(WASMTIME_PATH))">$(WASMTIME_PATH)</WasmtimeDir>
189+
-->
184190
<WasmtimeDir Condition="'$(WasmtimeDir)' == ''">$([MSBuild]::NormalizeDirectory($(ArtifactsObjDir), 'wasmtime'))</WasmtimeDir>
185191
<InstallWasmtimeForTests Condition="'$(InstallWasmtimeForTests)' == '' and !Exists($(WasmtimeDir))">true</InstallWasmtimeForTests>
186192
<WasmCommonTargetsPath>$([MSBuild]::NormalizeDirectory($(WasmProjectRoot), 'build'))</WasmCommonTargetsPath>
@@ -397,12 +403,10 @@
397403
<PropertyGroup Condition="$(MSBuildProjectFullPath.Contains('$([System.IO.Path]::DirectorySeparatorChar)tests$([System.IO.Path]::DirectorySeparatorChar)'))">
398404
<IsTestProject Condition="$(MSBuildProjectName.EndsWith('.UnitTests')) or $(MSBuildProjectName.EndsWith('.Tests'))">true</IsTestProject>
399405
<IsTrimmingTestProject Condition="$(MSBuildProjectName.EndsWith('.TrimmingTests'))">true</IsTrimmingTestProject>
400-
<IsNativeAotTestProject Condition="$(MSBuildProjectName.EndsWith('.NativeAotTests'))">true</IsNativeAotTestProject>
401-
<IsPublishedAppTestProject Condition="'$(IsTrimmingTestProject)' == 'true' or '$(IsNativeAotTestProject)' == 'true'">true</IsPublishedAppTestProject>
402-
<IsTestSupportProject Condition="'$(IsTestProject)' != 'true' and '$(IsPublishedAppTestProject)' != 'true'">true</IsTestSupportProject>
406+
<IsTestSupportProject Condition="'$(IsTestProject)' != 'true' and '$(IsTrimmingTestProject)' != 'true'">true</IsTestSupportProject>
403407

404408
<!-- Treat test assemblies as non-shipping (do not publish or sign them). -->
405-
<IsShipping Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsPublishedAppTestProject)' == 'true'">false</IsShipping>
409+
<IsShipping Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true'">false</IsShipping>
406410
</PropertyGroup>
407411

408412
<PropertyGroup>
@@ -413,7 +417,7 @@
413417
'$(IsReferenceAssemblyProject)' != 'true' and
414418
'$(IsGeneratorProject)' != 'true' and
415419
'$(IsTestProject)' != 'true' and
416-
'$(IsPublishedAppTestProject)' != 'true' and
420+
'$(IsTrimmingTestProject)' != 'true' and
417421
'$(IsTestSupportProject)' != 'true' and
418422
'$(UsingMicrosoftDotNetSharedFrameworkSdk)' != 'true' and
419423
'$(MSBuildProjectExtension)' != '.pkgproj' and
@@ -464,7 +468,7 @@
464468
</PropertyGroup>
465469

466470
<!-- Warnings that should be disabled in our test projects. -->
467-
<PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsPublishedAppTestProject)' == 'true'">
471+
<PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true'">
468472
<!-- we need to re-enable BinaryFormatter within test projects since some tests exercise these code paths to ensure compat -->
469473
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
470474
<!-- don't warn on usage of BinaryFormatter or legacy serialization infrastructure from test projects -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The general rule we follow is "use Visual Studio defaults".
3636

3737
An [EditorConfig](https://editorconfig.org "EditorConfig homepage") file (`.editorconfig`) has been provided at the root of the runtime repository, enabling C# auto-formatting conforming to the above guidelines.
3838

39-
We also use the [.NET Codeformatter Tool](https://github.com/dotnet/codeformatter) to ensure the code base maintains a consistent style over time, the tool automatically fixes the code base to conform to the guidelines outlined above.
39+
We also use the [dotnet-format tool](https://learn.microsoft.com/dotnet/core/tools/dotnet-format) to ensure the code base maintains a consistent style over time, the tool automatically fixes the code base to conform to the guidelines outlined above.
4040

4141
### Example File:
4242

‎docs/design/datacontracts/contract-descriptor.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ reserved bits should be written as zero. Diagnostic tooling may ignore non-zero
4545

4646
The `descriptor` is a pointer to a UTF-8 JSON string described in [data descriptor physical layout](./data_descriptor.md#Physical_JSON_descriptor). The total number of bytes is given by `descriptor_size`.
4747

48-
The auxiliary data for the JSON descriptor is stored at the location `aux_data` in `aux_data_count` pointer-sized slots.
48+
The auxiliary data for the JSON descriptor is stored at the location `pointer_data` in `pointer_data_count` pointer-sized slots.
4949

5050
### Architecture properties
5151

@@ -83,7 +83,7 @@ a JSON integer constant.
8383
"globals":
8484
{
8585
"FEATURE_COMINTEROP": 0,
86-
"s_pThreadStore": [ 0 ] // indirect from aux data offset 0
86+
"s_pThreadStore": [ 0 ] // indirect from pointer data offset 0
8787
},
8888
"contracts": {"Thread": 1, "GCHandle": 1, "ThreadStore": 1}
8989
}

‎docs/workflow/building/coreclr/linux-instructions.md‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ docker pull mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-ar
5959
All official builds are cross-builds with a rootfs for the target OS, and will use the clang version available on the container.
6060

6161
| Host OS | Target OS | Target Arch | Image location | crossrootfs location |
62-
| --------------------- | ------------ | --------------- | -------------------------------------------------------------------------------- | -------------------- |
63-
| CBL-mariner 2.0 (x64) | Alpine 3.13 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-alpine` | `/crossrootfs/x64` |
64-
| CBL-mariner 2.0 (x64) | Ubuntu 16.04 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64` | `/crossrootfs/x64` |
65-
| CBL-mariner 2.0 (x64) | Alpine | arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine` | `/crossrootfs/arm` |
66-
| CBL-mariner 2.0 (x64) | Ubuntu 16.04 | arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm` | `/crossrootfs/arm` |
67-
| CBL-mariner 2.0 (x64) | Alpine | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine` | `/crossrootfs/arm64` |
68-
| CBL-mariner 2.0 (x64) | Ubuntu 16.04 | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64` | `/crossrootfs/arm64` |
69-
| Ubuntu 18.04 (x64) | FreeBSD | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-freebsd-12` | `/crossrootfs/x64` |
62+
| --------------------- | ------------ | --------------- | -------------------------------------------------------------------------------------- | -------------------- |
63+
| Azure Linux (x64) | Alpine 3.13 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-alpine-net9.0` | `/crossrootfs/x64` |
64+
| Azure Linux (x64) | Ubuntu 16.04 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-net9.0` | `/crossrootfs/x64` |
65+
| Azure Linux (x64) | Alpine | arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm-alpine-net9.0` | `/crossrootfs/arm` |
66+
| Azure Linux (x64) | Ubuntu 16.04 | arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm-net9.0` | `/crossrootfs/arm` |
67+
| Azure Linux (x64) | Alpine | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm64-alpine-net9.0` | `/crossrootfs/arm64` |
68+
| Azure Linux (x64) | Ubuntu 16.04 | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm64-net9.0` | `/crossrootfs/arm64` |
69+
| Azure Linux (x64) | Ubuntu 16.04 | x86 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-x86-net9.0` | `/crossrootfs/x86` |
70+
| CBL-mariner 2.0 (x64) | FreeBSD 13 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-freebsd-13` | `/crossrootfs/x64` |
7071

7172
These Docker images are built using the Dockerfiles maintained in the [dotnet-buildtools-prereqs-docker repo](https://github.com/dotnet/dotnet-buildtools-prereqs-docker).
7273

0 commit comments

Comments
 (0)