Skip to content

Commit df584ca

Browse files
theprateikgalvesribeiro
theprateik
authored and
galvesribeiro
committed
Update to Blazor 3.0.0-preview6 (#35)
* Update to Blazor 3.0.0-preview6 - Update global.json to reflect the updated sdk version - Replace Json.Deserialize by JsonSerializer.Parse in class HubConnection - Add this. where missing in class HubConnection - Replace onclick and bind attributes in test razor pages by @OnClick and @Bind - Replace @functions by @code in test razor files - Remove UseSignalR and UseBlazor from test Server Startup class Configure method - Add UseAuthorization to Startup class - Comment out AddMessagePackProtocol and uncommented AddJsonProtocol in Startup class - Comment out AddMessagePackProtocol in ChatComponent class * Update .vsts-ci.yml and .vsts-release.yml to use the .NET Core Preview 6 SDK.
1 parent 9e9923a commit df584ca

File tree

11 files changed

+103
-103
lines changed

11 files changed

+103
-103
lines changed

‎.vsts-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- task: DotNetCoreInstaller@0
99
inputs:
1010
packageType: 'sdk'
11-
version: '3.0.100-preview4-011223'
11+
version: '3.0.100-preview6-012264'
1212

1313
- task: DotNetCoreCLI@2
1414
inputs:

‎.vsts-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- task: DotNetCoreInstaller@0
99
inputs:
1010
packageType: 'sdk'
11-
version: '3.0.100-preview4-011223'
11+
version: '3.0.100-preview6-012264'
1212

1313
- task: DotNetCoreCLI@2
1414
inputs:

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview4-011223"
3+
"version": "3.0.100-preview6-012264"
44
}
55
}

‎src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview4-19216-03" />
18+
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview6.19307.2" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Blazor.Extensions.SignalR/HubConnection.cs‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.JSInterop;
22
using System;
33
using System.Collections.Generic;
4+
using System.Text.Json.Serialization;
45
using System.Threading.Tasks;
56

67
namespace Blazor.Extensions
@@ -20,63 +21,63 @@ public class HubConnection : IDisposable
2021
internal HttpConnectionOptions Options { get; }
2122
internal string InternalConnectionId { get; }
2223

23-
private Dictionary<string, Dictionary<string, HubMethodCallback>> _callbacks = new Dictionary<string, Dictionary<string, HubMethodCallback>>();
24+
private Dictionary<string, Dictionary<string, HubMethodCallback>> callbacks = new Dictionary<string, Dictionary<string, HubMethodCallback>>();
2425

25-
private HubCloseCallback _closeCallback;
26-
private IJSRuntime _runtime;
26+
private HubCloseCallback closeCallback;
27+
private IJSRuntime runtime;
2728

2829
public HubConnection(IJSRuntime runtime, HttpConnectionOptions options)
2930
{
30-
this._runtime = runtime;
31+
this.runtime = runtime;
3132
this.Options = options;
3233
this.InternalConnectionId = Guid.NewGuid().ToString();
3334
runtime.InvokeSync<object>(CREATE_CONNECTION_METHOD,
3435
this.InternalConnectionId,
35-
new DotNetObjectRef(this.Options));
36+
DotNetObjectRef.Create(this.Options));
3637
}
3738

3839

39-
public Task StartAsync() => this._runtime.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
40-
public Task StopAsync() => this._runtime.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
40+
public Task StartAsync() => this.runtime.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
41+
public Task StopAsync() => this.runtime.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
4142

4243
public IDisposable On<TResult1>(string methodName, Func<TResult1, Task> handler)
43-
=> On<TResult1, object, object, object, object, object, object, object, object, object>(methodName,
44+
=> this.On<TResult1, object, object, object, object, object, object, object, object, object>(methodName,
4445
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1));
4546

4647
public IDisposable On<TResult1, TResult2>(string methodName, Func<TResult1, TResult2, Task> handler)
47-
=> On<TResult1, TResult2, object, object, object, object, object, object, object, object>(methodName,
48+
=> this.On<TResult1, TResult2, object, object, object, object, object, object, object, object>(methodName,
4849
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2));
4950

5051
public IDisposable On<TResult1, TResult2, TResult3>(string methodName, Func<TResult1, TResult2, TResult3, Task> handler)
51-
=> On<TResult1, TResult2, TResult3, object, object, object, object, object, object, object>(methodName,
52+
=> this.On<TResult1, TResult2, TResult3, object, object, object, object, object, object, object>(methodName,
5253
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3));
5354

5455
public IDisposable On<TResult1, TResult2, TResult3, TResult4>(string methodName, Func<TResult1, TResult2, TResult3, TResult4, Task> handler)
55-
=> On<TResult1, TResult2, TResult3, TResult4, object, object, object, object, object, object>(methodName,
56+
=> this.On<TResult1, TResult2, TResult3, TResult4, object, object, object, object, object, object>(methodName,
5657
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4));
5758

5859
public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5>(string methodName, Func<TResult1, TResult2, TResult3, TResult4, TResult5, Task> handler)
59-
=> On<TResult1, TResult2, TResult3, TResult4, TResult5, object, object, object, object, object>(methodName,
60+
=> this.On<TResult1, TResult2, TResult3, TResult4, TResult5, object, object, object, object, object>(methodName,
6061
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5));
6162

6263
public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6>(string methodName,
6364
Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, Task> handler)
64-
=> On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, object, object, object, object>(methodName,
65+
=> this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, object, object, object, object>(methodName,
6566
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6));
6667

6768
public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7>(string methodName,
6869
Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, Task> handler)
69-
=> On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, object, object, object>(methodName,
70+
=> this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, object, object, object>(methodName,
7071
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6, t7));
7172

7273
public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8>(string methodName,
7374
Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, Task> handler)
74-
=> On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, object, object>(methodName,
75+
=> this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, object, object>(methodName,
7576
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6, t7, t8));
7677

7778
public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9>(string methodName,
7879
Func<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, Task> handler)
79-
=> On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, object>(methodName,
80+
=> this.On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, object>(methodName,
8081
(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) => handler(t1, t2, t3, t4, t5, t6, t7, t8, t9));
8182

8283
public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6, TResult7, TResult8, TResult9, TResult10>(string methodName,
@@ -103,103 +104,103 @@ public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6
103104

104105
if (payloads.Length > 0)
105106
{
106-
t1 = Json.Deserialize<TResult1>(payloads[0]);
107+
t1 = JsonSerializer.Parse<TResult1>(payloads[0]);
107108
}
108109
if (payloads.Length > 1)
109110
{
110-
t2 = Json.Deserialize<TResult2>(payloads[1]);
111+
t2 = JsonSerializer.Parse<TResult2>(payloads[1]);
111112
}
112113
if (payloads.Length > 2)
113114
{
114-
t3 = Json.Deserialize<TResult3>(payloads[2]);
115+
t3 = JsonSerializer.Parse<TResult3>(payloads[2]);
115116
}
116117
if (payloads.Length > 3)
117118
{
118-
t4 = Json.Deserialize<TResult4>(payloads[3]);
119+
t4 = JsonSerializer.Parse<TResult4>(payloads[3]);
119120
}
120121
if (payloads.Length > 4)
121122
{
122-
t5 = Json.Deserialize<TResult5>(payloads[4]);
123+
t5 = JsonSerializer.Parse<TResult5>(payloads[4]);
123124
}
124125
if (payloads.Length > 5)
125126
{
126-
t6 = Json.Deserialize<TResult6>(payloads[5]);
127+
t6 = JsonSerializer.Parse<TResult6>(payloads[5]);
127128
}
128129
if (payloads.Length > 6)
129130
{
130-
t7 = Json.Deserialize<TResult7>(payloads[6]);
131+
t7 = JsonSerializer.Parse<TResult7>(payloads[6]);
131132
}
132133
if (payloads.Length > 7)
133134
{
134-
t8 = Json.Deserialize<TResult8>(payloads[7]);
135+
t8 = JsonSerializer.Parse<TResult8>(payloads[7]);
135136
}
136137
if (payloads.Length > 8)
137138
{
138-
t9 = Json.Deserialize<TResult9>(payloads[8]);
139+
t9 = JsonSerializer.Parse<TResult9>(payloads[8]);
139140
}
140141
if (payloads.Length > 9)
141142
{
142-
t10 = Json.Deserialize<TResult10>(payloads[9]);
143+
t10 = JsonSerializer.Parse<TResult10>(payloads[9]);
143144
}
144145

145146
return handler(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
146147
}
147148
);
148149

149-
RegisterHandle(methodName, callback);
150+
this.RegisterHandle(methodName, callback);
150151

151152
return callback;
152153
}
153154

154155
internal void RegisterHandle(string methodName, HubMethodCallback callback)
155156
{
156-
if (this._callbacks.TryGetValue(methodName, out var methodHandlers))
157+
if (this.callbacks.TryGetValue(methodName, out var methodHandlers))
157158
{
158159
methodHandlers[callback.Id] = callback;
159160
}
160161
else
161162
{
162-
this._callbacks[methodName] = new Dictionary<string, HubMethodCallback>
163+
this.callbacks[methodName] = new Dictionary<string, HubMethodCallback>
163164
{
164165
{ callback.Id, callback }
165166
};
166167
}
167168

168-
this._runtime.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, new DotNetObjectRef(callback));
169+
this.runtime.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, DotNetObjectRef.Create(callback));
169170
}
170171

171172
internal void RemoveHandle(string methodName, string callbackId)
172173
{
173-
if (this._callbacks.TryGetValue(methodName, out var callbacks))
174+
if (this.callbacks.TryGetValue(methodName, out var callbacks))
174175
{
175176
if (callbacks.TryGetValue(callbackId, out var callback))
176177
{
177-
this._runtime.InvokeSync<object>(OFF_METHOD, this.InternalConnectionId, methodName, callbackId);
178+
this.runtime.InvokeSync<object>(OFF_METHOD, this.InternalConnectionId, methodName, callbackId);
178179
//HubConnectionManager.Off(this.InternalConnectionId, handle.Item1);
179180
callbacks.Remove(callbackId);
180181

181182
if (callbacks.Count == 0)
182183
{
183-
this._callbacks.Remove(methodName);
184+
this.callbacks.Remove(methodName);
184185
}
185186
}
186187
}
187188
}
188189

189190
public void OnClose(Func<Exception, Task> callback)
190191
{
191-
this._closeCallback = new HubCloseCallback(callback);
192-
this._runtime.InvokeSync<object>(ON_CLOSE_METHOD,
192+
this.closeCallback = new HubCloseCallback(callback);
193+
this.runtime.InvokeSync<object>(ON_CLOSE_METHOD,
193194
this.InternalConnectionId,
194-
new DotNetObjectRef(this._closeCallback));
195+
DotNetObjectRef.Create(this.closeCallback));
195196
}
196197

197198
public Task InvokeAsync(string methodName, params object[] args) =>
198-
this._runtime.InvokeAsync<object>(INVOKE_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
199+
this.runtime.InvokeAsync<object>(INVOKE_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
199200

200201
public Task<TResult> InvokeAsync<TResult>(string methodName, params object[] args) =>
201-
this._runtime.InvokeAsync<TResult>(INVOKE_WITH_RESULT_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
202+
this.runtime.InvokeAsync<TResult>(INVOKE_WITH_RESULT_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
202203

203-
public void Dispose() => this._runtime.InvokeSync<object>(REMOVE_CONNECTION_METHOD, this.InternalConnectionId);
204+
public void Dispose() => this.runtime.InvokeSync<object>(REMOVE_CONNECTION_METHOD, this.InternalConnectionId);
204205
}
205206
}

‎test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<RazorLangVersion>3.0</RazorLangVersion>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
14-
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
14+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎test/Blazor.Extensions.SignalR.Test.Client/Pages/Chat.razor‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,68 +5,68 @@
55
<h4>Serialization Test</h4>
66
<form class="form-inline">
77
<div class="input-append">
8-
<input type="button" class="btn" value="Gimme objects!" onclick=@TellHubToDoStuff />
8+
<input type="button" class="btn" value="Gimme objects!" @onclick=@TellHubToDoStuff />
99

1010
</div>
1111
</form>
1212

1313
<h4>Multiple Arguments</h4>
1414
<form class="form-inline">
1515
<div class="input-append">
16-
<input type="button" class="btn" value="Gimme multiple arguments!" onclick=@DoMultipleArgs />
16+
<input type="button" class="btn" value="Gimme multiple arguments!" @onclick=@DoMultipleArgs />
1717

1818
</div>
1919
</form>
2020

2121
<h4>Byte array Arguments</h4>
2222
<form class="form-inline">
2323
<div class="input-append">
24-
<input type="button" class="btn" value="Gimme byte array arguments!" onclick=@DoByteArrayArg />
24+
<input type="button" class="btn" value="Gimme byte array arguments!" @onclick=@DoByteArrayArg />
2525

2626
</div>
2727
</form>
2828

2929
<h4>To Everybody</h4>
3030
<form class="form-inline">
3131
<div class="input-append">
32-
<input type="text" id="message-text" placeholder="Type a message" bind=@_toEverybody />
33-
<input type="button" id="broadcast" class="btn" value="Broadcast" onclick=@Broadcast />
34-
<input type="button" id="broadcast-exceptme" class="btn" value="Broadcast (Others)" onclick=@SendToOthers />
32+
<input type="text" id="message-text" placeholder="Type a message" @bind=@ToEverybody />
33+
<input type="button" id="broadcast" class="btn" value="Broadcast" @onclick=@Broadcast />
34+
<input type="button" id="broadcast-exceptme" class="btn" value="Broadcast (Others)" @onclick=@SendToOthers />
3535
</div>
3636
</form>
3737

3838
<h4>To Connection</h4>
3939
<form class="form-inline">
4040
<div class="input-prepend input-append">
41-
<input type="text" name="connection-message" id="connection-message-text" placeholder="Type a message" bind=@_toConnection />
42-
<input type="text" name="connection-id" id="connection-id" placeholder="Type a connection id" bind=@_connectionId />
43-
<input type="button" id="connection-send" class="btn" value="Send to Connection" onclick=@SendToConnection />
41+
<input type="text" name="connection-message" id="connection-message-text" placeholder="Type a message"@bind=@ToConnection />
42+
<input type="text" name="connection-id" id="connection-id" placeholder="Type a connection id"@bind=@ConnectionId />
43+
<input type="button" id="connection-send" class="btn" value="Send to Connection" @onclick=@SendToConnection />
4444
</div>
4545
</form>
4646

4747
<h4>To Me</h4>
4848
<form class="form-inline">
4949
<div class="input-append">
50-
<input type="text" id="me-message-text" placeholder="Type a message" bind=@_toMe />
51-
<input type="button" id="send" class="btn" value="Send to Me" onclick=@SendToMe />
50+
<input type="text" id="me-message-text" placeholder="Type a message"@bind=@ToMe />
51+
<input type="button" id="send" class="btn" value="Send to Me" @onclick=@SendToMe />
5252
</div>
5353
</form>
5454

5555
<h4>Group Actions</h4>
5656
<form class="form-inline">
5757
<div class="input-prepend input-append">
58-
<input type="text" name="group-message" id="group-message-text" placeholder="Type a message" bind=@_toGroup />
59-
<input type="text" name="group-name" id="group-name" placeholder="Type a group name" bind=@_groupName />
60-
<input type="button" id="groupmsg" class="btn" value="Send to Group" onclick=@SendToGroup />
61-
<input type="button" id="others-groupmsg" class="btn" value="Send to Others in Group" onclick=@SendToOthersInGroup />
62-
<input type="button" id="join-group" class="btn" value="Join Group" onclick=@JoinGroup />
63-
<input type="button" id="leave-group" class="btn" value="Leave Group" onclick=@LeaveGroup />
58+
<input type="text" name="group-message" id="group-message-text" placeholder="Type a message"@bind=@ToGroup />
59+
<input type="text" name="group-name" id="group-name" placeholder="Type a group name"@bind=@GroupName />
60+
<input type="button" id="groupmsg" class="btn" value="Send to Group" @onclick=@SendToGroup />
61+
<input type="button" id="others-groupmsg" class="btn" value="Send to Others in Group" @onclick=@SendToOthersInGroup />
62+
<input type="button" id="join-group" class="btn" value="Join Group" @onclick=@JoinGroup />
63+
<input type="button" id="leave-group" class="btn" value="Leave Group" @onclick=@LeaveGroup />
6464

6565
</div>
6666
</form>
6767

6868
<ul id="message-list">
69-
@foreach (var msg in _messages)
69+
@foreach (var msg in Messages)
7070
{
7171
<li>@msg</li>
7272
}

0 commit comments

Comments
 (0)