From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:40:37 +0000 (+0000) Subject: [main] Update dependencies from dotnet/arcade (#4300) X-Git-Tag: accepted/tizen/unified/riscv/20231226.055542~35^2~1^2~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14bcb465b23221b8e4c9e6ca2a885265d169d13a;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git [main] Update dependencies from dotnet/arcade (#4300) [main] Update dependencies from dotnet/arcade - Fix build from new analysis checks --- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9444b904b..7d86b7426 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,14 +14,14 @@ - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + 822f095b8c815dd7b9161140a9ff8151de593f82 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + 822f095b8c815dd7b9161140a9ff8151de593f82 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index ce5e6f2f7..e97cecda8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 6.0.0 6.0.8 2.0.3 - 8.0.0-beta.23463.1 + 9.0.0-beta.23508.1 1.2.0-beta.406 7.0.0-beta.22316.2 10.0.18362 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 6c4ac6fec..91f8196cc 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa74ab4a8..84cfe7cd9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2 - $defaultXCopyMSBuildVersion = '17.6.0-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 9b5157cc3..92fde626a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rc.1.23455.8", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreApp60Version)", @@ -16,6 +16,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1" } } diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs index 5e013b977..88317be47 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs @@ -50,7 +50,7 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { if (!matcher.Match(value)) { - Assert.True(false, $"Expected {value} to match pattern {keyValuePair.Key}"); + Assert.Fail($"Expected {value} to match pattern {keyValuePair.Key}"); }; } @@ -58,7 +58,7 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { if (matcher.Match(value)) { - Assert.False(true, $"Expected {value} to not match pattern {keyValuePair.Key}"); + Assert.Fail($"Expected {value} to not match pattern {keyValuePair.Key}"); } } } diff --git a/src/tests/eventpipe/ThreadPoolEvents.cs b/src/tests/eventpipe/ThreadPoolEvents.cs index 2160984ac..c1a167619 100644 --- a/src/tests/eventpipe/ThreadPoolEvents.cs +++ b/src/tests/eventpipe/ThreadPoolEvents.cs @@ -50,7 +50,9 @@ namespace EventPipe.UnitTests.ThreadPoolValidation taskArray[i] = Task.Run(() => TestTask()); } +#pragma warning disable xUnit1031 // Do not use blocking task operations in test method Task.WaitAll(taskArray); +#pragma warning restore xUnit1031 // Do not use blocking task operations in test method }; void TestTask()