Skip to content

Commit 0fa6c70

Browse files
committed
Remove nuget-files.props and consolidate in GitVersion.MsBuild.csproj
Removed the nuget-files.props file and moved its contents into the GitVersion.MsBuild.csproj, simplifying the project structure. This restructuring also involved refactoring the packaging process, enhancing readability and maintainability.
1 parent 48dedf4 commit 0fa6c70

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

src/GitVersion.MsBuild/GitVersion.MsBuild.csproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<IncludeBuildOutput>false</IncludeBuildOutput>
99
<DevelopmentDependency>true</DevelopmentDependency>
1010
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
11+
12+
<BinPath>bin/$(Configuration)</BinPath>
13+
<ExePublishPath>../GitVersion.App/$(BinPath)</ExePublishPath>
1114
</PropertyGroup>
1215

1316
<ItemGroup>
@@ -26,6 +29,14 @@
2629
<InternalsVisibleTo Include="GitVersion.MsBuild.Tests" />
2730
</ItemGroup>
2831

29-
<Import Project="nuget-files.props" />
32+
<ItemGroup Condition="$(IsPackaging) != ''">
33+
<None Include="msbuild/tools/*.*" Pack="true" PackagePath="tools" />
34+
<None Include="msbuild/build/*.*" Pack="true" PackagePath="build" />
35+
<None Include="msbuild/buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
36+
37+
<None Include="$(ExePublishPath)/net6.0/publish/**/*;$(BinPath)/net6.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net6.0" />
38+
<None Include="$(ExePublishPath)/net7.0/publish/**/*;$(BinPath)/net7.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net7.0" />
39+
40+
</ItemGroup>
3041

3142
</Project>

src/GitVersion.MsBuild/nuget-files.props

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)