diff --git a/src/NexNet.IntegrationTests/BaseTests.cs b/src/NexNet.IntegrationTests/BaseTests.cs index 10dd2a24..b09b44cf 100644 --- a/src/NexNet.IntegrationTests/BaseTests.cs +++ b/src/NexNet.IntegrationTests/BaseTests.cs @@ -5,6 +5,7 @@ using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; using NexNet.IntegrationTests.TestInterfaces; +using NexNet.Quic; using NexNet.Transports; using NUnit.Framework; using NUnit.Framework.Internal; diff --git a/src/NexNet.IntegrationTests/NexNet.IntegrationTests.csproj b/src/NexNet.IntegrationTests/NexNet.IntegrationTests.csproj index f189d35d..f0803b8f 100644 --- a/src/NexNet.IntegrationTests/NexNet.IntegrationTests.csproj +++ b/src/NexNet.IntegrationTests/NexNet.IntegrationTests.csproj @@ -24,6 +24,7 @@ + diff --git a/src/NexNet.Quic/NexNet.Quic.csproj b/src/NexNet.Quic/NexNet.Quic.csproj new file mode 100644 index 00000000..563989e4 --- /dev/null +++ b/src/NexNet.Quic/NexNet.Quic.csproj @@ -0,0 +1,20 @@ + + + + net7.0 + enable + enable + true + + + + + + + + + + + + + diff --git a/src/NexNet/Transports/QuicConfigs.cs b/src/NexNet.Quic/QuicConfigs.cs similarity index 90% rename from src/NexNet/Transports/QuicConfigs.cs rename to src/NexNet.Quic/QuicConfigs.cs index 052e4cbb..87354f8c 100644 --- a/src/NexNet/Transports/QuicConfigs.cs +++ b/src/NexNet.Quic/QuicConfigs.cs @@ -1,13 +1,8 @@ -using System; -using System.Net; -using System.Net.Quic; +using System.Net; using System.Net.Security; -using System.Net.Sockets; -using System.Runtime.Versioning; -using System.Threading; -using System.Threading.Tasks; +using NexNet.Transports; -namespace NexNet.Transports; +namespace NexNet.Quic; /// /// Configurations for the client to connect to a QUIC NexNet server. diff --git a/src/NexNet/Transports/QuicTransport.cs b/src/NexNet.Quic/QuicTransport.cs similarity index 94% rename from src/NexNet/Transports/QuicTransport.cs rename to src/NexNet.Quic/QuicTransport.cs index 81bc6cc6..aef443ab 100644 --- a/src/NexNet/Transports/QuicTransport.cs +++ b/src/NexNet.Quic/QuicTransport.cs @@ -1,16 +1,11 @@ -using System; -using System.Collections.Generic; -using System.IO.Pipelines; -using System.Net; +using System.IO.Pipelines; using System.Net.Quic; using System.Net.Security; -using System.Net.Sockets; -using System.Threading; -using System.Threading.Tasks; -using Pipelines.Sockets.Unofficial; +using NexNet.Transports; + #pragma warning disable CA1416 -namespace NexNet.Transports; +namespace NexNet.Quic; internal class QuicTransport : ITransport { diff --git a/src/NexNet/Transports/QuicTransportListener.cs b/src/NexNet.Quic/QuicTransportListener.cs similarity index 92% rename from src/NexNet/Transports/QuicTransportListener.cs rename to src/NexNet.Quic/QuicTransportListener.cs index cf942d87..e354c00b 100644 --- a/src/NexNet/Transports/QuicTransportListener.cs +++ b/src/NexNet.Quic/QuicTransportListener.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Net; -using System.Net.Quic; +using System.Net.Quic; using System.Net.Security; -using System.Net.Sockets; -using System.Threading; -using System.Threading.Tasks; -using Pipelines.Sockets.Unofficial; +using NexNet.Transports; + #pragma warning disable CA1416 -namespace NexNet.Transports; +namespace NexNet.Quic; internal class QuicTransportListener : ITransportListener { diff --git a/src/NexNet.sln b/src/NexNet.sln index 4bc81762..13bd334a 100644 --- a/src/NexNet.sln +++ b/src/NexNet.sln @@ -18,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{AFD63E ..\.github\workflows\dotnet.yml = ..\.github\workflows\dotnet.yml EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NexNet.Quic", "NexNet.Quic\NexNet.Quic.csproj", "{AB75B6D0-0DC0-4E3A-A3A7-320DFB6B09C5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,6 +46,10 @@ Global {156ED4BC-EF04-4230-9AED-7E1058130BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU {156ED4BC-EF04-4230-9AED-7E1058130BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU {156ED4BC-EF04-4230-9AED-7E1058130BB5}.Release|Any CPU.Build.0 = Release|Any CPU + {AB75B6D0-0DC0-4E3A-A3A7-320DFB6B09C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB75B6D0-0DC0-4E3A-A3A7-320DFB6B09C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB75B6D0-0DC0-4E3A-A3A7-320DFB6B09C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB75B6D0-0DC0-4E3A-A3A7-320DFB6B09C5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/NexNet/NexNet.csproj b/src/NexNet/NexNet.csproj index 76006335..2c37eff5 100644 --- a/src/NexNet/NexNet.csproj +++ b/src/NexNet/NexNet.csproj @@ -6,18 +6,12 @@ $(DefineConstants);SOCKET_STREAM_BUFFERS;RANGES true latest - true true snupkg Communication system to two way communication between a single server and multiple clients. 0.1.1 - - - - - - + <_Parameter1>NexNet.IntegrationTests diff --git a/src/NexNetDemo/NexNetDemo.csproj b/src/NexNetDemo/NexNetDemo.csproj index af732274..45ebae09 100644 --- a/src/NexNetDemo/NexNetDemo.csproj +++ b/src/NexNetDemo/NexNetDemo.csproj @@ -15,6 +15,7 @@ +