Skip to content

Commit 1fa4304

Browse files
authored
Merge pull request #4087 from vruss/issue-4086
Fix path separator for gitversion.dll in MSBuild task
2 parents 91720b3 + cb76a70 commit 1fa4304

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == 'true' And '$(GenerateGitVersionFiles)' == 'true' ">true</UpdateAssemblyInfo>
99
<GenerateGitVersionInformation Condition=" '$(GenerateGitVersionInformation)' == '' And '$(GenerateGitVersionFiles)' == 'true' ">true</GenerateGitVersionInformation>
1010

11-
<GitVersionFileExe Condition="'$(GitVersionFileExe)' == ''">dotnet --roll-forward Major &quot;$(MSBuildThisFileDirectory)$(TargetFramework)/gitversion.dll&quot;</GitVersionFileExe>
12-
<GitVersionAssemblyFile Condition="'$(GitVersionAssemblyFile)' == ''">$(MSBuildThisFileDirectory)$(TargetFramework)/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
11+
<GitVersionFileExe Condition="'$(GitVersionFileExe)' == ''">dotnet --roll-forward Major &quot;$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(TargetFramework)))gitversion.dll&quot;</GitVersionFileExe>
12+
<GitVersionAssemblyFile Condition="'$(GitVersionAssemblyFile)' == ''">$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(TargetFramework)))GitVersion.MsBuild.dll</GitVersionAssemblyFile>
1313
</PropertyGroup>
14-
14+
1515
<UsingTask TaskName="GetVersion" AssemblyFile="$(GitVersionAssemblyFile)" />
1616
<UsingTask TaskName="GenerateGitVersionInformation" AssemblyFile="$(GitVersionAssemblyFile)" />
1717
<UsingTask TaskName="WriteVersionInfoToBuildLog" AssemblyFile="$(GitVersionAssemblyFile)" />

0 commit comments

Comments
 (0)