Skip to content

Commit ce114d5

Browse files
authored
Pin transitive dependencies to mitigate CVEs (#284)
Also: - Increment package version number - Fix build warnings found by updated dependency analyzers
1 parent 7fb737a commit ce114d5

File tree

10 files changed

+31
-36
lines changed

10 files changed

+31
-36
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## v1.5.1 (Unreleased)
4+
5+
### Updates
6+
7+
* Updated repo to use central package management
8+
* Resolved multiple CVEs in dependencies
9+
310
## v1.5.0
411

512
### Updates

Directory.Packages.props

1.11 KB
Binary file not shown.

DurableTask.SqlServer.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1616
CHANGELOG.md = CHANGELOG.md
1717
src\common.props = src\common.props
1818
Directory.Build.targets = Directory.Build.targets
19+
Directory.Packages.props = Directory.Packages.props
1920
nuget.config = nuget.config
2021
README.md = README.md
2122
sign.snk = sign.snk

src/DurableTask.SqlServer/DurableTask.SqlServer.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@
2424
<PackageReference Include="Microsoft.Azure.DurableTask.Core" />
2525
<PackageReference Include="Microsoft.Data.SqlClient" />
2626
<PackageReference Include="SemanticVersion" />
27-
<PackageReference Include="System.Threading.Channels" />
27+
</ItemGroup>
28+
29+
<!-- Transitive dependency pinning -->
30+
<ItemGroup>
31+
<PackageReference Include="Azure.Core" />
32+
<PackageReference Include="Azure.Identity" />
33+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
34+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
35+
<PackageReference Include="System.Text.Json" />
2836
</ItemGroup>
2937

3038
</Project>

src/DurableTask.SqlServer/Utils/AsyncQueue.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PropertyGroup>
1818
<MajorVersion>1</MajorVersion>
1919
<MinorVersion>5</MinorVersion>
20-
<PatchVersion>0</PatchVersion>
20+
<PatchVersion>1</PatchVersion>
2121
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
2222
<VersionSuffix></VersionSuffix>
2323
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>

test/DurableTask.SqlServer.AzureFunctions.Tests/IntegrationTestBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ class TestFunctionTypeLocator : ITypeLocator
236236

237237
class TestSettingsResolver : INameResolver, IConnectionInfoResolver
238238
{
239-
readonly Dictionary<string, string> testSettings;
239+
readonly Dictionary<string, string?> testSettings;
240240
IConfigurationRoot? config;
241241

242242
public TestSettingsResolver()
243243
{
244-
this.testSettings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
244+
this.testSettings = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
245245
}
246246

247247
public void AddSetting(string name, string value)

test/DurableTask.SqlServer.AzureFunctions.Tests/TargetBasedScalingTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace DurableTask.SqlServer.AzureFunctions.Tests
55
{
6+
using System.Threading.Tasks;
67
using DurableTask.Core;
78
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
89
using Microsoft.Azure.WebJobs.Host.Scale;
@@ -21,14 +22,14 @@ public TargetBasedScalingTests()
2122
SqlOrchestrationService? nullServiceArg = null; // not needed for this test
2223
this.metricsProviderMock = new Mock<SqlMetricsProvider>(
2324
behavior: MockBehavior.Strict,
24-
nullServiceArg);
25+
nullServiceArg!);
2526
}
2627

2728
[Theory]
2829
[InlineData(0)]
2930
[InlineData(10)]
3031
[InlineData(20)]
31-
public async void TargetBasedScalingTest(int expectedTargetWorkerCount)
32+
public async Task TargetBasedScalingTest(int expectedTargetWorkerCount)
3233
{
3334
var durabilityProviderMock = new Mock<DurabilityProvider>(
3435
MockBehavior.Strict,

test/DurableTask.SqlServer.Tests/Integration/DatabaseManagement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ async Task ValidateDatabaseSchemaAsync(TestDatabase database, string schemaName
505505
schemaName);
506506
Assert.Equal(1, currentSchemaVersion.Major);
507507
Assert.Equal(5, currentSchemaVersion.Minor);
508-
Assert.Equal(0, currentSchemaVersion.Patch);
508+
Assert.Equal(1, currentSchemaVersion.Patch);
509509
}
510510

511511
sealed class TestDatabase : IDisposable

tools/TestDBGenerator/TestDBGenerator.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,11 @@
1616
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
1717
</ItemGroup>
1818

19+
<!-- Transitive dependency pinning -->
20+
<ItemGroup>
21+
<PackageReference Include="Azure.Identity" />
22+
<PackageReference Include="Azure.Core" />
23+
<PackageReference Include="System.Text.Json" />
24+
</ItemGroup>
25+
1926
</Project>

0 commit comments

Comments
 (0)