Skip to content

Commit 15390e6

Browse files
committed
#376(@nikita-petko): Update version prop
#!components: grid-bot, grid-bot-recovery Use time in version prop to allow desync
1 parent d4b5146 commit 15390e6

4 files changed

Lines changed: 5 additions & 35 deletions

File tree

lib/Directory.Build.props

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,14 @@
88
<LangVersion>10</LangVersion>
99
</PropertyGroup>
1010

11-
<Target Name="AddGitMetadaAssemblyAttributes"
12-
BeforeTargets="GetAssemblyAttributes">
13-
14-
<!--Executes the Git Commands to get the Hash and Branch-->
15-
<Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true"
16-
StandardOutputImportance="low" IgnoreExitCode="true" Condition=" '$(CommitHash)' == '' " WorkingDirectory="$(RootDirectory)">
17-
<Output TaskParameter="ConsoleOutput" PropertyName="CommitHash" />
18-
</Exec>
19-
<Exec Command="git rev-parse --short HEAD" ConsoleToMSBuild="true"
20-
StandardOutputImportance="low" IgnoreExitCode="true" Condition=" '$(CommitShortHash)' == '' " WorkingDirectory="$(RootDirectory)">
21-
<Output TaskParameter="ConsoleOutput" PropertyName="CommitShortHash" />
22-
</Exec>
23-
<Exec Command="git rev-parse --abbrev-ref HEAD" ConsoleToMSBuild="true"
24-
StandardOutputImportance="low" IgnoreExitCode="true" Condition=" '$(CommitBranch)' == '' " WorkingDirectory="$(RootDirectory)">
25-
<Output TaskParameter="ConsoleOutput" PropertyName="CommitBranch" />
26-
</Exec>
27-
28-
<ItemGroup>
29-
<AssemblyMetadata Include="BuildTimestamp" Value="$([System.DateTime]::UtcNow.ToString(yyyy-MM-ddTHH:mm:ssK))" />
30-
<AssemblyMetadata Condition=" $(CommitHash) != '' " Include="GitHash" Value="$(CommitHash)" />
31-
<AssemblyMetadata Condition=" $(CommitBranch) != '' " Include="GitBranch" Value="$(CommitBranch)" />
32-
</ItemGroup>
33-
</Target>
11+
<Import Project="$(RootDirectory)targets/git-metadata.targets" Condition="Exists('$(RootDirectory)targets/git-metadata.targets')" />
3412

3513
<PropertyGroup Label="PackageMetadata">
3614
<Company>MFDLABS</Company>
3715
<Copyright>Copyright © $(Company) $([System.DateTime]::Now.ToString(`yyyy`)). All rights reserved.</Copyright>
3816
<Authors>$(Company);Nikita Petko</Authors>
3917

40-
<VersionPrefix>1.1.2</VersionPrefix>
18+
<Version>$([System.DateTime]::Now.ToString(`yyyy.MM.dd+HHmmss`))</Version>
4119

4220
<RepositoryUrl>https://github.com/mfdlabs/grid-bot-libraries</RepositoryUrl>
4321
<RepositoryType>git</RepositoryType>

services/Directory.Build.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
<Configurations>debug;release</Configurations>
1212
</PropertyGroup>
13-
14-
<PropertyGroup>
15-
<LocalBuild>false</LocalBuild>
16-
</PropertyGroup>
1713

1814
<PropertyGroup Label="RootDirectory">
1915
<RootDirectory>$(MSBuildThisFileDirectory)..\</RootDirectory>
@@ -29,7 +25,7 @@
2925
<RepositoryUrl>https://github.com/mfdlabs/grid-bot</RepositoryUrl>
3026
<RepositoryType>git</RepositoryType>
3127

32-
<Version>$([System.DateTime]::Now.ToString(`yyyy.MM.dd`))</Version>
28+
<Version>$([System.DateTime]::Now.ToString(`yyyy.MM.dd+HHmmss`))</Version>
3329

3430
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
3531
<InformationalVersion Condition="'$(CI)' == 'true'">$(IMAGE_TAG)</InformationalVersion>

services/grid-bot/lib/Directory.Build.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<RootNamespace>Grid.Bot</RootNamespace>
1010
</PropertyGroup>
1111

12-
<PropertyGroup>
13-
<LocalBuild>false</LocalBuild>
14-
</PropertyGroup>
15-
1612
<PropertyGroup Label="PackageMetadata">
1713
<Company>MFDLABS</Company>
1814
<Copyright>Copyright © $(Company) $([System.DateTime]::Now.ToString(`yyyy`)). All rights reserved.</Copyright>
@@ -21,7 +17,7 @@
2117
<RepositoryUrl>https://github.com/mfdlabs/grid-bot</RepositoryUrl>
2218
<RepositoryType>git</RepositoryType>
2319

24-
<Version>$([System.DateTime]::Now.ToString(`yyyy.MM.dd`))</Version>
20+
<Version>$([System.DateTime]::Now.ToString(`yyyy.MM.dd+HHmmss`))</Version>
2521

2622
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
2723
<InformationalVersion Condition="'$(CI)' == 'true'">$(IMAGE_TAG)</InformationalVersion>

targets/git-metadata.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<Target Name="AddGitMetadaAssemblyAttributes"
2+
<Target Name="AddGitMetadataAssemblyAttributes"
33
BeforeTargets="GetAssemblyAttributes">
44

55
<!--Executes the Git Commands to get the Hash and Branch-->

0 commit comments

Comments
 (0)