Skip to content

Commit 819220b

Browse files
committed
Fix of the rev.txt generation target
1 parent a1a5bc6 commit 819220b

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

Directory.Build.props

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,13 @@
7575
<Pack>true</Pack>
7676
</None>
7777
</ItemGroup>
78-
<Target Name="ExportRev" Condition="Exists('.git\index') AND '$(Configuration)' == 'Release'">
79-
<MakeDir Directories="_Build" />
80-
<Exec Command="git rev-parse HEAD > rev.txt" WorkingDirectory="_Build" />
78+
<Target Name="ExportRev"
79+
BeforeTargets="Pack"
80+
Condition="'$(Configuration)' == 'Release' AND Exists('$(SolutionDir).git\index')"
81+
Inputs="$(SolutionDir).git\index"
82+
Outputs="$(DoRevFile)">
83+
<MakeDir Directories="$(SolutionDir)_Build" />
84+
<Exec Command="git rev-parse HEAD > rev.txt" WorkingDirectory="$(SolutionDir)_Build" />
8185
</Target>
8286

8387
<Import Condition="Exists('User.Directory.Build.props')" Project="User.Directory.Build.props" />

MSBuild/DataObjects.Net.InternalBuild.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<XtensiveOrmPath>$(SolutionDir)_Build\$(Configuration)\</XtensiveOrmPath>
66
</PropertyGroup>
77

8-
<Import Project="$(MSBuildThisFileDirectory)\DataObjects.Net.targets" />
8+
<Import Project="$(MSBuildThisFileDirectory)DataObjects.Net.targets" />
99

1010
</Project>

MSBuild/DataObjects.Net.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PropertyGroup>
1212
<CompileDependsOn>$(CompileDependsOn);XtensiveOrmBuild</CompileDependsOn>
1313
<XtensiveOrmPath Condition="'$(XtensiveOrmPath)'==''">$(MSBuildThisFileDirectory)</XtensiveOrmPath>
14-
<XtensiveOrmPath Condition="!HasTrailingSlash('$(XtensiveOrmPath)')">$(XtensiveOrmPath)\</XtensiveOrmPath>
14+
<XtensiveOrmPath Condition="!HasTrailingSlash('$(XtensiveOrmPath)')">$(XtensiveOrmPath)</XtensiveOrmPath>
1515
<XtensiveOrmWeaver Condition="'$(XtensiveOrmWeaver)'==''">$(XtensiveOrmPath)tools\weaver\Xtensive.Orm.Weaver.dll</XtensiveOrmWeaver>
1616
<XtensiveOrmBuildDependsOn>$(XtensiveOrmBuildDependsOn)</XtensiveOrmBuildDependsOn>
1717
</PropertyGroup>

0 commit comments

Comments
 (0)