Updated samples to v1.4.0

cgillum · cgillum · commit 9e778b0527c8 · 2018-05-06T00:27:01.000-07:00
diff --git a/docs/files/DFSampleApp.zip b/docs/files/DFSampleApp.zip
diff --git a/docs/files/VSDFSampleApp.zip b/docs/files/VSDFSampleApp.zip
diff --git a/samples/VSSample.Tests/HttpSyncStartTests.cs b/samples/VSSample.Tests/HttpSyncStartTests.cs
diff --git a/samples/VSSample.Tests/VSSample.Tests.csproj b/samples/VSSample.Tests/VSSample.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.3.0-rc" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="Moq" Version="4.8.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
diff --git a/samples/csx/E3_Monitor/run.csx b/samples/csx/E3_Monitor/run.csx
@@ -40,7 +40,7 @@ public static async Task Run(DurableOrchestrationContext monitorContext, ILogger
         }
     }
 
-    log.Info($"Monitor expiring.");
+    log.LogInformation("Monitor expiring.");
 }
 
 private static void VerifyRequest(MonitorRequest request)
diff --git a/samples/fsharp/DurableFSharp.fsproj b/samples/fsharp/DurableFSharp.fsproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="TaskBuilder.fs" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.3.1-rc" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.4.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Twilio" Version="3.0.0-beta5" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.13" />
   </ItemGroup>
diff --git a/samples/fsharp/HttpSyncStart.fs b/samples/fsharp/HttpSyncStart.fs
@@ -12,12 +12,12 @@ open FSharp.Control.Tasks
 
 module HttpSyncStart = 
 
-  let private getTimeSpan (request: HttpRequestMessage) (queryParameterName: string) =
+  let private getTimeSpan (request: HttpRequestMessage) (queryParameterName: string) (defaultSeconds: double) =
     request.RequestUri.ParseQueryString().[queryParameterName]
     |> Option.ofObj
     |> Option.map Double.Parse
-    |> Option.map TimeSpan.FromSeconds
-    |> Option.toNullable
+    |> Option.defaultValue defaultSeconds
+    |> TimeSpan.FromSeconds
 
   [<FunctionName("HttpSyncStart")>]
   let Run([<HttpTrigger(AuthorizationLevel.Function, "post", Route = "orchestrators/{functionName}/wait")>] req: HttpRequestMessage,
@@ -30,8 +30,8 @@ module HttpSyncStart =
 
       log.Info(sprintf "Started orchestration with ID = '{%s}'." instanceId)
 
-      let timeout = getTimeSpan req "timeout"
-      let retryInterval = getTimeSpan req "retryInterval"
+      let timeout = getTimeSpan req "timeout" 30.0
+      let retryInterval = getTimeSpan req "retryInterval" 1.0
 
       return! starter.WaitForCompletionOrCreateCheckStatusResponseAsync(req, instanceId, timeout, retryInterval)
     }
diff --git a/samples/precompiled/HttpSyncStart.cs b/samples/precompiled/HttpSyncStart.cs
@@ -29,8 +29,8 @@ public static async Task<HttpResponseMessage> Run(
 
             log.LogInformation($"Started orchestration with ID = '{instanceId}'.");
 
-            TimeSpan? timeout = GetTimeSpan(req, Timeout);
-            TimeSpan? retryInterval = GetTimeSpan(req, RetryInterval);
+            TimeSpan timeout = GetTimeSpan(req, Timeout) ?? TimeSpan.FromSeconds(30);
+            TimeSpan retryInterval = GetTimeSpan(req, RetryInterval) ?? TimeSpan.FromSeconds(1);
             
             return await starter.WaitForCompletionOrCreateCheckStatusResponseAsync(
                 req,
diff --git a/samples/precompiled/VSSample.csproj b/samples/precompiled/VSSample.csproj
@@ -6,7 +6,7 @@
 
   <!-- Common packages for all targets -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.3.0-rc" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.4.0" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.13" />
   </ItemGroup>
 
diff --git a/samples/precompiled/local.settings.json b/samples/precompiled/local.settings.json
@@ -1,8 +1,8 @@
 {
   "IsEncrypted": false,
   "Values": {
-    "AzureWebJobsStorage": "UseDevelopmentStorage=true;DevelopmentStorageProxyUri=http://127.0.0.1:10002/",
-    "AzureWebJobsDashboard": "UseDevelopmentStorage=true;DevelopmentStorageProxyUri=http://127.0.0.1:10002/",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "AzureWebJobsDashboard": "UseDevelopmentStorage=true",
     "TwilioAccountSid": "<Put your Twilio Account SID here>",
     "TwilioAuthToken": "<Put your Twilio Auth Token here>",
     "TwilioPhoneNumber": "<Put your Twilio Phone Number here>",
diff --git a/samples/webjobssdk/chaining/DFWebJobsSample.csproj b/samples/webjobssdk/chaining/DFWebJobsSample.csproj
@@ -56,7 +56,7 @@
       <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask">
-      <Version>1.3.1-rc</Version>
+      <Version>1.4.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights">
       <Version>2.2.0</Version>
diff --git a/samples/webjobssdk/chaining/Functions.cs b/samples/webjobssdk/chaining/Functions.cs
@@ -3,13 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.Extensions.DurableTask;
-using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Extensions.Logging;
 
 namespace DFWebJobsSample
diff --git a/samples/webjobssdk/chaining/Program.cs b/samples/webjobssdk/chaining/Program.cs
@@ -1,20 +1,11 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System;
-using System.Collections.Generic;
 using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Extensions.DurableTask;
-using Microsoft.Azure.WebJobs.Extensions.Files;
-using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Extensions.Logging;
 
-
 namespace DFWebJobsSample
 {
     public static class Program

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static async Task Run(DurableOrchestrationContext monitorContext, ILogger`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- log.Info($"Monitor expiring.");`
	`43`	`+ log.LogInformation("Monitor expiring.");`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private static void VerifyRequest(MonitorRequest request)`