From c970d7c903219edbf6ea9caf53ed87137fc6eb38 Mon Sep 17 00:00:00 2001
From: Naiyuan Tian <110135109+nytian@users.noreply.github.com>
Date: Mon, 22 Sep 2025 11:24:15 -0700
Subject: [PATCH 1/5] Add safe versioning for FileVersionRevision

---
 src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
index 411b201b2..dd99e2fc6 100644
--- a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
+++ b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
@@ -15,7 +15,9 @@
     <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. -->
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+    <FileVersionRevisionSafe Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevisionSafe>
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevisionSafe)</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- This version is used as the nuget package version -->

From fbf555d5d2dcc0dda1a446c671ad479bf5f4a1b5 Mon Sep 17 00:00:00 2001
From: "naiyuantian@microsoft.com" <naiyuantian@microsoft.com>
Date: Mon, 22 Sep 2025 12:08:09 -0700
Subject: [PATCH 2/5] add platform

---
 eng/templates/build.yml                                  | 1 +
 src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eng/templates/build.yml b/eng/templates/build.yml
index ac2f8c56a..ef2e02820 100644
--- a/eng/templates/build.yml
+++ b/eng/templates/build.yml
@@ -62,6 +62,7 @@ jobs:
           vsVersion: '16.0'
           logFileVerbosity: minimal
           configuration: Release
+          platform: x64
           msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
 
       - task: VSBuild@1
diff --git a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
index dd99e2fc6..8b7259c1a 100644
--- a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
+++ b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <PackageId>Microsoft.Azure.DurableTask.ServiceBus</PackageId>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
     <!-- Version Info -->

From 3e465ead2d2d7d0cc706b1d44dedcef8c9135208 Mon Sep 17 00:00:00 2001
From: "naiyuantian@microsoft.com" <naiyuantian@microsoft.com>
Date: Tue, 23 Sep 2025 10:07:06 -0700
Subject: [PATCH 3/5] update by comments

---
 .../DurableTask.ApplicationInsights.csproj                  | 2 ++
 .../DurableTask.AzureStorage.csproj                         | 2 ++
 src/DurableTask.Core/DurableTask.Core.csproj                | 2 ++
 src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj    | 6 +++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
index fe725b1e4..253720c9c 100644
--- a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
+++ b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
@@ -16,6 +16,8 @@
         <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. -->
+		<!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+		<FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
         <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
         <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
         <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
index 33df68421..099a1f14b 100644
--- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
+++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
@@ -26,6 +26,8 @@
     <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. -->
+	  <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+	  <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
     <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
diff --git a/src/DurableTask.Core/DurableTask.Core.csproj b/src/DurableTask.Core/DurableTask.Core.csproj
index a7e2d56ec..02fcf8597 100644
--- a/src/DurableTask.Core/DurableTask.Core.csproj
+++ b/src/DurableTask.Core/DurableTask.Core.csproj
@@ -22,6 +22,8 @@
     <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. -->
+	  <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+	  <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
     <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
diff --git a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
index 8b7259c1a..51ed4e904 100644
--- a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
+++ b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
@@ -16,9 +16,9 @@
     <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. -->
-    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-    <FileVersionRevisionSafe Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevisionSafe>
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevisionSafe)</FileVersion>
+	  <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+	  <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
+	  <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- This version is used as the nuget package version -->

From e0363cc08065f85a659760d3e1c4bf20741eef99 Mon Sep 17 00:00:00 2001
From: "naiyuantian@microsoft.com" <naiyuantian@microsoft.com>
Date: Tue, 23 Sep 2025 10:21:28 -0700
Subject: [PATCH 4/5] fix formaty

---
 .../DurableTask.AzureStorage.csproj                         | 4 ++--
 src/DurableTask.Core/DurableTask.Core.csproj                | 4 ++--
 src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
index 099a1f14b..cf8cd95d6 100644
--- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
+++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
@@ -26,8 +26,8 @@
     <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. -->
-	  <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-	  <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+    <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
     <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
diff --git a/src/DurableTask.Core/DurableTask.Core.csproj b/src/DurableTask.Core/DurableTask.Core.csproj
index 02fcf8597..99f0a7120 100644
--- a/src/DurableTask.Core/DurableTask.Core.csproj
+++ b/src/DurableTask.Core/DurableTask.Core.csproj
@@ -22,8 +22,8 @@
     <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. -->
-	  <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-	  <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+    <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
     <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
diff --git a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
index 51ed4e904..b14150cfd 100644
--- a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
+++ b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
@@ -16,9 +16,9 @@
     <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. -->
-	  <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-	  <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
-	  <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
+    <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- This version is used as the nuget package version -->

From 9c171d3d71e3192c083cf3d56b8fbc7780a13f39 Mon Sep 17 00:00:00 2001
From: "naiyuantian@microsoft.com" <naiyuantian@microsoft.com>
Date: Tue, 23 Sep 2025 10:46:47 -0700
Subject: [PATCH 5/5] update fileversion

---
 .../DurableTask.ApplicationInsights.csproj                   | 5 ++---
 src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj | 5 ++---
 src/DurableTask.Core/DurableTask.Core.csproj                 | 5 ++---
 src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj     | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
index 253720c9c..6321d410e 100644
--- a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
+++ b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
@@ -16,9 +16,8 @@
         <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. -->
-		<!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-		<FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
-        <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+		<!-- Ensure FileVersionRevision fits within valid range (0-65535) -->
+		<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
         <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
         <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
         <!-- This version is used as the nuget package version -->
diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
index cf8cd95d6..b65a306fd 100644
--- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
+++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
@@ -26,9 +26,8 @@
     <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. -->
-    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-    <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535)-->
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
   </PropertyGroup>
diff --git a/src/DurableTask.Core/DurableTask.Core.csproj b/src/DurableTask.Core/DurableTask.Core.csproj
index 99f0a7120..802fe8097 100644
--- a/src/DurableTask.Core/DurableTask.Core.csproj
+++ b/src/DurableTask.Core/DurableTask.Core.csproj
@@ -22,9 +22,8 @@
     <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. -->
-    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-    <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535) -->
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <PackageReadmeFile>.\README.md</PackageReadmeFile>
diff --git a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
index b14150cfd..36038afaa 100644
--- a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
+++ b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
@@ -16,9 +16,8 @@
     <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. -->
-    <!-- Ensure FileVersionRevision fits within valid range (0-65535) by using modulo operation -->
-    <FileVersionRevision Condition="'$(FileVersionRevision)' != ''">$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersionRevision>
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535)-->
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- This version is used as the nuget package version -->