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

microsoft · Oct 9, 2023 · bc5639b · bc5639b
1 parent 0229054
commit bc5639b
Show file tree

Hide file tree

Showing 28 changed files with 85 additions and 86 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,12 +6,11 @@
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageIcon></PackageIcon>
     <PackageIconFullPath></PackageIconFullPath>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
   <ProductDependencies>
   </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>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23463.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" 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/Versions.props b/eng/Versions.props
@@ -14,6 +14,6 @@
   <PropertyGroup>
     <SystemCollectionsImmutableVersion>8.0.0-rc.1.23419.4</SystemCollectionsImmutableVersion>
     <MicrosoftBclTimeProviderVersion>8.0.0-rc.1.23419.4</MicrosoftBclTimeProviderVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23463.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23508.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
   </PropertyGroup>
 </Project>
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
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.7.23376.3"
+    "version": "8.0.100-rc.1.23455.8"
   },
   "tools": {
-    "dotnet": "8.0.100-preview.7.23376.3",
+    "dotnet": "8.0.100-rc.1.23455.8",
     "runtimes": {
       "dotnet": [
         "6.0.14",
@@ -16,7 +16,7 @@
     }
   },
   "msbuild-sdks": {
-    "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/Kubernetes.Tests/Client/ResourceInformerTests.cs b/test/Kubernetes.Tests/Client/ResourceInformerTests.cs
@@ -62,10 +62,10 @@ public async Task ResourcesAreListedWhenReadyAsyncIsComplete()
             pods[NamespacedName.From(pod)] = pod;
         });
 
-        await clusterHost.StartAsync(cancellation.Token).ConfigureAwait(false);
-        await testHost.StartAsync(cancellation.Token).ConfigureAwait(false);
+        await clusterHost.StartAsync(cancellation.Token);
+        await testHost.StartAsync(cancellation.Token);
 
-        await registration.ReadyAsync(cancellation.Token).ConfigureAwait(false);
+        await registration.ReadyAsync(cancellation.Token);
 
         Assert.Equal(shouldBe, pods.Keys);
     }
@@ -102,10 +102,10 @@ public async Task ResourcesWithApiGroupAreListed()
             deployments[NamespacedName.From(deployment)] = deployment;
         });
 
-        await clusterHost.StartAsync(cancellation.Token).ConfigureAwait(false);
-        await testHost.StartAsync(cancellation.Token).ConfigureAwait(false);
+        await clusterHost.StartAsync(cancellation.Token);
+        await testHost.StartAsync(cancellation.Token);
 
-        await registration.ReadyAsync(cancellation.Token).ConfigureAwait(false);
+        await registration.ReadyAsync(cancellation.Token);
 
         Assert.Equal(shouldBe, deployments.Keys);
     }

diff --git a/test/Kubernetes.Tests/Hosting/BackgroundHostedServiceTests.cs b/test/Kubernetes.Tests/Hosting/BackgroundHostedServiceTests.cs
@@ -29,11 +29,11 @@ public async Task StartAndStopUnderHosting()
             .Build();
 
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(15));
-        await host.StartAsync(cts.Token).ConfigureAwait(false);
-        await latches.RunEnter.WhenSignalAsync(cts.Token).ConfigureAwait(false);
+        await host.StartAsync(cts.Token);
+        await latches.RunEnter.WhenSignalAsync(cts.Token);
         latches.RunResult.Signal();
-        await latches.RunExit.WhenSignalAsync(cts.Token).ConfigureAwait(false);
-        await host.StopAsync(cts.Token).ConfigureAwait(false);
+        await latches.RunExit.WhenSignalAsync(cts.Token);
+        await host.StopAsync(cts.Token);
     }
 
     [Fact]
@@ -57,11 +57,11 @@ public async Task StartAndStopUnderWebHost()
 
         var runTask = host.RunAsync(cts.Token);
 
-        await latches.RunEnter.WhenSignalAsync(cts.Token).ConfigureAwait(false);
+        await latches.RunEnter.WhenSignalAsync(cts.Token);
         latches.RunResult.Signal();
-        await latches.RunExit.WhenSignalAsync(cts.Token).ConfigureAwait(false);
+        await latches.RunExit.WhenSignalAsync(cts.Token);
 
-        await runTask.ConfigureAwait(false);
+        await runTask;
     }
 
 
@@ -88,7 +88,7 @@ public async Task IfRunAsyncThrowsItComesBackFromHost()
         context.RunResult.Throw(new ApplicationException("Unwind"));
 #pragma warning restore CA1303 // Do not pass literals as localized parameters
 
-        var ex = await Assert.ThrowsAsync<AggregateException>(() => runTask).ConfigureAwait(false);
+        var ex = await Assert.ThrowsAsync<AggregateException>(() => runTask);
 
         Assert.Equal("Unwind", Assert.Single(ex.Flatten().InnerExceptions).Message);
     }

diff --git a/test/Kubernetes.Tests/IngressConversionTests.cs b/test/Kubernetes.Tests/IngressConversionTests.cs
@@ -59,7 +59,7 @@ public IngressConversionTests()
     public async Task ParsingTests(string name)
     {
         var ingressClass = KubeResourceGenerator.CreateIngressClass("yarp", "microsoft.com/ingress-yarp", true);
-        var cache = await GetKubernetesInfo(name, ingressClass).ConfigureAwait(false);
+        var cache = await GetKubernetesInfo(name, ingressClass);
         var configContext = new YarpConfigContext();
         var ingresses = cache.GetIngresses().ToArray();
 

diff --git a/test/Kubernetes.Tests/Queues/WorkQueueTests.cs b/test/Kubernetes.Tests/Queues/WorkQueueTests.cs
@@ -22,11 +22,11 @@ public async Task NormalUsageIsAddGetDone()
         Assert.Equal(1, queue.Len());
         queue.Add("two");
         Assert.Equal(2, queue.Len());
-        var (item1, shutdown1) = await queue.GetAsync(Cancellation.Token).ConfigureAwait(false);
+        var (item1, shutdown1) = await queue.GetAsync(Cancellation.Token);
         Assert.Equal(1, queue.Len());
         queue.Done(item1);
         Assert.Equal(1, queue.Len());
-        var (item2, shutdown2) = await queue.GetAsync(Cancellation.Token).ConfigureAwait(false);
+        var (item2, shutdown2) = await queue.GetAsync(Cancellation.Token);
         Assert.Equal(0, queue.Len());
         queue.Done(item2);
         Assert.Equal(0, queue.Len());
@@ -61,7 +61,7 @@ public async Task CallingAddWhileItemIsBeingProcessedHasNoEffect()
         var lenOriginal = queue.Len();
         queue.Add("one");
         var lenAfterAdd = queue.Len();
-        var (item1, _) = await queue.GetAsync(Cancellation.Token).ConfigureAwait(false);
+        var (item1, _) = await queue.GetAsync(Cancellation.Token);
         var lenAfterGet = queue.Len();
         queue.Add("one");
         var lenAfterAddAgain = queue.Len();
@@ -83,7 +83,7 @@ public async Task ItemCanBeAddedAgainAfterDoneIsCalled()
         var lenOriginal = queue.Len();
         queue.Add("one");
         var lenAfterAdd = queue.Len();
-        var (item1, _) = await queue.GetAsync(Cancellation.Token).ConfigureAwait(false);
+        var (item1, _) = await queue.GetAsync(Cancellation.Token);
         var lenAfterGet = queue.Len();
         queue.Done(item1);
         var lenAfterDone = queue.Len();
@@ -108,13 +108,13 @@ public async Task IfAddWasCalledDuringProcessingThenItemIsRequeuedByDone()
         var lenOriginal = queue.Len();
         queue.Add("one");
         var lenAfterAdd = queue.Len();
-        var (item1, _) = await queue.GetAsync(Cancellation.Token).ConfigureAwait(false);
+        var (item1, _) = await queue.GetAsync(Cancellation.Token);
         var lenAfterGet = queue.Len();
         queue.Add("one");
         var lenAfterAddAgain = queue.Len();
         queue.Done(item1);
         var lenAfterDone = queue.Len();
-        var (item2, _) = await queue.GetAsync(Cancellation.Token).ConfigureAwait(false);
+        var (item2, _) = await queue.GetAsync(Cancellation.Token);
         var lenAfterGetAgain = queue.Len();
 
         Assert.Equal("one", item1);
@@ -140,7 +140,7 @@ public async Task GetCompletesOnceAddIsCalled()
         Assert.False(getTask.IsCompleted);
 
         queue.Add("one");
-        var (item1, _) = await getTask.ConfigureAwait(false);
+        var (item1, _) = await getTask;
         Assert.Equal(0, queue.Len());
         Assert.True(getTask.IsCompleted);
 
@@ -158,7 +158,7 @@ public async Task GetReturnsShutdownTrueAfterShutdownIsCalled()
         Assert.False(getTask.IsCompleted);
 
         queue.ShutDown();
-        var (item1, shutdown1) = await getTask.ConfigureAwait(false);
+        var (item1, shutdown1) = await getTask;
         Assert.Equal(0, queue.Len());
         Assert.True(getTask.IsCompleted);
 

diff --git a/test/Kubernetes.Tests/Rate/LimiterTests.cs b/test/Kubernetes.Tests/Rate/LimiterTests.cs
@@ -122,31 +122,31 @@ public async Task WaitAsyncCausesPauseLikeReserve()
             var task = limiter.WaitAsync(cancellation.Token);
             if (!task.IsCompleted)
             {
-                await task.ConfigureAwait(false);
+                await task;
                 break;
             }
         }
 
         var delayOne = new Stopwatch();
         delayOne.Start();
-        await limiter.WaitAsync(cancellation.Token).ConfigureAwait(false);
+        await limiter.WaitAsync(cancellation.Token);
         delayOne.Stop();
 
         var delayTwoMore = new Stopwatch();
         delayTwoMore.Start();
-        await limiter.WaitAsync(2, cancellation.Token).ConfigureAwait(false);
+        await limiter.WaitAsync(2, cancellation.Token);
         delayTwoMore.Stop();
 
-        await Task.Delay(TimeSpan.FromMilliseconds(150)).ConfigureAwait(false);
+        await Task.Delay(TimeSpan.FromMilliseconds(150));
 
         var delayAlreadyAvailable = new Stopwatch();
         delayAlreadyAvailable.Start();
-        await limiter.WaitAsync(cancellation.Token).ConfigureAwait(false);
+        await limiter.WaitAsync(cancellation.Token);
         delayAlreadyAvailable.Stop();
 
         var delayHalfAvailable = new Stopwatch();
         delayHalfAvailable.Start();
-        await limiter.WaitAsync(cancellation.Token).ConfigureAwait(false);
+        await limiter.WaitAsync(cancellation.Token);
         delayHalfAvailable.Stop();
 
         Assert.InRange(delayOne.Elapsed, TimeSpan.FromMilliseconds(75), TimeSpan.FromMilliseconds(125));
@@ -171,7 +171,7 @@ await Policy
                     var task = limiter.WaitAsync(cancellation.Token);
                     if (!task.IsCompleted)
                     {
-                        await task.ConfigureAwait(false);
+                        await task;
                         break;
                     }
                 }
@@ -192,24 +192,24 @@ await Policy
                     limiter.WaitAsync(cancellation.Token),
                 };
 
-                var taskOne = await Task.WhenAny(waits).ConfigureAwait(false);
-                await taskOne.ConfigureAwait(false);
+                var taskOne = await Task.WhenAny(waits);
+                await taskOne;
                 delayOne.Stop();
                 waits.Remove(taskOne);
 
-                var taskTwo = await Task.WhenAny(waits).ConfigureAwait(false);
-                await taskTwo.ConfigureAwait(false);
+                var taskTwo = await Task.WhenAny(waits);
+                await taskTwo;
                 delayTwo.Stop();
                 waits.Remove(taskTwo);
 
-                var taskThree = await Task.WhenAny(waits).ConfigureAwait(false);
-                await taskThree.ConfigureAwait(false);
+                var taskThree = await Task.WhenAny(waits);
+                await taskThree;
                 delayThree.Stop();
                 waits.Remove(taskThree);
 
                 Assert.InRange(delayOne.Elapsed, TimeSpan.FromMilliseconds(75), TimeSpan.FromMilliseconds(125));
                 Assert.InRange(delayTwo.Elapsed, TimeSpan.FromMilliseconds(175), TimeSpan.FromMilliseconds(225));
                 Assert.InRange(delayThree.Elapsed, TimeSpan.FromMilliseconds(275), TimeSpan.FromMilliseconds(325));
-            }).ConfigureAwait(false);
+            });
     }
 }
diff --git a/test/ReverseProxy.FunctionalTests/HttpProxyCookieTests.cs b/test/ReverseProxy.FunctionalTests/HttpProxyCookieTests.cs
@@ -100,7 +100,7 @@ public async Task Invoke(HttpContext context)
             }
             else
             {
-                Assert.True(false, $"Unexpected HTTP protocol '{context.Request.Protocol}'");
+                Assert.Fail($"Unexpected HTTP protocol '{context.Request.Protocol}'");
             }
 
             await _next.Invoke(context);

diff --git a/test/ReverseProxy.Tests/Configuration/ConfigProvider/ConfigurationConfigProviderTests.cs b/test/ReverseProxy.Tests/Configuration/ConfigProvider/ConfigurationConfigProviderTests.cs
@@ -163,7 +163,7 @@ public class ConfigurationConfigProviderTests
                 },
                 Transforms = new[]
                 {
-                    new Dictionary<string, string> { { "RequestHeadersCopy", "true" }, { "PathRemovePrefix", "/apis" } }, new Dictionary<string, string> { { "PathPrefix", "/apis" } }
+                    new Dictionary<string, string> { { "PathRemovePrefix", "/apis" }, { "RequestHeadersCopy", "true" } }, new Dictionary<string, string> { { "PathPrefix", "/apis" } }
                 },
                 Metadata = new Dictionary<string, string> { { "routeA-K1", "routeA-V1" }, { "routeA-K2", "routeA-V2" } }
             },
@@ -435,7 +435,7 @@ void VerifyFullyInitialized(object obj, string name)
             switch (obj)
             {
                 case null:
-                    Assert.True(false, $"Property {name} is not initialized.");
+                    Assert.Fail($"Property {name} is not initialized.");
                     break;
                 case Enum m:
                     Assert.NotEqual(0, (int)(object)m);
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ public async Task Invoke(HttpContext context) @@
                 }
                 else
                 {
-                    Assert.True(false, $"Unexpected HTTP protocol '{context.Request.Protocol}'");
+                    Assert.Fail($"Unexpected HTTP protocol '{context.Request.Protocol}'");
                 }
                 await _next.Invoke(context);
@@ Expand Down @@