Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into apx-evex-nf-nov
Browse files Browse the repository at this point in the history
  • Loading branch information
Ruihan-Yin committed Dec 17, 2024
2 parents 55cbda6 + 9a02107 commit a9a3d5c
Show file tree
Hide file tree
Showing 1,396 changed files with 36,436 additions and 30,397 deletions.
6 changes: 6 additions & 0 deletions .CodeQL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ path_classifiers:
# be excluded from analysis. If there is a problem at the API layer, the analysis
# engine will detect the problem in the src/ implementations anyway.
- src/libraries/**/ref/*
# exclude artifacts/obj/**/CMakeFiles/**/CheckFunctionExists.c since CMake
# generates random directory names causing creation of duplicate issues
# related to obsolete encryption algorithm used. Note that CheckFuntionExists
# files are generated as part of build-time checks in CMake and are not compiled
# or linked into any product binaries.
- artifacts/obj/**/CMakeFiles/**/CheckFunctionExists.c
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "10.0.0-prerelease.24564.1",
"version": "10.0.0-prerelease.24575.1",
"commands": [
"xharness"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ main PR <!-- Link to PR if any that fixed this in the main branch. -->

<!-- Please assess the risk of taking this fix. Provide details backing up your assessment. -->

# Package authoring signed off?
# Package authoring no longer needed in .NET 9

IMPORTANT: If this change touches code that ships in a NuGet package, please make certain that you have added any necessary [package authoring](../../docs/project/library-servicing.md) and gotten it explicitly reviewed.
IMPORTANT: Starting with .NET 9, you no longer need to edit a NuGet package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older versions.
4 changes: 1 addition & 3 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1589,9 +1589,7 @@ configuration:
then:
- mentionUsers:
mentionees:
- agocke
- sbomer
- vitek-karas
- dotnet/illink
replyTemplate: >-
Tagging subscribers to this area: ${mentionees}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,7 @@ jobs:
- The PR target branch is `release/X.0-staging`, not `release/X.0`.
- If the change touches code that ships in a NuGet package, you have added the necessary [package authoring](https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md) and gotten it explicitly reviewed.
## Package authoring no longer needed in .NET 9
**IMPORTANT**: Starting with .NET 9, you no longer need to edit a NuGet package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older versions.
15 changes: 2 additions & 13 deletions .github/workflows/jit-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,10 @@ jobs:
container: ${{ matrix.os.container }}
name: Format jit codebase ${{ matrix.os.name }}
steps:
- name: Checkout jitutils
uses: actions/checkout@v4
with:
path: jitutils
repository: dotnet/jitutils
ref: main
token: ${{ secrets.GITHUB_TOKEN }}
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Build jitutils
run: |
./bootstrap${{ matrix.os.extension }}
working-directory: jitutils
- name: Checkout runtime
uses: actions/checkout@v4
with:
Expand All @@ -52,7 +41,7 @@ jobs:

- name: Run jitformat.py
run: |
python3 runtime/src/coreclr/scripts/jitformat.py --jitutils jitutils -r runtime -o ${{ matrix.os.name }} -a x64 ${{ matrix.os.cross }}
python3 runtime/src/coreclr/scripts/jitformat.py -r runtime -o ${{ matrix.os.name }} -a x64 ${{ matrix.os.cross }}
env:
ROOTFS_DIR: ${{ matrix.os.rootfs }}

Expand All @@ -61,4 +50,4 @@ jobs:
with:
path: runtime/format.patch
name: format.${{matrix.os.name}}.patch
if: failure()
if: failure()
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ Chips:
- [ARM32](https://github.com/dotnet/runtime/labels/arch-arm32)
- [ARM64](https://github.com/dotnet/runtime/labels/arch-arm64)
- [X86](https://github.com/dotnet/runtime/labels/arch-x86)
- [LoongArch64](https://github.com/dotnet/runtime/labels/arch-loongarch64)
- [RISC-V](https://github.com/dotnet/runtime/labels/arch-riscv)

Operating System:

Expand Down
8 changes: 3 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@
<!-- 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>
<NetCoreAppToolCurrentVersion>10.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>

<AspNetCoreAppCurrentVersion>9.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrentVersion>10.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>

<NetFrameworkMinimum>net462</NetFrameworkMinimum>
Expand All @@ -120,9 +120,7 @@
<NetFrameworkToolCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
<NetFrameworkCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />

<!-- Important: Set this to the GA version (or a close approximation) during servicing and adjust the TFM property below. -->
<!-- TODO: Update to 9.0.0 when .NET 9 is generally available. https://github.com/dotnet/runtime/issues/106598 -->
<ApiCompatNetCoreAppBaselineVersion>9.0.0-preview.7.24405.7</ApiCompatNetCoreAppBaselineVersion>
<ApiCompatNetCoreAppBaselineVersion>9.0.0</ApiCompatNetCoreAppBaselineVersion>
<ApiCompatNetCoreAppBaselineTFM>net9.0</ApiCompatNetCoreAppBaselineTFM>
</PropertyGroup>

Expand Down
3 changes: 0 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
<!-- TODO: Remove dotnet9 feeds when all dependencies moved to the dotnet10 feeds. https://github.com/dotnet/runtime/issues/106593 -->
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
</packageSources>
Expand Down
Loading

0 comments on commit a9a3d5c

Please sign in to comment.