Skip to content

Commit 69a4303

Browse files
committed
bumping timer package (#10916)
1 parent 9f259ca commit 69a4303

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

release_notes.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
- My change description (#PR)
55
-->
66
- Fixing default DateTime bug with TimeZones in TimerTrigger (#10906)
7+
- Fixing invalid DateTimes in status blobs when invoking via portal (#10916)

src/WebJobs.Script/WebJobs.Script.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
44
<PackageId>Microsoft.Azure.WebJobs.Script</PackageId>
@@ -44,7 +44,7 @@
4444
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
4545
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.1" />
4646
<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.3.20240307.67" />
47-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="5.2.0-12282" />
47+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="5.2.0-12287" />
4848
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
4949
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Timers.Storage" Version="1.0.0-beta.1" />
5050
<PackageReference Include="Microsoft.Azure.WebJobs.Script.Abstractions" Version="1.0.4-preview" />

test/WebJobs.Script.Tests.Integration/Management/InstanceManagerTests.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using System.Net.Http;
1010
using System.Threading;
1111
using System.Threading.Tasks;
12-
using Castle.Core.Logging;
1312
using Microsoft.Azure.WebJobs.Script.Diagnostics;
1413
using Microsoft.Azure.WebJobs.Script.WebHost;
1514
using Microsoft.Azure.WebJobs.Script.WebHost.Management;
@@ -974,16 +973,19 @@ public async Task Does_Not_Mount_Invalid_BYOS_Accounts()
974973

975974
var meshInitServiceClient = new Mock<IMeshServiceClient>(MockBehavior.Strict);
976975

976+
bool called = false;
977977
meshInitServiceClient.Setup(client =>
978-
client.MountCifs(Utility.BuildStorageConnectionString(account1, accessKey1, CloudConstants.AzureStorageSuffix), share1, targetPath1)).Returns(Task.FromResult(true));
978+
client.MountCifs(Utility.BuildStorageConnectionString(account1, accessKey1, CloudConstants.AzureStorageSuffix), share1, targetPath1))
979+
.Returns(Task.FromResult(true))
980+
.Callback(() => called = true);
979981

980982
var instanceManager = new AtlasInstanceManager(_optionsFactory, _httpClientFactory, _scriptWebEnvironment, _environment,
981983
_loggerFactory.CreateLogger<AtlasInstanceManager>(), new TestMetricsLogger(), meshInitServiceClient.Object,
982984
_runFromPackageHandler, _packageDownloadHandler.Object);
983985

984986
instanceManager.StartAssignment(hostAssignmentContext);
985987

986-
await Task.Delay(TimeSpan.FromSeconds(0.5));
988+
await TestHelpers.Await(() => called);
987989

988990
meshInitServiceClient.Verify(
989991
client => client.MountCifs(Utility.BuildStorageConnectionString(account1, accessKey1, CloudConstants.AzureStorageSuffix), share1,

0 commit comments

Comments
 (0)