Merge pull request #180 from AArnott/updateSdk

Update .NET Core SDK to 3.1.201

Author: AArnott

azure-pipelines/artifacts/coverageResults.ps1

@@ -3,7 +3,7 @@ $RepoRoot = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\..")
 # Prepare code coverage reports for merging on another machine
 if ($env:SYSTEM_DEFAULTWORKINGDIRECTORY) {
     Write-Host "Substituting $env:SYSTEM_DEFAULTWORKINGDIRECTORY with `"{reporoot}`""
-    $reports = Get-ChildItem "$RepoRoot/bin/coverage.cobertura.xml" -Recurse
+    $reports = Get-ChildItem "$RepoRoot/bin/coverage.*.cobertura.xml" -Recurse
     $reports |% {
         $content = Get-Content -Path $_ |% { $_ -Replace [regex]::Escape($env:SYSTEM_DEFAULTWORKINGDIRECTORY), "{reporoot}" }
         Set-Content -Path $_ -Value $content -Encoding UTF8
@@ -16,7 +16,7 @@ if (!((Test-Path $RepoRoot\bin) -and (Test-Path $RepoRoot\obj))) { return }
 
 @{
     $RepoRoot = (
-        @(Get-ChildItem "$RepoRoot\bin\coverage.cobertura.xml" -Recurse) +
+        @(Get-ChildItem "$RepoRoot\bin\coverage.*.cobertura.xml" -Recurse) +
         (Get-ChildItem "$RepoRoot\obj\*.cs" -Recurse)
     );
 }

azure-pipelines/publish-codecoverage.yml

@@ -15,7 +15,7 @@ steps:
     dotnet tool install --tool-path obj dotnet-reportgenerator-globaltool --version 4.2.2 --configfile azure-pipelines/justnugetorg.nuget.config
     Copy-Item -Recurse $(Pipeline.Workspace)/coverageResults-Windows/obj/* $(System.DefaultWorkingDirectory)/obj
     Write-Host "Substituting {reporoot} with $(System.DefaultWorkingDirectory)"
-    $reports = Get-ChildItem -Recurse "$(Pipeline.Workspace)/coverage.cobertura.xml"
+    $reports = Get-ChildItem -Recurse "$(Pipeline.Workspace)/coverage.*.cobertura.xml"
     $reports |% {
         $content = Get-Content -Path $_ |% { $_.Replace("{reporoot}", "$(System.DefaultWorkingDirectory)") }
         Set-Content -Path $_ -Value $content -Encoding UTF8

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100"
+    "version": "3.1.201"
   }
 }

src/Nerdbank.Streams.Interop.Tests/Nerdbank.Streams.Interop.Tests.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.4.33" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.6.13" />
   </ItemGroup>
 
 </Project>

src/Nerdbank.Streams.Tests/DuplexPipeTests.cs

@@ -40,7 +40,9 @@ public async Task ReaderOnly()
         Assert.Throws<InvalidOperationException>(() => pipe.Writer.GetSpan());
         Assert.Throws<InvalidOperationException>(() => duplex.Output.GetSpan());
 
-        Assert.Throws<InvalidOperationException>(() => pipe.Writer.Advance(0));
+        // System.IO.Pipelines stopped throwing when Advance(0) is called after completion,
+        // But we still feel it's useful to throw since it's a read-only pipe.
+        pipe.Writer.Advance(0);
         Assert.Throws<InvalidOperationException>(() => duplex.Output.Advance(0));
 
         var flushResult = await pipe.Writer.FlushAsync();
@@ -51,8 +53,10 @@ public async Task ReaderOnly()
         pipe.Writer.CancelPendingFlush();
         duplex.Output.CancelPendingFlush();
 
+#pragma warning disable CS0618 // Type or member is obsolete
         pipe.Writer.OnReaderCompleted((ex, s) => { }, null);
         duplex.Output.OnReaderCompleted((ex, s) => { }, null);
+#pragma warning restore CS0618 // Type or member is obsolete
 
         pipe.Writer.Complete();
         duplex.Output.Complete();
@@ -78,8 +82,10 @@ public async Task WriterOnly()
         pipe.Reader.CancelPendingRead();
         duplex.Input.CancelPendingRead();
 
+#pragma warning disable CS0618 // Type or member is obsolete
         pipe.Reader.OnWriterCompleted((ex, s) => { }, null);
         duplex.Input.OnWriterCompleted((ex, s) => { }, null);
+#pragma warning restore CS0618 // Type or member is obsolete
 
         pipe.Reader.Complete();
         duplex.Input.Complete();

src/Nerdbank.Streams.Tests/MultiplexingStreamPerfTests.cs

@@ -43,7 +43,7 @@ public Task DisposeAsync()
     {
         this.serverPipe.Dispose();
         this.clientPipe.Dispose();
-        return TplExtensions.CompletedTask;
+        return Task.CompletedTask;
     }
 
     [SkippableFact]

src/Nerdbank.Streams.Tests/MultiplexingStreamTests.cs

@@ -65,7 +65,7 @@ public Task DisposeAsync()
         this.mx1?.TraceSource.Listeners.OfType<XunitTraceListener>().SingleOrDefault()?.Dispose();
         this.mx2?.TraceSource.Listeners.OfType<XunitTraceListener>().SingleOrDefault()?.Dispose();
 
-        return TplExtensions.CompletedTask;
+        return Task.CompletedTask;
     }
 
     [Fact]
@@ -726,7 +726,7 @@ public async Task ChannelOfferedEvent_Named(bool alreadyAccepted)
         Assert.Equal(alreadyAccepted, mx2EventArgs.IsAccepted);
 
         Assert.False(mx1EventArgsSource.Task.IsCompleted);
-        await acceptTask.WithCancellation(this.TimeoutToken); // Rethrow any exceptions
+        await acceptTask!.WithCancellation(this.TimeoutToken); // Rethrow any exceptions
     }
 
     [Fact]
@@ -1095,6 +1095,7 @@ public override Memory<byte> GetMemory(int sizeHint = 0)
 
         public override Span<byte> GetSpan(int sizeHint = 0) => this.GetMemory(sizeHint).Span;
 
+        [Obsolete]
         public override void OnReaderCompleted(Action<Exception, object> callback, object state)
         {
             // We don't have a reader that consumers of this mock need to worry about,

src/Nerdbank.Streams.Tests/Nerdbank.Streams.Tests.csproj

@@ -19,18 +19,18 @@
     <Compile Include="..\Nerdbank.Streams\Utilities.cs" Link="Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.4.33" />
-    <PackageReference Include="PInvoke.Kernel32" Version="0.5.184" />
-    <PackageReference Include="StreamJsonRpc" Version="2.0.208" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.6.13" />
+    <PackageReference Include="PInvoke.Kernel32" Version="0.6.6" />
+    <PackageReference Include="StreamJsonRpc" Version="2.3.103" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.combinatorial" Version="1.2.7" />
+    <PackageReference Include="xunit.combinatorial" Version="1.3.2" />
     <PackageReference Include="xunit.skippablefact" Version="1.3.12" />
     <PackageReference Include="xunit.runner.console" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="System.IO.Pipes" Version="4.3.0" />
-    <PackageReference Include="coverlet.msbuild" Version="2.6.3" />
+    <PackageReference Include="coverlet.msbuild" Version="2.8.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
   </ItemGroup>

src/Nerdbank.Streams.Tests/NestedPipeReaderTests.cs

@@ -191,7 +191,9 @@ public void OnWriterCompleted_NoOps()
     {
         var sliceReader = this.pipe.Reader.ReadSlice(5);
         bool called = false;
+#pragma warning disable CS0618 // Type or member is obsolete
         sliceReader.OnWriterCompleted((e, s) => called = true, null);
+#pragma warning restore CS0618 // Type or member is obsolete
         this.pipe.Writer.Complete();
         Assert.False(called);
     }

src/Nerdbank.Streams.Tests/StreamPipeWriterTestBase.cs

@@ -64,7 +64,7 @@ public async Task TryWriteAfterComplete()
         writer.Complete();
         Assert.Throws<InvalidOperationException>(() => writer.GetMemory());
         Assert.Throws<InvalidOperationException>(() => writer.GetSpan());
-        Assert.Throws<InvalidOperationException>(() => writer.Advance(0));
+        writer.Advance(0);
     }
 
     [Fact]