Skip to content

Commit 2a8f627

Browse files
authored
Add Safe FileVersion for DurableTask.ServiceBus (#1245)
* Add safe versioning for FileVersionRevision * add platform * update by comments * fix formaty * update fileversion
1 parent bee7311 commit 2a8f627

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

eng/templates/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
vsVersion: '16.0'
6363
logFileVerbosity: minimal
6464
configuration: Release
65+
platform: x64
6566
msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
6667

6768
- task: VSBuild@1

src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1717
<FileVersion>$(VersionPrefix).0</FileVersion>
1818
<!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
19-
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
19+
<!-- Ensure FileVersionRevision fits within valid range (0-65535) -->
20+
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
2021
<!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
2122
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
2223
<!-- This version is used as the nuget package version -->

src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
2727
<FileVersion>$(VersionPrefix).0</FileVersion>
2828
<!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
29-
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
29+
<!-- Ensure FileVersionRevision fits within valid range (0-65535)-->
30+
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
3031
<!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
3132
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
3233
</PropertyGroup>

src/DurableTask.Core/DurableTask.Core.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
2323
<FileVersion>$(VersionPrefix).0</FileVersion>
2424
<!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
25-
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
25+
<!-- Ensure FileVersionRevision fits within valid range (0-65535) -->
26+
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
2627
<!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
2728
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
2829
<PackageReadmeFile>.\README.md</PackageReadmeFile>

src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
66
<PackageId>Microsoft.Azure.DurableTask.ServiceBus</PackageId>
7+
<Platforms>AnyCPU;x64</Platforms>
78
</PropertyGroup>
89

910
<!-- Version Info -->
@@ -15,7 +16,8 @@
1516
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1617
<FileVersion>$(VersionPrefix).0</FileVersion>
1718
<!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
18-
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
19+
<!-- Ensure FileVersionRevision fits within valid range (0-65535)-->
20+
<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
1921
<!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
2022
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
2123
<!-- This version is used as the nuget package version -->

0 commit comments

Comments
 (0)