Skip to content

Commit 928a165

Browse files
arturcicarturcic
committed
1 parent fd6ec5f commit 928a165

File tree

16 files changed

+110
-105
lines changed

16 files changed

+110
-105
lines changed

‎src/Directory.Build.props‎

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,57 +28,44 @@
2828
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
2929

3030
</PropertyGroup>
31-
<PropertyGroup>
32-
<PackageVersion_LibGit2Sharp>0.27.0-preview-0182</PackageVersion_LibGit2Sharp>
33-
<PackageVersion_LibGit2Sharp_NativeBinaries>2.0.315-alpha.0.9</PackageVersion_LibGit2Sharp_NativeBinaries>
34-
35-
<PackageVersion_JetBrainsAnnotations>2022.1.0</PackageVersion_JetBrainsAnnotations>
36-
<PackageVersion_YamlDotNet>12.0.2</PackageVersion_YamlDotNet>
37-
<PackageVersion_MicrosoftExtensions>6.0.0</PackageVersion_MicrosoftExtensions>
38-
<PackageVersion_MicrosoftJson>6.0.0</PackageVersion_MicrosoftJson>
39-
<PackageVersion_MicrosoftTextEncoding>6.0.0</PackageVersion_MicrosoftTextEncoding>
40-
<PackageVersion_MsBuild>17.3.1</PackageVersion_MsBuild>
41-
42-
<PackageVersion_MicrosoftTestSdk>17.3.2</PackageVersion_MicrosoftTestSdk>
43-
<PackageVersion_NSubstitute>4.4.0</PackageVersion_NSubstitute>
44-
<PackageVersion_CoverletMsBuild>3.1.2</PackageVersion_CoverletMsBuild>
45-
<PackageVersion_NUnit>3.13.3</PackageVersion_NUnit>
46-
<PackageVersion_NUnit3TestAdapter>4.2.1</PackageVersion_NUnit3TestAdapter>
47-
<PackageVersion_JunitXmlTestLogger>3.0.114</PackageVersion_JunitXmlTestLogger>
48-
<PackageVersion_Shouldly>4.1.0</PackageVersion_Shouldly>
49-
<PackageVersion_MicrosoftPublicApiAnalyzers>3.3.3</PackageVersion_MicrosoftPublicApiAnalyzers>
50-
</PropertyGroup>
51-
31+
<ItemGroup>
32+
<PackageReference Include="System.Text.Json"/>
33+
<PackageReference Include="System.Text.Encodings.Web"/>
34+
</ItemGroup>
35+
<ItemGroup Condition=" '$(IsTestProject)' == 'false' ">
36+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
37+
<PrivateAssets>all</PrivateAssets>
38+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
39+
</PackageReference>
40+
</ItemGroup>
5241
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
53-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion_MicrosoftTestSdk)" />
54-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
55-
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_MicrosoftJson)" />
56-
<PackageReference Include="System.Text.Encodings.Web" Version="$(PackageVersion_MicrosoftTextEncoding)" />
42+
<PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
43+
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
5744

58-
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" />
59-
<PackageReference Include="NSubstitute" Version="$(PackageVersion_NSubstitute)" />
45+
<PackageReference Include="JetBrains.Annotations"/>
46+
<PackageReference Include="NSubstitute"/>
6047

61-
<PackageReference Include="NUnit" Version="$(PackageVersion_NUnit)" />
62-
<PackageReference Include="NUnit3TestAdapter" Version="$(PackageVersion_NUnit3TestAdapter)" />
63-
<PackageReference Include="JunitXml.TestLogger" Version="$(PackageVersion_JunitXmlTestLogger)" />
64-
<PackageReference Include="Shouldly" Version="$(PackageVersion_Shouldly)" />
48+
<PackageReference Include="NUnit"/>
49+
<PackageReference Include="NUnit3TestAdapter"/>
50+
<PackageReference Include="JunitXml.TestLogger"/>
51+
<PackageReference Include="Shouldly"/>
6552

66-
<PackageReference Include="coverlet.msbuild" Version="$(PackageVersion_CoverletMsBuild)">
53+
<PackageReference Include="coverlet.msbuild">
6754
<PrivateAssets>all</PrivateAssets>
6855
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
6956
</PackageReference>
7057

71-
<ProjectReference Include="..\GitTools.Testing\GitTools.Testing.csproj" />
58+
<ProjectReference Include="..\GitTools.Testing\GitTools.Testing.csproj"/>
7259

7360
</ItemGroup>
7461

7562
<ItemGroup>
76-
<Using Include="System.Collections" />
77-
<Using Include="System.Collections.Specialized" />
78-
<Using Include="System.Diagnostics" />
79-
<Using Include="System.Reflection" />
80-
<Using Include="System.Text" />
81-
<Using Include="System.Xml" />
63+
<Using Include="System.Collections"/>
64+
<Using Include="System.Collections.Specialized"/>
65+
<Using Include="System.Diagnostics"/>
66+
<Using Include="System.Reflection"/>
67+
<Using Include="System.Text"/>
68+
<Using Include="System.Xml"/>
8269
</ItemGroup>
8370

8471
<ItemGroup>

‎src/Directory.Packages.props‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="FluentDateTime" Version="2.1.0"/>
7+
<PackageVersion Include="LibGit2Sharp" Version="0.27.0-preview-0182"/>
8+
<PackageVersion Include="LibGit2Sharp.NativeBinaries" Version="2.0.315-alpha.0.9"/>
9+
<PackageVersion Include="JetBrains.Annotations" Version="2022.1.0"/>
10+
11+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.3.1"/>
12+
<PackageVersion Include="Microsoft.Build" Version="17.3.1"/>
13+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3"/>
14+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0"/>
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0"/>
16+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0"/>
17+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0"/>
18+
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0"/>
19+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2"/>
20+
<PackageVersion Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5"/>
21+
22+
<PackageVersion Include="Mono.Cecil" Version="0.11.4"/>
23+
24+
<PackageVersion Include="Buildalyzer" Version="4.1.5"/>
25+
<PackageVersion Include="coverlet.msbuild" Version="3.1.2"/>
26+
<PackageVersion Include="MSBuild.ProjectCreation" Version="8.3.0"/>
27+
<PackageVersion Include="NSubstitute" Version="4.4.0"/>
28+
<PackageVersion Include="NUnit" Version="3.13.3"/>
29+
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1"/>
30+
<PackageVersion Include="JunitXml.TestLogger" Version="3.0.114"/>
31+
<PackageVersion Include="Shouldly" Version="4.1.0"/>
32+
33+
<PackageVersion Include="Polly" Version="7.2.3"/>
34+
35+
<PackageVersion Include="System.Net.Requests" Version="4.3.0"/>
36+
<PackageVersion Include="System.Text.Json" Version="6.0.0"/>
37+
<PackageVersion Include="System.Text.Encodings.Web" Version="6.0.0"/>
38+
<PackageVersion Include="YamlDotNet" Version="12.0.2"/>
39+
</ItemGroup>
40+
</Project>

‎src/GitTools.Testing/GitTools.Testing.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
8-
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All" />
7+
<PackageReference Include="LibGit2Sharp" />
8+
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
99
</ItemGroup>
1010
</Project>

‎src/GitVersion.App.Tests/GitVersion.App.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
9+
<PackageReference Include="Mono.Cecil"/>
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj" />

‎src/GitVersion.App/GitVersion.App.csproj‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,20 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(PackageVersion_MicrosoftPublicApiAnalyzers)">
26-
<PrivateAssets>all</PrivateAssets>
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28-
</PackageReference>
29-
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_MicrosoftJson)" />
30-
<PackageReference Include="System.Text.Encodings.Web" Version="$(PackageVersion_MicrosoftJson)" />
31-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(PackageVersion_MicrosoftExtensions)" />
32-
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(PackageVersion_MicrosoftExtensions)" />
25+
<PackageReference Include="Microsoft.Extensions.Hosting"/>
26+
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing"/>
3327
</ItemGroup>
3428

3529
<ItemGroup>
36-
<ProjectReference Include="..\GitVersion.LibGit2Sharp\GitVersion.LibGit2Sharp.csproj" />
37-
<ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj" />
30+
<ProjectReference Include="..\GitVersion.LibGit2Sharp\GitVersion.LibGit2Sharp.csproj"/>
31+
<ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj"/>
3832
</ItemGroup>
3933

4034
<ItemGroup>
41-
<EmbeddedResource Include="../../docs/input/docs/usage/cli/arguments.md" />
35+
<EmbeddedResource Include="../../docs/input/docs/usage/cli/arguments.md"/>
4236
</ItemGroup>
4337

4438
<ItemGroup>
45-
<InternalsVisibleTo Include="GitVersion.App.Tests" />
39+
<InternalsVisibleTo Include="GitVersion.App.Tests"/>
4640
</ItemGroup>
4741
</Project>

‎src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="FluentDateTime" Version="2.1.0" />
15-
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
17-
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
14+
<PackageReference Include="FluentDateTime" />
15+
<PackageReference Include="LibGit2Sharp.NativeBinaries" />
16+
<PackageReference Include="Microsoft.Extensions.Options" />
17+
<PackageReference Include="YamlDotNet" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\GitVersion.LibGit2Sharp\GitVersion.LibGit2Sharp.csproj" />

‎src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using GitTools.Testing;
22
using GitVersion.Core.Tests.Helpers;
3-
using GitVersion.Core.Tests.IntegrationTests;
43
using GitVersion.VersionCalculation;
54
using LibGit2Sharp;
65
using Microsoft.Extensions.DependencyInjection;
@@ -16,7 +15,7 @@ public class VersionSourceTests : TestBase
1615
public void VersionSourceSha()
1716
{
1817
using var fixture = new EmptyRepositoryFixture();
19-
var initialCommit = fixture.Repository.MakeACommit();
18+
_ = fixture.Repository.MakeACommit();
2019
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
2120
_ = fixture.Repository.MakeACommit();
2221
var featureBranch = fixture.Repository.CreateBranch("feature/foo");
@@ -36,7 +35,7 @@ public void VersionSourceSha()
3635
public void VersionSourceShaOneCommit()
3736
{
3837
using var fixture = new EmptyRepositoryFixture();
39-
var initialCommit = fixture.Repository.MakeACommit();
38+
_ = fixture.Repository.MakeACommit();
4039

4140
var nextVersionCalculator = GetNextVersionCalculator(fixture);
4241

‎src/GitVersion.Core/BuildAgents/AppVeyor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.Text.Json;
21
using GitVersion.Extensions;
32
using GitVersion.Logging;
43
using GitVersion.OutputVariables;
4+
using System.Text.Json;
55

66
namespace GitVersion.BuildAgents;
77

‎src/GitVersion.Core/Core/MainlineBranchFinder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public IDictionary<string, List<IBranch>> FindMainlineBranches(ICommit commit)
4343
private bool BranchIsMainline(INamedReference branch)
4444
{
4545
var matcher = new MainlineConfigBranchMatcher(branch, this.log);
46-
return this.mainlineBranchConfigurations.Any(matcher.IsMainline) == true;
46+
return this.mainlineBranchConfigurations.Any(matcher.IsMainline);
4747
}
4848

4949
private class MainlineConfigBranchMatcher

‎src/GitVersion.Core/Core/RepositoryStore.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public IEnumerable<IBranch> GetSourceBranches(IBranch branch, Config configurati
150150
{
151151
foreach (var branchCommit in FindCommitBranchesWasBranchedFrom(branch, configuration, excludedBranches))
152152
{
153-
foreach (var item in referenceLookup[branchCommit.Commit.Sha]
153+
foreach (var _ in referenceLookup[branchCommit.Commit.Sha]
154154
.Where(r => r.Name.Friendly == branchCommit.Branch.Name.Friendly))
155155
{
156156
if (returnedBranches.Add(branchCommit.Branch))

0 commit comments

Comments
 (0)