Skip to content

Commit 6f94922

Browse files
manandremanandre
authored
Update all Nuget packages to latest version (#22)
1 parent fe084fd commit 6f94922

File tree

9 files changed

+44
-33
lines changed

9 files changed

+44
-33
lines changed

‎FollowingFileStream.APIdoc/FollowingFileStream.APIdoc.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<LogFile>$(MSBuildProjectDirectory)\bin\docfx.log.txt</LogFile>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="docfx.console" Version="2.45.1" PrivateAssets="All"/>
9+
<PackageReference Include="docfx.console" Version="2.53.1" PrivateAssets="All"/>
1010
</ItemGroup>
1111
</Project>

‎FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.5" PrivateAssets="All"/>
16+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All"/>
1717
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All"/>
1818
</ItemGroup>
1919

‎FollowingFileStream.SourceBrowser/FollowingFileStream.SourceBrowser.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="SourceBrowser" Version="1.0.24" PrivateAssets="All" />
6+
<PackageReference Include="SourceBrowser" Version="1.0.28" PrivateAssets="All" />
77
</ItemGroup>
88
<Target Name="GenerateSourceBrowserWebsite" AfterTargets="PostBuildEvent" Condition=" '$(OS)' == 'Windows_NT' ">
99
<Exec Command="$(PkgSourceBrowser)\tools\HtmlGenerator.exe $(MSBuildProjectDirectory)\..\All.sln /out:$(ProjectDir)bin\Index /force" />

‎FollowingFileStream.Tests/FollowingFileStream.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<noWarn>SA0001</noWarn>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="coverlet.msbuild" Version="2.7.0">
9+
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
<PrivateAssets>all</PrivateAssets>
1212
</PackageReference>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0"/>
14-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0"/>
15-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0"/>
16-
<PackageReference Include="Moq" Version="4.13.0"/>
17-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.5" PrivateAssets="All"/>
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1"/>
14+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1"/>
15+
<PackageReference Include="MSTest.TestFramework" Version="2.1.1"/>
16+
<PackageReference Include="Moq" Version="4.14.1"/>
17+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All"/>
1818
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All"/>
1919
</ItemGroup>
2020
<ItemGroup>

‎FollowingFileStream.Tests/FollowingFileStreamTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void FFSCopyTo(bool async)
167167
ffs.CopyTo(destination.BaseStream);
168168
}
169169

170-
Assert.IsTrue(this.FileCompare(this.inputFilePath, this.outputFilePath));
170+
Assert.IsTrue(FileCompare(this.inputFilePath, this.outputFilePath));
171171
}
172172

173173
/// <summary>
@@ -195,7 +195,7 @@ public void FFSFollowingRead(bool async)
195195
Assert.IsTrue(copy.Wait(3 * ffs.ReadTimeout));
196196
}
197197

198-
Assert.IsTrue(this.FileCompare(this.inputFilePath, this.outputFilePath));
198+
Assert.IsTrue(FileCompare(this.inputFilePath, this.outputFilePath));
199199
}
200200

201201
/// <summary>
@@ -223,7 +223,7 @@ public void FFSClose(bool async)
223223
Assert.IsTrue(copy.IsCompletedSuccessfully);
224224
}
225225

226-
private bool FileCompare(string file1, string file2)
226+
private static bool FileCompare(string file1, string file2)
227227
{
228228
// Determine if the same file was referenced two times.
229229
if (file1 == file2)

‎FollowingFileStream/AsyncStream.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ namespace Manandre.IO
1212
using System.Threading;
1313
using System.Threading.Tasks;
1414
using Nito.AsyncEx;
15+
#if !NETSTANDARD1_3
1516
using Nito.AsyncEx.Interop;
17+
#endif
1618
using Nito.AsyncEx.Synchronous;
1719

1820
/// <summary>
@@ -327,7 +329,11 @@ public sealed override void Write(byte[] buffer, int offset, int count)
327329
/// Asynchronously releases all resources used by the AsyncStream.
328330
/// </summary>
329331
/// <returns>A ValueTask representing the dispose operation.</returns>
330-
public sealed override ValueTask DisposeAsync() => this.DisposeAsync(true);
332+
public sealed override async ValueTask DisposeAsync()
333+
{
334+
await this.DisposeAsync(true).ConfigureAwait(false);
335+
await base.DisposeAsync().ConfigureAwait(false);
336+
}
331337

332338
/// <summary>
333339
/// Asynchronously releases the unmanaged resources used by the FollowingFileStream and optionally
@@ -342,7 +348,11 @@ public sealed override void Write(byte[] buffer, int offset, int count)
342348
/// releases the managed resources.
343349
/// </summary>
344350
/// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
345-
protected sealed override void Dispose(bool disposing) => this.DisposeAsync(disposing).GetAwaiter().GetResult();
351+
protected sealed override void Dispose(bool disposing)
352+
{
353+
this.DisposeAsync(disposing).AsTask().GetAwaiter().GetResult();
354+
base.Dispose(disposing);
355+
}
346356
#else
347357
/// <summary>
348358
/// Releases the unmanaged resources used by the FollowingFileStream and optionally
@@ -517,7 +527,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
517527
this.cts.Cancel();
518528
using (await this.locker.LockAsync())
519529
{
520-
await ((IAsyncDisposable)this.asyncStream).DisposeAsync();
530+
await ((IAsyncDisposable)this.asyncStream).DisposeAsync().ConfigureAwait(false);
521531
}
522532

523533
this.cts.Dispose();
@@ -526,7 +536,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
526536
finally
527537
{
528538
this.disposed = true;
529-
await base.DisposeAsync(disposing);
539+
await base.DisposeAsync(disposing).ConfigureAwait(false);
530540
}
531541
}
532542
#else

‎FollowingFileStream/FollowingFileStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
357357
if (disposing)
358358
{
359359
this.cts.Cancel();
360-
await this.fileStream.DisposeAsync();
360+
await this.fileStream.DisposeAsync().ConfigureAwait(false);
361361
this.cts.Dispose();
362362
}
363363
}
@@ -366,7 +366,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
366366
this.disposed = true;
367367

368368
// Call AsyncStream class implementation.
369-
await base.DisposeAsync(disposing);
369+
await base.DisposeAsync(disposing).ConfigureAwait(false);
370370
}
371371
}
372372
#else

‎FollowingFileStream/FollowingFileStream.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</ItemGroup>
2323
<ItemGroup>
2424
<PackageReference Include="Nito.AsyncEx" Version="5.0.0" />
25-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
26-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.5" PrivateAssets="All" />
25+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
26+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All" />
2727
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
2828
</ItemGroup>
2929
</Project>

‎azure-pipelines.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,28 @@ jobs:
2424
vmImage: $(imageName)
2525

2626
steps:
27+
- task: UseDotNet@2
28+
displayName: 'Use dotnet sdk 2.x'
29+
inputs:
30+
version: 2.x
31+
32+
- task: UseDotNet@2
33+
displayName: 'Use dotnet sdk 3.x'
34+
inputs:
35+
version: 3.x
36+
2737
- task: GitVersion@5
2838
inputs:
2939
runtime: 'core'
40+
3041
- task: SonarCloudPrepare@1
3142
inputs:
3243
SonarCloud: 'SonarCloud'
3344
organization: 'manandre'
3445
scannerMode: 'MSBuild'
3546
projectKey: 'manandre_FollowingFileStream'
3647
projectVersion: '$(Build.BuildId)'
37-
extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.opencover.xml'
38-
39-
- task: UseDotNet@2
40-
displayName: 'Use dotnet sdk 2.x'
41-
inputs:
42-
version: 2.x
43-
44-
- task: UseDotNet@2
45-
displayName: 'Use dotnet sdk 3.x'
46-
inputs:
47-
version: 3.x
48+
extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.netcoreapp3.0.opencover.xml'
4849

4950
- task: DotNetCoreCLI@2
5051
displayName: Restore
@@ -79,13 +80,13 @@ jobs:
7980

8081
- script: |
8182
dotnet tool install dotnet-reportgenerator-globaltool --tool-path .
82-
./reportgenerator "-reports:$(Build.SourcesDirectory)/coverage/coverage.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart"
83+
./reportgenerator "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp3.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart"
8384
condition: eq( variables['Agent.OS'], 'Linux' )
8485
displayName: Run Reportgenerator on Linux
8586
8687
- script: |
8788
dotnet tool install dotnet-reportgenerator-globaltool --tool-path .
88-
.\reportgenerator.exe "-reports:$(Build.SourcesDirectory)/coverage/coverage.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart"
89+
.\reportgenerator.exe "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp3.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart"
8990
condition: eq( variables['Agent.OS'], 'Windows_NT' )
9091
displayName: Run Reportgenerator on Windows
9192

0 commit comments

Comments
 (0)