Skip to content

Commit 18686ee

Browse files
authored
Merge branch 'main' into binskimBA2008CFG
2 parents 4775f22 + 541ac3e commit 18686ee

File tree

100 files changed

+1527
-723
lines changed

Some content is hidden

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

100 files changed

+1527
-723
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Create PR
4949
if: steps.check_changes.outputs.has_changes == 'true'
50-
uses: actions/github-script@v7
50+
uses: actions/github-script@v8
5151
with:
5252
script: |
5353
const { CHROME_LINUX_VER, CHROME_WIN_VER } = process.env;

.github/workflows/jit-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
path: runtime
3939
- name: Install Python
40-
uses: actions/setup-python@v5
40+
uses: actions/setup-python@v6
4141

4242
- name: Run jitformat.py
4343
run: |

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v5
2121
- name: Use Node.js
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v5
2323
with:
2424
node-version: 'lts/*'
2525
- name: Run Markdownlint

docs/workflow/building/coreclr/wasm.md

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ This will start a local HTTP server and you can open the provided URL in your br
6363
You can also run the runtime directly in Node.js:
6464

6565
```bash
66-
cd artifacts/bin/coreclr/browser.wasm.Debug/corewasmrun/
67-
node corewasmrun.js
66+
cd artifacts/bin/coreclr/browser.wasm.Debug/
67+
node ./corerun.js -c /runtime3/artifacts/bin/coreclr/browser.wasm.Debug/IL /runtime3/artifacts/bin/coreclr/browser.wasm.Debug/helloworld.dll
6868
```
6969

70+
Note that path in the `args` need to be absolute path on your host file system in unix format (even on Windows).
71+
7072
## Debugging
7173

7274
### Chrome DevTools with DWARF Support
@@ -94,25 +96,38 @@ VS Code, through Node.js, provides a good debugging option for WebAssembly CoreC
9496

9597
2. **Create a launch.json configuration:**
9698
```json
97-
{
98-
"version": "0.2.0",
99-
"configurations": [
100-
{
101-
"type": "node",
102-
"request": "launch",
103-
"name": "corewasmrun",
104-
"skipFiles": [
105-
"<node_internals>/**"
106-
],
107-
"program": "corewasmrun.js",
108-
"cwd": "${workspaceFolder}/artifacts/bin/coreclr/browser.wasm.Debug/corewasmrun/"
109-
}
110-
]
111-
}
99+
{
100+
"version": "0.2.0",
101+
"configurations": [
102+
{
103+
"type": "node",
104+
"request": "launch",
105+
"name": "corerun",
106+
"skipFiles": [
107+
"<node_internals>/**"
108+
],
109+
"outputCapture": "std",
110+
"program": "corerun.js",
111+
"env": {
112+
"PAL_DBG_CHANNELS": "+all.all"
113+
},
114+
"args": [
115+
"-c",
116+
"/runtime3/artifacts/bin/coreclr/browser.wasm.Debug/IL/",
117+
"/runtime3/artifacts/bin/coreclr/browser.wasm.Debug/IL/helloworld.dll"
118+
],
119+
"cwd": "${workspaceFolder}/artifacts/bin/coreclr/browser.wasm.Debug/"
120+
}
121+
]
122+
}
112123
```
113124

125+
Note that path in the `args` need to be absolute path on your host file system in unix format (even on Windows).
126+
114127
3. **Set breakpoints** in `corewasmrun.js` in one of the `put_char` functions (the `stdout`/`stderr` implementation)
115128

116129
4. **Start debugging** and step through the WebAssembly code using the call stack
117130

118131
This approach allows you to debug the JavaScript host and step into WebAssembly code or into the C/C++ code if the Dwarf Debugging extension was installed.
132+
133+
5. to display `WCHAR *` strings in debugger watch window, cast it to `char16_t*` like `(char16_t*)pLoaderModule->m_fileName`

eng/Version.Details.props

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!--
32
This file is auto-generated by the Maestro dependency flow system.
43
Do not edit it manually, as it will get overwritten by automation.
@@ -41,45 +40,45 @@ This file should be imported by eng/Versions.props
4140
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>19.1.0-alpha.1.25167.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>
4241
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>19.1.0-alpha.1.25167.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>
4342
<!-- dotnet/dotnet dependencies -->
44-
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25420.121</MicrosoftCodeAnalysisPackageVersion>
45-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25420.121</MicrosoftCodeAnalysisAnalyzersPackageVersion>
46-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25420.121</MicrosoftCodeAnalysisCSharpPackageVersion>
47-
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.100-rc.1.25420.121</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
48-
<MicrosoftDotNetApiCompatTaskPackageVersion>10.0.100-rc.1.25420.121</MicrosoftDotNetApiCompatTaskPackageVersion>
49-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetArcadeSdkPackageVersion>
50-
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksArchivesPackageVersion>
51-
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksFeedPackageVersion>
52-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksInstallersPackageVersion>
53-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksPackagingPackageVersion>
54-
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
55-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
56-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25420.121</MicrosoftDotNetCecilPackageVersion>
58-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetCodeAnalysisPackageVersion>
59-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetGenAPIPackageVersion>
60-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetGenFacadesPackageVersion>
61-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetHelixSdkPackageVersion>
62-
<MicrosoftDotNetPackageTestingPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetPackageTestingPackageVersion>
63-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetRemoteExecutorPackageVersion>
64-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
65-
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetXliffTasksPackageVersion>
66-
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.25420.121</MicrosoftDotNetXUnitAssertPackageVersion>
67-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.25420.121</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
68-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetXUnitExtensionsPackageVersion>
69-
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25420.121</MicrosoftNetCompilersToolsetPackageVersion>
70-
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETSdkILPackageVersion>
71-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rc.1.25420.121</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
72-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreAppRefPackageVersion>
73-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreILAsmPackageVersion>
74-
<NuGetFrameworksPackageVersion>7.0.0-preview.1.42121</NuGetFrameworksPackageVersion>
75-
<NuGetPackagingPackageVersion>7.0.0-preview.1.42121</NuGetPackagingPackageVersion>
76-
<NuGetProjectModelPackageVersion>7.0.0-preview.1.42121</NuGetProjectModelPackageVersion>
77-
<NuGetVersioningPackageVersion>7.0.0-preview.1.42121</NuGetVersioningPackageVersion>
78-
<runtimenativeSystemIOPortsPackageVersion>10.0.0-rc.1.25420.121</runtimenativeSystemIOPortsPackageVersion>
79-
<SystemCommandLinePackageVersion>2.0.0-rc.1.25420.121</SystemCommandLinePackageVersion>
80-
<SystemReflectionMetadataPackageVersion>10.0.0-rc.1.25420.121</SystemReflectionMetadataPackageVersion>
81-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25420.121</SystemReflectionMetadataLoadContextPackageVersion>
82-
<SystemTextJsonPackageVersion>10.0.0-rc.1.25420.121</SystemTextJsonPackageVersion>
43+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25453.110</MicrosoftCodeAnalysisPackageVersion>
44+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25453.110</MicrosoftCodeAnalysisAnalyzersPackageVersion>
45+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25453.110</MicrosoftCodeAnalysisCSharpPackageVersion>
46+
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.100-rc.1.25453.110</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
47+
<MicrosoftDotNetApiCompatTaskPackageVersion>10.0.100-rc.1.25453.110</MicrosoftDotNetApiCompatTaskPackageVersion>
48+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetArcadeSdkPackageVersion>
49+
<MicrosoftDotNetBuildTasksArchivesPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetBuildTasksArchivesPackageVersion>
50+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetBuildTasksFeedPackageVersion>
51+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetBuildTasksInstallersPackageVersion>
52+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetBuildTasksPackagingPackageVersion>
53+
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
54+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
55+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25453.110</MicrosoftDotNetCecilPackageVersion>
57+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetCodeAnalysisPackageVersion>
58+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetGenAPIPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetHelixSdkPackageVersion>
61+
<MicrosoftDotNetPackageTestingPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetPackageTestingPackageVersion>
62+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetRemoteExecutorPackageVersion>
63+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
64+
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetXliffTasksPackageVersion>
65+
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.25453.110</MicrosoftDotNetXUnitAssertPackageVersion>
66+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.25453.110</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
67+
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetXUnitExtensionsPackageVersion>
68+
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25453.110</MicrosoftNetCompilersToolsetPackageVersion>
69+
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETSdkILPackageVersion>
70+
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rc.1.25453.110</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
71+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETCoreAppRefPackageVersion>
72+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETCoreILAsmPackageVersion>
73+
<NuGetFrameworksPackageVersion>7.0.0-preview.1.45410</NuGetFrameworksPackageVersion>
74+
<NuGetPackagingPackageVersion>7.0.0-preview.1.45410</NuGetPackagingPackageVersion>
75+
<NuGetProjectModelPackageVersion>7.0.0-preview.1.45410</NuGetProjectModelPackageVersion>
76+
<NuGetVersioningPackageVersion>7.0.0-preview.1.45410</NuGetVersioningPackageVersion>
77+
<runtimenativeSystemIOPortsPackageVersion>10.0.0-rc.1.25453.110</runtimenativeSystemIOPortsPackageVersion>
78+
<SystemCommandLinePackageVersion>2.0.0-rc.1.25453.110</SystemCommandLinePackageVersion>
79+
<SystemReflectionMetadataPackageVersion>10.0.0-rc.1.25453.110</SystemReflectionMetadataPackageVersion>
80+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25453.110</SystemReflectionMetadataLoadContextPackageVersion>
81+
<SystemTextJsonPackageVersion>10.0.0-rc.1.25453.110</SystemTextJsonPackageVersion>
8382
<!-- dotnet/runtime-assets dependencies -->
8483
<MicrosoftDotNetCilStripSourcesPackageVersion>10.0.0-beta.25310.1</MicrosoftDotNetCilStripSourcesPackageVersion>
8584
<MicrosoftNETHostModelTestDataPackageVersion>10.0.0-beta.25310.1</MicrosoftNETHostModelTestDataPackageVersion>

0 commit comments

Comments
 (0)