diff --git a/README.md b/README.md index 2745ce9a..a8339024 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dotnetty-span-fork +# SpanNetty This is a fork of [DotNetty](https://github.com/azure/dotnetty). @@ -6,23 +6,23 @@ This is a fork of [DotNetty](https://github.com/azure/dotnetty). | Stage | Status | |-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Build | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=future&jobName=Windows%20Build)](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=future) | -| .NET Framework 451 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=future&jobName=.NET%20Framework%20451%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=future) | -| .NET Framework 471 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=future&jobName=.NET%20Framework%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=future) | -| .NET Core (Windows) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) | -| .NET Core (Ubuntu 16.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-16))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) | -| .NET Core (Ubuntu 18.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-18))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) | -| .NET Core (macOS X Mojave 10.14) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.14))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) | -| .NET Core (macOS X Catalina 10.15) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.15))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) | -| .NET Netstandard (Windows) Unit Tests | [![Build status](https://ci.appveyor.com/api/projects/status/rvx3h1bmahad2giw/branch/future?svg=true)](https://ci.appveyor.com/project/cuteant/SpanNetty/branch/future) | +| Build | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=main&jobName=Windows%20Build)](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=main) | +| .NET Framework 451 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=main&jobName=.NET%20Framework%20451%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=main) | +| .NET Framework 471 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=main&jobName=.NET%20Framework%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=main) | +| .NET Core (Windows) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) | +| .NET Core (Ubuntu 16.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-16))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) | +| .NET Core (Ubuntu 18.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-18))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) | +| .NET Core (macOS X Mojave 10.14) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.14))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) | +| .NET Core (macOS X Catalina 10.15) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.15))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) | +| .NET Netstandard (Windows) Unit Tests | [![Build status](https://ci.appveyor.com/api/projects/status/rvx3h1bmahad2giw/branch/main?svg=true)](https://ci.appveyor.com/project/cuteant/SpanNetty/branch/main) | ## Features - Align with [Netty-4.1.51.Final](https://github.com/netty/netty/tree/netty-4.1.51.Final) - ArrayPooledByteBuffer - Support **Span<byte>** and **Memory<byte>** in Buffer/Common APIs - Add support for IBufferWriter<byte> to the **IByteBuffer** - - [ByteBufferReader](https://github.com/cuteant/dotnetty-span-fork/tree/future/src/DotNetty.Buffers/Reader) and [ByteBufferWriter](https://github.com/cuteant/dotnetty-span-fork/tree/future/src/DotNetty.Buffers/Writer) - - [HTTP 2 codec](https://github.com/cuteant/dotnetty-span-fork/tree/future/src/DotNetty.Codecs.Http2) + - [ByteBufferReader](https://github.com/cuteant/spannetty/tree/main/src/DotNetty.Buffers/Reader) and [ByteBufferWriter](https://github.com/cuteant/dotnetty-span-fork/tree/main/src/DotNetty.Buffers/Writer) + - [HTTP 2 codec](https://github.com/cuteant/spannetty/tree/main/src/DotNetty.Codecs.Http2) ## Use diff --git a/build.fsx b/build.fsx index 0c45041e..97d02ad4 100644 --- a/build.fsx +++ b/build.fsx @@ -35,7 +35,7 @@ let versionFromReleaseNotes = let versionSuffix = match (getBuildParam "nugetprerelease") with - | "future" -> preReleaseVersionSuffix + | "main" -> preReleaseVersionSuffix | "" -> versionFromReleaseNotes | str -> str @@ -94,8 +94,8 @@ let getAffectedProjects = Target "ComputeIncrementalChanges" (fun _ -> if runIncrementally then let targetBranch = match getBuildParam "targetBranch" with - | "" -> "future" - | null -> "future" + | "" -> "main" + | null -> "main" | b -> b let incrementalistPath = let incrementalistDir = toolsDir @@ "incrementalist" diff --git a/build/pr-netfx-validation.yaml b/build/pr-netfx-validation.yaml index 052899b6..4843aa5d 100644 --- a/build/pr-netfx-validation.yaml +++ b/build/pr-netfx-validation.yaml @@ -3,14 +3,13 @@ trigger: branches: include: - - future - - master + - main - release/* pr: autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true branches: - include: [ future, master, release/* ] # branch names which will trigger a build + include: [ main, release/* ] # branch names which will trigger a build name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) diff --git a/build/pr-validation.yaml b/build/pr-validation.yaml index 86a1e24c..fd63c8ea 100644 --- a/build/pr-validation.yaml +++ b/build/pr-validation.yaml @@ -3,14 +3,13 @@ trigger: branches: include: - - future - - master + - main - release/* pr: autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true branches: - include: [ future, master, release/* ] # branch names which will trigger a build + include: [ main, release/* ] # branch names which will trigger a build name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) diff --git a/buildNetstandard.fsx b/buildNetstandard.fsx index 6962f8d3..62204136 100644 --- a/buildNetstandard.fsx +++ b/buildNetstandard.fsx @@ -35,7 +35,7 @@ let versionFromReleaseNotes = let versionSuffix = match (getBuildParam "nugetprerelease") with - | "future" -> preReleaseVersionSuffix + | "main" -> preReleaseVersionSuffix | "" -> versionFromReleaseNotes | str -> str @@ -93,8 +93,8 @@ let getAffectedProjects = Target "ComputeIncrementalChanges" (fun _ -> if runIncrementally then let targetBranch = match getBuildParam "targetBranch" with - | "" -> "future" - | null -> "future" + | "" -> "main" + | null -> "main" | b -> b let incrementalistPath = let incrementalistDir = toolsDir @@ "incrementalist"