Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Transport.Libuv based on NetUV #23

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/
[Pp]erf[Rr]esult*/
/Deploy
TODO.txt
*.GhostDoc.xml
Expand Down
3 changes: 3 additions & 0 deletions Clean.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
@ECHO .
@ECHO Cleaning %CD%
@ECHO .

rd /s /Q TestResults

FOR /F "tokens=*" %%G IN ('DIR /B /AD /S bin') DO RMDIR /S /Q "%%G"
FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
FOR /F "tokens=*" %%G IN ('DIR /B /AD /S TestResults') DO RMDIR /S /Q "%%G"
Expand Down
39 changes: 36 additions & 3 deletions DotNetty.CrossPlatform.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ VisualStudioVersion = 16.0.30204.135
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{013DFD29-E1DB-4968-A67B-C2342E6F5B6E}"
ProjectSection(SolutionItems) = preProject
azure_build.cmd = azure_build.cmd
build.cmd = build.cmd
build.fsx = build.fsx
build.ps1 = build.ps1
build.sh = build.sh
DotnetCLIVersion.txt = DotnetCLIVersion.txt
buildNetstandard.cmd = buildNetstandard.cmd
buildNetstandard.fsx = buildNetstandard.fsx
buildNetstandard.ps1 = buildNetstandard.ps1
buildNetstandard.sh = buildNetstandard.sh
global.json = global.json
NuGet.Config = NuGet.Config
README.md = README.md
Expand Down Expand Up @@ -45,12 +47,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Codecs.Protobuf",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Microbench", "perf\DotNetty.Microbench\DotNetty.Microbench.csproj", "{10264C0F-F854-4201-AFCB-2B7315EFBCE0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{EC6681D3-3F9C-4CBB-B5D5-091E7F85D1C7}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-pipelines", "azure-pipelines", "{EC6681D3-3F9C-4CBB-B5D5-091E7F85D1C7}"
ProjectSection(SolutionItems) = preProject
build\azure-pipeline.template.yaml = build\azure-pipeline.template.yaml
build\pr-netfx-validation.yaml = build\pr-netfx-validation.yaml
build\pr-validation.yaml = build\pr-validation.yaml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.NetUV", "src\DotNetty.NetUV\DotNetty.NetUV.csproj", "{3162B002-96BD-4C3A-BA83-94791BA65A49}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "local-build", "local-build", "{D16D7F56-E54C-498D-B4B2-AEBF1C8CA462}"
ProjectSection(SolutionItems) = preProject
DotnetCLIVersion.txt = DotnetCLIVersion.txt
Ensure-DotNetSdk.cmd = Ensure-DotNetSdk.cmd
init-tools.cmd = init-tools.cmd
localBuild.cmd = localBuild.cmd
localPublish.cmd = localPublish.cmd
localRestore.cmd = localRestore.cmd
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -255,6 +270,22 @@ Global
{10264C0F-F854-4201-AFCB-2B7315EFBCE0}.Release|x64.Build.0 = Release|Any CPU
{10264C0F-F854-4201-AFCB-2B7315EFBCE0}.Release|x86.ActiveCfg = Release|Any CPU
{10264C0F-F854-4201-AFCB-2B7315EFBCE0}.Release|x86.Build.0 = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|ARM.ActiveCfg = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|ARM.Build.0 = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|x64.ActiveCfg = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|x64.Build.0 = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|x86.ActiveCfg = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Debug|x86.Build.0 = Debug|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|Any CPU.Build.0 = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|ARM.ActiveCfg = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|ARM.Build.0 = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|x64.ActiveCfg = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|x64.Build.0 = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|x86.ActiveCfg = Release|Any CPU
{3162B002-96BD-4C3A-BA83-94791BA65A49}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -273,6 +304,8 @@ Global
{F5A34D9C-854C-4972-ABF3-8BAE4712386D} = {3D04C4DC-6F8E-4326-9569-92F3E26C6EEB}
{10264C0F-F854-4201-AFCB-2B7315EFBCE0} = {B6984E67-A4D0-459E-B3C9-01CA4DBBE241}
{EC6681D3-3F9C-4CBB-B5D5-091E7F85D1C7} = {013DFD29-E1DB-4968-A67B-C2342E6F5B6E}
{3162B002-96BD-4C3A-BA83-94791BA65A49} = {3D04C4DC-6F8E-4326-9569-92F3E26C6EEB}
{D16D7F56-E54C-498D-B4B2-AEBF1C8CA462} = {013DFD29-E1DB-4968-A67B-C2342E6F5B6E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A659CEFB-DDB3-49BE-AEDD-FF2F1B3297DB}
Expand Down
28 changes: 28 additions & 0 deletions DotNetty.Netstandard.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ VisualStudioVersion = 16.0.29926.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{013DFD29-E1DB-4968-A67B-C2342E6F5B6E}"
ProjectSection(SolutionItems) = preProject
build.cmd = build.cmd
build.fsx = build.fsx
build.ps1 = build.ps1
build.sh = build.sh
buildNetstandard.cmd = buildNetstandard.cmd
buildNetstandard.fsx = buildNetstandard.fsx
buildNetstandard.ps1 = buildNetstandard.ps1
buildNetstandard.sh = buildNetstandard.sh
global.json = global.json
NuGet.Config = NuGet.Config
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
Expand Down Expand Up @@ -68,6 +77,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.NetUV.Netstandard"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.NetUV.Tests", "test\DotNetty.NetUV.Tests.Netstandard\DotNetty.NetUV.Tests.csproj", "{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-pipelines", "azure-pipelines", "{7AF386B8-794E-449E-9174-D6FD9ADD99EF}"
ProjectSection(SolutionItems) = preProject
build\azure-pipeline.template.yaml = build\azure-pipeline.template.yaml
build\pr-netfx-validation.yaml = build\pr-netfx-validation.yaml
build\pr-validation.yaml = build\pr-validation.yaml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "local-build", "local-build", "{468C56AA-C2DC-4D2E-A5E3-92CF53703867}"
ProjectSection(SolutionItems) = preProject
DotnetCLIVersion.txt = DotnetCLIVersion.txt
Ensure-DotNetSdk.cmd = Ensure-DotNetSdk.cmd
init-tools.cmd = init-tools.cmd
localBuild.cmd = localBuild.cmd
localPublish.cmd = localPublish.cmd
localRestore.cmd = localRestore.cmd
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -544,6 +570,8 @@ Global
{D7063A5D-CEEE-4496-96E9-AA244B44744B} = {2CCCD679-102A-4422-97D8-DA1A55DAFCA5}
{70213847-9E6A-4880-8808-CE469A75D42D} = {3D04C4DC-6F8E-4326-9569-92F3E26C6EEB}
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B} = {2CCCD679-102A-4422-97D8-DA1A55DAFCA5}
{7AF386B8-794E-449E-9174-D6FD9ADD99EF} = {013DFD29-E1DB-4968-A67B-C2342E6F5B6E}
{468C56AA-C2DC-4D2E-A5E3-92CF53703867} = {013DFD29-E1DB-4968-A67B-C2342E6F5B6E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A659CEFB-DDB3-49BE-AEDD-FF2F1B3297DB}
Expand Down
20 changes: 17 additions & 3 deletions DotNetty.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ VisualStudioVersion = 16.0.30104.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{013DFD29-E1DB-4968-A67B-C2342E6F5B6E}"
ProjectSection(SolutionItems) = preProject
azure_build.cmd = azure_build.cmd
build.cmd = build.cmd
build.fsx = build.fsx
build.ps1 = build.ps1
build.sh = build.sh
DotnetCLIVersion.txt = DotnetCLIVersion.txt
buildNetstandard.cmd = buildNetstandard.cmd
buildNetstandard.fsx = buildNetstandard.fsx
buildNetstandard.ps1 = buildNetstandard.ps1
buildNetstandard.sh = buildNetstandard.sh
global.json = global.json
NuGet.Config = NuGet.Config
README.md = README.md
Expand Down Expand Up @@ -69,9 +71,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Codecs.Protobuf",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Codecs.Protobuf.Tests", "test\DotNetty.Codecs.Protobuf.Tests\DotNetty.Codecs.Protobuf.Tests.csproj", "{76C629B7-0B58-4D82-9FAA-A620DFD5E588}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A8473C9F-08FF-47DE-8C23-D2BAF5EF4E0A}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-pipelines", "azure-pipelines", "{A8473C9F-08FF-47DE-8C23-D2BAF5EF4E0A}"
ProjectSection(SolutionItems) = preProject
build\azure-pipeline.template.yaml = build\azure-pipeline.template.yaml
build\pr-netfx-validation.yaml = build\pr-netfx-validation.yaml
build\pr-validation.yaml = build\pr-validation.yaml
EndProjectSection
EndProject
Expand All @@ -83,6 +86,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.NetUV", "src\DotNe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.NetUV.Tests", "test\DotNetty.NetUV.Tests\DotNetty.NetUV.Tests.csproj", "{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "local-build", "local-build", "{E27C94F8-A148-46D4-A1E0-2CC2B1FBECE9}"
ProjectSection(SolutionItems) = preProject
DotnetCLIVersion.txt = DotnetCLIVersion.txt
Ensure-DotNetSdk.cmd = Ensure-DotNetSdk.cmd
init-tools.cmd = init-tools.cmd
localBuild.cmd = localBuild.cmd
localPublish.cmd = localPublish.cmd
localRestore.cmd = localRestore.cmd
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -577,6 +590,7 @@ Global
{920F73C7-7FBE-44BE-8A99-3A394207D4C8} = {01F3CC7E-F996-411E-AFD6-72673A826549}
{68548ECD-222C-40C8-B975-46A17E5D5038} = {3D04C4DC-6F8E-4326-9569-92F3E26C6EEB}
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D} = {01F3CC7E-F996-411E-AFD6-72673A826549}
{E27C94F8-A148-46D4-A1E0-2CC2B1FBECE9} = {013DFD29-E1DB-4968-A67B-C2342E6F5B6E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A659CEFB-DDB3-49BE-AEDD-FF2F1B3297DB}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# dotnetty-span-fork

This is a fork from [DotNetty](https://github.com/azure/dotnetty) project.
This is a fork of [DotNetty](https://github.com/azure/dotnetty).

## Build Status

Expand Down
1 change: 0 additions & 1 deletion azure_build.cmd

This file was deleted.

48 changes: 1 addition & 47 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,47 +1 @@
@if not defined _echo @echo off
setlocal enabledelayedexpansion

SET CMDHOME=%~dp0.
if "%BUILD_FLAGS%"=="" SET BUILD_FLAGS=/m /v:m
if not defined BuildConfiguration SET BuildConfiguration=Debug

:: Clear the 'Platform' env variable for this session, as it's a per-project setting within the build, and
:: misleading value (such as 'MCD' in HP PCs) may lead to build breakage (issue: #69).
set Platform=

:: Disable multilevel lookup https://github.com/dotnet/core-setup/blob/master/Documentation/design-docs/multilevel-sharedfx-lookup.md
set DOTNET_MULTILEVEL_LOOKUP=0

call Ensure-DotNetSdk.cmd

SET SOLUTION=%CMDHOME%\DotNetty.sln

:: Set DateTime suffix for debug builds
for /f %%j in ('powershell -NoProfile -ExecutionPolicy ByPass Get-Date -format "{yyMMddHHmm}"') do set DATE_SUFFIX=%%j
SET AdditionalConfigurationProperties=;VersionDateSuffix=%DATE_SUFFIX%

@echo ===== Building %SOLUTION% =====

@echo Build %BuildConfiguration% ==============================
SET STEP=Restore %BuildConfiguration%

call %_dotnet% restore %BUILD_FLAGS% /bl:%BuildConfiguration%-Restore.binlog /p:Configuration=%BuildConfiguration%%AdditionalConfigurationProperties% "%SOLUTION%"
@if ERRORLEVEL 1 GOTO :ErrorStop
@echo RESTORE ok for %BuildConfiguration% %SOLUTION%

SET STEP=Build %BuildConfiguration%
call %_dotnet% build --no-restore %BUILD_FLAGS% /bl:%BuildConfiguration%-Build.binlog /p:Configuration=%BuildConfiguration%%AdditionalConfigurationProperties% "%SOLUTION%"
@if ERRORLEVEL 1 GOTO :ErrorStop
@echo BUILD ok for %BuildConfiguration% %SOLUTION%


:BuildFinished
@echo ===== Build succeeded for %SOLUTION% =====
@GOTO :EOF

:ErrorStop
set RC=%ERRORLEVEL%
if "%STEP%" == "" set STEP=%BuildConfiguration%
@echo ===== Build FAILED for %SOLUTION% -- %STEP% with error %RC% - CANNOT CONTINUE =====
exit /B %RC%
:EOF
PowerShell.exe -file "build.ps1" %*
Loading