warnings cleanup

Author: arturcic

src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs

@@ -33,14 +33,14 @@ private static IRemote MockRemote(IGitRepository repository)
 
         var branches = Substitute.For<IBranchCollection>();
         branches[branch.Name.Canonical].Returns(branch);
-        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)[branch]).GetEnumerator());
+        branches.MockCollectionReturn(branch);
 
         var reference = Substitute.For<IReference>();
         reference.Name.Returns(new ReferenceName("refs/heads/develop"));
 
         var references = Substitute.For<IReferenceCollection>();
         references["develop"].Returns(reference);
-        references.GetEnumerator().Returns(_ => ((IEnumerable<IReference>)[reference]).GetEnumerator());
+        references.MockCollectionReturn(reference);
 
         repository.Refs.Returns(references);
         repository.Head.Returns(branch);

src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs

@@ -39,7 +39,7 @@ public static IBranch CreateMockBranch(string name, params ICommit[] commits)
         branch.Tip.Returns(commits.FirstOrDefault());
 
         var commitsCollection = Substitute.For<ICommitCollection>();
-        commitsCollection.GetEnumerator().Returns(_ => ((IEnumerable<ICommit>)commits).GetEnumerator());
+        commitsCollection.MockCollectionReturn(commits);
         commitsCollection.GetCommitsPriorTo(Arg.Any<DateTimeOffset>()).Returns(commits);
         branch.Commits.Returns(commitsCollection);
         return branch;

src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs

@@ -0,0 +1,15 @@
+namespace GitVersion.Core.Tests;
+
+public static class MockCollectionExtensions
+{
+    private static IEnumerator<T> GetEnumerator<T>(params T[] itemsToReturn)
+    {
+        foreach (var item in itemsToReturn)
+        {
+            yield return item;
+        }
+    }
+
+    public static void MockCollectionReturn<T>(this IEnumerable<T> items, params T[] itemsToReturn)
+        => items.GetEnumerator().Returns(_ => GetEnumerator(itemsToReturn));
+}

src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs

@@ -47,7 +47,7 @@ private GitVersionContextBuilder AddBranch(string branchName)
 
         var branches = this.repository.Branches.ToList();
         branches.Add(mockBranch);
-        this.repository.Branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)branches).GetEnumerator());
+        this.repository.Branches.MockCollectionReturn([.. branches]);
         this.repository.Head.Returns(mockBranch);
         return this;
     }
@@ -75,7 +75,7 @@ private static IGitRepository CreateRepository()
         var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
         var mockBranch = GitToolsTestingExtensions.CreateMockBranch(TestBase.MainBranch, mockCommit);
         var branches = Substitute.For<IBranchCollection>();
-        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)[mockBranch]).GetEnumerator());
+        branches.MockCollectionReturn(mockBranch);
 
         var mockRepository = Substitute.For<IGitRepository>();
         mockRepository.Branches.Returns(branches);

src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -20,7 +20,7 @@ public void ShouldNotAllowIncrementOfVersion()
 
         var mockBranch = GitToolsTestingExtensions.CreateMockBranch(MainBranch, mockCommit);
         var branches = Substitute.For<IBranchCollection>();
-        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)[mockBranch]).GetEnumerator());
+        branches.MockCollectionReturn(mockBranch);
 
         var mockRepository = Substitute.For<IGitRepository>();
         mockRepository.Head.Returns(mockBranch);

src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <PackageReference Include="MSBuild.ProjectCreation" />
@@ -28,5 +28,6 @@
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitToolsTestingExtensions.cs" Link="Extensions\GitToolsTestingExtensions.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitVersionVariablesExtensions.cs" Link="Extensions\GitVersionVariablesExtensions.cs" />
+        <Compile Include="..\GitVersion.Core.Tests\Extensions\MockCollectionExtensions.cs" Link="Extensions\MockCollectionExtensions.cs" />
     </ItemGroup>
 </Project>