[main] Update dependencies from dotnet/arcade (#4539)

* Update dependencies from https://github.com/dotnet/arcade build 20231008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23508.1 * Fix build --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Igor Velikorossov <igor.velikorossov@microsoft.com>
dotnet · Oct 11, 2023 · 6fda2c8 · 6fda2c8
1 parent 4bd9714
commit 6fda2c8
Show file tree

Hide file tree

Showing 52 changed files with 204 additions and 166 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -186,13 +186,13 @@
     </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>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23463.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23508.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
+      <Sha>822f095b8c815dd7b9161140a9ff8151de593f82</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git 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
@@ -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
@@ -18,7 +18,7 @@
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.5.0",
     "Microsoft.Build.Traversal": "3.2.0",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23508.1"
   }
 }
diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/ArraysTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/ArraysTests.cs
@@ -122,7 +122,7 @@ public void Triggers()
                 Assembly.GetAssembly(typeof(ImmutableDictionary<,>))!,
                 Assembly.GetAssembly(typeof(FrozenDictionary<,>))!,
             },
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
         Assert.Equal(54, d.Count);
         for (int i = 0; i < d.Count; i++)

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/EnumStringsTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/EnumStringsTests.cs
@@ -35,7 +35,7 @@ private void Foo()
         var d = await RoslynTestUtils.RunAnalyzer(
             new CallAnalyzer(),
             null,
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
         Assert.Equal(4, d.Count);
         for (int i = 0; i < d.Count; i++)

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/LegacyCollectionTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/LegacyCollectionTests.cs
@@ -44,7 +44,7 @@ public void Foo()
                 Assembly.GetAssembly(typeof(System.Collections.Queue))!,
                 Assembly.GetAssembly(typeof(System.Collections.Specialized.HybridDictionary))!
             },
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
         Assert.Equal(8, d.Count);
         for (int i = 0; i < d.Count; i++)

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/LegacyLoggingTests.Extra.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/LegacyLoggingTests.Extra.cs
@@ -92,7 +92,7 @@ static partial class Log
             new CallAnalyzer(),
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
-            new[] { OriginalSource, OriginalTarget }).ConfigureAwait(false);
+            new[] { OriginalSource, OriginalTarget });
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -170,7 +170,7 @@ static partial class Log
             new CallAnalyzer(),
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))! },
-            new[] { OriginalSource, OriginalTarget }).ConfigureAwait(false);
+            new[] { OriginalSource, OriginalTarget });
 
             actualSource = l[0];
             actualTarget = l[1];
@@ -234,7 +234,7 @@ static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource },
-            extraFile: "Log.cs").ConfigureAwait(false);
+            extraFile: "Log.cs");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -297,7 +297,7 @@ static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource },
-            extraFile: "Log.cs").ConfigureAwait(false);
+            extraFile: "Log.cs");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -358,7 +358,7 @@ static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource },
-            extraFile: "Log.cs").ConfigureAwait(false);
+            extraFile: "Log.cs");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -434,7 +434,7 @@ static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource },
-            extraFile: "Log.cs").ConfigureAwait(false);
+            extraFile: "Log.cs");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -684,7 +684,7 @@ static partial class Log
             new CallAnalyzer(),
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
-            new[] { OrriginalSource, OrriginalTarget }).ConfigureAwait(false);
+            new[] { OrriginalSource, OrriginalTarget });
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -746,7 +746,7 @@ static partial class Log
             new CallAnalyzer(),
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
-            new[] { OrriginalSource, OrriginalTarget }).ConfigureAwait(false);
+            new[] { OrriginalSource, OrriginalTarget });
 
         var actualSource = l[0];
         var actualTarget = l[1];

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/LegacyLoggingTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/LegacyLoggingTests.cs
@@ -73,7 +73,7 @@ public static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource, OriginalTarget },
-            defaultNamespace: "Example").ConfigureAwait(false);
+            defaultNamespace: "Example");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -166,7 +166,7 @@ public static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource, OriginalTarget },
-            defaultNamespace: "Example").ConfigureAwait(false);
+            defaultNamespace: "Example");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -230,7 +230,7 @@ static partial class Log
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource },
             extraFile: "Log.cs",
-            defaultNamespace: "Example").ConfigureAwait(false);
+            defaultNamespace: "Example");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -290,7 +290,7 @@ public static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource, OriginalTarget },
-            defaultNamespace: "Example").ConfigureAwait(false);
+            defaultNamespace: "Example");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -364,7 +364,7 @@ static partial class Log
             new LegacyLoggingFixer(),
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource, OriginalTarget },
-            defaultNamespace: "Example.Example2").ConfigureAwait(false);
+            defaultNamespace: "Example.Example2");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -441,7 +441,7 @@ static partial class Log
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource, OriginalTarget },
             extraFile: "Log.cs",
-            defaultNamespace: "Example.Example2").ConfigureAwait(false);
+            defaultNamespace: "Example.Example2");
 
         var actualSource = l[0];
         var actualTarget = l[2];
@@ -513,7 +513,7 @@ static partial class Log
             new[] { OriginalSource, OriginalTarget },
             sourceNames: new[] { "primary.cs", "Log.cs" },
             extraFile: "Log2.cs",
-            defaultNamespace: "Example").ConfigureAwait(false);
+            defaultNamespace: "Example");
 
         var actualSource = l[0];
         var actualTarget = l[2];
@@ -584,7 +584,7 @@ public static partial class Log
             },
             new[] { Assembly.GetAssembly(typeof(ILogger))!, Assembly.GetAssembly(typeof(LoggerMessageAttribute))! },
             new[] { OriginalSource, OriginalTarget },
-            defaultNamespace: "Example").ConfigureAwait(false);
+            defaultNamespace: "Example");
 
         var actualSource = l[0];
         var actualTarget = l[1];
@@ -649,7 +649,7 @@ public static void TestMethod(ILogger logger)
 
         proj.CommitChanges();
         var targetDoc = proj.FindDocument("target.cs");
-        var targetRoot = await targetDoc.GetSyntaxRootAsync(CancellationToken.None).ConfigureAwait(false);
+        var targetRoot = await targetDoc.GetSyntaxRootAsync(CancellationToken.None);
         var targetClass = targetRoot!.FindNode(RoslynTestUtils.MakeTextSpan(TargetSourceCode, 0)) as ClassDeclarationSyntax;
         var invocationDoc = proj.FindDocument("invocation.cs");
 
@@ -658,7 +658,7 @@ public static void TestMethod(ILogger logger)
         var (invocationExpression, details) = await f.CheckIfCanFixAsync(
             invocationDoc,
             InvocationSourceCode.MakeTextSpan(0),
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.NotNull(invocationExpression);
         Assert.NotNull(details);
@@ -669,7 +669,7 @@ public static void TestMethod(ILogger logger)
             invocationDoc,
             invocationExpression!,
             details!,
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.Equal("TestA", methodName);
         Assert.False(existing);
@@ -682,7 +682,7 @@ public static void TestMethod(ILogger logger)
         (invocationExpression, details) = await f.CheckIfCanFixAsync(
             invocationDoc,
             RoslynTestUtils.MakeTextSpan(InvocationSourceCode, 0),
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.Null(invocationExpression);
         Assert.Null(details);
@@ -695,7 +695,7 @@ public static void TestMethod(ILogger logger)
         (invocationExpression, details) = await f.CheckIfCanFixAsync(
             invocationDoc,
             RoslynTestUtils.MakeTextSpan(InvocationSourceCode, 0),
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.Null(invocationExpression);
         Assert.Null(details);
@@ -708,7 +708,7 @@ public static void TestMethod(ILogger logger)
         (invocationExpression, details) = await f.CheckIfCanFixAsync(
             invocationDoc,
             RoslynTestUtils.MakeTextSpan(InvocationSourceCode, 0),
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.Null(invocationExpression);
         Assert.Null(details);
@@ -721,7 +721,7 @@ public static void TestMethod(ILogger logger)
         (invocationExpression, details) = await f.CheckIfCanFixAsync(
             invocationDoc,
             RoslynTestUtils.MakeTextSpan(InvocationSourceCode, 0),
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.NotNull(invocationExpression);
         Assert.NotNull(details);
@@ -732,7 +732,7 @@ public static void TestMethod(ILogger logger)
             invocationDoc,
             invocationExpression!,
             details!,
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.Equal("TestA", methodName);
         Assert.False(existing);
@@ -745,7 +745,7 @@ public static void TestMethod(ILogger logger)
         (invocationExpression, details) = await f.CheckIfCanFixAsync(
             invocationDoc,
             RoslynTestUtils.MakeTextSpan(InvocationSourceCode, 0),
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.Null(invocationExpression);
         Assert.Null(details);
@@ -758,7 +758,7 @@ public static void TestMethod(ILogger logger)
         (invocationExpression, details) = await f.CheckIfCanFixAsync(
             invocationDoc,
             RoslynTestUtils.MakeTextSpan(InvocationSourceCode, 0),
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.NotNull(invocationExpression);
         Assert.NotNull(details);
@@ -769,7 +769,7 @@ public static void TestMethod(ILogger logger)
             invocationDoc,
             invocationExpression!,
             details!,
-            CancellationToken.None).ConfigureAwait(false);
+            CancellationToken.None);
 
         Assert.Equal("TestA", methodName);
         Assert.False(existing);

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/SplitTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/SplitTests.cs
@@ -29,9 +29,11 @@ public static void TestMethod()
         var d = await RoslynTestUtils.RunAnalyzer(
             new CallAnalyzer(),
             null,
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
+#pragma warning disable xUnit2013 // Do not use equality check to check for collection size.
         Assert.Equal(1, d.Count);
+#pragma warning restore xUnit2013 // Do not use equality check to check for collection size.
         for (int i = 0; i < d.Count; i++)
         {
             Source.AssertDiagnostic(i, DiagDescriptors.Split, d[i]);

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/StartsEndsWithTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/StartsEndsWithTests.cs
@@ -56,7 +56,7 @@ public static void DontFlagMe()
         var d = await RoslynTestUtils.RunAnalyzer(
             new CallAnalyzer(),
             null,
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
         Assert.Equal(8, d.Count);
 
@@ -114,7 +114,7 @@ public static void DontFlagMe()
         var d = await RoslynTestUtils.RunAnalyzer(
             new CallAnalyzer(),
             null,
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
         Assert.Equal(8, d.Count);
 

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/StaticTimeTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/StaticTimeTests.cs
@@ -77,7 +77,7 @@ private DateTimeOffset GetTimeOffset(bool condition)
         var d = await RoslynTestUtils.RunAnalyzer(
             new CallAnalyzer(),
             _staticTimeReferences,
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
         Assert.Equal(17, d.Count);
         for (int i = 0; i < d.Count; i++)

diff --git a/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/ValueTupleTests.cs b/test/Analyzers/Microsoft.Analyzers.Extra.Tests/CallAnalysis/ValueTupleTests.cs
@@ -46,7 +46,7 @@ public void Foo()
         var d = await RoslynTestUtils.RunAnalyzer(
             new CallAnalyzer(),
             null,
-            new[] { Source }).ConfigureAwait(false);
+            new[] { Source });
 
         Assert.Equal(16, d.Count);
         for (int i = 0; i < d.Count; i++)