Skip to content

Commit a16edfe

Browse files
arturcicarturcic
committed
csproj cleanup
1 parent 58492a9 commit a16edfe

File tree

4 files changed

+9
-42
lines changed

4 files changed

+9
-42
lines changed

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,15 @@
1313
<ItemGroup>
1414
<PackageReference Include="FluentDateTime" Version="2.0.0" />
1515
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
1716
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
1817
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
1918
</ItemGroup>
2019
<ItemGroup>
2120
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
2221
</ItemGroup>
2322
<ItemGroup>
24-
<Content Include="Approved\**\*.approved.txt" />
25-
<Content Include="VersionCalculation\Approved\JsonVersionBuilderTests.Json.approved.txt" />
26-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt" />
27-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt" />
28-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt" />
29-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt" />
30-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt" />
31-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt" />
32-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt" />
33-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt" />
34-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt" />
35-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt" />
36-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
37-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
38-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
39-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone.approved.txt" />
40-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt" />
41-
<Content Include="VersionConverters\Approved\cs\GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt" />
42-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt" />
43-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt" />
44-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
45-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
46-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
47-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone.approved.txt" />
48-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt" />
49-
<Content Include="VersionConverters\Approved\fs\GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt" />
50-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt" />
51-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt" />
52-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
53-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
54-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
55-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone.approved.txt" />
56-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt" />
57-
<Content Include="VersionConverters\Approved\vb\GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt" />
58-
<Content Include="VersionConverters\Approved\WixFileTests.UpdateWixVersionFile.approved.txt" />
23+
<Content Include="VersionCalculation\Approved\**\*.approved.txt" />
24+
<Content Include="VersionConverters\Approved\**\*.approved.txt" />
5925
</ItemGroup>
6026
<ItemGroup>
6127
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<Import Project="..\test.props" />
88
<ItemGroup>
99
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
1110
</ItemGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<PackageReference Include="Buildalyzer" Version="3.0.0" />
1010
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
1111
<PackageReference Include="Microsoft.Build" Version="$(PackageVersion_MsBuild)" />
12-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
1312
<PackageReference Include="MSBuild.ProjectCreation" Version="1.4.2" />
1413
</ItemGroup>
1514
<ItemGroup>

‎src/test.props

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@
55

66
<ItemGroup>
77
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion_MicrosoftTestSdk)" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
9+
810
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" />
911
<PackageReference Include="Newtonsoft.Json" Version="$(PackageVersion_NewtonsoftJson)" />
1012
<PackageReference Include="NSubstitute" Version="$(PackageVersion_NSubstitute)" />
11-
<PackageReference Include="coverlet.msbuild" Version="$(PackageVersion_CoverletMsBuild)">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14-
</PackageReference>
13+
1514
<PackageReference Include="NUnit" Version="$(PackageVersion_NUnit)" />
1615
<PackageReference Include="NUnit3TestAdapter" Version="$(PackageVersion_NUnit3TestAdapter)" />
1716
<PackageReference Include="NunitXml.TestLogger" Version="$(PackageVersion_NunitXmlTestLogger)" />
1817
<PackageReference Include="Shouldly" Version="$(PackageVersion_Shouldly)" />
1918
<PackageReference Include="GitTools.Testing" Version="$(PackageVersion_GitToolsTesting)" />
2019

20+
<PackageReference Include="coverlet.msbuild" Version="$(PackageVersion_CoverletMsBuild)">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
23+
</PackageReference>
2124
</ItemGroup>
2225
</Project>

0 commit comments

Comments
 (0)