From 18fbbff8c58b30888a1f8649f8d608085bf052d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2024 12:08:17 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20240611.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24306.4 -> To Version 9.0.0-beta.24311.1 --- eng/Version.Details.xml | 84 ++++++++++---------- eng/Versions.props | 32 ++++---- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 4 +- global.json | 6 +- 6 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 877692d81ce72d..e828997434b960 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 914dd73b3622741590db173b5dd6eac1aa9cc553 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0c7b9b3e0ba1b9..97f13a8e6b2fa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.6.24277.1 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 2.6.7-beta.24306.4 - 9.0.0-beta.24306.4 - 2.6.7-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 2.6.7-beta.24311.1 + 9.0.0-beta.24311.1 + 2.6.7-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 1.4.0 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index d6a39e31cc3e65..8bc107fa7381e4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -43,7 +43,7 @@ try { --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` - --disable-interactive-auth ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 0febe696dbdbce..9574f4eb9df09c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() { $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' - $env:RESTORENOCACHE = $true + $env:RESTORENOHTTPCACHE = $true } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a4f5d1b7761b44..5e4f910fc8392b 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -347,14 +347,14 @@ function InitializeBuildTool { fi } -# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 +# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then export NUGET_PACKAGES="$HOME/.nuget/packages" else export NUGET_PACKAGES="$repo_root/.packages" - export RESTORENOCACHE=true + export RESTORENOHTTPCACHE=true fi fi diff --git a/global.json b/global.json index b42548f05e6d3c..01cde5221be74a 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.4.24267.66" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24306.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24306.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24311.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24275.1" From d19db56ce05a1a1193de029a13297d9276b4a92c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2024 08:26:11 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20240611.10 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24306.4 -> To Version 9.0.0-beta.24311.10 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- eng/common/tools.sh | 4 +- global.json | 6 +-- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e828997434b960..51f76634034c2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 914dd73b3622741590db173b5dd6eac1aa9cc553 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 97f13a8e6b2fa7..fbadac0b04ad7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.6.24277.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 2.6.7-beta.24311.1 - 9.0.0-beta.24311.1 - 2.6.7-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 2.8.1-beta.24311.10 + 9.0.0-beta.24311.10 + 2.8.1-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 + 9.0.0-beta.24311.10 1.4.0 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 5e4f910fc8392b..00473c9f918d47 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -351,9 +351,9 @@ function InitializeBuildTool { function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then - export NUGET_PACKAGES="$HOME/.nuget/packages" + export NUGET_PACKAGES="$HOME/.nuget/packages/" else - export NUGET_PACKAGES="$repo_root/.packages" + export NUGET_PACKAGES="$repo_root/.packages/" export RESTORENOHTTPCACHE=true fi fi diff --git a/global.json b/global.json index 01cde5221be74a..510ce215de44d7 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.4.24267.66" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24311.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.10", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.10", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24311.10", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24275.1" From f0385a4b6b9133e50da9e628814fab90e1b989b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2024 12:07:55 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20240611.10 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24306.4 -> To Version 9.0.0-beta.24311.10 From bed2ef0c2b335781490690607e738554f01474b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 12 Jun 2024 20:14:30 +0200 Subject: [PATCH 4/4] Fix BasicEventSourceTest xunit added a new event source that we need to filter out: https://github.com/xunit/xunit/pull/2884 --- .../tests/BasicEventSourceTest/TestUtilities.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs index 62382c1d82dab9..e78e57d7946d61 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs @@ -37,6 +37,9 @@ public static void CheckNoEventSourcesRunning(string message = "") eventSource.Name != "Microsoft-Windows-DotNETRuntime" && eventSource.Name != "System.Runtime" && + // event source from xunit runner + eventSource.Name != "xUnit.TestEventSource" && + // These event sources show up when hosted in the VS test runner eventSource.Name != "System.Net.Sockets" && eventSource.Name != "Private.InternalDiagnostics.System.Net.Sockets" &&