Skip to content

Commit

Permalink
NuGet v2.3.2.1, .NET 6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel committed Nov 12, 2021
1 parent 7944cfb commit 58e18f8
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 11 deletions.
1 change: 1 addition & 0 deletions Test.Client/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ static void InitializeClient()
_Client.ServerDisconnected += ServerDisconnected;
_Client.MessageReceived += MessageReceived;
_Client.Logger = Logger;
_Client.AddCookie(new System.Net.Cookie("foo", "bar", "/", "localhost"));

// await _Client.StartAsync();
_Client.StartWithTimeout(10);
Expand Down
2 changes: 1 addition & 1 deletion Test.Client/Test.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net452;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net452;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Test.Dispose/Test.Dispose.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net452;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net452;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Test.Echo/Test.Echo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net452;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net452;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Test.Integrity/Test.Integrity.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net452;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net452;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
11 changes: 9 additions & 2 deletions Test.Server/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ static void Main(string[] args)
_ServerPort = InputInteger("Server port:", 9000, true, true);
_Ssl = InputBoolean("Use SSL:", false);

// InitializeServer();
InitializeServerMultiple();
InitializeServer();
// InitializeServerMultiple();

bool runForever = true;
while (runForever)
Expand Down Expand Up @@ -294,6 +294,13 @@ static void ClientConnected(object sender, ClientConnectedEventArgs args)
{
Console.WriteLine("Client " + args.IpPort + " connected using URL " + args.HttpRequest.RawUrl);
_LastIpPort = args.IpPort;
if (args.HttpRequest.Cookies != null && args.HttpRequest.Cookies.Count > 0)
{
foreach (Cookie cookie in args.HttpRequest.Cookies)
{
Console.WriteLine(cookie.Name + ": " + cookie.Value);
}
}
}

static void ClientDisconnected(object sender, ClientDisconnectedEventArgs args)
Expand Down
2 changes: 1 addition & 1 deletion Test.Server/Test.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net452;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net452;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions WatsonWebsocket/WatsonWebsocket.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1;net452;net5.0</TargetFrameworks>
<Version>2.3.2</Version>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net452;net5.0;net6.0</TargetFrameworks>
<Version>2.3.2.1</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Joel Christner</Authors>
<Description>WatsonWebsocket is the EASIEST and FASTEST way to build client and server applications that rely on messaging using websockets. It's. Really. Easy.</Description>
<Copyright>(c)2020 Joel Christner</Copyright>
<Copyright>(c)2021 Joel Christner</Copyright>
<PackageProjectUrl>https://github.com/jchristn/WatsonWebsocket</PackageProjectUrl>
<RepositoryUrl>https://github.com/jchristn/WatsonWebsocket</RepositoryUrl>
<RepositoryType>Github</RepositoryType>
<PackageLicenseUrl></PackageLicenseUrl>
<PackageTags>websocket message messaging frame framing web socket rpc api</PackageTags>
<PackageReleaseNotes>Multiple listener prefixes</PackageReleaseNotes>
<PackageReleaseNotes>.NET 6 support</PackageReleaseNotes>
<PackageIconUrl></PackageIconUrl>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageIcon>watson.png</PackageIcon>
Expand Down

0 comments on commit 58e18f8

Please sign in to comment.