Skip to content

Commit

Permalink
Backend.*: fix assembly version attribs
Browse files Browse the repository at this point in the history
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.

[1] ce93f84
  • Loading branch information
knocte committed Jan 29, 2023
1 parent ce93f84 commit 2edb96e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
2 changes: 2 additions & 0 deletions scripts/bump.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ let filesToBumpMiniVersion: seq<string> =

let filesToBumpFullVersion: seq<string> =
Seq.append filesToBumpMiniVersion [
"src/GWallet.Backend/GWallet.Backend.fsproj"
"src/GWallet.Backend.NetStandard/GWallet.Backend.NetStandard.fsproj"
"src/GWallet.Backend/Properties/CommonAssemblyInfo.fs"
"snap/snapcraft.yaml"
"src/GWallet.Frontend.XF.UWP/Package.appxmanifest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<Version>0.4.371.0</Version>
<AssemblyVersion>0.4.371.0</AssemblyVersion>
<FileVersion>0.4.371.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/GWallet.Backend.Tests/MarshallingData.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions src/GWallet.Backend/GWallet.Backend.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup>
<Version>0.4.371.0</Version>
<AssemblyVersion>0.4.371.0</AssemblyVersion>
<FileVersion>0.4.371.0</FileVersion>
</PropertyGroup>

<ItemGroup>
<Compile Include="Properties\CommonAssemblyInfo.fs" />
<Compile Include="Properties\AssemblyInfo.fs" />
Expand Down

0 comments on commit 2edb96e

Please sign in to comment.