Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 49 additions & 55 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,114 +9,108 @@

<!-- Product dependencies -->
<ItemGroup>
<PackageVersion Include="Azure.Core" Version="1.44.1" />
<PackageVersion Include="Azure.Core" Version="1.51.1" />
<PackageVersion Include="Azure.Data.Tables" Version="12.11.0" />
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.27.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.25.0" />
<PackageVersion Include="Castle.Core" Version="5.2.1" />
<PackageVersion Include="ImpromptuInterface" Version="6.2.2" Condition="'$(TargetFramework)' == 'net48' OR '$(TargetFramework)' == 'net472'" />
<PackageVersion Include="ImpromptuInterface" Version="7.0.1" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageVersion Include="ImpromptuInterface" Version="8.0.6" />
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.23.0" />
<PackageVersion Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.3.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.5" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.Data.Services.Client" Version="5.8.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageVersion Include="Microsoft.ServiceFabric" Version="6.4.617" />
<PackageVersion Include="Microsoft.ServiceFabric.Data" Version="3.3.617" />
<PackageVersion Include="Microsoft.ServiceFabric.Services" Version="3.3.617" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="System.Collections.Immutable" Version="1.2.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Reactive.Compatibility" Version="4.4.1" />
<PackageVersion Include="System.Reactive.Core" Version="4.4.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
<PackageVersion Include="Microsoft.ServiceFabric" Version="11.3.475" />
<PackageVersion Include="Microsoft.ServiceFabric.Data" Version="8.3.475" />
<PackageVersion Include="Microsoft.ServiceFabric.Services" Version="8.3.475" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.5" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.5" />
<PackageVersion Include="System.Linq.Async" Version="7.0.0" />
<PackageVersion Include="System.Reactive.Compatibility" Version="6.1.0" />
<PackageVersion Include="System.Reactive.Core" Version="6.1.0" />
</ItemGroup>

<!-- Product dependencies with net48 only-->
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageVersion Include="Microsoft.Azure.KeyVault.Core" Version="1.0.0" />
<PackageVersion Include="Microsoft.Azure.KeyVault.Core" Version="3.0.5" />
<PackageVersion Include="Microsoft.Data.Edm" Version="5.8.5" />
<PackageVersion Include="Microsoft.Data.OData" Version="5.8.5" />
<PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.1" />
<PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.3" />
<PackageVersion Include="System.Spatial" Version="5.8.5" />
<PackageVersion Include="WindowsAzure.ServiceBus" Version="4.1.3" />
<PackageVersion Include="WindowsAzure.ServiceBus" Version="7.0.1" />
</ItemGroup>

<!-- Test dependencies -->
<ItemGroup>
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.0.0-beta.4" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.6.0" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageVersion Include="CommandLineParser" Version="1.9.71" Condition="'$(TargetFramework)' == 'net48'" />
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.EventSourceAnalyzer.NetCore" Version="2.0.1406.4" />
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
<PackageVersion Include="Microsoft.Diagnostics.EventFlow.Core" Version="1.5.6" />
<PackageVersion Include="Microsoft.Diagnostics.EventFlow.Core" Version="1.13.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="Moq" Version="4.10.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.5.0" />
<PackageVersion Include="MSTest.TestFramework" Version="3.5.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.11.1" />
<PackageVersion Include="MSTest.TestFramework" Version="3.11.1" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.5" />
<PackageVersion Include="System.Data.SqlClient" Version="4.9.1" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
<PackageVersion Include="System.Text.Json" Version="10.0.5" />
<PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageVersion Include="WindowsAzure.Storage" Version="8.7.0" Condition="'$(TargetFramework)' == 'net48'" />
<PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>

<!-- Test dependencies with net6.0-->
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.NetCore" Version="2.0.1406.4" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
</ItemGroup>

<!-- Test dependencies with net472-->
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageVersion Include="Microsoft.AspNet.WebApi.Owin" Version="5.3.0" />
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.3" />
</ItemGroup>

<!-- Test dependencies with net48-->
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageVersion Include="EnterpriseLibrary.SemanticLogging" version="2.0.1406.1" />
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.TextFile" version="2.0.1406.1" />
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.3" />
<PackageVersion Include="Microsoft.Tpl.Dataflow" version="4.5.24" />
</ItemGroup>

<!-- Samples dependencies -->
<ItemGroup>
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.12.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.17.3" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.4" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="3.1.32" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.1.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.1.0" />
<PackageVersion Include="Vio.DurableTask.Hosting" Version="2.2.1" />
<PackageVersion Include="Azure.Identity" Version="1.19.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.23.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.17.5" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.13.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.15.0" />
<PackageVersion Include="Vio.DurableTask.Hosting" Version="2.2.17" />
</ItemGroup>

<!-- Dependencies specific to net8.0-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<!-- Logging dependencies -->
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.5" />
</ItemGroup>


<!-- Samples dependencies with net48-->
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageVersion Include="ncrontab" version="1.0.0" />
<PackageVersion Include="ncrontab" version="3.4.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void MissingRequestFailedException()
Assert.IsFalse(exception.LeaseLost);
}

[DataTestMethod]
[TestMethod]
[DataRow(true, HttpStatusCode.Conflict, nameof(BlobErrorCode.LeaseLost))]
[DataRow(false, HttpStatusCode.Conflict, nameof(BlobErrorCode.LeaseNotPresentWithBlobOperation))]
[DataRow(false, HttpStatusCode.NotFound, nameof(BlobErrorCode.BlobNotFound))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="7.0.2" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
<PackageReference Include="Vio.DurableTask.Hosting" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ async Task<IEnumerable<MessageData>> DedupeExecutionStartedMessagesAsync(
// "Remote" -> the instance ID info comes from the Instances table that we're querying
IAsyncEnumerable<InstanceStatus> instances = this.trackingStore.FetchInstanceStatusAsync(instanceIds, cancellationToken);
IDictionary<string, InstanceStatus> remoteOrchestrationsById =
await instances.ToDictionaryAsync(o => o.State.OrchestrationInstance.InstanceId, cancellationToken);
await instances.ToDictionaryAsync(o => o.State.OrchestrationInstance.InstanceId, comparer: StringComparer.OrdinalIgnoreCase, cancellationToken);

foreach (MessageData message in executionStartedMessages)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ public static async Task CleanAsync()
var replicas = (await client.QueryManager.GetDeployedReplicaListAsync(node.NodeName, application.ApplicationName)).OfType<DeployedStatefulServiceReplica>();
foreach (var replica in replicas)
{
#pragma warning disable CS0618 // RemoveReplicaAsync overload is deprecated
await client.ServiceManager.RemoveReplicaAsync(node.NodeName, replica.Partitionid, replica.ReplicaId);
#pragma warning restore CS0618
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" VersionOverride="1.4.0" />
<PackageReference Include="MSTest.TestFramework" VersionOverride="1.4.0" />
<PackageReference Include="System.Collections.Immutable" VersionOverride="1.5.0" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="Microsoft.AspNet.WebApi.Core" />
<PackageReference Include="Moq" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace DurableTask.AzureStorage.Tests
[TestClass]
public class AsyncAutoResetEventTests
{
[DataTestMethod]
[TestMethod]
[DataRow(false, false)]
[DataRow(true, true)]
public async Task InitialState(bool initiallySignaled, bool expectedResult)
Expand Down
6 changes: 3 additions & 3 deletions test/DurableTask.AzureStorage.Tests/AzureStorageScaleTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@

private async Task EnsureLeasesMatchControlQueue(string directoryReference, BlobContainerClient taskHubContainer, ControlQueue[] controlQueues)
{
BlobItem[] leaseBlobs = await taskHubContainer.GetBlobsAsync(prefix: directoryReference).ToArrayAsync();
BlobItem[] leaseBlobs = await taskHubContainer.GetBlobsAsync(BlobTraits.None, BlobStates.None, directoryReference, default).ToArrayAsync();
Assert.AreEqual(controlQueues.Length, leaseBlobs.Length, "Expected to see the same number of control queues and lease blobs.");
foreach (BlobItem blobItem in leaseBlobs)
{
Expand All @@ -210,7 +210,7 @@
/// REQUIREMENT: Workers can be added or removed at any time and control-queue partitions are load-balanced automatically.
/// REQUIREMENT: No two workers will ever process the same control queue.
/// </summary>
[DataTestMethod]

Check failure on line 213 in test/DurableTask.AzureStorage.Tests/AzureStorageScaleTests.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

'DataTestMethod' is obsolete. Use 'TestMethod' instead. (https://learn.microsoft.com/dotnet/core/testing/mstest-analyzers/mstest0044)
[DataRow(PartitionManagerType.V1Legacy, 30)]
[DataRow(PartitionManagerType.V2Safe, 180)]
public async Task MultiWorkerLeaseMovement(PartitionManagerType partitionManagerType, int timeoutInSeconds)
Expand Down Expand Up @@ -586,7 +586,7 @@
await service2.CompleteTaskOrchestrationWorkItemAsync(workItem2, runtimeState, new List<TaskMessage>(), new List<TaskMessage>(), new List<TaskMessage>(), null, null);
// Now worker 1 will attempt to complete the same work item. Since this is the first attempt to complete a work item and add a history for the orchestration (by worker 1),
// there is no etag stored for the OrchestrationSession, and so the a "conflict" exception will be thrown as worker 2 already created a history for the orchestration.
SessionAbortedException exception = await Assert.ThrowsExceptionAsync<SessionAbortedException>(async () =>
SessionAbortedException exception = await Assert.ThrowsExactlyAsync<SessionAbortedException>(async () =>
await service1.CompleteTaskOrchestrationWorkItemAsync(workItem1, runtimeState, new List<TaskMessage>(), new List<TaskMessage>(), new List<TaskMessage>(), null, null)
);
Assert.IsInstanceOfType(exception.InnerException, typeof(DurableTaskStorageException));
Expand Down Expand Up @@ -629,7 +629,7 @@
await service1.CompleteTaskOrchestrationWorkItemAsync(workItem1, runtimeState, new List<TaskMessage>(), new List<TaskMessage>(), new List<TaskMessage>(), null, null);
// Now worker 2 attempts to complete the same work item. Since this is not the first work item for the orchestration, now an etag exists for the OrchestrationSession, and the exception
// that is thrown will be "precondition failed" as the Etag is stale after worker 1 completed the work item.
exception = await Assert.ThrowsExceptionAsync<SessionAbortedException>(async () =>
exception = await Assert.ThrowsExactlyAsync<SessionAbortedException>(async () =>
await service2.CompleteTaskOrchestrationWorkItemAsync(workItem2, runtimeState, new List<TaskMessage>(), new List<TaskMessage>(), new List<TaskMessage>(), null, null)
);
Assert.IsInstanceOfType(exception.InnerException, typeof(DurableTaskStorageException));
Expand Down
Loading
Loading