Skip to content

Commit f828fef

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/net-primitives-il
# Conflicts: # src/Csharpc/upstream-types.txt
2 parents cea00e1 + f3e1703 commit f828fef

171 files changed

Lines changed: 2638 additions & 25451 deletions

File tree

Some content is hidden

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

‎.github/actions/run-suites/action.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ runs:
5151
shell: bash
5252
run: tests/toolchain.sh
5353

54+
# string.GetHashCode is Marvin with a per-process random seed (hash flooding, #285); no recorded output can show it.
55+
- name: String hash seed
56+
if: ${{ (success() || failure()) && inputs.os != 'wasm' }}
57+
shell: bash
58+
run: tests/hashseed.sh
59+
5460
- name: IL front-end (libraries consumed as DLLs and NuGet packages)
5561
if: ${{ (success() || failure()) && inputs.os != 'wasm' }}
5662
shell: bash

‎.github/actions/setup-toolchain/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ runs:
104104
run: |
105105
set -euo pipefail
106106
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
107-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
107+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
108108
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
109109
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
110110
@@ -113,6 +113,6 @@ runs:
113113
shell: pwsh
114114
run: |
115115
Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -OutFile dotnet-install.ps1
116-
./dotnet-install.ps1 -JsonFile global.json -InstallDir "$env:USERPROFILE\.dotnet11"
116+
./dotnet-install.ps1 -Channel 11.0.1xx -InstallDir "$env:USERPROFILE\.dotnet11"
117117
"$env:USERPROFILE\.dotnet11" | Out-File -Append -Encoding utf8 $env:GITHUB_PATH
118118
"DOTNET_ROOT=$env:USERPROFILE\.dotnet11" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV

‎.github/workflows/bench.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Install .NET 11 SDK
5151
run: |
5252
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
53-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
53+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
5454
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
5555
5656
- name: Runner

‎.github/workflows/bootstrap.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ name: Bootstrap
1717
# shards (16 jobs, the long part) run on pushes to main and ci/m6-** branches only.
1818
on:
1919
pull_request:
20-
paths: ['src/**', 'tests/projects/il/IlRoslynHostApp/**', 'tests/il.sh', 'tools/bootstrap/**', '.github/workflows/bootstrap.yml']
20+
paths: ['src/**', 'global.json', 'tests/projects/il/IlRoslynHostApp/**', 'tests/il.sh', 'tools/bootstrap/**', '.github/workflows/bootstrap.yml']
2121
push:
2222
branches: [main, "ci/m6-**"]
23-
paths: ['src/**', 'tests/projects/il/IlRoslynHostApp/**', 'tests/il.sh', 'tools/bootstrap/**', '.github/workflows/bootstrap.yml']
23+
paths: ['src/**', 'global.json', 'tests/projects/il/IlRoslynHostApp/**', 'tests/il.sh', 'tools/bootstrap/**', '.github/workflows/bootstrap.yml']
2424
workflow_dispatch:
2525

2626
permissions:

‎.github/workflows/compat.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install .NET 11 SDK
4040
run: |
4141
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
42-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
42+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
4343
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
4444
4545
- name: Run the corpus

‎.github/workflows/il-survey.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Install .NET 11 SDK
5151
run: |
5252
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
53-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
53+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
5454
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
5555
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
5656
@@ -113,7 +113,7 @@ jobs:
113113
- name: Install .NET 11 SDK
114114
run: |
115115
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
116-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
116+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
117117
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
118118
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
119119
@@ -186,7 +186,7 @@ jobs:
186186
- name: Install .NET 11 SDK
187187
run: |
188188
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
189-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
189+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
190190
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
191191
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
192192

‎.github/workflows/m7-perf.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Install .NET 11 SDK
5757
run: |
5858
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
59-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
59+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
6060
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
6161
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
6262

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ jobs:
297297
if: matrix.os != 'windows'
298298
run: |
299299
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
300-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
300+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
301301
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
302302
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
303303
@@ -306,7 +306,7 @@ jobs:
306306
shell: pwsh
307307
run: |
308308
Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -OutFile dotnet-install.ps1
309-
./dotnet-install.ps1 -JsonFile global.json -InstallDir "$env:USERPROFILE\.dotnet11"
309+
./dotnet-install.ps1 -Channel 11.0.1xx -InstallDir "$env:USERPROFILE\.dotnet11"
310310
"$env:USERPROFILE\.dotnet11" | Out-File -Append -Encoding utf8 $env:GITHUB_PATH
311311
"DOTNET_ROOT=$env:USERPROFILE\.dotnet11" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV
312312
@@ -430,7 +430,7 @@ jobs:
430430
- name: Install .NET 11 SDK
431431
run: |
432432
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
433-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
433+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
434434
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
435435
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
436436

‎.github/workflows/techempower.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Install .NET 11 SDK
7171
run: |
7272
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
73-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
73+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
7474
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
7575
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
7676
@@ -104,7 +104,7 @@ jobs:
104104
- name: Install .NET 11 SDK
105105
run: |
106106
curl -sSL https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh
107-
bash dotnet-install.sh --jsonfile global.json --install-dir "$HOME/.dotnet11"
107+
bash dotnet-install.sh --channel 11.0.1xx --install-dir "$HOME/.dotnet11"
108108
echo "$HOME/.dotnet11" >> "$GITHUB_PATH"
109109
echo "DOTNET_ROOT=$HOME/.dotnet11" >> "$GITHUB_ENV"
110110

‎AGENTS.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ possible bug; an explicit "not supported by csharpc yet" diagnostic is always pr
3333

3434
## Setup
3535

36-
- Linux x86-64/ARM64, macOS ARM64 or Windows x64, .NET 11 SDK (version pinned in `global.json`;
37-
preview allowed), LLVM 18 (`libLLVM-18.so`, Homebrew `llvm@18` on macOS, LLVM-MinGW's
36+
- Linux x86-64/ARM64, macOS ARM64 or Windows x64, .NET 11 SDK (`global.json`: .NET 11 GA,
37+
SDK 11.0.100 rolling forward to the latest 11.0.1xx patch; CI installs that patch, prereleases never), LLVM 18 (`libLLVM-18.so`, Homebrew `llvm@18` on macOS, LLVM-MinGW's
3838
`libLLVM-18.dll` on Windows, or set `CSHARPC_LIBLLVM`) and `clang` (linker driver, runtime
3939
compiler; on macOS Homebrew's clang 18, plus the Xcode Command Line Tools for the SDK and linker;
4040
on Windows LLVM-MinGW's clang, with the test scripts run from Git Bash).

0 commit comments

Comments
 (0)