diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 2fa7d1bc38..ff875006d5 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -20,11 +20,11 @@ This file should be imported by eng/Versions.props
11.0.0-alpha.1.26308.211.0.0-alpha.1.26308.2
- 11.0.0-beta.26311.113
- 11.0.0-beta.26311.113
- 11.0.0-beta.26311.113
- 11.0.0-beta.26311.113
- 11.0.0-beta.26311.113
+ 11.0.0-beta.26328.106
+ 11.0.0-beta.26328.106
+ 11.0.0-beta.26328.106
+ 11.0.0-beta.26328.106
+ 11.0.0-beta.26328.10611.0.0-alpha.1.26314.1
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f70c95ff7d..9ba9fedf09 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,6 +1,6 @@
-
+ https://github.com/dotnet/binaryen
@@ -236,25 +236,25 @@
https://github.com/dotnet/llvm-project921a6f0c606b4504c5d221aede62d4e35339ec1c
-
+ https://github.com/dotnet/dotnet
- 50e862b8da0c82ddbf3952cfe61a8681ab93f5bc
+ 4e63ed688b0db806aa962c318a237b22aa069435
-
+ https://github.com/dotnet/dotnet
- 50e862b8da0c82ddbf3952cfe61a8681ab93f5bc
+ 4e63ed688b0db806aa962c318a237b22aa069435
-
+ https://github.com/dotnet/dotnet
- 50e862b8da0c82ddbf3952cfe61a8681ab93f5bc
+ 4e63ed688b0db806aa962c318a237b22aa069435
-
+ https://github.com/dotnet/dotnet
- 50e862b8da0c82ddbf3952cfe61a8681ab93f5bc
+ 4e63ed688b0db806aa962c318a237b22aa069435
-
+ https://github.com/dotnet/dotnet
- 50e862b8da0c82ddbf3952cfe61a8681ab93f5bc
+ 4e63ed688b0db806aa962c318a237b22aa069435
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 4b4f6b0923..2cbb725323 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -173,7 +173,11 @@ try {
if (-not $excludeCIBinarylog) {
$binaryLog = $true
}
- $nodeReuse = $false
+ # Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
+ # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
+ if ($env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
+ $nodeReuse = $false
+ }
}
if (-not [string]::IsNullOrEmpty($binaryLogName)) {
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 719ee4b587..3a9fdcfd0f 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -213,7 +213,11 @@ if [[ -z "$configuration" ]]; then
fi
if [[ "$ci" == true ]]; then
- node_reuse=false
+ # Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
+ # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
+ if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
+ node_reuse=false
+ fi
if [[ "$exclude_ci_binary_log" == false ]]; then
binary_log=true
fi
diff --git a/eng/common/dotnet.ps1 b/eng/common/dotnet.ps1
index 45e5676c9e..ce4ea40730 100644
--- a/eng/common/dotnet.ps1
+++ b/eng/common/dotnet.ps1
@@ -8,4 +8,5 @@ $dotnetRoot = InitializeDotNetCli -install:$true
if ($args.count -gt 0) {
$env:DOTNET_NOLOGO=1
& "$dotnetRoot\dotnet.exe" $args
+ ExitWithExitCode $LASTEXITCODE
}
diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1
index f041e5ddd9..495d533a90 100644
--- a/eng/common/msbuild.ps1
+++ b/eng/common/msbuild.ps1
@@ -14,7 +14,11 @@ Param(
try {
if ($ci) {
- $nodeReuse = $false
+ # Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
+ # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
+ if ($env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
+ $nodeReuse = $false
+ }
}
MSBuild @extraArgs
diff --git a/eng/common/msbuild.sh b/eng/common/msbuild.sh
index 20d3dad543..333be3232f 100755
--- a/eng/common/msbuild.sh
+++ b/eng/common/msbuild.sh
@@ -51,7 +51,11 @@ done
. "$scriptroot/tools.sh"
if [[ "$ci" == true ]]; then
- node_reuse=false
+ # Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
+ # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
+ if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
+ node_reuse=false
+ fi
fi
MSBuild $extra_args
diff --git a/eng/common/native/NativeAotSupported.props b/eng/common/native/NativeAotSupported.props
new file mode 100644
index 0000000000..559a666392
--- /dev/null
+++ b/eng/common/native/NativeAotSupported.props
@@ -0,0 +1,26 @@
+
+
+
+
+ <_NativeAotSupportedOS Condition="
+ '$(TargetOS)' != 'browser' and
+ '$(TargetOS)' != 'haiku' and
+ '$(TargetOS)' != 'illumos' and
+ '$(TargetOS)' != 'netbsd' and
+ '$(TargetOS)' != 'solaris'
+ ">true
+
+
+ <_NativeAotSupportedArch Condition="
+ '$(TargetArchitecture)' != 'wasm' and
+ ('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows')
+ ">true
+
+ true
+
+
+
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index fc72fe6304..de32a6da37 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -742,7 +742,9 @@ function MSBuild() {
ExitWithExitCode 1
}
- if ($nodeReuse) {
+ # Node reuse must be disabled in CI builds unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
+ # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
+ if ($nodeReuse -and $env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
Write-PipelineTelemetryError -Category 'Build' -Message 'Node reuse must be disabled in CI build.'
ExitWithExitCode 1
}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 48cab70ebf..05f9edd0aa 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -497,7 +497,9 @@ function MSBuild {
ExitWithExitCode 1
fi
- if [[ "$node_reuse" == true ]]; then
+ # Node reuse must be disabled in CI builds unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
+ # Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
+ if [[ "$node_reuse" == true && "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
Write-PipelineTelemetryError -category 'Build' "Node reuse must be disabled in CI build."
ExitWithExitCode 1
fi
diff --git a/global.json b/global.json
index 8df0045adb..d49ba07338 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "11.0.100-preview.5.26227.104",
+ "version": "11.0.100-preview.5.26302.115",
"allowPrerelease": true,
"rollForward": "major",
"paths": [
@@ -10,11 +10,11 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
- "dotnet": "11.0.100-preview.5.26227.104"
+ "dotnet": "11.0.100-preview.5.26302.115"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26311.113",
- "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26311.113",
+ "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26328.106",
+ "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26328.106",
"Microsoft.Build.Traversal": "3.4.0"
}
}