diff --git a/CHANGELOG.md b/CHANGELOG.md
index 108c759..29727f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## v1.5.1 (Unreleased)
+
+### Updates
+
+* Updated repo to use central package management
+* Resolved multiple CVEs in dependencies
+
## v1.5.0
### Updates
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0c45043..164bf20 100644
Binary files a/Directory.Packages.props and b/Directory.Packages.props differ
diff --git a/DurableTask.SqlServer.sln b/DurableTask.SqlServer.sln
index b6c63e1..69645c3 100644
--- a/DurableTask.SqlServer.sln
+++ b/DurableTask.SqlServer.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
CHANGELOG.md = CHANGELOG.md
src\common.props = src\common.props
Directory.Build.targets = Directory.Build.targets
+ Directory.Packages.props = Directory.Packages.props
nuget.config = nuget.config
README.md = README.md
sign.snk = sign.snk
diff --git a/src/DurableTask.SqlServer/DurableTask.SqlServer.csproj b/src/DurableTask.SqlServer/DurableTask.SqlServer.csproj
index d1ea71a..e8b3e59 100644
--- a/src/DurableTask.SqlServer/DurableTask.SqlServer.csproj
+++ b/src/DurableTask.SqlServer/DurableTask.SqlServer.csproj
@@ -24,7 +24,15 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/src/DurableTask.SqlServer/Utils/AsyncQueue.cs b/src/DurableTask.SqlServer/Utils/AsyncQueue.cs
deleted file mode 100644
index e14178b..0000000
--- a/src/DurableTask.SqlServer/Utils/AsyncQueue.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-namespace DurableTask.SqlServer.Utils
-{
- using System.Threading;
- using System.Threading.Channels;
- using System.Threading.Tasks;
-
- sealed class AsyncQueue
- {
- readonly Channel channel = Channel.CreateUnbounded();
-
- public void Enqueue(T item)
- {
- this.channel.Writer.TryWrite(item);
- }
-
- public ValueTask DequeueAsync(CancellationToken cancellationToken)
- {
- return this.channel.Reader.ReadAsync(cancellationToken);
- }
-
- public bool TryDequeue(out T item)
- {
- return this.channel.Reader.TryRead(out item);
- }
- }
-}
diff --git a/src/common.props b/src/common.props
index 083636d..439f521 100644
--- a/src/common.props
+++ b/src/common.props
@@ -17,7 +17,7 @@
1
5
- 0
+ 1
$(MajorVersion).$(MinorVersion).$(PatchVersion)
$(MajorVersion).$(MinorVersion).0.0
diff --git a/test/DurableTask.SqlServer.AzureFunctions.Tests/IntegrationTestBase.cs b/test/DurableTask.SqlServer.AzureFunctions.Tests/IntegrationTestBase.cs
index b6c7c60..413c036 100644
--- a/test/DurableTask.SqlServer.AzureFunctions.Tests/IntegrationTestBase.cs
+++ b/test/DurableTask.SqlServer.AzureFunctions.Tests/IntegrationTestBase.cs
@@ -236,12 +236,12 @@ class TestFunctionTypeLocator : ITypeLocator
class TestSettingsResolver : INameResolver, IConnectionInfoResolver
{
- readonly Dictionary testSettings;
+ readonly Dictionary testSettings;
IConfigurationRoot? config;
public TestSettingsResolver()
{
- this.testSettings = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ this.testSettings = new Dictionary(StringComparer.OrdinalIgnoreCase);
}
public void AddSetting(string name, string value)
diff --git a/test/DurableTask.SqlServer.AzureFunctions.Tests/TargetBasedScalingTests.cs b/test/DurableTask.SqlServer.AzureFunctions.Tests/TargetBasedScalingTests.cs
index 9c6a793..0d65bc6 100644
--- a/test/DurableTask.SqlServer.AzureFunctions.Tests/TargetBasedScalingTests.cs
+++ b/test/DurableTask.SqlServer.AzureFunctions.Tests/TargetBasedScalingTests.cs
@@ -3,6 +3,7 @@
namespace DurableTask.SqlServer.AzureFunctions.Tests
{
+ using System.Threading.Tasks;
using DurableTask.Core;
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
using Microsoft.Azure.WebJobs.Host.Scale;
@@ -21,14 +22,14 @@ public TargetBasedScalingTests()
SqlOrchestrationService? nullServiceArg = null; // not needed for this test
this.metricsProviderMock = new Mock(
behavior: MockBehavior.Strict,
- nullServiceArg);
+ nullServiceArg!);
}
[Theory]
[InlineData(0)]
[InlineData(10)]
[InlineData(20)]
- public async void TargetBasedScalingTest(int expectedTargetWorkerCount)
+ public async Task TargetBasedScalingTest(int expectedTargetWorkerCount)
{
var durabilityProviderMock = new Mock(
MockBehavior.Strict,
diff --git a/test/DurableTask.SqlServer.Tests/Integration/DatabaseManagement.cs b/test/DurableTask.SqlServer.Tests/Integration/DatabaseManagement.cs
index 4554d3d..86a6eaf 100644
--- a/test/DurableTask.SqlServer.Tests/Integration/DatabaseManagement.cs
+++ b/test/DurableTask.SqlServer.Tests/Integration/DatabaseManagement.cs
@@ -505,7 +505,7 @@ async Task ValidateDatabaseSchemaAsync(TestDatabase database, string schemaName
schemaName);
Assert.Equal(1, currentSchemaVersion.Major);
Assert.Equal(5, currentSchemaVersion.Minor);
- Assert.Equal(0, currentSchemaVersion.Patch);
+ Assert.Equal(1, currentSchemaVersion.Patch);
}
sealed class TestDatabase : IDisposable
diff --git a/tools/TestDBGenerator/TestDBGenerator.csproj b/tools/TestDBGenerator/TestDBGenerator.csproj
index 14949a7..ff3f925 100644
--- a/tools/TestDBGenerator/TestDBGenerator.csproj
+++ b/tools/TestDBGenerator/TestDBGenerator.csproj
@@ -16,4 +16,11 @@
+
+
+
+
+
+
+