Skip to content

Commit a27bb96

Browse files
tpiotrowskigalvesribeiro
tpiotrowski
authored and
galvesribeiro
committed
Update to 3.0.100-preview9 (#51)
* Upgrade to version: .NET Core 3.0.100-preview9 * Fix breaking change missing import of Microsoft.AspNetCore.Components.Web
1 parent 5ecf246 commit a27bb96

12 files changed

Lines changed: 64 additions & 36 deletions

File tree

‎.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-preview8-013656
11+
version: 3.0.100-preview9-014004
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-preview8-013656
11+
version: 3.0.100-preview9-014004
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-preview8-013656"
3+
"version": "3.0.100-preview9-014004"
44
}
55
}

‎src/Blazor.Extensions.SignalR.JS/package-lock.json‎

Lines changed: 30 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Blazor.Extensions.SignalR.JS/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"webpack-cli": "3.3.6"
1616
},
1717
"dependencies": {
18-
"@microsoft/signalr": "3.0.0-preview8.19405.7",
19-
"@microsoft/signalr-protocol-msgpack": "3.0.0-preview8.19405.7"
18+
"@microsoft/signalr": "3.0.0-preview9.19424.4",
19+
"@microsoft/signalr-protocol-msgpack": "3.0.0-preview9.19424.4"
2020
}
2121
}

‎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.Web" Version="3.0.0-preview8.19405.7" />
18+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview9.19424.4" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public HubConnection(IJSRuntime runtime, HttpConnectionOptions options)
3434
this.InternalConnectionId = Guid.NewGuid().ToString();
3535
runtime.InvokeSync<object>(CREATE_CONNECTION_METHOD,
3636
this.InternalConnectionId,
37-
DotNetObjectRef.Create(this.Options));
37+
DotNetObjectReference.Create(this.Options));
3838
}
3939

4040

41-
public Task StartAsync() => this.runtime.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
42-
public Task StopAsync() => this.runtime.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
41+
public ValueTask<object> StartAsync() => this.runtime.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
42+
public ValueTask<object> StopAsync() => this.runtime.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
4343

4444
public IDisposable On<TResult1>(string methodName, Func<TResult1, Task> handler)
4545
=> this.On<TResult1, object, object, object, object, object, object, object, object, object>(methodName,
@@ -167,7 +167,7 @@ internal void RegisterHandle(string methodName, HubMethodCallback callback)
167167
};
168168
}
169169

170-
this.runtime.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, DotNetObjectRef.Create(callback));
170+
this.runtime.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, DotNetObjectReference.Create(callback));
171171
}
172172

173173
internal void RemoveHandle(string methodName, string callbackId)
@@ -193,13 +193,13 @@ public void OnClose(Func<Exception, Task> callback)
193193
this.closeCallback = new HubCloseCallback(callback);
194194
this.runtime.InvokeSync<object>(ON_CLOSE_METHOD,
195195
this.InternalConnectionId,
196-
DotNetObjectRef.Create(this.closeCallback));
196+
DotNetObjectReference.Create(this.closeCallback));
197197
}
198198

199-
public Task InvokeAsync(string methodName, params object[] args) =>
199+
public ValueTask<object> InvokeAsync(string methodName, params object[] args) =>
200200
this.runtime.InvokeAsync<object>(INVOKE_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
201201

202-
public Task<TResult> InvokeAsync<TResult>(string methodName, params object[] args) =>
202+
public ValueTask<TResult> InvokeAsync<TResult>(string methodName, params object[] args) =>
203203
this.runtime.InvokeAsync<TResult>(INVOKE_WITH_RESULT_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
204204

205205
public void Dispose() => this.runtime.InvokeSync<object>(REMOVE_CONNECTION_METHOD, this.InternalConnectionId);

‎test/Blazor.Extensions.SignalR.Test.Client/App.razor‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
<Router AppAssembly="typeof(Program).Assembly" />
1+
<Router AppAssembly="typeof(Program).Assembly">
2+
<Found Context="routeData">
3+
<RouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)" />
4+
</Found>
5+
<NotFound>
6+
<h1>Page not found</h1>
7+
<p>Sorry, but there's nothing here!</p>
8+
</NotFound>
9+
</Router>

‎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-preview8.19405.7" />
14-
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" />
14+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@page "/"
22
@page "/chat"
33
@inherits ChatComponent
4+
@using Microsoft.AspNetCore.Components.Web
45

56
<h4>Serialization Test</h4>
67
<form class="form-inline">
@@ -38,25 +39,25 @@
3839
<h4>To Connection</h4>
3940
<form class="form-inline">
4041
<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 />
42+
<input type="text" name="connection-message" id="connection-message-text" placeholder="Type a message" @bind=@ToConnection />
43+
<input type="text" name="connection-id" id="connection-id" placeholder="Type a connection id" @bind=@ConnectionId />
4344
<input type="button" id="connection-send" class="btn" value="Send to Connection" @onclick=@SendToConnection />
4445
</div>
4546
</form>
4647

4748
<h4>To Me</h4>
4849
<form class="form-inline">
4950
<div class="input-append">
50-
<input type="text" id="me-message-text" placeholder="Type a message"@bind=@ToMe />
51+
<input type="text" id="me-message-text" placeholder="Type a message" @bind=@ToMe />
5152
<input type="button" id="send" class="btn" value="Send to Me" @onclick=@SendToMe />
5253
</div>
5354
</form>
5455

5556
<h4>Group Actions</h4>
5657
<form class="form-inline">
5758
<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 />
59+
<input type="text" name="group-message" id="group-message-text" placeholder="Type a message" @bind=@ToGroup />
60+
<input type="text" name="group-name" id="group-name" placeholder="Type a group name" @bind=@GroupName />
6061
<input type="button" id="groupmsg" class="btn" value="Send to Group" @onclick=@SendToGroup />
6162
<input type="button" id="others-groupmsg" class="btn" value="Send to Others in Group" @onclick=@SendToOthersInGroup />
6263
<input type="button" id="join-group" class="btn" value="Join Group" @onclick=@JoinGroup />

0 commit comments

Comments
 (0)