Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use MSBuildRuntimeTime to discern xbuild #50

Merged
merged 1 commit into from
Aug 15, 2017
Merged

Use MSBuildRuntimeTime to discern xbuild #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/GitInfo/build/GitInfo.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,10 +849,10 @@
<WriteLinesToFile File='$(GitInfoThisAssemblyFile)' Lines='$(_ThisAssemblyContent)' Overwrite='true' />

<!-- Denotes xbuild, which doesn't properly handle escaped semicolon %3B -->
<Exec Condition="'$(MSBuildRuntimeVersion)' == '' AND '$(OS)' != 'Windows_NT'"
<Exec Condition="'$(MSBuildRuntimeType)' == ''"
Command="sed 's/\(.*\)&quot;/\1&quot;;/' '$(GitInfoThisAssemblyFile)'" />
<!-- Remove potential double semi-colon we might have added -->
<Exec Condition="'$(MSBuildRuntimeVersion)' == '' AND '$(OS)' != 'Windows_NT'"
<Exec Condition="'$(MSBuildRuntimeType)' == ''"
Command="sed 's/\(.*\)&quot;;;/\1&quot;;/' '$(GitInfoThisAssemblyFile)'" />

</Target>
Expand Down Expand Up @@ -895,7 +895,7 @@
<CygPathExe Condition="'$(CygPathExe)' == '' And Exists('C:\cygwin64\bin\cygpath.exe') And $(GitExe.Contains('cygwin64'))">C:\cygwin64\bin\cygpath.exe</CygPathExe>
</PropertyGroup>

<Import Project="GitInfo.xbuild" Condition="'$(MSBuildRuntimeVersion)' == '' AND '$(OS)' != 'Windows_NT'" />
<Import Project="GitInfo.xbuild" Condition="'$(MSBuildRuntimeType)' == ''" />

<Target Name="SetGitExe" Condition="'$(OS)' == 'Windows_NT'">
<!-- If git from %PATH% works, override the paths we calculated with that one instead -->
Expand Down