Skip to content

Commit cf52d08

Browse files
committed
Update project to support Functions v2 release version, plus new SIgnal R service binder version
1 parent 2efaf90 commit cf52d08

File tree

6 files changed

+14
-11
lines changed

6 files changed

+14
-11
lines changed

dotnet/ServerlessMicroservices.FunctionApp.Drivers/ServerlessMicroservices.FunctionApp.Drivers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.14" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\ServerlessMicroservices.Models\ServerlessMicroservices.Models.csproj" />

dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/ServerlessMicroservices.FunctionApp.Orchestrators.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.5.0" />
8-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.14" />
7+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.7.1" />
8+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.3" />
9+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
910
</ItemGroup>
1011
<ItemGroup>
1112
<None Update="host.json">

dotnet/ServerlessMicroservices.FunctionApp.Passengers/ServerlessMicroservices.FunctionApp.Passengers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.14" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\ServerlessMicroservices.Models\ServerlessMicroservices.Models.csproj" />

dotnet/ServerlessMicroservices.FunctionApp.Trips/ServerlessMicroservices.FunctionApp.Trips.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="AzureAdvocates.WebJobs.Extensions.SignalRService" Version="0.2.0-alpha" />
8-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid" Version="2.0.0-beta2" />
9-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.14" />
7+
<PackageReference Include="AzureAdvocates.WebJobs.Extensions.SignalRService" Version="0.3.0-alpha" />
8+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid" Version="2.0.0" />
9+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.3" />
10+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
1011
</ItemGroup>
1112
<ItemGroup>
1213
<ProjectReference Include="..\ServerlessMicroservices.Models\ServerlessMicroservices.Models.csproj" />

dotnet/ServerlessMicroservices.FunctionApp.Trips/TripFunctions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using System.IO;
1616
using System.Text;
1717
using System.Threading.Tasks;
18+
using Microsoft.WindowsAzure.Storage.Blob;
1819

1920
namespace ServerlessMicroservices.FunctionApp.Trips
2021
{
@@ -165,7 +166,7 @@ public static async Task<IActionResult> AssignTripDriver([HttpTrigger(Authorizat
165166
/*** SignalR Info or Negotiate Function ****/
166167
[FunctionName("GetSignalRInfo")]
167168
public static IActionResult GetSignalRInfo([HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "signalrinfo")] HttpRequest req,
168-
[SignalRConnectionInfo(HubName = "trips")] AzureSignalRConnectionInfo info,
169+
[SignalRConnectionInfo(HubName = "trips")] SignalRConnectionInfo info,
169170
ILogger log)
170171
{
171172
log.LogInformation("GetSignalRInfo triggered....");

web/serverless-microservices-web/src/components/SignalRTrips.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default {
3636
});
3737
if (rawResponse.status === 200) {
3838
let signalRInfo = await rawResponse.json();
39-
console.log(`Connection Endpoint: ${signalRInfo.endpoint}`);
39+
console.log(`Connection Endpoint: ${signalRInfo.url}`);
4040
return signalRInfo;
4141
} else {
4242
console.log(`getSignalRInfo Response status: ${rawResponse.status}`);
@@ -51,11 +51,11 @@ export default {
5151
.then(signalrInfo => {
5252
if (signalrInfo !== null && signalrInfo !== undefined) {
5353
let options = {
54-
accessTokenFactory: () => signalrInfo.accessKey
54+
accessTokenFactory: () => signalrInfo.accessToken
5555
};
5656
5757
let hubConnection = new signalR.HubConnectionBuilder()
58-
.withUrl(signalrInfo.endpoint, options)
58+
.withUrl(signalrInfo.url, options)
5959
.configureLogging(signalR.LogLevel.Information)
6060
.build();
6161

0 commit comments

Comments
 (0)