[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 9444b904b126e9223cb4b98ba96b15b3b1faaf15..7d86b742684581cd800a4d564cbb7d063b5261ba 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -14,14 +14,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23508.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
+      <Sha>822f095b8c815dd7b9161140a9ff8151de593f82</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23463.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23508.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
+      <Sha>822f095b8c815dd7b9161140a9ff8151de593f82</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
       <Uri>https://github.com/dotnet/arcade</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index ce5e6f2f7511ee26c656993f613eda5418ff9bd1..e97cecda81908db329ae9d18b9dd4fe9097a14f4 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -62,7 +62,7 @@
     <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23463.1</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23508.1</MicrosoftDotNetCodeAnalysisVersion>
     <StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
     <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>

diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 6c4ac6fec1a99aef9aae470d16c0e6f4748bb634..91f8196cc808dbb26b8721e7e7992896ab8208e6 100644 (file)
--- 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 aa74ab4a81e782a20c4105a97d2f22f2fa19a019..84cfe7cd9cb463282a3f342e03e9c8c16ad81f0a 100644 (file)
--- 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 9b5157cc310b993e0ab64f665204ba3b70407243..92fde626a4cee03614698496ebf3c137e9070e93 100644 (file)
--- 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 5e013b977661ab9d4bd3e046593b47fbbce1c74b..88317be47b12d866136a21a7c00be394ac5dc8d4 100644 (file)
--- 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 2160984ac964405a51dee797712b6f323e5dea33..c1a16761966759559caf033a9fa4bbd05eab0248 100644 (file)
--- 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()