Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
30d970f
initial commit
nytian Jul 10, 2025
bc99c8a
Update nuget.config
nytian Jul 10, 2025
5bca4ba
update nuget.org
nytian Jul 10, 2025
33a68c0
udpate version
nytian Jul 10, 2025
1a2a71c
Merge branch 'nytian/azure-storage-queue-encoding' of https://github.…
nytian Jul 10, 2025
101a9f6
no warning on two feeds
nytian Jul 10, 2025
de1fdca
remove warning
nytian Jul 10, 2025
75039c5
disable warning of Nu1507
nytian Jul 11, 2025
0393527
udpate nuget
nytian Jul 11, 2025
0913559
update nuget
nytian Jul 11, 2025
59ba0d7
udpate test
nytian Jul 11, 2025
d58764f
update typeinterface.csproj
nytian Jul 11, 2025
b362296
update typeinterface.csproj
nytian Jul 11, 2025
5c37840
update typeinterface.csproj
nytian Jul 11, 2025
4323ba3
update typeinterface.csproj
nytian Jul 11, 2025
84fdd60
update typeinterface.csproj
nytian Jul 11, 2025
8f37e79
udpate test
nytian Jul 11, 2025
bfaf59d
added nuget.config to VSSample project
bachuv Jul 14, 2025
c8e7057
added nuget.config to VSSample.Tests
bachuv Jul 14, 2025
9722155
updated webjobs extension references to project not package reference…
bachuv Jul 14, 2025
403bfc4
updated dotnet restore step in build.yml
bachuv Jul 15, 2025
6b0ecb4
removed typedinterfaces projects from sln
bachuv Jul 16, 2025
b756de6
remove private feed and use nuget package
nytian Aug 8, 2025
a5fde6d
update index
nytian Aug 8, 2025
db49377
merge latest from dev
nytian Aug 8, 2025
0eb6a1e
undo .sln change
nytian Aug 11, 2025
7ca4de5
Merge branch 'dev' into nytian/azure-storage-queue-encoding
nytian Aug 11, 2025
ec45a0e
Merge branch 'dev' into nytian/azure-storage-queue-encoding
nytian Aug 11, 2025
ed09b85
undo tyintergace.csproj change
nytian Aug 11, 2025
cbe332f
Merge branch 'nytian/azure-storage-queue-encoding' of https://github.…
nytian Aug 11, 2025
2c853c8
udpate bycomment
nytian Aug 11, 2025
fd2f7b6
udpate bycomment
nytian Aug 11, 2025
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
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.ApplicationInsights" Version="0.5.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="2.3.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="2.4.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.Core" Version="3.3.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Core" Version="1.16.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ internal AzureStorageOrchestrationServiceSettings GetAzureStorageOrchestrationSe
MaxEntityOperationBatchSize = this.options.MaxEntityOperationBatchSize,
AllowReplayingTerminalInstances = this.azureStorageOptions.AllowReplayingTerminalInstances,
PartitionTableOperationTimeout = this.azureStorageOptions.PartitionTableOperationTimeout,
QueueClientMessageEncoding = this.azureStorageOptions.QueueClientMessageEncoding,
};

if (this.inConsumption)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using DurableTask.AzureStorage;
using Microsoft.Azure.WebJobs.Extensions.DurableTask.Storage;
using Microsoft.Extensions.Logging;

Expand Down Expand Up @@ -232,6 +233,12 @@ public TimeSpan MaxQueuePollingInterval
/// </remarks>
public TimeSpan PartitionTableOperationTimeout { get; set; } = TimeSpan.FromSeconds(2);

/// <summary>
/// Gets or sets the encoding strategy used for Azure Storage Queue messages.
/// The default is <see cref="QueueClientMessageEncoding.UTF8"/>.
/// </summary>
public QueueClientMessageEncoding QueueClientMessageEncoding { get; set; } = QueueClientMessageEncoding.UTF8;

/// <summary>
/// Throws an exception if the provided hub name violates any naming conventions for the storage provider.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<AssemblyName>Microsoft.Azure.WebJobs.Extensions.DurableTask</AssemblyName>
<RootNamespace>Microsoft.Azure.WebJobs.Extensions.DurableTask</RootNamespace>
<MajorVersion>3</MajorVersion>
<MinorVersion>3</MinorVersion>
<PatchVersion>1</PatchVersion>
<MinorVersion>4</MinorVersion>
<PatchVersion>0</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<FileVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</FileVersion>
<AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Worker.Extensions.DurableTask/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;

// TODO: Find a way to generate this dynamically at build-time
[assembly: ExtensionInformation("Microsoft.Azure.WebJobs.Extensions.DurableTask", "3.3.1")]
[assembly: ExtensionInformation("Microsoft.Azure.WebJobs.Extensions.DurableTask", "3.4.0")]
[assembly: InternalsVisibleTo("Worker.Extensions.DurableTask.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100cd1dabd5a893b40e75dc901fe7293db4a3caf9cd4d3e3ed6178d49cd476969abe74a9e0b7f4a0bb15edca48758155d35a4f05e6e852fff1b319d103b39ba04acbadd278c2753627c95e1f6f6582425374b92f51cca3deb0d2aab9de3ecda7753900a31f70a236f163006beefffe282888f85e3c76d1205ec7dfef7fa472a17b1")]
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<AssemblyOriginatorKeyFile>..\..\sign.snk</AssemblyOriginatorKeyFile>

<!-- Version information -->
<VersionPrefix>1.6.1</VersionPrefix>
<VersionPrefix>1.7.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
<!-- FileVersionRevision is expected to be set by the CI. -->
Expand Down
40 changes: 40 additions & 0 deletions test/Common/DurableTaskEndToEndTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5107,6 +5107,46 @@ public async Task DurableEntity_CleanEntityStorage(string storageProvider)
}
}

/// <summary>
/// End-to-end test which validates that QueueClientMessageEncoding.Base64 works correctly with a Hello World orchestration.
/// And with base64-queueclient we can support orchestration with escaped characters.
/// </summary>
[Fact]
[Trait("Category", PlatformSpecificHelpers.TestCategory)]
public async Task HelloWorld_QueueClientMessageEncoding_Base64()
{
string[] orchestratorFunctionNames =
{
nameof(TestOrchestrations.SayHelloInline),
};

var options = new DurableTaskOptions();

// Configure Azure Storage provider with Base64 message encoding
options.StorageProvider["ConnectionName"] = "AzureWebJobsStorage";
options.StorageProvider["QueueClientMessageEncoding"] = "Base64";

// Create input with escaped characters including 0xFFFE
string inputWithEscapedChars = "World\uFFFE\u0001\u0002\u0003";

using (var host = TestHelpers.GetJobHostWithOptions(
this.loggerProvider,
durableTaskOptions: options,
storageProviderType: TestHelpers.AzureStorageProviderType))
{
await host.StartAsync();

var client = await host.StartOrchestratorAsync(orchestratorFunctionNames[0], inputWithEscapedChars, this.output);
var status = await client.WaitForCompletionAsync(this.output);

Assert.Equal(OrchestrationRuntimeStatus.Completed, status?.RuntimeStatus);
Assert.Equal(inputWithEscapedChars, status?.Input);
Assert.Equal($"Hello, {inputWithEscapedChars}!", status?.Output);

await host.StopAsync();
}
}

[Theory]
[Trait("Category", PlatformSpecificHelpers.TestCategory)]
[MemberData(nameof(TestDataGenerator.GetFullFeaturedStorageProviderOptions), MemberType = typeof(TestDataGenerator))]
Expand Down
2 changes: 1 addition & 1 deletion test/SmokeTests/OOProcSmokeTests/durableJava/Nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<clear/>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json"/>
<add key="local" value="." />
<add key="durabletask" value="https://pkgs.dev.azure.com/durabletaskframework/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask/nuget/v3/index.json" />
<add key="durabletask" value="https://azfunc.pkgs.visualstudio.com/public/_packaging/durabletask/nuget/v3/index.json" />

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update this because we don't use that feed anymore.

</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion test/SmokeTests/OOProcSmokeTests/durablePy/Nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<clear/>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json"/>
<add key="local" value="." />
<add key="durabletask" value="https://pkgs.dev.azure.com/durabletaskframework/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask/nuget/v3/index.json" />
<add key="durabletask" value="https://azfunc.pkgs.visualstudio.com/public/_packaging/durabletask/nuget/v3/index.json" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion test/TimeoutTests/Python/Nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<clear/>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json"/>
<add key="local" value="." />
<add key="durabletask" value="https://pkgs.dev.azure.com/durabletaskframework/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask/nuget/v3/index.json" />
<add key="durabletask" value="https://azfunc.pkgs.visualstudio.com/public/_packaging/durabletask/nuget/v3/index.json" />
</packageSources>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>

Expand Down
Loading