From ece4ca9c225147522735019c130cb6a79b03a6eb Mon Sep 17 00:00:00 2001 From: Emmanuel ANDRE <2341261+manandre@users.noreply.github.com> Date: Mon, 18 May 2020 17:59:57 +0200 Subject: [PATCH 1/5] .Net 5.0 support - Preview 3 --- .../FollowingFileStream.ConsoleTestTool.csproj | 2 +- FollowingFileStream.Tests/FollowingFileStream.Tests.csproj | 2 +- FollowingFileStream/AsyncStream.cs | 4 ++-- FollowingFileStream/FollowingFileStream.csproj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj b/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj index bb6cbce..76de8ed 100644 --- a/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj +++ b/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj @@ -6,7 +6,7 @@ Exe - netcoreapp3.0;netcoreapp2.2 + netcoreapp5.0;netcoreapp3.0;netcoreapp2.2 8.0 enable false diff --git a/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj b/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj index 260b3c2..8de4fee 100644 --- a/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj +++ b/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj @@ -1,6 +1,6 @@ - netcoreapp3.0;netcoreapp2.2 + netcoreapp5.0;netcoreapp3.0;netcoreapp2.2 8.0 enable false diff --git a/FollowingFileStream/AsyncStream.cs b/FollowingFileStream/AsyncStream.cs index 0767a5f..0a85935 100644 --- a/FollowingFileStream/AsyncStream.cs +++ b/FollowingFileStream/AsyncStream.cs @@ -73,7 +73,7 @@ public static AsyncStream Synchronized(AsyncStream stream) /// /// An asynchronous read was attempted past the end of the file. /// - public sealed override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + public sealed override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state) { return ApmAsyncFactory.ToBegin( this.ReadAsync(buffer, offset, count, CancellationToken.None), @@ -110,7 +110,7 @@ public sealed override IAsyncResult BeginRead(byte[] buffer, int offset, int cou /// /// An asynchronous write was attempted past the end of the file. /// - public sealed override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + public sealed override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state) { return ApmAsyncFactory.ToBegin( this.WriteAsync(buffer, offset, count, CancellationToken.None), diff --git a/FollowingFileStream/FollowingFileStream.csproj b/FollowingFileStream/FollowingFileStream.csproj index 128a685..05a18e1 100644 --- a/FollowingFileStream/FollowingFileStream.csproj +++ b/FollowingFileStream/FollowingFileStream.csproj @@ -1,7 +1,7 @@ Library - netstandard2.1;netstandard2.0;netstandard1.3 + netcoreapp5.0;netstandard2.1;netstandard2.0;netstandard1.3 8.0 enable bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml From 695add5e99558af6fa3c61d5f2269f7f57ab6ca9 Mon Sep 17 00:00:00 2001 From: Emmanuel ANDRE <2341261+manandre@users.noreply.github.com> Date: Mon, 18 May 2020 18:04:01 +0200 Subject: [PATCH 2/5] Add dotnet 5.0 sdk to azure-pipelines.yml --- azure-pipelines.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 81ddb48..f4bc9b2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,6 +34,11 @@ jobs: inputs: version: 3.x + - task: UseDotNet@2 + displayName: 'Use dotnet sdk 5.x' + inputs: + version: 5.x + - task: GitVersion@5 inputs: runtime: 'core' @@ -45,7 +50,7 @@ jobs: scannerMode: 'MSBuild' projectKey: 'manandre_FollowingFileStream' projectVersion: '$(Build.BuildId)' - extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.netcoreapp3.0.opencover.xml' + extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.netcoreapp5.0.opencover.xml' - task: DotNetCoreCLI@2 displayName: Restore @@ -80,13 +85,13 @@ jobs: - script: | dotnet tool install dotnet-reportgenerator-globaltool --tool-path . - ./reportgenerator "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp3.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" + ./reportgenerator "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp5.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" condition: eq( variables['Agent.OS'], 'Linux' ) displayName: Run Reportgenerator on Linux - script: | dotnet tool install dotnet-reportgenerator-globaltool --tool-path . - .\reportgenerator.exe "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp3.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" + .\reportgenerator.exe "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp5.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: Run Reportgenerator on Windows @@ -179,6 +184,11 @@ jobs: inputs: version: 3.x + - task: UseDotNet@2 + displayName: 'Use dotnet sdk 5.x' + inputs: + version: 5.x + # First restore to resolve external dependencies - task: DotNetCoreCLI@2 displayName: Restore From 206b0ec2e0d2324aa9d38926a4467edbcf690493 Mon Sep 17 00:00:00 2001 From: Emmanuel ANDRE <2341261+manandre@users.noreply.github.com> Date: Mon, 18 May 2020 18:16:05 +0200 Subject: [PATCH 3/5] Add includePreviewVersions --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f4bc9b2..e5d2a74 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,6 +38,7 @@ jobs: displayName: 'Use dotnet sdk 5.x' inputs: version: 5.x + includePreviewVersions: true - task: GitVersion@5 inputs: @@ -188,6 +189,7 @@ jobs: displayName: 'Use dotnet sdk 5.x' inputs: version: 5.x + includePreviewVersions: true # First restore to resolve external dependencies - task: DotNetCoreCLI@2 From c2764a8efe2f59d7db5c4723c07e8b6f998cc616 Mon Sep 17 00:00:00 2001 From: Emmanuel ANDRE <2341261+manandre@users.noreply.github.com> Date: Tue, 19 May 2020 12:20:17 +0200 Subject: [PATCH 4/5] Move to new TFM net5.0 --- .../FollowingFileStream.ConsoleTestTool.csproj | 2 +- FollowingFileStream.Tests/FollowingFileStream.Tests.csproj | 2 +- FollowingFileStream/FollowingFileStream.csproj | 2 +- azure-pipelines.yml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj b/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj index 76de8ed..3ac42f2 100644 --- a/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj +++ b/FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj @@ -6,7 +6,7 @@ Exe - netcoreapp5.0;netcoreapp3.0;netcoreapp2.2 + net5.0;netcoreapp3.0;netcoreapp2.2 8.0 enable false diff --git a/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj b/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj index 8de4fee..9843081 100644 --- a/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj +++ b/FollowingFileStream.Tests/FollowingFileStream.Tests.csproj @@ -1,6 +1,6 @@ - netcoreapp5.0;netcoreapp3.0;netcoreapp2.2 + net5.0;netcoreapp3.0;netcoreapp2.2 8.0 enable false diff --git a/FollowingFileStream/FollowingFileStream.csproj b/FollowingFileStream/FollowingFileStream.csproj index 05a18e1..c3d9b88 100644 --- a/FollowingFileStream/FollowingFileStream.csproj +++ b/FollowingFileStream/FollowingFileStream.csproj @@ -1,7 +1,7 @@ Library - netcoreapp5.0;netstandard2.1;netstandard2.0;netstandard1.3 + net5.0;netstandard2.1;netstandard2.0;netstandard1.3 8.0 enable bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5d2a74..180cf16 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,7 +51,7 @@ jobs: scannerMode: 'MSBuild' projectKey: 'manandre_FollowingFileStream' projectVersion: '$(Build.BuildId)' - extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.netcoreapp5.0.opencover.xml' + extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/coverage/coverage.net5.0.opencover.xml' - task: DotNetCoreCLI@2 displayName: Restore @@ -86,13 +86,13 @@ jobs: - script: | dotnet tool install dotnet-reportgenerator-globaltool --tool-path . - ./reportgenerator "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp5.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" + ./reportgenerator "-reports:$(Build.SourcesDirectory)/coverage/coverage.net5.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" condition: eq( variables['Agent.OS'], 'Linux' ) displayName: Run Reportgenerator on Linux - script: | dotnet tool install dotnet-reportgenerator-globaltool --tool-path . - .\reportgenerator.exe "-reports:$(Build.SourcesDirectory)/coverage/coverage.netcoreapp5.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" + .\reportgenerator.exe "-reports:$(Build.SourcesDirectory)/coverage/coverage.net5.0.opencover.xml" "-targetdir:coverage/Cobertura" "-reporttypes:Cobertura;HTMLInline;HTMLChart" condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: Run Reportgenerator on Windows From f90b3bb0d4916210c4f993b0cbcd8e61f04ce7a0 Mon Sep 17 00:00:00 2001 From: Emmanuel ANDRE <2341261+manandre@users.noreply.github.com> Date: Mon, 25 May 2020 16:28:05 +0200 Subject: [PATCH 5/5] Move devcontainer to .Net 5.0 --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6d66e95..ccbf2b8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM mcr.microsoft.com/dotnet/core/sdk:3.1 +FROM mcr.microsoft.com/dotnet/sdk:5.0 # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c597fe9..1da2d78 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: // https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/dotnetcore-3.1 { - "name": "C# (.NET Core 3.1)", + "name": "FollowingFileStream dev (.NET 5.0)", "dockerFile": "Dockerfile", // Set *default* container specific settings.json values on container create.