Skip to content

Commit ce2c042

Browse files
doghappydoghappy
committed
upgrade nuget version
1 parent 32cb9b0 commit ce2c042

File tree

65 files changed

+113
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+113
-72
lines changed

src/socket.io-client-csharp.sln renamed to socket.io-client-csharp.sln

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient", "SocketIOClient\SocketIOClient.csproj", "{FFF33EC4-5BFA-4BC4-BB09-014192A0EA37}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient", "src\SocketIOClient\SocketIOClient.csproj", "{FFF33EC4-5BFA-4BC4-BB09-014192A0EA37}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.Newtonsoft.Json", "SocketIOClient.Newtonsoft.Json\SocketIOClient.Newtonsoft.Json.csproj", "{BAA4FB87-51B4-415F-AB05-315ED1132F78}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.Newtonsoft.Json", "src\SocketIOClient.Newtonsoft.Json\SocketIOClient.Newtonsoft.Json.csproj", "{BAA4FB87-51B4-415F-AB05-315ED1132F78}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.Windows7", "SocketIOClient.Windows7\SocketIOClient.Windows7.csproj", "{8EA5705A-16D6-4477-9682-26E819402149}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.Windows7", "src\SocketIOClient.Windows7\SocketIOClient.Windows7.csproj", "{8EA5705A-16D6-4477-9682-26E819402149}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.UnitTest", "SocketIOClient.UnitTest\SocketIOClient.UnitTest.csproj", "{B3A90FB0-5D1C-499C-A2F9-6E4DD331C8E9}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.UnitTest", "tests\SocketIOClient.UnitTest\SocketIOClient.UnitTest.csproj", "{B3A90FB0-5D1C-499C-A2F9-6E4DD331C8E9}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.IntegrationTests", "SocketIOClient.IntegrationTests\SocketIOClient.IntegrationTests.csproj", "{3987863F-026D-4B74-AD7F-E29470DA16A8}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketIOClient.IntegrationTests", "tests\SocketIOClient.IntegrationTests\SocketIOClient.IntegrationTests.csproj", "{3987863F-026D-4B74-AD7F-E29470DA16A8}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketIOClient.IntegrationTests.Net472", "SocketIOClient.IntegrationTests.Net472\SocketIOClient.IntegrationTests.Net472.csproj", "{A12339F8-B60D-4296-A61E-A6FFFA4C4A73}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketIOClient.IntegrationTests.Net472", "tests\SocketIOClient.IntegrationTests.Net472\SocketIOClient.IntegrationTests.Net472.csproj", "{A12339F8-B60D-4296-A61E-A6FFFA4C4A73}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketIOClient.IntegrationTests.Common", "SocketIOClient.IntegrationTests.Common\SocketIOClient.IntegrationTests.Common.csproj", "{8C62BD1E-9F14-4170-8E19-29A39996AAA2}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketIOClient.IntegrationTests.Common", "tests\SocketIOClient.IntegrationTests.Common\SocketIOClient.IntegrationTests.Common.csproj", "{8C62BD1E-9F14-4170-8E19-29A39996AAA2}"
19+
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7FFBC536-6E48-400E-AB05-BEAEAE45CAAC}"
21+
EndProject
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{335237B5-C6F5-4D4D-BD0C-006558A6F1B6}"
1923
EndProject
2024
Global
2125
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -58,4 +62,13 @@ Global
5862
GlobalSection(ExtensibilityGlobals) = postSolution
5963
SolutionGuid = {E5CDE829-A11F-4384-BFA3-7F7140E83D99}
6064
EndGlobalSection
65+
GlobalSection(NestedProjects) = preSolution
66+
{FFF33EC4-5BFA-4BC4-BB09-014192A0EA37} = {7FFBC536-6E48-400E-AB05-BEAEAE45CAAC}
67+
{BAA4FB87-51B4-415F-AB05-315ED1132F78} = {7FFBC536-6E48-400E-AB05-BEAEAE45CAAC}
68+
{8EA5705A-16D6-4477-9682-26E819402149} = {7FFBC536-6E48-400E-AB05-BEAEAE45CAAC}
69+
{3987863F-026D-4B74-AD7F-E29470DA16A8} = {335237B5-C6F5-4D4D-BD0C-006558A6F1B6}
70+
{8C62BD1E-9F14-4170-8E19-29A39996AAA2} = {335237B5-C6F5-4D4D-BD0C-006558A6F1B6}
71+
{A12339F8-B60D-4296-A61E-A6FFFA4C4A73} = {335237B5-C6F5-4D4D-BD0C-006558A6F1B6}
72+
{B3A90FB0-5D1C-499C-A2F9-6E4DD331C8E9} = {335237B5-C6F5-4D4D-BD0C-006558A6F1B6}
73+
EndGlobalSection
6174
EndGlobal

‎src/SocketIOClient.Newtonsoft.Json/SocketIOClient.Newtonsoft.Json.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
17-
<PackageReference Include="System.Text.Json" Version="7.0.0" />
17+
<PackageReference Include="System.Text.Json" Version="7.0.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/SocketIOClient/SocketIO.cs‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Diagnostics;
53
using System.Net.Http;
64
using System.Net.WebSockets;
75
using System.Threading;
@@ -14,6 +12,10 @@
1412
using SocketIOClient.Transport.WebSockets;
1513
using SocketIOClient.UriConverters;
1614

15+
#if DEBUG
16+
using System.Diagnostics;
17+
#endif
18+
1719
namespace SocketIOClient
1820
{
1921
/// <summary>
@@ -349,7 +351,7 @@ private async Task<TransportProtocol> GetProtocolAsync()
349351
catch (Exception e)
350352
{
351353
#if DEBUG
352-
System.Diagnostics.Debug.WriteLine(e);
354+
Debug.WriteLine(e);
353355
#endif
354356
}
355357
}
@@ -494,7 +496,9 @@ private void BinaryAckMessageHandler(ClientBinaryAckMessage msg)
494496

495497
private void OnErrorReceived(Exception ex)
496498
{
497-
//Logger.LogError(ex, ex.Message);
499+
#if DEBUG
500+
Debug.WriteLine(ex);
501+
#endif
498502
_ = InvokeDisconnect(DisconnectReason.TransportClose);
499503
}
500504

@@ -536,7 +540,7 @@ private void OnMessageReceived(IMessage msg)
536540
catch (Exception e)
537541
{
538542
#if DEBUG
539-
System.Diagnostics.Debug.WriteLine(e);
543+
Debug.WriteLine(e);
540544
#endif
541545
}
542546
}
@@ -556,7 +560,7 @@ public async Task DisconnectAsync()
556560
catch (Exception e)
557561
{
558562
#if DEBUG
559-
System.Diagnostics.Debug.WriteLine(e);
563+
Debug.WriteLine(e);
560564
#endif
561565
}
562566
await InvokeDisconnect(DisconnectReason.IOClientDisconnect);
@@ -770,7 +774,7 @@ private async Task InvokeDisconnect(string reason)
770774
catch (Exception e)
771775
{
772776
#if DEBUG
773-
System.Diagnostics.Debug.WriteLine(e);
777+
Debug.WriteLine(e);
774778
#endif
775779
}
776780
if (reason != DisconnectReason.IOServerDisconnect && reason != DisconnectReason.IOClientDisconnect)

‎src/SocketIOClient/SocketIOClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2;net462</TargetFrameworks>
55
<AssemblyName>SocketIOClient</AssemblyName>
66
<RootNamespace>SocketIOClient</RootNamespace>
77
<Authors>HeroWong</Authors>
@@ -26,7 +26,7 @@
2626

2727
<ItemGroup>
2828
<PackageReference Include="System.Collections" Version="4.3.0" />
29-
<PackageReference Include="System.Text.Json" Version="7.0.0" />
29+
<PackageReference Include="System.Text.Json" Version="7.0.1" />
3030
</ItemGroup>
3131

3232
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">

‎src/SocketIOClient/Transport/BaseTransport.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
using SocketIOClient.Extensions;
77
using SocketIOClient.Messages;
88

9+
#if DEBUG
10+
using System.Diagnostics;
11+
#endif
12+
913
namespace SocketIOClient.Transport
1014
{
1115
public abstract class BaseTransport : IDisposable
@@ -133,7 +137,7 @@ public virtual void Dispose()
133137
protected async Task OnTextReceived(string text)
134138
{
135139
#if DEBUG
136-
System.Diagnostics.Debug.WriteLine($"[{Protocol}⬇] {text}");
140+
Debug.WriteLine($"[{Protocol}⬇] {text}");
137141
#endif
138142
var msg = MessageFactory.CreateMessage(Options.EIO, text);
139143
if (msg == null)
@@ -204,7 +208,7 @@ protected async Task OnTextReceived(string text)
204208
protected void OnBinaryReceived(byte[] bytes)
205209
{
206210
#if DEBUG
207-
System.Diagnostics.Debug.WriteLine($"[{Protocol}⬇]0️⃣1️⃣0️⃣1️⃣");
211+
Debug.WriteLine($"[{Protocol}⬇]0️⃣1️⃣0️⃣1️⃣");
208212
#endif
209213
if (_messageQueue.Count > 0)
210214
{

‎src/SocketIOClient/Transport/WebSockets/WebSocketTransport.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
using System.Threading.Tasks;
66
using SocketIOClient.Extensions;
77

8+
#if DEBUG
9+
using System.Diagnostics;
10+
#endif
11+
812
namespace SocketIOClient.Transport.WebSockets
913
{
1014
public class WebSocketTransport : BaseTransport
@@ -120,6 +124,9 @@ private void Listen(CancellationToken cancellationToken)
120124
catch (Exception e)
121125
{
122126
OnError.TryInvoke(e);
127+
#if DEBUG
128+
Debug.WriteLine($"[{Protocol}❌] {e}");
129+
#endif
123130
break;
124131
}
125132
}
@@ -157,7 +164,7 @@ public override async Task SendAsync(Payload payload, CancellationToken cancella
157164
byte[] bytes = Encoding.UTF8.GetBytes(payload.Text);
158165
await SendAsync(TransportMessageType.Text, bytes, cancellationToken);
159166
#if DEBUG
160-
System.Diagnostics.Debug.WriteLine($"[WebSocket⬆] {payload.Text}");
167+
Debug.WriteLine($"[WebSocket⬆] {payload.Text}");
161168
#endif
162169
}
163170
if (payload.Bytes != null)
@@ -166,7 +173,7 @@ public override async Task SendAsync(Payload payload, CancellationToken cancella
166173
{
167174
await SendAsync(TransportMessageType.Binary, item, cancellationToken).ConfigureAwait(false);
168175
#if DEBUG
169-
System.Diagnostics.Debug.WriteLine($"[WebSocket⬆] {Convert.ToBase64String(item)}");
176+
Debug.WriteLine($"[WebSocket⬆] {Convert.ToBase64String(item)}");
170177
#endif
171178
}
172179
}

src/SocketIOClient.IntegrationTests.Common/SocketIOClient.IntegrationTests.Common.csproj renamed to tests/SocketIOClient.IntegrationTests.Common/SocketIOClient.IntegrationTests.Common.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
1515
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="7.0.0" />
1616
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.2.0" />
17-
<PackageReference Include="YamlDotNet" Version="12.0.2" />
17+
<PackageReference Include="YamlDotNet" Version="12.3.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="..\SocketIOClient\SocketIOClient.csproj" />
21+
<ProjectReference Include="..\..\src\SocketIOClient\SocketIOClient.csproj" />
2222
</ItemGroup>
2323

2424
</Project>

src/SocketIOClient.IntegrationTests.Common/Startup.cs renamed to tests/SocketIOClient.IntegrationTests.Common/Startup.cs

File renamed without changes.

src/SocketIOClient.IntegrationTests.Net472/Properties/AssemblyInfo.cs renamed to tests/SocketIOClient.IntegrationTests.Net472/Properties/AssemblyInfo.cs

File renamed without changes.

0 commit comments

Comments
 (0)