diff --git a/NuGet.config b/NuGet.config index 671ab38936c684..5b89305119684c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,6 +27,7 @@ + diff --git a/eng/AcquireEmscriptenSdk.targets b/eng/AcquireEmscriptenSdk.targets index e0563d98ac3122..a30475d5fbc4bd 100644 --- a/eng/AcquireEmscriptenSdk.targets +++ b/eng/AcquireEmscriptenSdk.targets @@ -235,4 +235,27 @@ JS_ENGINES = [NODE_JS] + + + + + <_NodeValidationRoot>$([MSBuild]::EnsureTrailingSlash('$(EMSDK_PATH)'))node/ + <_NodeValidationExe>$(_NodeValidationRoot)bin/node + <_NodeValidationExe Condition="'$(HostOS)' == 'windows'">$(_NodeValidationRoot)bin/node.exe + <_NodeValidationNpmCli>$(_NodeValidationRoot)lib/node_modules/npm/bin/npm-cli.js + <_NodeValidationNpmCli Condition="'$(HostOS)' == 'windows'">$(_NodeValidationRoot)bin/node_modules/npm/bin/npm-cli.js + + + + + + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c0c900590e8d2c..2963247767d7b4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -36,7 +36,7 @@ This file should be imported by eng/Versions.props 5.12.0-1.26521.105 11.0.0 11.0.0 - 11.0.100-rtm.26521.105 + 11.0.100-rtm.26523.122 11.0.0 11.0.0 8.0.0-rc.52305 @@ -83,14 +83,14 @@ This file should be imported by eng/Versions.props 23.1.0-alpha.1.26505.4 23.1.0-alpha.1.26505.4 - 11.0.0-alpha.1.26517.3 - 11.0.0-alpha.1.26517.3 - 11.0.0-alpha.1.26517.3 - 11.0.0-alpha.1.26517.3 - 11.0.0-alpha.1.26517.3 - 11.0.0-alpha.1.26517.3 - 11.0.0-alpha.1.26517.3 - 11.0.0-alpha.1.26517.3 + 11.0.0-alpha.1.26523.2 + 11.0.0-alpha.1.26523.2 + 11.0.0-alpha.1.26523.2 + 11.0.0-alpha.1.26523.2 + 11.0.0-alpha.1.26523.2 + 11.0.0-alpha.1.26523.2 + 11.0.0-alpha.1.26523.2 + 11.0.0-alpha.1.26523.2 1.0.0-prerelease.26502.1 1.0.0-prerelease.26502.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20b51a488ec4a4..ad1d6b1453dd6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/dotnet 6fa58a2ef810f82b3197d69763cedfb34c88b9fd - + https://github.com/dotnet/dotnet - 6fa58a2ef810f82b3197d69763cedfb34c88b9fd + 2b5a4387dbee6181159f53c9ab1ada19a5ebe720 https://github.com/dotnet/dotnet @@ -385,37 +385,37 @@ https://github.com/dotnet/dotnet 6fa58a2ef810f82b3197d69763cedfb34c88b9fd - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 - - https://github.com/dotnet/node - 1ab9161aaf6814d105d3aa78c752bfd222e0946e + + https://dev.azure.com/dnceng/internal/_git/dotnet-node + 8c288428de44adaab8f60963302d0ab511eb5887 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 5875ac42b07077..0137b8dea7749e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,6 +30,8 @@ <_DotnetSdkVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportVersion) $(_DotnetSdkVersion) $(_GlobalJsonSdkVersion) + + $(_GlobalJsonSdkVersion) $([System.String]::Copy('$(SdkVersionForWorkloadTesting)').Split('.')[0]) $(SdkMajorVersion).0.100 $([System.Text.RegularExpressions.Regex]::Match($(SdkVersionForWorkloadTesting), '-(?!rtm|servicing)(.+)\.[^.]+\.[^.]+$').Groups[1].Value) @@ -168,6 +170,8 @@ $(MicrosoftDotNetApiCompatTaskPackageVersion) + + $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) 6.0.2