Skip to content

Commit 22d265d

Browse files
committed
Attempt to fix broken msbuild task
1 parent 12c4e9a commit 22d265d

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

src/GitVersionTask/GitVersionTask.csproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,9 @@
119119
</ItemGroup>
120120
<MakeDir Directories="$(BuildDir)NuGetTaskBuild" />
121121
<ItemGroup>
122-
<NativeBinaries Include="$(TargetDir)NativeBinaries\**\*.*" />
122+
<NativeBinaries Include="$(TargetDir)lib\**\*.*" />
123123
</ItemGroup>
124-
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)NuGetTaskBuild\NativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" />
125-
<!-- Workaround for issue with DllMap. Mono will currently always prepend lib to start of target dll name. -->
126-
<CreateItem Include="$(TargetDir)NativeBinaries\**\*.so;$(TargetDir)NativeBinaries\**\*.dylib">
127-
<Output TaskParameter="Include" ItemName="libNativeBinaries" />
128-
</CreateItem>
129-
<Copy SourceFiles="@(libNativeBinaries)" DestinationFiles="@(libNativeBinaries->'$(BuildDir)NuGetTaskBuild\libNativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" />
130-
<!-- The LibGit2Sharp.dll.config file contains dll maps for the osx and linux libgit2 native binaries -->
124+
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)NuGetTaskBuild\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
131125
<Copy SourceFiles="$(TargetDir)LibGit2Sharp.dll.config" DestinationFiles="$(BuildDir)NuGetTaskBuild\GitVersionTask.dll.config" />
132126
<Copy SourceFiles="$(TargetDir)ILMergeTemp\GitVersionTask.dll" DestinationFolder="$(BuildDir)NuGetTaskBuild" Condition="Exists('$(TargetDir)ILMergeTemp\GitVersionTask.dll')" />
133127
<Copy SourceFiles="$(TargetDir)GitVersionTask.pdb" DestinationFolder="$(BuildDir)NuGetTaskBuild" Condition="Exists('$(TargetDir)GitVersionTask.pdb')" />

0 commit comments

Comments
 (0)