diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b9e247f68ab2..da112969d21e 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.26325.102", + "version": "11.0.0-beta.26359.117", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/Directory.Packages.props b/Directory.Packages.props index d605efaeed50..d6cf59b6cfce 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -15,7 +15,7 @@ - + diff --git a/NuGet.config b/NuGet.config index 4e8eb7f42e2c..0a892e592f7e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -46,4 +46,8 @@ + + + + diff --git a/eng/MSBuildTaskAuthoringAnalyzer.props b/eng/MSBuildTaskAuthoringAnalyzer.props index 1f096a981a21..a8fc70ec343f 100644 --- a/eng/MSBuildTaskAuthoringAnalyzer.props +++ b/eng/MSBuildTaskAuthoringAnalyzer.props @@ -14,12 +14,14 @@ via .editorconfig as the multithreaded-task migration (IMultiThreadableTask / TaskEnvironment) proceeds. The analyzer package is produced by the msbuild repo and flows to this repo via eng/Version.Details.xml - (dotnet/dotnet), so it is available in source build as well and does not need to be excluded there. + (dotnet/dotnet). It is report-only and analyzers do not affect build output, so it is excluded from + source-only builds (DotNetBuildSourceOnly), where the package is not produced from source and would + otherwise be flagged as a prebuilt. --> - <_UseMSBuildTaskAuthoringAnalyzer Condition="'$(IsMSBuildTaskProject)' == 'true'">true + <_UseMSBuildTaskAuthoringAnalyzer Condition="'$(IsMSBuildTaskProject)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'">true diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e5a7c03d0298..43aadf3e3839 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -11,133 +11,134 @@ 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.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 10.4.0-preview.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 18.9.0-preview-26311-113 - 18.9.0-preview-26311-113 - 7.9.0-rc.31213 - 18.9.0-preview-26311-113 - 11.0.100-preview.7.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 10.4.0-preview.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 2.0.0-preview.1.26325.102 - 3.0.0-preview.7.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-beta.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 15.2.101-preview7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 5.9.0-1.26325.102 - 5.9.0-1.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 10.4.0-preview.26325.102 - 11.0.0-preview.7.26325.102 - 18.8.0-release-26311-113 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.100-preview.7.26325.102 - 11.0.100-preview.7.26325.102 - 11.0.100-preview.7.26325.102 - 11.0.100-preview.7.26325.102 - 11.0.100-preview.7.26325.102 - 18.8.0-release-26311-113 - 18.8.0-release-26311-113 - 3.3.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 7.9.0-rc.31213 - 11.0.0-preview.7.26325.102 - 3.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 - 11.0.0-preview.7.26325.102 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.1.0-preview.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 18.10.0-preview-26359-117 + 18.10.0-preview-26359-117 + 7.10.0-rc.36017 + 18.10.0-preview-26359-117 + 11.0.100-preview.7.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 11.1.0-preview.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 2.0.0-preview.1.26359.117 + 3.0.0-preview.7.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-beta.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 15.2.101-preview7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 5.10.0-1.26359.117 + 5.10.0-1.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.1.0-preview.26359.117 + 11.0.0-preview.7.26359.117 + 18.10.0-preview-26359-117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.100-preview.7.26359.117 + 11.0.100-preview.7.26359.117 + 11.0.100-preview.7.26359.117 + 11.0.100-preview.7.26359.117 + 11.0.100-preview.7.26359.117 + 18.10.0-preview-26359-117 + 18.10.0-preview-26359-117 + 3.3.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 7.10.0-rc.36017 + 11.0.0-preview.7.26359.117 + 3.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 + 11.0.0-preview.7.26359.117 2.3.0-preview.26355.11 + 2.3.0-preview.26330.8 4.3.0-preview.26355.11 @@ -275,6 +276,7 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) + $(MicrosoftTestingPlatformInternalDotnetTestPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74756a825181..2f1425f9da72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d @@ -28,174 +28,174 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d https://github.com/dotnet/dotnet @@ -242,304 +242,304 @@ https://github.com/dotnet/dotnet 85ca690954a6f5e988d523dec249b57b84d1ad0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d https://github.com/microsoft/testfx @@ -549,9 +549,13 @@ https://github.com/microsoft/testfx 8609d3bf430db360f420fbe9af9b223aa372ec2b - + https://github.com/dotnet/dotnet - 1358fe9202089df7bdb79282a191c9dbbb773a06 + 331fbbd197e21c8ec9d3eef292df8bbcd4deec0d + + + https://github.com/microsoft/testfx + 3090fe6407891d9303da20f718dc5aef1b890fe3 diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index a8162c511667..96287e55a15b 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -57,6 +57,14 @@ parameters: type: number default: 30 +# When 'true' (the default), Helix work items that exit 0 but have failed AzDO test results +# are treated as failed: they count toward the monitor's exit code and are resubmitted by a +# later invocation's retry pass. Set to 'false' to fall back to exit-code-only outcomes. +# Forwarded as --fail-on-failed-tests. +- name: failWorkItemsWithFailedTests + type: boolean + default: true + # 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 @@ -170,6 +178,7 @@ jobs: 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)' ) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index de32a6da3770..261def92b9c5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -741,13 +741,6 @@ function MSBuild() { Write-PipelineTelemetryError -Category 'Build' -Message 'Binary log must be enabled in CI build, or explicitly opted-out from with the -excludeCIBinarylog switch.' ExitWithExitCode 1 } - - # 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 - } } $buildTool = InitializeBuildTool diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 69ca926a6a87..8d1a6b461032 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -423,7 +423,7 @@ function InitializeToolset { if [[ -z "$nuget_config" ]]; then # Search for any variation of nuget.config in the RepoRoot local found_config - found_config=$(find "$repo_root" -maxdepth 1 -type f -iname "nuget.config" -print -quit) + found_config=$(find "$repo_root" -maxdepth 1 -type f -iname nuget.config | head -n 1) if [[ -n "$found_config" ]]; then nuget_config="$found_config" @@ -494,14 +494,7 @@ function DotNet { function MSBuild { if [[ "$ci" == true ]]; then if [[ "$binary_log" != true && "$exclude_ci_binary_log" != true ]]; then - Write-PipelineTelemetryError -category 'Build' "Binary log must be enabled in CI build, or explicitly opted-out from with the -noBinaryLog switch." - ExitWithExitCode 1 - fi - - # 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." + Write-PipelineTelemetryError -category 'Build' "Binary log must be enabled in CI build, or explicitly opted-out from with the --excludeCIBinarylog switch." ExitWithExitCode 1 fi fi diff --git a/global.json b/global.json index dd113a283fce..0c3727f29173 100644 --- a/global.json +++ b/global.json @@ -24,11 +24,11 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26325.102", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26325.102", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26359.117", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26359.117", "Microsoft.Build.NoTargets": "3.7.134", "Microsoft.Build.Traversal": "4.1.82", - "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4", + "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6", "MSTest.Sdk": "4.3.0-preview.26325.12" } } diff --git a/src/Layout/redist/targets/BundledDotnetTools.targets b/src/Layout/redist/targets/BundledDotnetTools.targets index 4249eefe926f..62ed0b0a310b 100644 --- a/src/Layout/redist/targets/BundledDotnetTools.targets +++ b/src/Layout/redist/targets/BundledDotnetTools.targets @@ -9,25 +9,25 @@ - + <_RidSpecificBundledDotnetTool Include="@(BundledDotnetTool)" - Condition="'$(DotNetBuildSourceOnly)' != 'true' and '%(BundledDotnetTool.RidSpecificPackageRids)' != ''"> + Condition="'$(DotNetBuildUseMonoRuntime)' != 'true' and '%(BundledDotnetTool.RidSpecificPackageRids)' != ''"> %(BundledDotnetTool.Identity) %(BundledDotnetTool.RidSpecificPackageVersion) %(BundledDotnetTool.Version) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs index fa9823448244..f1bd625a91fb 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs @@ -343,6 +343,11 @@ public void It_resolves_assembly_conflicts_with_a_NETFramework_library() TargetFrameworks = "net462", }; + // The conflict-resolution packages this test references are intentionally old and + // trigger NuGet audit warnings, which break the "no warnings" assertions below. We + // don't want to maintain those dependencies, so disable auditing for this project. + project.AdditionalProperties["NuGetAudit"] = "false"; + project.SourceFiles[project.Name + ".cs"] = $@" using System; public static class {project.Name}