Skip to content

Commit 2164200

Browse files
lewinglewing
authored
Merge branch 'main' into dependabot/github_actions/actions/upload-artifact-5
2 parents cbd5681 + 9dcf95a commit 2164200

File tree

1,301 files changed

+24876
-32025
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,301 files changed

+24876
-32025
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": "10.0.0-prerelease.25506.2",
18+
"version": "11.0.0-prerelease.25603.1",
1919
"commands": [
2020
"xharness"
2121
]

‎.devcontainer/android/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
5656
// Add the Android SDK tooling and emulator to the path.
5757
"remoteEnv": {
58-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools/bin:${containerEnv:ANDROID_SDK_ROOT}/emulator:${containerEnv:ANDROID_SDK_ROOT}/platform-tools:${containerEnv:PATH}",
59-
"DOTNET_MULTILEVEL_LOOKUP": "0"
58+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools/bin:${containerEnv:ANDROID_SDK_ROOT}/emulator:${containerEnv:ANDROID_SDK_ROOT}/platform-tools:${containerEnv:PATH}"
6059
},
6160

6261
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
// Add the locally installed dotnet to the path to ensure that it is activated
4141
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4242
"remoteEnv": {
43-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
44-
"DOTNET_MULTILEVEL_LOOKUP": "0"
43+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
4544
},
4645

4746
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.devcontainer/libraries/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
// Add the locally installed dotnet to the path to ensure that it is activated
4747
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4848
"remoteEnv": {
49-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
50-
"DOTNET_MULTILEVEL_LOOKUP": "0"
49+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
5150
},
5251

5352
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.devcontainer/wasm-multiThreaded/devcontainer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4848
// Add the global tools dir to the PATH so that globally installed tools will work
4949
"remoteEnv": {
50-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
51-
"DOTNET_MULTILEVEL_LOOKUP": "0",
50+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}"
5251
},
5352

5453
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
@@ -58,7 +57,7 @@
5857
"forwardPorts": [8000],
5958
"portsAttributes": {
6059
"8000": {
61-
"label": "mono wasm samples (8000)",
60+
"label": "mono wasm samples (8000)"
6261
}
6362
}
6463
}

‎.devcontainer/wasm/devcontainer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4848
// Add the global tools dir to the PATH so that globally installed tools will work
4949
"remoteEnv": {
50-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
51-
"DOTNET_MULTILEVEL_LOOKUP": "0",
50+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}"
5251
},
5352

5453
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
@@ -58,7 +57,7 @@
5857
"forwardPorts": [8000],
5958
"portsAttributes": {
6059
"8000": {
61-
"label": "mono wasm samples (8000)",
60+
"label": "mono wasm samples (8000)"
6261
}
6362
}
6463
}

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-
8181
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input.txt text eol=lf
8282
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input-big.txt text eol=lf
8383
src/mono/browser/runtime/dotnet.d.ts text eol=lf
84+
src/native/corehost/browserhost/loader/dotnet.d.ts text eol=lf

‎.github/workflows/locker.yml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Locker - Lock stale issues and PRs
1+
name: Locker - Lock stale issues and PRs, unlock reopened ones
22
on:
33
schedule:
44
- cron: '37 8 * * *' # Once per day, early morning PT
@@ -13,14 +13,21 @@ on:
1313
required: true
1414
default: "30"
1515

16+
issues:
17+
types: [reopened]
18+
19+
pull_request_target:
20+
types: [reopened]
21+
1622
permissions:
1723
issues: write
1824
pull-requests: write
1925

2026
jobs:
21-
main:
27+
lock:
2228
runs-on: ubuntu-latest
23-
if: ${{ github.repository_owner == 'dotnet' }}
29+
# Only run the locking job for scheduled runs and manual dispatch, not for reopened events
30+
if: ${{ github.repository_owner == 'dotnet' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }}
2431
steps:
2532
- name: Checkout Actions
2633
uses: actions/checkout@v6
@@ -35,3 +42,20 @@ jobs:
3542
with:
3643
daysSinceClose: ${{ fromJson(inputs.daysSinceClose || 30) }}
3744
daysSinceUpdate: ${{ fromJson(inputs.daysSinceUpdate || 30) }}
45+
46+
unlock:
47+
runs-on: ubuntu-latest
48+
# Only run the unlocking job when issues or PRs are reopened
49+
if: ${{ github.repository_owner == 'dotnet' && (github.event_name == 'issues' || github.event_name == 'pull_request_target') && github.event.action == 'reopened' }}
50+
steps:
51+
- name: Unlock if issue/PR is locked
52+
uses: actions/github-script@v7
53+
if: ${{ github.event.issue.locked == true }}
54+
with:
55+
script: |
56+
console.log(`Unlocking locked issue/PR #${context.issue.number}.`);
57+
await github.rest.issues.unlock({
58+
issue_number: context.issue.number,
59+
owner: context.repo.owner,
60+
repo: context.repo.repo,
61+
});

‎Directory.Build.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@
5757

5858
<!-- The TFMs to build and test against. -->
5959
<PropertyGroup>
60-
<NetCoreAppCurrentVersion>10.0</NetCoreAppCurrentVersion>
60+
<NetCoreAppCurrentVersion>11.0</NetCoreAppCurrentVersion>
6161
<NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
6262
<NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
6363
<MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
6464
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
6565
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
6666

6767
<!-- The previous supported .NET version. -->
68-
<NetCoreAppPrevious>net9.0</NetCoreAppPrevious>
69-
<NetCoreAppPrevious Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppPrevious>
68+
<NetCoreAppPrevious />
69+
<!-- <NetCoreAppPrevious Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppPrevious> -->
7070

7171
<!-- The minimum supported .NET version. -->
72-
<NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
72+
<NetCoreAppMinimum>net10.0</NetCoreAppMinimum>
7373
<NetCoreAppMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
7474

7575
<!-- when this is updated, make sure to keep $(_NetCoreAppToolCurrent)
@@ -87,8 +87,8 @@
8787
<NetFrameworkToolCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
8888
<NetFrameworkCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
8989

90-
<ApiCompatNetCoreAppBaselineVersion>9.0.0</ApiCompatNetCoreAppBaselineVersion>
91-
<ApiCompatNetCoreAppBaselineTFM>net9.0</ApiCompatNetCoreAppBaselineTFM>
90+
<ApiCompatNetCoreAppBaselineVersion>10.0.0</ApiCompatNetCoreAppBaselineVersion>
91+
<ApiCompatNetCoreAppBaselineTFM>net10.0</ApiCompatNetCoreAppBaselineTFM>
9292
</PropertyGroup>
9393

9494
<PropertyGroup Label="CalculateConfiguration">
@@ -178,7 +178,7 @@
178178

179179
<PropertyGroup>
180180
<DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(TargetRid).$(HostConfiguration)', 'corehost'))</DotNetHostBinDir>
181-
<DotNetCdacBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mscordaccore_universal', '$(Configuration)', '$(NetCoreAppCurrent)', '$(PortableTargetRid)', 'publish'))</DotNetCdacBinDir>
181+
<DotNetCdacBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mscordaccore_universal', '$(Configuration)', '$(PortableTargetRid)', 'publish'))</DotNetCdacBinDir>
182182
</PropertyGroup>
183183

184184
<!--Feature switches -->

‎Directory.Build.targets‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,6 @@
209209
<Analyzer Remove="@(_targetingPackExcludedAnalyzerReferenceWithProjectName->Metadata('OriginalIdentity'))" />
210210
</ItemGroup>
211211
</Target>
212+
213+
<Import Project="$(RepositoryEngineeringDir)pruning.targets" />
212214
</Project>

0 commit comments

Comments
 (0)