diff --git a/NuGet.config b/NuGet.config
index 99b1786a057..5b2606e130c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,12 +12,6 @@
-
-
-
-
-
-
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 7a8208065f8..7f0f6fb7806 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
- 11.0.0-beta.26313.102
- 11.0.0-beta.26313.102
- 0.11.5-preview.26313.102
- 11.0.0-beta.26313.102
- 11.0.0-preview.6.26313.102
- 11.0.0-preview.6.26313.102
- 11.0.0-preview.6.26313.102
- 11.0.100-preview.6.26313.102
- 11.0.0-preview.6.26313.102
- 11.0.100-preview.6.26313.102
+ 11.0.0-beta.26318.105
+ 11.0.0-beta.26318.105
+ 0.11.5-preview.26318.105
+ 11.0.0-beta.26318.105
+ 11.0.0-preview.6.26318.105
+ 11.0.0-preview.6.26318.105
+ 11.0.0-preview.6.26318.105
+ 11.0.100-preview.6.26318.105
+ 11.0.0-preview.6.26318.105
+ 11.0.100-preview.6.26318.105
26.0.11017
26.5.10291
@@ -26,7 +26,7 @@ This file should be imported by eng/Versions.props
26.0.11017
26.5.10291
- 11.0.0-prerelease.26264.1
+ 11.0.0-prerelease.26217.1
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 96153f65eed..89a1b92f8e5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,29 +1,29 @@
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
@@ -61,25 +61,25 @@
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
https://github.com/dotnet/xharness
866707736d49c2323628744716cda2475b3af9ee
-
+
https://github.com/dotnet/dotnet
- 06787fc66d5364230924d00f2c5c251aeb7a31cd
+ ae899ea0758628a22feb37a1401ae397cc5fc8d1
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 4b4f6b0923f..2cbb725323e 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 719ee4b5874..3a9fdcfd0f5 100644
--- 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 45e5676c9eb..ce4ea40730a 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 f041e5ddd95..495d533a909 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 20d3dad5435..333be3232fc 100644
--- 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 00000000000..559a6663929
--- /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 fc72fe63049..de32a6da377 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 48cab70ebf4..05f9edd0aae 100644
--- 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 9183af3bbec..d47e35f96c5 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "11.0.100-preview.6.26313.102",
+ "version": "11.0.100-preview.6.26318.105",
"paths": [
"builds/downloads/dotnet",
"$host$"
@@ -8,9 +8,9 @@
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
- "dotnet": "11.0.100-preview.6.26313.102"
+ "dotnet": "11.0.100-preview.6.26318.105"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26313.102"
+ "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26318.105"
}
}