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.

Sign up for GitHub

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

chore: Stage 2 - Merge CI and upstream into main (based on mkim/ci-upstream) #19

Merged
merged 126 commits into from
Feb 9, 2024
Merged

chore: Stage 2 - Merge CI and upstream into main (based on mkim/ci-upstream) #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
b260de9
Ensure HandleHandshakeCompleted can only be executed in loop thread
yyjdelete May 22, 2021
7a95725
Merge pull request #47 from yyjdelete/issue_46
cuteant May 23, 2021
84261aa
Workflows target main branch
cuteant May 23, 2021
5270ea9
Merge pull request #49 from cuteant/workflows-target-main-branch
cuteant May 23, 2021
22e7411
fix Disconnect method summary returns
lwqwag May 25, 2021
f20a710
Merge pull request #53 from lwqwag/main
cuteant May 25, 2021
1633c27
Compatibility with DotNetty
cuteant May 25, 2021
331d466
Merge pull request #54 from cuteant/compatibility-with-dotnetty
cuteant May 25, 2021
8ae144a
Add test for IByteBuffer.Read/WriteBytes(Memory<byte>/Span<byte>)
yyjdelete May 30, 2021
12e5af4
Fix inconsistent behavior for IByteBuffer.Read/WriteBytes(Memory<byte…
yyjdelete May 30, 2021
6a4044c
Fix build warning (netstandard2.1)
cuteant May 31, 2021
fdcffd8
Merge pull request #56 from cuteant/fix-build-warning
cuteant Jun 1, 2021
849cd3f
Address PR feedbacks
yyjdelete Jun 2, 2021
6081bdc
Add missing tests
yyjdelete Jun 2, 2021
20c7bc0
Merge pull request #55 from yyjdelete/buf_span
cuteant Jun 3, 2021
1a1e7d0
Create codeql-analysis.yml
cuteant Jun 3, 2021
577d3ad
Update .NET 5 SDK to 5.0.301.
cuteant Jun 22, 2021
25fb2f6
Merge pull request #59 from cuteant/update-net-sdk-50301
cuteant Jun 22, 2021
1a49f61
Use C# compiler provided nint/nuint
cuteant Jun 22, 2021
f694823
Align with dotnet/runtime/CoreLib
cuteant Jun 23, 2021
ed6cec8
Update ByteBufferReader
cuteant Jun 24, 2021
9e0a740
Using MemoryMarshal.GetArrayDataReference in .net5.0
cuteant Jun 24, 2021
e55c9b9
added MyGet package info in readme
cuteant Jun 24, 2021
f78e3d7
Merge pull request #60 from cuteant/nint-nuint
cuteant Jun 26, 2021
992ba90
Remove netuv from main branch
cuteant Jun 30, 2021
bff4f63
Merge pull request #61 from cuteant/remove-netuv
cuteant Jun 30, 2021
33f8c58
Revert "DotNetty.CrossPlatform.sln"
cuteant Jun 30, 2021
4451a60
Merge pull request #62 from cuteant/revert-sln
cuteant Jun 30, 2021
1cf54d7
Ignore 'WakeupTask' in SingleThreadEventLoop::PollTask
cuteant Jul 1, 2021
d8b7c1a
Merge pull request #63 from cuteant/ignore-wakeup-task
cuteant Jul 1, 2021
d8d7e8a
Fix SingleThreadEventExecutor::IsBacklogEmpty
cuteant Jul 1, 2021
7fcaab4
Merge pull request #64 from cuteant/fix-IsBacklogEmpty
cutesprite Jul 2, 2021
ae4df1f
The old dotnetty.com.pfx use Sha1+RSA1024 instead of Sha256+RSA2048, …
yyjdelete May 23, 2021
564d5dd
Fix 'LoopExecutor' unhandled scheduled task error
cuteant Jul 11, 2021
a72d429
Save old buffer to ownBuffer in ResetSource if there are some bytes w…
yyjdelete May 27, 2021
c602aaf
Add TlsHandler::EnsureAuthenticationCompleted
cuteant Jul 11, 2021
657acf5
impl
maksimkim Jul 12, 2021
76a28e9
Merge pull request #67 from maksimkim/fixflowcontrol
cuteant Jul 13, 2021
4211d01
Fix: TlsHandler does not close the channel that it uses
cuteant Jul 13, 2021
f8893bd
Add TaskUtil::IsFailure
cuteant Jul 15, 2021
21aff27
examples - update packages
cuteant Jul 15, 2021
9f31f09
Merge pull request #65 from cuteant/fix-issue-4
cuteant Jul 15, 2021
892234a
Update .NET 5 SDK to 5.0.302.
cuteant Jul 16, 2021
2712d4a
Merge pull request #68 from cuteant/update-net-sdk-50302
cuteant Jul 16, 2021
1b75510
Fix #69
cuteant Jul 16, 2021
3500b1e
Merge pull request #70 from cuteant/issue-69
cuteant Jul 16, 2021
46f4abe
Port handler-proxy (http-only) (#71)
maksimkim Jul 20, 2021
9e0db4c
Fix #75 (#76)
yyjdelete Sep 12, 2021
6bb2099
Cleanup example projects (#78)
tinohager Sep 12, 2021
39a3a8e
HTTP 1.1 HttpMethod should be case-sensitive according to specs (#81)
pcwiese Nov 18, 2021
7eccf0b
Fix CompositeByteBuffer.ComponentAtOffset() (#85)
yyjdelete Nov 19, 2021
9b18853
ci: Ensure pipelines & CodeQL are triggered correctly (#1)
tomkerkhove Jan 13, 2023
b7a57b0
ci: Use yaml list for specifying PR triggers (#3)
tomkerkhove Jan 13, 2023
bf472b8
ci: Update build agents
tomkerkhove Jan 30, 2023
f526a8e
Update pr-validation.yaml
tomkerkhove Jan 30, 2023
2a1f38b
Update pr-netfx-validation.yaml
tomkerkhove Jan 30, 2023
99f1c70
Rough NuGet edit
tomkerkhove Feb 1, 2023
ff42d34
Re-add NugetPath
tomkerkhove Feb 1, 2023
1234b6f
Fix
tomkerkhove Feb 1, 2023
34fdf7a
Centralize NuGet restore
tomkerkhove Feb 1, 2023
f3d0067
Use stages
tomkerkhove Feb 1, 2023
f0d49d6
Use ubuntu-22.04 instead of ubuntu-18.04
tomkerkhove Feb 1, 2023
82c53af
Clean up
tomkerkhove Feb 1, 2023
61b0489
Let's try this
tomkerkhove Feb 1, 2023
cbf1a4e
Feed -> Source
tomkerkhove Feb 1, 2023
48ffbf4
Install Incrementalist
tomkerkhove Feb 1, 2023
5039cb1
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 1, 2023
423e63e
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 1, 2023
5203090
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 1, 2023
ce7cbbf
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 1, 2023
708f4a9
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 1, 2023
b6855eb
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 1, 2023
2361a7e
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 2, 2023
bc0c0e0
Use NuGet 5.x
tomkerkhove Feb 2, 2023
e61a15c
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 2, 2023
87b4ff1
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 2, 2023
f3caf24
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 2, 2023
65b0a8b
Update pr-validation.yaml for Azure Pipelines
tomkerkhove Feb 2, 2023
15bc827
replace 'future' with 'main' in build.fsx
maksimkim Feb 6, 2023
ecd6e86
incrementalist verbose logging
maksimkim Feb 7, 2023
890607f
bump incrementalist to 0.8.0
maksimkim Feb 7, 2023
226bfc1
bump incrementalist to 0.8.0 in yml pipeline
maksimkim Feb 7, 2023
93778da
install fake for unit tests
maksimkim Feb 7, 2023
fb3dbf7
unqoute install fake in template
maksimkim Feb 7, 2023
a380dc8
default value for pkgfeed parameter in template
maksimkim Feb 7, 2023
0a54365
pass parameters to template
maksimkim Feb 7, 2023
2bcc939
install incrementalist in template
maksimkim Feb 7, 2023
40caaf4
nuget auth for template
maksimkim Feb 7, 2023
08b269c
Remove old config
tomkerkhove Feb 7, 2023
15bd692
Clean up scripts
tomkerkhove Feb 7, 2023
dab3d40
Consolidate things
tomkerkhove Feb 7, 2023
6fc813c
Remove template folder
tomkerkhove Feb 7, 2023
4cae270
Revert
tomkerkhove Feb 7, 2023
8b2c5de
Remove duplicate NuGet
tomkerkhove Feb 7, 2023
6e611d2
SImplify
tomkerkhove Feb 7, 2023
2d2c4af
Pass package feed for .NET Framework
tomkerkhove Feb 7, 2023
f911c06
Merge remote-tracking branch 'origin/main' into mkim/ci-upstream
maksimkim Feb 7, 2023
a100c23
fix pr pipeline indent
maksimkim Feb 7, 2023
6367ab2
fix pr-netfx pipeline indent
maksimkim Feb 7, 2023
d7d22c4
reuse nuget tasks
maksimkim Feb 7, 2023
69ba1da
bring back nuget auth in build job
maksimkim Feb 7, 2023
5103684
consolidate nuget tasks
maksimkim Feb 8, 2023
05aed16
tooling installation for pr-netfx-validation
maksimkim Feb 8, 2023
a1b249c
add net6 sdk to netfx build
maksimkim Feb 8, 2023
8f1111d
Revert "Fix CompositeByteBuffer.ComponentAtOffset() (#85)"
maksimkim Feb 8, 2023
8785925
Merge branch 'mkim/ci' into mkim/ci-upstream
tomkerkhove Feb 8, 2023
8a67885
Explicitly fail
tomkerkhove Feb 8, 2023
c1213ff
Fix dependsOn to not wait for windows
tomkerkhove Feb 8, 2023
76eaa14
Migrate to v2 actions for CodeQL
tomkerkhove Feb 9, 2023
7e87686
Delete .github/workflows directory
tomkerkhove Feb 9, 2023
b202bca
don't test tls10/11 on windows 11
maksimkim Feb 10, 2023
d8a017c
enforce timeout on handlers.proxy tests
maksimkim Feb 10, 2023
9300c74
check legacy tls in tlswrite tests
maksimkim Feb 10, 2023
d22eda0
convert http proxy handler tests to async task to detect the issue
maksimkim Feb 10, 2023
00d009a
print os version
maksimkim Feb 10, 2023
5cb5cd6
log extended os version
maksimkim Feb 11, 2023
4afbb7e
exclude tls10/11 from ubuntu 20.04
maksimkim Feb 11, 2023
f4146eb
temporary disable httpproxyhandlertests
maksimkim Feb 11, 2023
457b145
reduce win2022 minimal version
maksimkim Feb 11, 2023
7f185ec
fix legacy tls support flag calculation
maksimkim Feb 11, 2023
5a91ebb
verify legacy tls through registry on windows (commented out)
maksimkim Feb 12, 2023
7ccfea7
add tls handshake await to read test
maksimkim Mar 12, 2023
bc686a9
feat: Provide pipeline to publish NuGet packages (#10)
tomkerkhove Apr 12, 2023
c13c24e
Skip tests we agreed for now
tomkerkhove Sep 7, 2023
48c8bc9
Disabling a few unreliable tests to turn validation green and so they…
nimakamoosi Feb 6, 2024
587dac9
Excluding tests (ProxyHandlerTest.Test) and pipelines (ubuntu, .NET f…
nimakamoosi Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,6 @@ TODO.txt
/test/DotNetty.Transport.Tests.Performance/Perf
/tools
/global.json
/.idea/
build.fsx.lock
/.vscode
3 changes: 1 addition & 2 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"version": "0.1.0",
"version": "2.0.0",
"command": "dotnet",
"isShellCommand": true,
"args": [],
"tasks": [
{
Expand Down
21 changes: 1 addition & 20 deletions DotNetty.CrossPlatform.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Microbench", "perf
EndProject
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\templates\azure-pipeline.template.yaml = build\templates\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
Expand Down Expand Up @@ -270,22 +268,6 @@ 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 @@ -304,7 +286,6 @@ 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
Expand Down
40 changes: 1 addition & 39 deletions DotNetty.Netstandard.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.End2End.Tests", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Suite.Tests", "test\DotNetty.Suite.Tests.Netstandard\DotNetty.Suite.Tests.csproj", "{D7063A5D-CEEE-4496-96E9-AA244B44744B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.NetUV.Netstandard", "src\DotNetty.NetUV\DotNetty.NetUV.Netstandard.csproj", "{70213847-9E6A-4880-8808-CE469A75D42D}"
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\templates\azure-pipeline.template.yaml = build\templates\azure-pipeline.template.yaml
build\pr-netfx-validation.yaml = build\pr-netfx-validation.yaml
build\pr-validation.yaml = build\pr-validation.yaml
EndProjectSection
Expand Down Expand Up @@ -506,38 +502,6 @@ Global
{D7063A5D-CEEE-4496-96E9-AA244B44744B}.Release|x64.Build.0 = Release|Any CPU
{D7063A5D-CEEE-4496-96E9-AA244B44744B}.Release|x86.ActiveCfg = Release|Any CPU
{D7063A5D-CEEE-4496-96E9-AA244B44744B}.Release|x86.Build.0 = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|ARM.Build.0 = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|x64.ActiveCfg = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|x64.Build.0 = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|x86.ActiveCfg = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Debug|x86.Build.0 = Debug|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|Any CPU.Build.0 = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|ARM.ActiveCfg = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|ARM.Build.0 = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|x64.ActiveCfg = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|x64.Build.0 = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|x86.ActiveCfg = Release|Any CPU
{70213847-9E6A-4880-8808-CE469A75D42D}.Release|x86.Build.0 = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|ARM.Build.0 = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|x64.ActiveCfg = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|x64.Build.0 = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|x86.ActiveCfg = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Debug|x86.Build.0 = Debug|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|Any CPU.Build.0 = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|ARM.ActiveCfg = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|ARM.Build.0 = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|x64.ActiveCfg = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|x64.Build.0 = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|x86.ActiveCfg = Release|Any CPU
{21FCDAD0-26FC-41E6-B385-DEAB88BD661B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -568,8 +532,6 @@ Global
{EE14EB67-04A4-45AE-91F0-0A0DB36D7C0B} = {2CCCD679-102A-4422-97D8-DA1A55DAFCA5}
{37F48AC6-2A51-45AF-AEF0-1C83CB076B4E} = {2CCCD679-102A-4422-97D8-DA1A55DAFCA5}
{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
Expand Down
78 changes: 39 additions & 39 deletions DotNetty.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Codecs.Protobuf.Te
EndProject
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\templates\azure-pipeline.template.yaml = build\templates\azure-pipeline.template.yaml
build\pr-netfx-validation.yaml = build\pr-netfx-validation.yaml
build\pr-validation.yaml = build\pr-validation.yaml
EndProjectSection
Expand All @@ -82,10 +82,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.End2End.Tests", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.Suite.Tests", "test\DotNetty.Suite.Tests\DotNetty.Suite.Tests.csproj", "{920F73C7-7FBE-44BE-8A99-3A394207D4C8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetty.NetUV", "src\DotNetty.NetUV\DotNetty.NetUV.csproj", "{68548ECD-222C-40C8-B975-46A17E5D5038}"
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
Expand All @@ -96,6 +92,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "local-build", "local-build"
localRestore.cmd = localRestore.cmd
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetty.Handlers.Proxy", "src\DotNetty.Handlers.Proxy\DotNetty.Handlers.Proxy.csproj", "{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetty.Handlers.Proxy.Tests", "test\DotNetty.Handlers.Proxy.Tests\DotNetty.Handlers.Proxy.Tests.csproj", "{8A11F53C-02FD-4537-9BC9-0525489F128B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -524,38 +524,38 @@ Global
{920F73C7-7FBE-44BE-8A99-3A394207D4C8}.Release|x64.Build.0 = Release|Any CPU
{920F73C7-7FBE-44BE-8A99-3A394207D4C8}.Release|x86.ActiveCfg = Release|Any CPU
{920F73C7-7FBE-44BE-8A99-3A394207D4C8}.Release|x86.Build.0 = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|Any CPU.Build.0 = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|ARM.ActiveCfg = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|ARM.Build.0 = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|x64.ActiveCfg = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|x64.Build.0 = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|x86.ActiveCfg = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Debug|x86.Build.0 = Debug|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|Any CPU.ActiveCfg = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|Any CPU.Build.0 = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|ARM.ActiveCfg = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|ARM.Build.0 = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|x64.ActiveCfg = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|x64.Build.0 = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|x86.ActiveCfg = Release|Any CPU
{68548ECD-222C-40C8-B975-46A17E5D5038}.Release|x86.Build.0 = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|ARM.Build.0 = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|x64.ActiveCfg = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|x64.Build.0 = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|x86.ActiveCfg = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Debug|x86.Build.0 = Debug|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|Any CPU.Build.0 = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|ARM.ActiveCfg = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|ARM.Build.0 = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|x64.ActiveCfg = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|x64.Build.0 = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|x86.ActiveCfg = Release|Any CPU
{1C3FD988-6CBF-4EAE-A78D-F7D8BA085E0D}.Release|x86.Build.0 = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|ARM.ActiveCfg = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|ARM.Build.0 = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|x64.ActiveCfg = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|x64.Build.0 = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|x86.ActiveCfg = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Debug|x86.Build.0 = Debug|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|Any CPU.Build.0 = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|ARM.ActiveCfg = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|ARM.Build.0 = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|x64.ActiveCfg = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|x64.Build.0 = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|x86.ActiveCfg = Release|Any CPU
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC}.Release|x86.Build.0 = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|ARM.Build.0 = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|x64.ActiveCfg = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|x64.Build.0 = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|x86.ActiveCfg = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Debug|x86.Build.0 = Debug|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|Any CPU.Build.0 = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|ARM.ActiveCfg = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|ARM.Build.0 = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|x64.ActiveCfg = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|x64.Build.0 = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|x86.ActiveCfg = Release|Any CPU
{8A11F53C-02FD-4537-9BC9-0525489F128B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -588,9 +588,9 @@ Global
{A8473C9F-08FF-47DE-8C23-D2BAF5EF4E0A} = {013DFD29-E1DB-4968-A67B-C2342E6F5B6E}
{E6B102FE-C706-4C40-B4F9-569EFC89B70F} = {01F3CC7E-F996-411E-AFD6-72673A826549}
{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}
{9A960CAF-E1BB-49F0-8F4F-7FA52F787CFC} = {3D04C4DC-6F8E-4326-9569-92F3E26C6EEB}
{8A11F53C-02FD-4537-9BC9-0525489F128B} = {01F3CC7E-F996-411E-AFD6-72673A826549}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A659CEFB-DDB3-49BE-AEDD-FF2F1B3297DB}
Expand Down
2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.203
5.0.302
6 changes: 2 additions & 4 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<!--<add key="nuget.org" value="https://nuget.cdn.azure.cn/v3/index.json" />-->
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="myget" value="https://www.myget.org/F/cuteant/api/v3/index.json" />
<add key="ApiManagement" value="https://pkgs.dev.azure.com/msazure/_packaging/ApiManagement/nuget/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
</configuration>
Loading