Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4fe34ed
[release/9.0] Stop testing with nodejs (#120193)
ilonatommy Oct 13, 2025
355e4a2
Merge pull request #120679 from dotnet/merge/release/9.0-to-release/9…
PranavSenthilnathan Oct 15, 2025
3a9ff7e
Update dependencies from https://github.com/dotnet/icu build 20251011…
dotnet-maestro[bot] Oct 15, 2025
1c283ed
Update dependencies from https://github.com/dotnet/cecil build 202510…
dotnet-maestro[bot] Oct 15, 2025
144ddb1
[release/9.0-staging] Update dependencies from dotnet/source-build-re…
dotnet-maestro[bot] Oct 16, 2025
0f4450f
[release/9.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Oct 16, 2025
128bbc9
[release/9.0-staging] Update dependencies from dotnet/cecil (#120782)
dotnet-maestro[bot] Oct 16, 2025
8af0613
Merge branch 'release/9.0-staging' into merge/release/9.0-to-release/…
PranavSenthilnathan Oct 17, 2025
bfc7448
[release/9.0-staging] Update dependencies from dotnet/runtime-assets …
dotnet-maestro[bot] Oct 28, 2025
53330eb
[release/9.0-staging] disable multicast tests on AzureLinux (#119475)
github-actions[bot] Oct 30, 2025
1d264f7
[release/9.0-staging] Simplify findvcvarsall.bat (#120913)
github-actions[bot] Nov 3, 2025
b96bc2b
[automated] Merge branch 'release/9.0' => 'release/9.0-staging' (#120…
PranavSenthilnathan Nov 4, 2025
e3f337f
[release/9.0-staging] Update dependencies from dotnet/xharness (#120764)
dotnet-maestro[bot] Nov 4, 2025
d892abe
[release/9.0-staging] Update dependencies from dotnet/cecil (#120926)
dotnet-maestro[bot] Nov 5, 2025
fe1f52e
[release/9.0-staging] Update dependencies from dotnet/icu (#120834)
dotnet-maestro[bot] Nov 5, 2025
54d40cf
[release/9.0-staging] [mono][sgen] Add option to disable tarjan gc br…
github-actions[bot] Nov 6, 2025
3bb4ae2
[release/9.0-staging] Remove audit sources from NuGet.config (#121426)
github-actions[bot] Nov 7, 2025
b0fe7d0
[release/9.0-staging] Update dependencies from dotnet/arcade (#121430)
dotnet-maestro[bot] Nov 11, 2025
e9313ed
[release/9.0-staging] Update dependencies from dotnet/cecil (#121516)
dotnet-maestro[bot] Nov 11, 2025
d4ff345
[release/9.0-staging] Add flags when the clang's major version is > 2…
AaronRobinsonMSFT Nov 14, 2025
0c90233
[release/9.0-staging] Update dependencies from dotnet/cecil (#121606)
dotnet-maestro[bot] Nov 14, 2025
ff25726
[release/9.0-staging] Update dependencies from dotnet/roslyn (#121568)
dotnet-maestro[bot] Nov 14, 2025
06055b1
[release/9.0-staging] Update dependencies from dotnet/source-build-re…
dotnet-maestro[bot] Nov 14, 2025
3e7bf22
[release/9.0-staging] Don't try to offer a conversion to SG COM when …
github-actions[bot] Nov 14, 2025
556caa4
[release/9.0-staging] [mono] Fix crash while debugging AOT'ed app. (#…
github-actions[bot] Nov 14, 2025
930a779
[release/9.0-staging] Backport Replace test certificate chain that us…
vcsjones Nov 17, 2025
b76a97f
Merge branch 'release/9.0-staging' into merge/release/9.0-to-release/…
steveisok Nov 20, 2025
4f25f80
[release/9.0-staging] Update dependencies from dotnet/cecil (#121725)
dotnet-maestro[bot] Nov 20, 2025
81d9bea
[release/9.0-staging] Update dependencies from dotnet/roslyn (#121724)
dotnet-maestro[bot] Nov 20, 2025
e09cc44
[release/9.0-staging] Update dependencies from dotnet/xharness (#121693)
dotnet-maestro[bot] Nov 20, 2025
7b46d58
[release/9.0-staging] Update dependencies from dotnet/icu (#121678)
dotnet-maestro[bot] Nov 20, 2025
504ce9c
[release/9.0-staging] Update dependencies from dotnet/runtime-assets …
dotnet-maestro[bot] Nov 20, 2025
525dfe9
[release/9.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Nov 20, 2025
9f7961a
Merge branch 'release/9.0-staging' into merge/release/9.0-to-release/…
akoeplinger Nov 21, 2025
a2494f9
[release/9.0-staging] Update dependencies from dotnet/icu (#121944)
dotnet-maestro[bot] Nov 26, 2025
100e27b
[release/9.0-staging] Don't assume all S_IFREG files are seekable (#1…
github-actions[bot] Dec 1, 2025
fd6fdd4
[release/9.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Dec 3, 2025
14f00aa
[release/9.0-staging] Update dependencies from dotnet/xharness (#121908)
dotnet-maestro[bot] Dec 3, 2025
a2accf3
Merge branch 'release/9.0-staging' into merge/release/9.0-to-release/…
SamMonoRT Dec 3, 2025
a3a201f
[automated] Merge branch 'release/9.0' => 'release/9.0-staging' (#121…
akoeplinger Dec 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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": "9.0.0-prerelease.25504.2",
"version": "9.0.0-prerelease.25570.2",
"commands": [
"xharness"
]
Expand Down
4 changes: 0 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
<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" />
</packageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</auditSources>
<disabledPackageSources>
<clear />
</disabledPackageSources>
Expand Down
188 changes: 94 additions & 94 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25467.18</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.12.0-3.25467.18</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25467.18</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25569.8</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
Expand Down Expand Up @@ -85,22 +85,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.109</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25515.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25515.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25515.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25515.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25515.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25515.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25515.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25515.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25515.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25555.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25555.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25555.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25555.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25555.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25555.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25555.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25555.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25555.4</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down Expand Up @@ -147,20 +147,20 @@
<SystemTextEncodingsWebToolsetVersion>8.0.0</SystemTextEncodingsWebToolsetVersion>
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25504.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25504.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>9.0.0-beta.25504.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25504.2</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>9.0.0-beta.25504.2</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>9.0.0-beta.25504.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>9.0.0-beta.25504.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>9.0.0-beta.25504.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25504.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25504.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25504.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25504.2</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25504.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25504.2</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25565.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25565.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>9.0.0-beta.25565.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25565.2</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>9.0.0-beta.25565.2</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>9.0.0-beta.25565.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>9.0.0-beta.25565.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>9.0.0-beta.25565.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25565.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25565.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25565.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25565.2</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25565.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25565.2</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand Down Expand Up @@ -191,11 +191,11 @@
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<!-- xharness -->
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25504.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25504.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25504.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25570.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25570.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25570.2</MicrosoftDotNetXHarnessCLIVersion>
<!-- hotreload-utils -->
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25504.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25574.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<NUnitVersion>3.12.0</NUnitVersion>
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
Expand Down Expand Up @@ -223,11 +223,11 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
<!-- Mono Cecil -->
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25504.2</MicrosoftDotNetCecilVersion>
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25566.3</MicrosoftDotNetCecilVersion>
<!-- ILCompiler -->
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25509.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25574.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ jobs:
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@ stages:

- task: NuGetAuthenticate@1

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
Expand Down
18 changes: 15 additions & 3 deletions eng/native/configurecompiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,21 @@ if (CLR_CMAKE_HOST_UNIX)
# Disable frame pointer optimizations so profilers can get better call stacks
add_compile_options(-fno-omit-frame-pointer)

# Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around
# using twos-complement representation (this is normally undefined according to the C++ spec).
add_compile_options(-fwrapv)
if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0) OR
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0))
# Make signed overflow well-defined. Implies the following flags in clang-20 and above.
# -fwrapv - Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around
# using twos-complement representation (this is normally undefined according to the C++ spec).
# -fwrapv-pointer - The same as -fwrapv but for pointers.
add_compile_options(-fno-strict-overflow)

# Suppress C++ strict aliasing rules. This matches our use of MSVC.
add_compile_options(-fno-strict-aliasing)
else()
# Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around
# using twos-complement representation (this is normally undefined according to the C++ spec).
add_compile_options(-fwrapv)
endif()

if(CLR_CMAKE_HOST_APPLE)
# Clang will by default emit objc_msgSend stubs in Xcode 14, which ld from earlier Xcodes doesn't understand.
Expand Down
29 changes: 0 additions & 29 deletions eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,33 +92,6 @@ jobs:
- WasmTestOnV8
- WasmTestOnChrome

# this only runs on the extra pipeline
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
parameters:
platforms:
- browser_wasm
nameSuffix: _NodeJs
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
scenarios:
- WasmTestOnNodeJS

# Library tests - Windows - this only runs on the extra pipeline
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
parameters:
platforms:
- browser_wasm_win
nameSuffix: _NodeJs
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
# Don't run for rolling builds, as this is covered
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
scenarios:
- WasmTestOnNodeJS

# EAT Library tests - only run on linux
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
parameters:
Expand Down Expand Up @@ -201,7 +174,6 @@ jobs:
scenarios:
- WasmTestOnChrome
- WasmTestOnFirefox
- WasmTestOnNodeJS

# # Hybrid Globalization AOT tests
# # ActiveIssue: https://github.com/dotnet/runtime/issues/51746
Expand All @@ -218,7 +190,6 @@ jobs:
# alwaysRun: true
# scenarios:
# - WasmTestOnChrome
# - WasmTestOnNodeJS

- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
# Builds only
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,6 @@ extends:
# scenarios:
# - WasmTestOnChrome
# - WasmTestOnFirefox
# #- WasmTestOnNodeJS - this is not supported yet, https://github.com/dotnet/runtime/issues/85592

# EAT Library tests - only run on linux
- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
Expand Down
12 changes: 1 addition & 11 deletions eng/testing/WasmRunnerTemplate.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,14 @@ if [%XHARNESS_COMMAND%] == [] (

if /I [%XHARNESS_COMMAND%] == [test] (
if [%JS_ENGINE%] == [] (
if /I [%SCENARIO%] == [WasmTestOnNodeJS] (
set "JS_ENGINE=--engine^=NodeJS"
) else (
set "JS_ENGINE=--engine^=V8"
)
set "JS_ENGINE=--engine^=V8"
)
if [%MAIN_JS%] == [] (
set "MAIN_JS=--js-file^=test-main.js"
)

if [%JS_ENGINE_ARGS%] == [] (
set "JS_ENGINE_ARGS=--engine-arg^=--stack-trace-limit^=1000"
if /I NOT [%SCENARIO%] == [WasmTestOnNodeJS] (
set "JS_ENGINE_ARGS=%JS_ENGINE_ARGS% --engine-arg^=--module"
)
if /I [%SCENARIO%] == [WasmTestOnNodeJS] (
set "JS_ENGINE_ARGS=%JS_ENGINE_ARGS% --engine-arg^=--experimental-wasm-eh"
)
)
) else (
if /I [%SCENARIO%] == [WasmTestOnChrome] (
Expand Down
17 changes: 4 additions & 13 deletions eng/testing/WasmRunnerTemplate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,13 @@ if [[ "$XHARNESS_COMMAND" == "test" ]]; then

if [[ -z "$JS_ENGINE_ARGS" ]]; then
JS_ENGINE_ARGS="--engine-arg=--stack-trace-limit=1000"
if [[ "$SCENARIO" != "WasmTestOnNodeJS" && "$SCENARIO" != "wasmtestonnodejs" ]]; then
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --engine-arg=--module"
fi
if [[ "$SCENARIO" == "WasmTestOnNodeJS" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --engine-arg=--experimental-wasm-eh"
fi
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --engine-arg=--module"
fi

if [[ -z "$JS_ENGINE" ]]; then
if [[ "$SCENARIO" == "WasmTestOnNodeJS" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
JS_ENGINE="--engine=NodeJS"
else
JS_ENGINE="--engine=V8"
if [[ -n "$V8_PATH_FOR_TESTS" ]]; then
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --js-engine-path=$V8_PATH_FOR_TESTS"
fi
JS_ENGINE="--engine=V8"
if [[ -n "$V8_PATH_FOR_TESTS" ]]; then
JS_ENGINE_ARGS="$JS_ENGINE_ARGS --js-engine-path=$V8_PATH_FOR_TESTS"
fi
fi
else
Expand Down
9 changes: 1 addition & 8 deletions eng/testing/tests.browser.targets
Original file line number Diff line number Diff line change
Expand Up @@ -245,24 +245,17 @@
<Error Condition="'$(Scenario)' != 'WasmTestOnV8' and
'$(Scenario)' != 'WasmTestOnChrome' and
'$(Scenario)' != 'WasmTestOnFirefox' and
'$(Scenario)' != 'WasmTestOnNodeJS' and
'$(Scenario)' != 'WasmDebuggerTests' and
'$(Scenario)' != 'BuildWasmApps'"
Text="Only supported scenarios are WasmTestOnV8, WasmTestOnNodeJS, WasmTestOnChrome, WasmTestOnFirefox, WasmDebuggerTests and BuildWasmApps at the moment. It was $(Scenario)." />
Text="Only supported scenarios are WasmTestOnV8, WasmTestOnChrome, WasmTestOnFirefox, WasmDebuggerTests and BuildWasmApps at the moment. It was $(Scenario)." />

<!-- Restore NPM packages -->
<ItemGroup Condition="'$(OS)' != 'Windows_NT'">
<SetScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then export WasmXHarnessMonoArgs=&quot;$WasmXHarnessMonoArgs --setenv=NPM_MODULES=$(NodeNpmModuleString)&quot;; fi" />
<RunScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then npm ci; fi" />

<SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="export PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
<SetScriptCommands Condition="'$(InstallFirefoxForTests)' == 'true' and '$(GeckoDriverBinaryPath)' != ''" Include="export PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(GeckoDriverBinaryPath)))" />
<SetScriptCommands Condition="'$(IsBrowserWasmProject)' == 'true'" Include="export RuntimeIdentifier=browser-wasm" />
</ItemGroup>
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
<SetScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( set &quot;WasmXHarnessMonoArgs=%WasmXHarnessMonoArgs% --setenv=NPM_MODULES^=$(NodeNpmModuleString)&quot; )" />
<RunScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( call npm ci )" />

<SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
<SetScriptCommands Condition="'$(InstallFirefoxForTests)' == 'true' and '$(GeckoDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(GeckoDriverBinaryPath)))" />
<SetScriptCommands Condition="'$(IsBrowserWasmProject)' == 'true'" Include="set RuntimeIdentifier=browser-wasm" />
Expand Down
Loading
Loading