Skip to content

Commit d38e7fb

Browse files
Hazhzengfabiocav
authored andcommitted
Resolving conflict
1 parent 4d8c480 commit d38e7fb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build/python.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="3.0.13905" />
3+
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="3.0.14063" />
44
</ItemGroup>
55
</Project>

test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747

4848
<ItemGroup>
4949
<PackageReference Include="appinsights.testlogger" Version="1.0.0" />
50-
<PackageReference Include="FluentAssertions" Version="5.9.0" />
51-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
52-
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="3.0.13905" />
50+
<PackageReference Include="FluentAssertions" Version="5.9.0" />
51+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
52+
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="3.0.14063" />
5353
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
5454
<PackageReference Include="Moq" Version="4.9.0" />
5555
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004" />

0 commit comments

Comments
 (0)