Merge pull request #748 from dotnet/depUpdates

Bump VSThreading dependency to 17.10.48, System.IO.Pipelines to 8.0.0

Author: AArnott

.github/dependabot.yml

@@ -11,3 +11,5 @@ updates:
   directory: /
   schedule:
     interval: weekly
+  ignore:
+  - dependency-name: Microsoft.Bcl.AsyncInterfaces # We want to match the minimum target .NET runtime

Directory.Packages.props

@@ -6,14 +6,14 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <BenchmarkDotNetVersion>0.13.12</BenchmarkDotNetVersion>
     <AspNetCoreVersion>2.2.0</AspNetCoreVersion>
-    <VSThreadingVersion>17.8.14</VSThreadingVersion>
+    <VSThreadingVersion>17.10.48</VSThreadingVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetVersion)" />
     <PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="$(VSThreadingVersion)" />
@@ -23,7 +23,7 @@
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.16" />
     <PackageVersion Include="PInvoke.Kernel32" Version="0.7.124" />
     <PackageVersion Include="StreamJsonRpc" Version="2.16.36" />
-    <PackageVersion Include="System.IO.Pipelines" Version="7.0.0" />
+    <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageVersion Include="System.IO.Pipes" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />

src/Nerdbank.Streams/MultiplexingStream.Channel.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Andrew Arnott. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks -- We always use .ConfigureAwait(false).
+
 namespace Nerdbank.Streams
 {
     using System;

src/Nerdbank.Streams/MultiplexingStream.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Andrew Arnott. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks -- We always use .ConfigureAwait(false).
+
 namespace Nerdbank.Streams
 {
     using System;

src/Nerdbank.Streams/Nerdbank.Streams.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" />
     <PackageReference Include="System.IO.Pipelines" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Condition="'$(TargetFramework)' != 'net6.0'" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Strings.Designer.cs">

src/Nerdbank.Streams/ReadOnlySequenceStream.cs

@@ -86,6 +86,7 @@ public override Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancel
                 return TaskOfZero;
             }
 
+#pragma warning disable VSTHRD103 // Call async methods when in an async method - This task is guaranteed to already be complete.
             if (this.lastReadTask?.Result == bytesRead)
             {
                 return this.lastReadTask;
@@ -94,6 +95,7 @@ public override Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancel
             {
                 return this.lastReadTask = Task.FromResult(bytesRead);
             }
+#pragma warning restore VSTHRD103 // Call async methods when in an async method
         }
 
         /// <inheritdoc/>

src/Nerdbank.Streams/SpanPolyfillExtensions.cs

@@ -2,6 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #pragma warning disable AvoidAsyncSuffix // Avoid Async suffix
+#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks -- We always use .ConfigureAwait(false).
+
 #if !SPAN_BUILTIN
 
 namespace Nerdbank.Streams

test/Nerdbank.Streams.Interop.Tests/Nerdbank.Streams.Interop.Tests.csproj

@@ -11,6 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!-- Temporarily upgrade Microsoft.Bcl.AsyncInterfaces while we reference StreamJsonRpc that wants 7.0.0 -->
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="7.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" />
   </ItemGroup>
 

test/Nerdbank.Streams.Tests/Nerdbank.Streams.Tests.csproj

@@ -19,6 +19,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
+    <!-- Temporarily upgrade Microsoft.Bcl.AsyncInterfaces while we reference StreamJsonRpc that wants 7.0.0 -->
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" />
     <PackageReference Include="NSubstitute" />