diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e2f373c3198e..56aaf58a93c6 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.helix.jobmonitor": { - "version": "11.0.0-beta.26363.117", + "version": "11.0.0-beta.26378.106", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/Directory.Build.props b/Directory.Build.props index d21f6264f6d7..2d63571405fa 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -96,24 +96,12 @@ false - - - true - low - all false - - - false - - enable diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2cb9809360e7..d2dcecd7ad46 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -11,131 +11,131 @@ This file should be imported by eng/Versions.props 11.0.0-preview.5.26272.112 11.0.0-preview.5.26272.112 11.0.0-preview.5.26272.112 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.1.0-preview.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 18.10.0-1.26363.117 - 18.10.0-1.26363.117 - 7.10.0-rc.36417 - 18.10.0-1.26363.117 - 11.0.100-preview.7.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 11.1.0-preview.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 2.0.0-preview.1.26363.117 - 3.0.0-preview.7.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-beta.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 15.2.101-preview7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 5.10.0-1.26363.117 - 5.10.0-1.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.1.0-preview.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 18.10.0-1.26378.106 + 18.10.0-1.26378.106 + 7.10.0-rc.37906 + 18.10.0-1.26378.106 + 11.0.100-preview.7.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 11.1.0-preview.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 2.0.0-preview.1.26378.106 + 3.0.0-preview.7.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-beta.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 15.2.101-preview7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 5.10.0-1.26378.106 + 5.10.0-1.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 11.0.0-preview.7.26360.111 - 11.1.0-preview.26363.117 - 11.0.0-preview.7.26363.117 - 18.10.0-preview-26363-117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.100-preview.7.26363.117 - 11.0.100-preview.7.26363.117 - 11.0.100-preview.7.26363.117 - 11.0.100-preview.7.26363.117 - 11.0.100-preview.7.26363.117 - 18.10.0-preview-26363-117 - 18.10.0-preview-26363-117 - 3.3.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 7.10.0-rc.36417 - 11.0.0-preview.7.26363.117 - 3.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 - 11.0.0-preview.7.26363.117 + 11.1.0-preview.26378.106 + 11.0.0-preview.7.26378.106 + 18.10.0-release-26378-106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.100-preview.7.26378.106 + 11.0.100-preview.7.26378.106 + 11.0.100-preview.7.26378.106 + 11.0.100-preview.7.26378.106 + 11.0.100-preview.7.26378.106 + 18.10.0-release-26378-106 + 18.10.0-release-26378-106 + 3.3.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 7.10.0-rc.37906 + 11.0.0-preview.7.26378.106 + 3.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 + 11.0.0-preview.7.26378.106 2.4.0-preview.26372.14 2.3.0-preview.26330.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d7c7b08cdad..213db71cad22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 @@ -28,174 +28,174 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 https://github.com/dotnet/dotnet @@ -242,258 +242,258 @@ https://github.com/dotnet/dotnet 85ca690954a6f5e988d523dec249b57b84d1ad0d - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 https://github.com/dotnet/dotnet @@ -501,45 +501,45 @@ - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - + https://github.com/dotnet/dotnet - b25932e8d128b5242f1d89691f8e8171b82774c0 + ab4a9a5f25db0b29e980a7acfab46bc4eca924c3 - 11.0.0-preview.1.26102.3 - 36.1.99-preview.1.119 - 26.2.11310-net11-p1 - 26.2.11310-net11-p1 - 26.2.11310-net11-p1 - 26.2.11310-net11-p1 + 11.0.0-preview.6.26360.8 + 37.0.0-preview.6.59 + 26.5.11720-net11-p6 + 26.5.11720-net11-p6 + 26.5.11720-net11-p6 + 26.5.11720-net11-p6 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 2cbb725323e8..dd84699f500c 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -23,6 +23,7 @@ Param( [switch] $clean, [switch][Alias('pb')]$productBuild, [switch]$fromVMR, + [switch]$disablePipelineSetResult, [switch][Alias('bl')]$binaryLog, [string][Alias('bln')]$binaryLogName = '', [switch][Alias('nobl')]$excludeCIBinarylog, @@ -80,6 +81,7 @@ function Print-Usage() { Write-Host " -nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" Write-Host " -buildCheck Sets /check msbuild parameter" Write-Host " -fromVMR Set when building from within the VMR" + Write-Host " -disablePipelineSetResult Set to disable masking the actual exit code in the pipeline when the build fails" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." diff --git a/eng/common/build.sh b/eng/common/build.sh index 3a9fdcfd0f59..e37edd6cff34 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -40,12 +40,14 @@ usage() echo " --projects Project or solution file(s) to build" echo " --ci Set when running on CI server" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo " --pipelinesLog Promote msbuild errors/warnings to Azure Pipelines timeline issues; defaults to on in CI (short: -pl)" echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" echo " --warnNotAsError Sets a semi-colon delimited list of warning codes that should not be treated as errors" echo " --buildCheck Sets /check msbuild parameter" echo " --fromVMR Set when building from within the VMR" + echo " --disablePipelineSetResult Set to disable masking the actual exit code in the pipeline when the build fails" echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -68,6 +70,7 @@ build=false source_build=false product_build=false from_vmr=false +disable_pipeline_set_result=false rebuild=false test=false integration_test=false @@ -86,6 +89,7 @@ build_check=false binary_log=false binary_log_name='' exclude_ci_binary_log=false +pipelines_log=false projects='' configuration='' @@ -124,6 +128,9 @@ while [[ $# -gt 0 ]]; do -excludecibinarylog|-nobl) exclude_ci_binary_log=true ;; + -pipelineslog|-pl) + pipelines_log=true + ;; -restore|-r) restore=true ;; @@ -152,6 +159,9 @@ while [[ $# -gt 0 ]]; do -fromvmr|-from-vmr) from_vmr=true ;; + -disablepipelinesetresult|-disable-pipeline-set-result) + disable_pipeline_set_result=true + ;; -test|-t) test=true ;; @@ -213,6 +223,7 @@ if [[ -z "$configuration" ]]; then fi if [[ "$ci" == true ]]; then + pipelines_log=true # 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 diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 96287e55a15b..0da13cf69dbc 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -65,6 +65,14 @@ parameters: type: boolean default: true +# When true, test results are reported to Azure DevOps using the fully qualified test name +# (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as +# well (--use-fully-qualified-test-name). Opt-in because it changes AzDO test identity and display; +# primarily useful for frameworks like MSTest whose display name is only the method name. +- name: useFullyQualifiedTestName + type: boolean + default: false + # Advanced: optional pipeline artifact (produced earlier in this run) that contains the tool # nupkg. When set, the artifact is downloaded and the tool is installed from the nupkg into # a local tool-path; this bypasses the repo's .config/dotnet-tools.json manifest and is @@ -176,11 +184,12 @@ jobs: set -euo pipefail toolArgs=( - --helix-base-uri '${{ parameters.helixBaseUri }}' - --polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}' - --fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}' - --max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully. - --stage-name '$(System.StageName)' + --helix-base-uri '${{ parameters.helixBaseUri }}' + --polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}' + --fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}' + --use-fully-qualified-test-name '${{ parameters.useFullyQualifiedTestName }}' + --max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully. + --stage-name '$(System.StageName)' ) organization='${{ parameters.organization }}' diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 86ea9f635042..2816d2905a06 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,6 +8,12 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + # Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat). + # When set, dnceng/internal builds acquire a federated Entra token instead of using a PAT. + # All other projects (e.g. DevDiv, public), where this dnceng-scoped service connection does not + # exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter. + CeapexServiceConnection: 'dnceng-onelocbuild-ceapex' + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false @@ -74,6 +80,15 @@ jobs: displayName: Generate LocProject.json condition: ${{ parameters.condition }} + # Acquire an Entra token for ceapex feed access via WIF (dnceng/internal only). + # All other projects use PAT-based auth, since the ceapex service connection is scoped to dnceng/internal. + - ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: + - template: /eng/common/templates/steps/get-federated-access-token.yml + parameters: + federatedServiceConnection: ${{ parameters.CeapexServiceConnection }} + outputVariableName: 'CeapexEntraToken' + condition: ${{ parameters.condition }} + - task: OneLocBuild@2 displayName: OneLocBuild env: @@ -89,7 +104,10 @@ jobs: isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} + ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}: + patVariable: $(CeapexEntraToken) + ${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}: + patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 453bb1ba5b1e..38a3512f148d 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -453,9 +453,12 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "x86" ]]; then __AlpineVersion=3.17 # minimum version that supports lldb-dev __AlpinePackages+=" llvm15-libs" - elif [[ "$__AlpineArch" == "riscv64" || "$__AlpineArch" == "loongarch64" ]]; then + elif [[ "$__AlpineArch" == "loongarch64" ]]; then __AlpineVersion=3.21 # minimum version that supports lldb-dev __AlpinePackages+=" llvm19-libs" + elif [[ "$__AlpineArch" == "riscv64" ]]; then + __AlpineVersion=3.22 # lldb-dev requires 3.21+, but 3.22+ provides the newer linux-headers needed for RISC-V extension probes + __AlpinePackages+=" llvm20-libs" elif [[ -n "$__AlpineMajorVersion" ]]; then # use whichever alpine version is provided and select the latest toolchain libs __AlpineLlvmLibsLookup=1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ead7fe3ef263..70b71395e3ba 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -87,6 +87,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl) set(TOOLCHAIN "powerpc64le-alpine-linux-musl") + elseif(FREEBSD) + set(TOOLCHAIN "powerpc64le-unknown-freebsd14") else() set(TOOLCHAIN "powerpc64le-linux-gnu") endif() diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh index 38921d4338f7..62d62fed522a 100644 --- a/eng/common/native/init-os-and-arch.sh +++ b/eng/common/native/init-os-and-arch.sh @@ -27,6 +27,10 @@ if [ "$os" = "sunos" ]; then os="solaris" fi CPUName=$(isainfo -n) +elif [ "$os" = "freebsd" ]; then + # FreeBSD's `uname -m` is the machine class ("powerpc" for every PowerPC + # variant); `uname -p` gives the specific processor (e.g. powerpc64le). + CPUName=$(uname -p) else # For the rest of the operating systems, use uname(1) to determine what the CPU is. CPUName=$(uname -m) @@ -75,7 +79,7 @@ case "$CPUName" in arch=s390x ;; - ppc64le) + ppc64le|powerpc64le) arch=ppc64le ;; *) diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 68119de603ef..8d72d803dd2a 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -4,7 +4,9 @@ Param( [string] $task, [string] $verbosity = 'minimal', [string] $msbuildEngine = $null, - [switch] $restore, + # Restore defaults to on; -restore is retained only so existing consumers that pass it don't break. Use -norestore to opt out. + [switch] $restore = $true, + [switch] $norestore, [switch] $prepareMachine, [switch][Alias('nobl')]$excludeCIBinaryLog, [switch]$noWarnAsError, @@ -18,12 +20,23 @@ $ci = $true $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true } $warnAsError = if ($noWarnAsError) { $false } else { $true } +# Reconcile the restore state before importing tools.ps1: it reads $restore at import time to +# decide whether toolset/SDK acquisition installs. -norestore must win so that skipping restore +# also skips toolset initialization, not just the explicit Restore build below. +if ($norestore) { $restore = $false } + +# sdk-task runs a standalone Arcade SDK task and does not need repo-specific toolset setup. +# Skip importing configure-toolset.ps1 so its side effects (e.g. a repo's configure-toolset.ps1 +# calling exit) don't terminate this script before the task runs. +$disableConfigureToolsetImport = $true + . $PSScriptRoot\tools.ps1 function Print-Usage() { Write-Host "Common settings:" Write-Host " -task Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)" - Write-Host " -restore Restore dependencies" + Write-Host " -restore (Legacy) Restore runs by default; retained for backward compatibility. Use -norestore to skip" + Write-Host " -norestore Skip restoring dependencies" Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" Write-Host " -help Print help and exit" Write-Host "" diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 1cf71bb2aea4..a7f1ba060d73 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -3,7 +3,8 @@ show_usage() { echo "Common settings:" echo " --task Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)" - echo " --restore Restore dependencies" + echo " --restore (Legacy) Restore runs by default; retained for backward compatibility. Use --norestore to skip" + echo " --norestore Skip restoring dependencies" echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" echo " --help Print help and exit" echo "" @@ -50,10 +51,11 @@ binary_log=true configuration="Debug" verbosity="minimal" exclude_ci_binary_log=false -restore=false +# restore defaults to on; --restore is retained only so existing consumers that pass it don't break. Use --norestore to opt out. +restore=true help=false properties='' -warnAsError=true +warn_as_error=true while (($# > 0)); do lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" @@ -63,7 +65,10 @@ while (($# > 0)); do shift 2 ;; --restore) - restore=true + shift 1 + ;; + --norestore) + restore=false shift 1 ;; --verbosity) @@ -75,8 +80,8 @@ while (($# > 0)); do exclude_ci_binary_log=true shift 1 ;; - --noWarnAsError) - warnAsError=false + --nowarnaserror) + warn_as_error=false shift 1 ;; --help) @@ -97,6 +102,11 @@ if $help; then exit 0 fi +# sdk-task runs a standalone Arcade SDK task and does not need repo-specific toolset setup. +# Skip importing configure-toolset.sh so its side effects (e.g. a repo's configure-toolset.sh +# calling exit) don't terminate this script before the task runs. +disable_configure_toolset_import=1 + . "$scriptroot/tools.sh" InitializeToolset diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6f664ad890ba..da07386ff1fe 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -13,6 +13,12 @@ # Set to true to output binary log from msbuild. Note that emitting binary log slows down the build. [bool]$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $ci -and !$excludeCIBinarylog } +# Set to true to use the pipelines logger which will enable Azure logging output. +# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md +# This flag is meant as a temporary opt-in for the feature while validating it across +# our consumers. It will be deleted in the future. +[bool]$pipelinesLog = if (Test-Path variable:pipelinesLog) { $pipelinesLog } else { $ci } + # Turns on machine preparation/clean up code that changes the machine state (e.g. kills build processes). [bool]$prepareMachine = if (Test-Path variable:prepareMachine) { $prepareMachine } else { $false } @@ -65,6 +71,8 @@ $ErrorActionPreference = 'Stop' # True when the build is running within the VMR. [bool]$fromVMR = if (Test-Path variable:fromVMR) { $fromVMR } else { $false } +[bool]$disablePipelineSetResult = if (Test-Path variable:disablePipelineSetResult) { $disablePipelineSetResult } else { $false } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -713,7 +721,17 @@ function InitializeToolset() { $downloadArgs += "--configfile" $downloadArgs += $nugetConfig } - DotNet @downloadArgs + + # 'dotnet package download' fails outright if any source in the repo's NuGet.config is + # unavailable (for example a transport feed that was decommissioned after a release). The + # Arcade SDK is always published to the public dotnet-eng feed, so if the config-driven + # download fails, retry once against that feed directly (which ignores the other sources) + # before giving up, so a single dead source doesn't block the build. + $downloadExitCode = DotNet -ignoreFailure @downloadArgs + if ($downloadExitCode) { + Write-Host "Restoring the Arcade SDK from the configured sources failed; retrying from the public dotnet-eng feed." + DotNet @downloadArgs --source "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" + } $packageDir = Join-Path $nugetPackageCachePath (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion) $packageToolsetDir = Join-Path $packageDir 'toolset' @@ -775,6 +793,19 @@ function MSBuild() { $buildTool = InitializeBuildTool + if ($pipelinesLog) { + $toolsetBuildProject = InitializeToolset + $basePath = Split-Path -parent $toolsetBuildProject + $selectedPath = Join-Path $basePath (Join-Path 'net' 'Microsoft.DotNet.ArcadeLogging.dll') + + # Only inject the logger when it's present. A last-known-good Arcade used to bootstrap + # the build may not ship the logger yet, so its absence must not be a hard error. + # Specify the logger type explicitly so loading is deterministic. + if (Test-Path $selectedPath) { + $args += "/logger:Microsoft.DotNet.ArcadeLogging.PipelinesLogger,$selectedPath" + } + } + $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable @@ -790,7 +821,8 @@ function MSBuild() { } if ($warnAsError -and $warnNotAsError) { - $cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$warnNotAsError" + $escapedWarnNotAsError = $warnNotAsError -replace ';', '%3B' + $cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$escapedWarnNotAsError" } foreach ($arg in $args) { @@ -813,8 +845,8 @@ function MSBuild() { Write-Host "Build failed with exit code $exitCode. Check errors above." -ForegroundColor Red # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { + # Skip this when the build is a child of the VMR build, or when -disablePipelineSetResult is set so the real exit code propagates. + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR -and !$disablePipelineSetResult) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error @@ -829,7 +861,7 @@ function MSBuild() { # Executes a dotnet command with arguments passed to the function. # Terminates the script if the command fails. # -function DotNet() { +function DotNet([switch]$ignoreFailure) { $dotnetRoot = InitializeDotNetCli -install:$restore $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') @@ -848,9 +880,15 @@ function DotNet() { $exitCode = Exec-Process $dotnetPath $cmdArgs if ($exitCode -ne 0) { + # When -ignoreFailure is set, return the exit code to the caller so it can implement + # its own fallback logic instead of terminating the script. + if ($ignoreFailure) { + return $exitCode + } + Write-Host "dotnet command failed with exit code $exitCode. Check errors above." -ForegroundColor Red - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR -and !$disablePipelineSetResult) { Write-PipelineSetResult -Result "Failed" -Message "dotnet command execution failed." ExitWithExitCode 0 } else { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 347a29b8884f..20f791c11dee 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -8,6 +8,16 @@ ci=${ci:-false} # Build mode source_build=${source_build:-false} +# Set to true to use the pipelines logger which will enable Azure logging output. +# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md +# This flag is meant as a temporary opt-in for the feature while validating it across +# our consumers. It will be deleted in the future. +if [[ "$ci" == true ]]; then + pipelines_log=${pipelines_log:-true} +else + pipelines_log=${pipelines_log:-false} +fi + # Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names. configuration=${configuration:-'Debug'} @@ -68,6 +78,8 @@ runtime_source_feed_key=${runtime_source_feed_key:-''} # True when the build is running within the VMR. from_vmr=${from_vmr:-false} +disable_pipeline_set_result=${disable_pipeline_set_result:-false} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -442,7 +454,16 @@ function InitializeToolset { if [[ -n "$nuget_config" ]]; then download_args+=("--configfile" "$nuget_config") fi - DotNet "${download_args[@]}" + + # 'dotnet package download' fails outright if any source in the repo's NuGet.config is + # unavailable (for example a transport feed that was decommissioned after a release). The + # Arcade SDK is always published to the public dotnet-eng feed, so if the config-driven + # download fails, retry once against that feed directly (which ignores the other sources) + # before giving up, so a single dead source doesn't block the build. + if ! DotNet true "${download_args[@]}"; then + echo "Restoring the Arcade SDK from the configured sources failed; retrying from the public dotnet-eng feed." + DotNet "${download_args[@]}" --source "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" + fi local package_dir="$_InitializeNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version" @@ -481,6 +502,15 @@ function StopProcesses { } function DotNet { + # When the first argument is 'true' or 'false' it controls the exit behavior on failure: + # 'true' returns the dotnet exit code to the caller (so it can implement its own fallback), + # while the default terminates the script. Any other first argument is treated as a dotnet argument. + local ignore_failure=false + if [[ "$1" == 'true' || "$1" == 'false' ]]; then + ignore_failure="$1" + shift + fi + InitializeDotNetCli $restore local dotnet_path="$_InitializeDotNetCli/dotnet" @@ -489,9 +519,14 @@ function DotNet { "$dotnet_path" "$@" || { local exit_code=$? + + if [[ "$ignore_failure" == true ]]; then + return $exit_code + fi + echo "dotnet command failed with exit code $exit_code. Check errors above." - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true && "$disable_pipeline_set_result" != true ]]; then Write-PipelineSetResult -result "Failed" -message "dotnet command execution failed." ExitWithExitCode 0 else @@ -510,6 +545,21 @@ function MSBuild { InitializeBuildTool + local logger_switch=() + if [[ "$pipelines_log" == true ]]; then + InitializeToolset + + local toolset_dir="${_InitializeToolset%/*}" + local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" + + # Only inject the logger when it's present. A last-known-good Arcade used to bootstrap + # the build may not ship the logger yet, so its absence must not be a hard error. + # Specify the logger type explicitly so loading is deterministic. + if [[ -f "$selectedPath" ]]; then + logger_switch=("-logger:Microsoft.DotNet.ArcadeLogging.PipelinesLogger,$selectedPath") + fi + fi + local warnaserror_switch="" if [[ $warn_as_error == true ]]; then warnaserror_switch="/warnaserror" @@ -525,8 +575,8 @@ function MSBuild { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then + # Skip this when the build is a child of the VMR build, or when -disablePipelineSetResult is set so the real exit code propagates. + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true && "$disable_pipeline_set_result" != true ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error @@ -545,10 +595,10 @@ function MSBuild { local warnnotaserror_switch="" if [[ -n "$warn_not_as_error" && "$warn_as_error" == true ]]; then - warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error" + warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=${warn_not_as_error//;/%3B}" fi - RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" + RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch ${logger_switch[@]+"${logger_switch[@]}"} /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } function GetDarc { diff --git a/global.json b/global.json index b52fe928f53b..068057b49dc7 100644 --- a/global.json +++ b/global.json @@ -4,10 +4,13 @@ ".dotnet", "$host$" ], - "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." + "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally.", + "version": "11.0.100-preview.6.26359.118", + "allowPrerelease": true, + "rollForward": "latestFeature" }, "tools": { - "dotnet": "11.0.100-preview.5.26302.115", + "dotnet": "11.0.100-preview.6.26359.118", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -24,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26363.117", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26363.117", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26378.106", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26378.106", "Microsoft.Build.NoTargets": "3.7.134", "Microsoft.Build.Traversal": "4.1.82", "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6", diff --git a/src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs b/src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs index 747a00f1d1c4..55a2ab279c8a 100644 --- a/src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs +++ b/src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs @@ -7,6 +7,7 @@ using Microsoft.DotNet.Cli.Extensions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ProjectTools; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.DotNet.Cli.Commands.NuGet; @@ -78,6 +79,11 @@ public int Run(string[] args) #if !CLI_AOT private class InProcessNuGetCommandRunner(NuGetVirtualProjectBuilder virtualProjectBuilder) : ICommandRunner { + [UnconditionalSuppressMessage( + "Trimming", + "IL2026", + Justification = + "This runner is excluded from CLI_AOT builds")] public int Run(string[] args) { var originalDotNetHostPath = Environment.GetEnvironmentVariable(EnvironmentVariableNames.DOTNET_HOST_PATH); diff --git a/src/Layout/redist/dnx.cmd b/src/Layout/redist/dnx.cmd index c3433def2147..94156380edde 100644 --- a/src/Layout/redist/dnx.cmd +++ b/src/Layout/redist/dnx.cmd @@ -6,12 +6,18 @@ setlocal enableextensions set "DOTNET=%~dp0dotnet.exe" +set "SDK_VERSION=" for /f "tokens=1" %%i in ('"%DOTNET%" --list-sdks') do ( set "SDK_VERSION=%%i" ) +if not defined SDK_VERSION ( + echo Error: dnx requires a .NET SDK to be installed, but none was found. 1>&2 + exit /b 1 +) + set "SDK_PATH=%~dp0sdk\%SDK_VERSION%\dotnet.dll" "%DOTNET%" exec "%SDK_PATH%" dnx %* -endlocal +endlocal & exit /b %ERRORLEVEL% diff --git a/src/Layout/redist/targets/GenerateInstallerLayout.targets b/src/Layout/redist/targets/GenerateInstallerLayout.targets index a17f71c59777..8eb091abe196 100644 --- a/src/Layout/redist/targets/GenerateInstallerLayout.targets +++ b/src/Layout/redist/targets/GenerateInstallerLayout.targets @@ -123,11 +123,13 @@ DestinationFiles="@(SdkOutputFile -> '$(IntermediateSdkInstallerOutputPath)sdk\$(Version)\%(RecursiveDir)%(Filename)%(Extension)')" /> + Skipped on macOS and Windows: the sharedhost pkg/MSI (from dotnet/runtime) now + installs dnx at the same location, so shipping it here creates overlapping + component packages. LayoutDnxShim still emits it into the base redist layout + (tarball/zip). --> + Condition="!$([MSBuild]::IsOSPlatform('OSX')) and !$([MSBuild]::IsOSPlatform('Windows'))" /> diff --git a/test/dotnet-watch.Tests/TestUtilities/TestAssetsManagerExtensions.cs b/test/dotnet-watch.Tests/TestUtilities/TestAssetsManagerExtensions.cs index 1843bb800419..e63ef875b544 100644 --- a/test/dotnet-watch.Tests/TestUtilities/TestAssetsManagerExtensions.cs +++ b/test/dotnet-watch.Tests/TestUtilities/TestAssetsManagerExtensions.cs @@ -9,7 +9,7 @@ internal static class TestAssetsManagerExtensions { extension(TestAssetsManager) { - public static TestDirectory CreateTestDirectory([CallerMemberName] string? testName = null, object[]? identifiers = null) + public static TestDirectory CreateTestDirectory([CallerMemberName] string? testName = null, object?[]? identifiers = null) => TestDirectory.Create(TestAssetsManager.GetTestDestinationDirectoryPath( testName, testName,