diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a8b0c15d312..73744b03f65 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,29 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.26315.110 - 11.0.0-beta.26315.110 - 11.0.0-beta.26315.110 - 11.0.0-beta.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 + 11.0.0-beta.26319.105 + 11.0.0-beta.26319.105 + 11.0.0-beta.26319.105 + 11.0.0-beta.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 - 11.0.0-preview.6.26315.110 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 + 11.0.0-preview.6.26319.105 11.0.0-preview.2.26270.1 @@ -46,7 +45,6 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftPrivateWinformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkGitHubPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2359ce6135e..e2ee149eb74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,74 @@ - + - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 - - - https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int a6da41e859712fcb3f2e5ed3474bdf86b4e5046a - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 https://github.com/dotnet/dotnet @@ -84,21 +80,21 @@ - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 @@ -109,9 +105,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 370cd7b60d2dd85838d34e7e43a4622f3681d9a7 + b756a8d8a0e64905e16c81911bb09a8110bc3395 diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets index 1c6c4a39b7c..84946323d75 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets @@ -1,17 +1,6 @@ - - - - - + - - - - + + + + <_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 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 ec67c2e988d..fec45476bdf 100644 --- a/global.json +++ b/global.json @@ -13,10 +13,10 @@ "dotnet": "11.0.100-preview.5.26227.104", "runtimes": { "dotnet/x64": [ - "$(MicrosoftNETCorePlatformsVersion)" + "$(MicrosoftNETCoreAppRefVersion)" ], "dotnet/x86": [ - "$(MicrosoftNETCorePlatformsVersion)" + "$(MicrosoftNETCoreAppRefVersion)" ] }, "vs": { @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26315.110", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26315.110", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26319.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26319.105", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {