From 0337dfdee3f527240bde57b9100293465bd155c8 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Wed, 3 Jan 2024 13:13:54 +0800 Subject: [PATCH] Backend.*: fix assembly version attribs Somehow, even if CommonAssemblyInfo.fs is included in Backend.NetStandard project, it was not being applied (as the recent snap testing commit [1] revealed, when it calls geewallet with the --version flag), so we now use MSBuild attributes instead, which work and the best proof that they do, is that we've had to change a LOC in Backend.Tests for them not to break after this change. NOTE: this commit was decided to be backported from master to stable branch, cherry-picking [2], where Backend.NetStandard project doesn't exist, but Backend project does. [1] ce93f84c23b8ce8a682c56a3df3ebca2e4df528a [2] 2edb96ead1abc1ab2450c5e197cfbc50b2cec70a --- scripts/bump.fsx | 1 + src/GWallet.Backend.Tests/MarshallingData.fs | 2 +- src/GWallet.Backend/GWallet.Backend.fsproj | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/bump.fsx b/scripts/bump.fsx index 33ae883f3..0286233d3 100755 --- a/scripts/bump.fsx +++ b/scripts/bump.fsx @@ -49,6 +49,7 @@ let filesToBumpMiniVersion: seq = let filesToBumpFullVersion: seq = Seq.append filesToBumpMiniVersion [ + "src/GWallet.Backend/GWallet.Backend.fsproj" "src/GWallet.Backend/Properties/CommonAssemblyInfo.fs" "snap/snapcraft.yaml" ] diff --git a/src/GWallet.Backend.Tests/MarshallingData.fs b/src/GWallet.Backend.Tests/MarshallingData.fs index ed1526044..03ddc295f 100644 --- a/src/GWallet.Backend.Tests/MarshallingData.fs +++ b/src/GWallet.Backend.Tests/MarshallingData.fs @@ -14,7 +14,7 @@ open GWallet.Backend.Ether module MarshallingData = let private executingAssembly = Assembly.GetExecutingAssembly() - let private version = executingAssembly.GetName().Version.ToString() + let private version = VersionHelper.CURRENT_VERSION let private binPath = executingAssembly.Location |> FileInfo let private prjPath = Path.Combine(binPath.Directory.FullName, "..") |> DirectoryInfo diff --git a/src/GWallet.Backend/GWallet.Backend.fsproj b/src/GWallet.Backend/GWallet.Backend.fsproj index 21de2f640..b05f35205 100644 --- a/src/GWallet.Backend/GWallet.Backend.fsproj +++ b/src/GWallet.Backend/GWallet.Backend.fsproj @@ -5,6 +5,12 @@ true + + 0.4.407.0 + 0.4.407.0 + 0.4.407.0 + +