Skip to content

Commit 672fccf

Browse files
jsquirejsquire
committed
[Functions] Fix logging mismatches in tests
The focus of these changes is to attempt to fix the test failures that seem to occur only in nightly test pipelines.
1 parent 15d6edf commit 672fccf

File tree

8 files changed

+30
-18
lines changed

8 files changed

+30
-18
lines changed

‎eng/Packages.Data.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@
237237
<PackageReference Update="Microsoft.Azure.SignalR.Management" Version="1.29.0" />
238238
<PackageReference Update="Microsoft.Azure.SignalR.Protocols" Version="1.29.0" />
239239
<PackageReference Update="Microsoft.Azure.SignalR.Serverless.Protocols" Version="1.10.0" />
240-
<PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.37" />
241-
<PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.37" PrivateAssets="All"/>
242-
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Rpc" Version="3.0.37" />
243-
<PackageReference Update="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.0" />
240+
<PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.41" />
241+
<PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.41" PrivateAssets="All"/>
242+
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Rpc" Version="3.0.41" />
243+
<PackageReference Update="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
244244
<PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
245245
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
246246
</ItemGroup>
@@ -381,7 +381,8 @@
381381
<PackageReference Update="Microsoft.Azure.Storage.Queue" Version="11.1.7" />
382382
<PackageReference Update="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.3, 2.0.0)" />
383383
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions" Version="5.0.0" />
384-
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.2" />
384+
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
385+
<PackageReference Update="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.41" />
385386
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
386387
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
387388
<PackageReference Update="Microsoft.Data.SqlClient" Version="5.2.2" />

‎sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/Microsoft.Azure.WebJobs.Extensions.EventHubs.Tests.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77

88
<ItemGroup>
99
<PackageReference Include="Azure.ResourceManager.EventHubs" />
10-
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" VersionOverride="3.0.27" />
10+
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights"/>
1111
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" />
12+
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" />
1213
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
15+
<PackageReference Include="Microsoft.Extensions.Logging" />
1316
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1417
<PackageReference Include="Moq" />
1518
<PackageReference Include="NUnit" />
1619
<PackageReference Include="NUnit3TestAdapter" />
17-
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" />
1820
</ItemGroup>
1921

2022
<ItemGroup>

‎sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Version>5.17.0-beta.1</Version>
77
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
88
<ApiCompatVersion>5.16.6</ApiCompatVersion>
9-
<NoWarn>$(NoWarn);CS1591;SA1636;AZC0007;AZC0015</NoWarn>
9+
<NoWarn>$(NoWarn);CS1591;SA1636;AZC0007;AZC0015;SA1402</NoWarn>
1010
<SignAssembly>true</SignAssembly>
1111
<IsExtensionClientLibrary>true</IsExtensionClientLibrary>
1212
<InheritDocTrimLevel>internal</InheritDocTrimLevel>
@@ -32,7 +32,7 @@
3232
<ItemGroup>
3333
<Compile Include="$(AzureCoreSharedSources)Argument.cs" LinkBase="Shared" />
3434
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared" />
35-
<Compile Include="$(AzureCoreSharedSources)ValueStopwatch.cs" LinkBase="SharedSource" />
35+
<Compile Include="$(AzureCoreSharedSources)ValueStopwatch.cs" LinkBase="SharedSource" />
3636
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="SharedSource\Azure.Core" />
3737
<Compile Include="..\..\Azure.Messaging.ServiceBus\src\Administration\AdministrationClientConstants.cs" LinkBase="Shared" />
3838
<Compile Include="..\..\Azure.Messaging.ServiceBus\src\Constants.cs" LinkBase="Shared" />

‎sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
<PackageReference Include="Polly" />
1313
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" />
1414
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" />
15-
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" />
1615
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" />
1716
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
18-
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" />
17+
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" />
18+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
19+
<PackageReference Include="Microsoft.Extensions.Logging" />
1920
</ItemGroup>
2021

2122
<ItemGroup>

‎sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/samples/functionapp/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs.Samples.Function.App.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<RequiredTargetFrameworks>netcoreapp3.1</RequiredTargetFrameworks>
3+
<RequiredTargetFrameworks>net8.0</RequiredTargetFrameworks>
44
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
55
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
66
</PropertyGroup>
@@ -10,6 +10,8 @@
1010
<PackageReference Include="Microsoft.AspNetCore.Http" />
1111
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" />
1212
<PackageReference Include="Microsoft.NET.Sdk.Functions" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" />
1315
</ItemGroup>
1416
<ItemGroup>
1517
<None Update="host.json">

‎sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/tests/Microsoft.Azure.WebJobs.Extensions.Storage.Common.Tests.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
<ItemGroup>
77
<PackageReference Include="Microsoft.Azure.WebJobs" />
8+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
9+
<PackageReference Include="Microsoft.Extensions.Logging" />
810
</ItemGroup>
911

1012
<ItemGroup>

‎sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/samples/functionapp/Microsoft.Azure.WebJobs.Extensions.Storage.Queues.Samples.Function.App.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<RequiredTargetFrameworks>netcoreapp3.1</RequiredTargetFrameworks>
3+
<RequiredTargetFrameworks>net8.0</RequiredTargetFrameworks>
44
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
55
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
66
</PropertyGroup>
@@ -10,6 +10,8 @@
1010
<PackageReference Include="Microsoft.AspNetCore.Http" />
1111
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" />
1212
<PackageReference Include="Microsoft.NET.Sdk.Functions" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" />
1315
</ItemGroup>
1416
<ItemGroup>
1517
<None Update="host.json">

‎sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Scenario.Tests/tests/Microsoft.Azure.WebJobs.Extensions.Storage.Scenario.Tests.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="Microsoft.AspNetCore" VersionOverride="2.1.0" />
8-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="2.1.0"/>
9-
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" VersionOverride="3.0.34" />
10-
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" />
7+
<PackageReference Include="Microsoft.AspNetCore"/>
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing"/>
9+
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights"/>
10+
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
12+
<PackageReference Include="Microsoft.Extensions.Logging" />
1113
</ItemGroup>
1214

1315
<ItemGroup>
@@ -20,7 +22,7 @@
2022
<Compile Include="$(AzureStorageWebjobsExtensionSharedTestSources)\**\*.cs" LinkBase="Shared" />
2123
<Compile Include="$(AzureStorageSharedTestSources)\AzuriteNUnitFixture.cs" LinkBase="Shared" />
2224
<Compile Include="$(AzureStorageSharedTestSources)\AzuriteFixture.cs" LinkBase="Shared" />
23-
<Compile Include="..\..\..\extensions\Microsoft.Azure.WebJobs.Extensions.Clients\tests\shared\TestComponentFactory.cs" LinkBase="Shared"/>
25+
<Compile Include="..\..\..\extensions\Microsoft.Azure.WebJobs.Extensions.Clients\tests\shared\TestComponentFactory.cs" LinkBase="Shared"/>
2426
<None Include="$(AzureStorageSharedTestSources)\azurite_cert.pem" CopyToOutputDirectory="PreserveNewest" />
2527
</ItemGroup>
2628

0 commit comments

Comments
 (0)