Skip to content

Commit f89349e

Browse files
fbeltraofbeltrao
committed
Update dependencies, adding Startup implementation (fixing #4)
1 parent f591d5c commit f89349e

File tree

10 files changed

+59
-27
lines changed

10 files changed

+59
-27
lines changed

‎samples/EventGridSample/EventGridSample.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.13" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\..\src\AzureFunctionExtensions\AzureFunctionExtensions.csproj" />

‎samples/EventGridSample/PublishEventGridEvent.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Fbeltrao.AzureFunctionExtensions;
99
using System.Threading.Tasks;
1010
using System;
11+
using Microsoft.Extensions.Logging;
1112

1213
namespace EventGridSample
1314
{
@@ -27,7 +28,7 @@ public static class PublishEventGridEvent
2728
public static IActionResult WithFixTypeAndSubject(
2829
[HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
2930
[EventGridOutput(SasKey = "%eventgrid_sas%", TopicEndpoint = "%eventgrid_endpoint%", EventType = "EventGridSample.PublishEventGridEvent.Event", Subject = "message/fromAzureFunction")] out EventGridOutput outputEvent,
30-
TraceWriter log)
31+
ILogger log)
3132
{
3233
outputEvent = null;
3334

@@ -69,7 +70,7 @@ public static IActionResult WithFixTypeAndSubject(
6970
public static IActionResult MultipleSync(
7071
[HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
7172
[EventGridOutput(SasKey = "%eventgrid_sas%", TopicEndpoint = "%eventgrid_endpoint%", EventType = "EventGridSample.PublishEventGridEvent.Event", Subject = "message/fromAzureFunction")] out EventGridOutput[] outputEvents,
72-
TraceWriter log)
73+
ILogger log)
7374
{
7475
outputEvents = new EventGridOutput[]
7576
{
@@ -96,7 +97,7 @@ public static IActionResult MultipleSync(
9697
public static async Task<IActionResult> MultipleAsync(
9798
[HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
9899
[EventGridOutput(SasKey = "%eventgrid_sas%", TopicEndpoint = "%eventgrid_endpoint%", EventType = "EventGridSample.PublishEventGridEvent.Event", Subject = "message/fromAzureFunction")] IAsyncCollector<EventGridOutput> outputEvents,
99-
TraceWriter log)
100+
ILogger log)
100101
{
101102
await outputEvents.AddAsync(new EventGridOutput(new { source = "MultipleAsync", index = 0, ticks = DateTime.UtcNow.Ticks }));
102103
await outputEvents.AddAsync(new EventGridOutput(new { source = "MultipleAsync", index = 1, ticks = DateTime.UtcNow.Ticks }));

‎samples/EventGridSample/local.settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
55
"AzureWebJobsDashboard": "UseDevelopmentStorage=true",
66
"AzureWebJobs_ExtensionsPath": ".",
7-
"eventgrid_sas": "<eventgrid-sas>",
8-
"eventgrid_endpoint": "https://xxxx.westeurope-1.eventgrid.azure.net/api/events"
7+
"eventgrid_sas": "EFgFqSaABprKP0Ww7jgf8TCY9L6lE3cVrB4+nVeloxc=",
8+
"eventgrid_endpoint": "https://frbtest.westeurope-1.eventgrid.azure.net/api/events"
99
}
1010
}

‎samples/RedisSample/RedisSample.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using StackExchange.Redis;
1010
using System.Threading.Tasks;
1111
using System.Collections.Generic;
12+
using Microsoft.Extensions.Logging;
1213

1314
namespace CSharpSample
1415
{
@@ -28,9 +29,9 @@ public static class RedisSample
2829
public static async Task<IActionResult> RetrieveIntegerValue(
2930
[HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
3031
[RedisDatabase(Connection = "%redis_connectionstring%")] IDatabase db,
31-
TraceWriter log)
32+
ILogger log)
3233
{
33-
log.Info("C# HTTP trigger function processed a request.");
34+
log.LogInformation("C# HTTP trigger function processed a request.");
3435

3536
var key = req.Query["key"].ToString();
3637
if (string.IsNullOrEmpty(key))
@@ -55,7 +56,7 @@ public static async Task<IActionResult> RetrieveIntegerValue(
5556
public static async Task<IActionResult> RetrieveList(
5657
[HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
5758
[RedisDatabase(Connection = "%redis_connectionstring%")] IDatabase db,
58-
TraceWriter log)
59+
ILogger log)
5960
{
6061
var key = req.Query["key"].ToString();
6162
if (string.IsNullOrEmpty(key))
@@ -87,7 +88,7 @@ public static async Task<IActionResult> RetrieveList(
8788
public static IActionResult IncrementRedisValue(
8889
[HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest req,
8990
[RedisOutput(Connection = "%redis_connectionstring%")] out RedisOutput redisItem,
90-
TraceWriter log)
91+
ILogger log)
9192
{
9293
redisItem = null;
9394

@@ -129,9 +130,9 @@ public static IActionResult IncrementRedisValue(
129130
public static IActionResult SetValueInRedis(
130131
[HttpTrigger(AuthorizationLevel.Function, "post", Route = null)] HttpRequest req,
131132
[RedisOutput(Connection = "%redis_connectionstring%", Key = "%redis_setvalueinredis_key%")] out RedisOutput redisItem,
132-
TraceWriter log)
133+
ILogger log)
133134
{
134-
log.Info("C# HTTP trigger function processed a request.");
135+
log.LogInformation("C# HTTP trigger function processed a request.");
135136

136137
string requestBody = new StreamReader(req.Body).ReadToEnd();
137138

@@ -155,7 +156,7 @@ public static IActionResult SetValueInRedis(
155156
public static IActionResult AppendToListInRedis(
156157
[HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest req,
157158
[RedisOutput(Connection = "%redis_connectionstring%", Key = "myList", Operation = RedisOutputOperation.ListRightPush)] out RedisOutput redisItem,
158-
TraceWriter log)
159+
ILogger log)
159160
{
160161
string itemValue = new StreamReader(req.Body).ReadToEnd();
161162
if (string.IsNullOrEmpty(itemValue))
@@ -181,7 +182,7 @@ public static IActionResult AppendToListInRedis(
181182
public static IActionResult InsertToListInRedis(
182183
[HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest req,
183184
[RedisOutput(Connection = "%redis_connectionstring%", Key = "myList", Operation = RedisOutputOperation.ListLeftPush)] out RedisOutput redisItem,
184-
TraceWriter log)
185+
ILogger log)
185186
{
186187
string itemValue = new StreamReader(req.Body).ReadToEnd();
187188
if (string.IsNullOrEmpty(itemValue))

‎samples/RedisSample/RedisSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</Content>
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.13" />
12+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\..\src\AzureFunctionExtensions\AzureFunctionExtensions.csproj" />

‎samples/SignalRSample/SignalRSample.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.Azure.WebJobs;
77
using Microsoft.Azure.WebJobs.Extensions.Http;
88
using Microsoft.Azure.WebJobs.Host;
9+
using Microsoft.Extensions.Logging;
910

1011
namespace SignalRSample
1112
{
@@ -22,9 +23,9 @@ public static class SampleFunctions
2223
public static async Task<IActionResult> HttpTriggerBroadcastToHub(
2324
[HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
2425
[SignalR(ServiceName = "%service_name%", AccessKey = "%access_key%")] IAsyncCollector<SignalRMessage> message,
25-
TraceWriter log)
26+
ILogger log)
2627
{
27-
log.Info("C# HTTP trigger function processed a request.");
28+
log.LogInformation("C# HTTP trigger function processed a request.");
2829

2930

3031
await message.AddAsync(new SignalRMessage()
@@ -48,9 +49,9 @@ await message.AddAsync(new SignalRMessage()
4849
public static IActionResult HttpTriggerBroadcastToGroupHub(
4950
[HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
5051
[SignalR(ServiceName = "%service_name%", AccessKey = "%access_key%", Groups = "dashboard")] out SignalRMessage message,
51-
TraceWriter log)
52+
ILogger log)
5253
{
53-
log.Info("C# HTTP trigger function processed a request.");
54+
log.LogInformation("C# HTTP trigger function processed a request.");
5455

5556

5657

‎samples/SignalRSample/SignalRSample.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.13" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\..\src\AzureFunctionExtensions\AzureFunctionExtensions.csproj" />

‎src/AzureFunctionExtensions/AzureFunctionExtensions.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@
1515
- HttpCall
1616
- EventGrid
1717
- Azure SignalR</Description>
18-
<Version>1.0.0-beta1</Version>
18+
<Version>1.0.1</Version>
1919
<NeutralLanguage>en</NeutralLanguage>
2020
<Authors>fbeltrao</Authors>
2121
<Company>fbeltrao</Company>
2222
<Product>Azure Functions Extensions</Product>
23+
<AssemblyVersion>1.0.1.0</AssemblyVersion>
24+
<FileVersion>1.0.1.0</FileVersion>
2325
</PropertyGroup>
2426

2527
<ItemGroup>
26-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta5" />
28+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0" />
2729
<PackageReference Include="StackExchange.Redis.StrongName.Core" Version="1.1.605" />
28-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.4" />
30+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
2931
</ItemGroup>
3032

3133
</Project>

‎src/AzureFunctionExtensions/Startup.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using Microsoft.Azure.WebJobs;
2+
using Microsoft.Azure.WebJobs.Hosting;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Text;
6+
7+
[assembly: WebJobsStartup(typeof(Fbeltrao.AzureFunctionExtensions.Startup))]
8+
9+
namespace Fbeltrao.AzureFunctionExtensions
10+
{
11+
/// <summary>
12+
/// Extension initializer
13+
/// </summary>
14+
public class Startup : IWebJobsStartup
15+
{
16+
public void Configure(IWebJobsBuilder builder)
17+
{
18+
builder.AddExtension<EventGridOutputConfiguration>();
19+
builder.AddExtension<HttpCallConfiguration>();
20+
builder.AddExtension<RedisConfiguration>();
21+
builder.AddExtension<SignalRConfiguration>();
22+
}
23+
}
24+
}

‎test/AzureFunctionExtensions.Test/AzureFunctionExtensions.Test.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
15-
<PackageReference Include="Moq" Version="4.8.2" />
16-
<PackageReference Include="xunit" Version="2.3.1" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
15+
<PackageReference Include="Moq" Version="4.10.0" />
16+
<PackageReference Include="xunit" Version="2.4.0" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
20+
</PackageReference>
1821
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
1922
</ItemGroup>
2023

0 commit comments

Comments
 (0)