Skip to content

Commit d7aea6e

Browse files
committed
use exit
1 parent c52bf54 commit d7aea6e

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

Rubjerg.Graphviz/Rubjerg.Graphviz.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<Target Name="ComputeVersion" BeforeTargets="GenerateNuspec">
7676
<PropertyGroup>
77-
<_GitTmpFile>$(IntermediateOutputPath)git-info.txt</_GitTmpFile>
77+
<_GitTmpFile>$([System.String]::Copy('$(IntermediateOutputPath)git-info.txt').Replace('\', '/'))</_GitTmpFile>
7878
<Timestamp>$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss"))</Timestamp>
7979
</PropertyGroup>
8080

@@ -85,7 +85,7 @@
8585
</ReadLinesFromFile>
8686

8787
<!-- 2. Get exact tag at HEAD (may be blank) -->
88-
<Exec Command="(git describe --exact-match --tags HEAD || echo) > &quot;$(_GitTmpFile)&quot;" />
88+
<Exec Command="(git describe --exact-match --tags HEAD || exit 0) > &quot;$(_GitTmpFile)&quot;" />
8989
<ReadLinesFromFile File="$(_GitTmpFile)">
9090
<Output TaskParameter="Lines" PropertyName="ExactTag"/>
9191
</ReadLinesFromFile>
@@ -97,13 +97,13 @@
9797
</ReadLinesFromFile>
9898

9999
<!-- 4. Is working tree dirty? -->
100-
<Exec Command="(git diff --quiet HEAD &amp;&amp; echo no || echo yes) > &quot;$(_GitTmpFile)&quot;" />
100+
<Exec Command="(git diff --quiet HEAD &amp;&amp; echo no || exit 0) > &quot;$(_GitTmpFile)&quot;" />
101101
<ReadLinesFromFile File="$(_GitTmpFile)">
102102
<Output TaskParameter="Lines" PropertyName="IsDirty"/>
103103
</ReadLinesFromFile>
104104

105105
<!-- 5. Is master a descendant of HEAD? -->
106-
<Exec Command="(git merge-base --is-ancestor HEAD master &amp;&amp; echo yes || echo no) > &quot;$(_GitTmpFile)&quot;" />
106+
<Exec Command="(git merge-base --is-ancestor HEAD master &amp;&amp; echo yes || exit 0) > &quot;$(_GitTmpFile)&quot;" />
107107
<ReadLinesFromFile File="$(_GitTmpFile)">
108108
<Output TaskParameter="Lines" PropertyName="MasterDescendant"/>
109109
</ReadLinesFromFile>
@@ -138,7 +138,7 @@
138138
<Message Importance="High" Text="MasterDescendant : $(MasterDescendant)" />
139139
<Message Importance="High" Text="BaseVersion : $(BaseVersion)" />
140140
<Message Importance="High" Text="_ResolvedVersion : $(_ResolvedVersion)" />
141-
<Message Importance="High" Text="Final Version : $(Version)" />
141+
<Message Importance="High" Text="Final Version : $(PackageVersion)" />
142142
<Message Importance="High" Text="----------------------------------" />
143143

144144
</Target>

0 commit comments

Comments
 (0)