Merge branch 'main' into wangbill/atag

Author: YunchuWang

DurableTask.sln

@@ -59,8 +59,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Correlation.Samples", "samp
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D02EF5EF-3D7E-4223-B256-439BAF0C8853}"
 	ProjectSection(SolutionItems) = preProject
-		azure-pipelines-build.yml = azure-pipelines-build.yml
-		azure-pipelines-release.yml = azure-pipelines-release.yml
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
@@ -79,6 +77,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedIdentity.AzStorageV1
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedIdentity.AzStorageV2", "samples\ManagedIdentitySample\DTFx.AzureStorage v2.x\ManagedIdentity.AzStorageV2.csproj", "{87CA84DE-A0FE-443C-8B2B-AB89F5DF5C24}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{8123FF5E-A7B6-4649-BF5C-C2C69F2D67D3}"
+	ProjectSection(SolutionItems) = preProject
+		eng\ci\code-mirror.yml = eng\ci\code-mirror.yml
+		eng\ci\official-build.yml = eng\ci\official-build.yml
+		eng\ci\public-build.yml = eng\ci\public-build.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{BF34A9C8-20CA-44B9-BC72-AB905AB27F69}"
+	ProjectSection(SolutionItems) = preProject
+		eng\templates\build-steps.yml = eng\templates\build-steps.yml
+		eng\templates\build.yml = eng\templates\build.yml
+		eng\templates\test.yml = eng\templates\test.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -302,6 +316,8 @@ Global
 		{8B797A00-0F43-46F9-8F1A-C945FD4F304F} = {AF4E71A6-B16E-4488-B22D-2761101A601A}
 		{CFFC5AD7-5B82-48CF-879D-295D327B5CA6} = {8B797A00-0F43-46F9-8F1A-C945FD4F304F}
 		{87CA84DE-A0FE-443C-8B2B-AB89F5DF5C24} = {8B797A00-0F43-46F9-8F1A-C945FD4F304F}
+		{8123FF5E-A7B6-4649-BF5C-C2C69F2D67D3} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{BF34A9C8-20CA-44B9-BC72-AB905AB27F69} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		EnterpriseLibraryConfigurationToolBinariesPath = packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4

Test/DurableTask.Core.Tests/VersionSettingsTests.cs

@@ -0,0 +1,50 @@
+//  ----------------------------------------------------------------------------------
+//  Copyright Microsoft Corporation
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  ----------------------------------------------------------------------------------
+
+using DurableTask.Core.Settings;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace DurableTask.Core.Tests
+{
+    [TestClass]
+    public class VersionSettingsTests
+    {
+        [TestMethod]
+        [DataRow("1.0.0", "1.0.0", 0)]
+        [DataRow("1.1.0", "1.0.0", 1)]
+        [DataRow("1.0.0", "1.1.0", -1)]
+        [DataRow("1", "1", 0)]
+        [DataRow("2", "1", 1)]
+        [DataRow("1", "2", -1)]
+        [DataRow("", "1", -1)]
+        [DataRow("1", "", 1)]
+        [DataRow("", "", 0)]
+        public void TestVersionComparison(string orchVersion, string settingVersion, int expectedComparison)
+        {
+            int result = VersioningSettings.CompareVersions(orchVersion, settingVersion);
+
+            if (expectedComparison == 0)
+            {
+                Assert.AreEqual(0, result, $"Expected {orchVersion} to be equal to {settingVersion}");
+            }
+            else if (expectedComparison < 0)
+            {
+                Assert.IsTrue(result < 0, $"Expected {orchVersion} to be less than {settingVersion}");
+            }
+            else
+            {
+                Assert.IsTrue(result > 0, $"Expected {orchVersion} to be greater than {settingVersion}");
+            }
+        }
+    }
+}

azure-pipelines-release.yml

@@ -11,7 +11,7 @@
     <!-- Version Info -->
     <PropertyGroup>
         <MajorVersion>0</MajorVersion>
-        <MinorVersion>2</MinorVersion>
+        <MinorVersion>3</MinorVersion>
         <PatchVersion>0</PatchVersion>
         <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
         <FileVersion>$(VersionPrefix).0</FileVersion>

src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj

@@ -170,6 +170,14 @@ public class AzureStorageOrchestrationServiceSettings
         /// </remarks>
         public bool AllowReplayingTerminalInstances { get; set; } = false;
 
+        /// <summary>
+        /// Specifies the timeout (in seconds) for read and write operations on the partition table in partition manager V3 (table partition manager).
+        /// This helps detect and recover from potential silent hangs caused by Azure Storage client's internal retries. 
+        /// If the operation exceeds the timeout, a PartitionManagerWarning is logged and the operation is retried.
+        /// The default time is 2 seconds.
+        /// </summary>
+        public TimeSpan PartitionTableOperationTimeout { get; set; } = TimeSpan.FromSeconds(2);
+
         /// <summary>
         /// If UseAppLease is true, gets or sets the AppLeaseOptions used for acquiring the lease to start the application.
         /// </summary>

src/DurableTask.AzureStorage/AzureStorageOrchestrationServiceSettings.cs

@@ -21,8 +21,8 @@
   <!-- Version Info -->
   <PropertyGroup>
     <MajorVersion>2</MajorVersion>
-    <MinorVersion>0</MinorVersion>
-    <PatchVersion>2</PatchVersion>
+    <MinorVersion>1</MinorVersion>
+    <PatchVersion>0</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <FileVersion>$(VersionPrefix).0</FileVersion>
     <!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->

src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj

@@ -255,7 +255,9 @@ private async Task<string> DownloadAndDecompressAsBytesAsync(Blob blob, Cancella
 
         public string GetBlobUrl(string blobName)
         {
-            return Uri.UnescapeDataString(this.blobContainer.GetBlobReference(blobName).Uri.AbsoluteUri);
+            string baseUri = this.blobContainer.GetBlobContainerUri().ToString();
+
+            return $"{baseUri}/{EscapeBlobNamePreservingSlashes(blobName)}";
         }
 
         public MessageFormatFlags GetMessageFormatFlags(MessageData messageData)
@@ -304,6 +306,12 @@ public async Task<int> DeleteLargeMessageBlobs(string sanitizedInstanceId, Cance
 
             return storageOperationCount;
         }
+
+        /// Escapes a blob name for safe inclusion in a URI while preserving path structure.
+        static string EscapeBlobNamePreservingSlashes(string blobName)
+        {
+            return string.Join("/", blobName.Split('/').Select(Uri.EscapeDataString));
+        }
     }
 
 #if NETSTANDARD2_0