From ce8ff029766a6938f4db89538e80cb4b5596e4e5 Mon Sep 17 00:00:00 2001
From: Chris Gillum <cgillum@microsoft.com>
Date: Wed, 29 May 2024 01:34:00 +0900
Subject: [PATCH 1/4] Remove duplicate activity execution log message (#1101)

---
 src/DurableTask.Core/TaskActivityDispatcher.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/DurableTask.Core/TaskActivityDispatcher.cs b/src/DurableTask.Core/TaskActivityDispatcher.cs
index 1c0b8464f..c9e402401 100644
--- a/src/DurableTask.Core/TaskActivityDispatcher.cs
+++ b/src/DurableTask.Core/TaskActivityDispatcher.cs
@@ -130,8 +130,6 @@ async Task OnProcessWorkItemAsync(TaskActivityWorkItem workItem)
                 // Distributed tracing: start a new trace activity derived from the orchestration's trace context.
                 Activity? traceActivity = TraceHelper.StartTraceActivityForTaskExecution(scheduledEvent, orchestrationInstance);
 
-                this.logHelper.TaskActivityStarting(orchestrationInstance, scheduledEvent);
-
                 if (scheduledEvent.Name == null)
                 {
                     string message = $"The activity worker received a {nameof(EventType.TaskScheduled)} event that does not specify an activity name.";

From 0f252f08a8c6f3f5eb837d396e4e9c5e3ae036e4 Mon Sep 17 00:00:00 2001
From: Naiyuan Tian <110135109+nytian@users.noreply.github.com>
Date: Tue, 28 May 2024 14:30:19 -0400
Subject: [PATCH 2/4] Remove Wrong Core Entities Error Handling

---
 src/DurableTask.Core/DurableTask.Core.csproj | 2 +-
 src/DurableTask.Core/TaskEntityDispatcher.cs | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/DurableTask.Core/DurableTask.Core.csproj b/src/DurableTask.Core/DurableTask.Core.csproj
index f413cfab4..cf0496068 100644
--- a/src/DurableTask.Core/DurableTask.Core.csproj
+++ b/src/DurableTask.Core/DurableTask.Core.csproj
@@ -18,7 +18,7 @@
   <PropertyGroup>
     <MajorVersion>2</MajorVersion>
     <MinorVersion>17</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</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. -->
diff --git a/src/DurableTask.Core/TaskEntityDispatcher.cs b/src/DurableTask.Core/TaskEntityDispatcher.cs
index a7ecb5267..aad78675d 100644
--- a/src/DurableTask.Core/TaskEntityDispatcher.cs
+++ b/src/DurableTask.Core/TaskEntityDispatcher.cs
@@ -564,8 +564,6 @@ void DetermineWork(OrchestrationRuntimeState runtimeState, out SchedulerState sc
 
                         break;
 
-                    default:
-                        throw new EntitySchedulerException($"The entity with instanceId '{instanceId}' received an unexpected event type of type '{e.EventType}'. This is not a valid entity message. This is a framework-internal error, please report this issue in the GitHub repo: 'https://github.com/Azure/durabletask/'");
                 }
             }
 

From 9432291f65ed0ee3b150461cb16d6fd5ff565154 Mon Sep 17 00:00:00 2001
From: Naiyuan Tian <110135109+nytian@users.noreply.github.com>
Date: Tue, 28 May 2024 15:52:42 -0400
Subject: [PATCH 3/4] Increase DTFx.AzureStorage and DTFx.ApplicationInsights
 version

---
 .../DurableTask.ApplicationInsights.csproj                      | 2 +-
 src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
index 0bccf5929..0ee8d8b64 100644
--- a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
+++ b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
@@ -12,7 +12,7 @@
     <PropertyGroup>
         <MajorVersion>0</MajorVersion>
         <MinorVersion>1</MinorVersion>
-        <PatchVersion>5</PatchVersion>
+        <PatchVersion>6</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. -->
diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
index e9aef30c5..b324bd238 100644
--- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
+++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
@@ -21,7 +21,7 @@
   <PropertyGroup>
     <MajorVersion>1</MajorVersion>
     <MinorVersion>17</MinorVersion>
-    <PatchVersion>2</PatchVersion>
+    <PatchVersion>3</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. -->

From 0aa8886d8ffefdebdf86d39eab23400ac9db61fc Mon Sep 17 00:00:00 2001
From: "naiyuantian@microsoft.com" <naiyuantian@microsoft.com>
Date: Tue, 28 May 2024 13:53:07 -0700
Subject: [PATCH 4/4] solve conflicts

---
 .../DurableTask.AzureStorage.csproj                         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
index dae9fe60f..ab969b27e 100644
--- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
+++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
@@ -19,15 +19,9 @@
 
   <!-- Version Info -->
   <PropertyGroup>
-<<<<<<< HEAD
-    <MajorVersion>1</MajorVersion>
-    <MinorVersion>17</MinorVersion>
-    <PatchVersion>3</PatchVersion>
-=======
     <MajorVersion>2</MajorVersion>
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
->>>>>>> azure-storage-v12
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <VersionSuffix>preview.6</VersionSuffix>
     <FileVersion>$(VersionPrefix).0</FileVersion>