Merge branch 'master' into patch-1

NuKeeperDotNet · Aug 31, 2020 · 27ab225 · 27ab225
2 parents 887532a + 09bed2f
commit 27ab225
Show file tree

Hide file tree

Showing 77 changed files with 274 additions and 169 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,6 +16,6 @@
     <RepositoryUrl>https://github.com/NuKeeperDotNet/NuKeeper.git</RepositoryUrl>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" PrivateAssets="All" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/NuKeeper.Abstractions.Tests/Configuration/FileSettingsReaderTests.cs b/NuKeeper.Abstractions.Tests/Configuration/FileSettingsReaderTests.cs
@@ -13,7 +13,7 @@ namespace NuKeeper.Abstractions.Tests.Configuration
     [TestFixture]
     public class FileSettingsReaderTests
     {
-        private string _uniqueTemporaryFolder = null;
+        private string _uniqueTemporaryFolder;
 
         [SetUp]
         public void Setup()

diff --git a/NuKeeper.Abstractions.Tests/NuKeeper.Abstractions.Tests.csproj b/NuKeeper.Abstractions.Tests/NuKeeper.Abstractions.Tests.csproj
@@ -14,10 +14,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/NuKeeper.Abstractions/Configuration/FileSettingsCache.cs b/NuKeeper.Abstractions/Configuration/FileSettingsCache.cs
@@ -4,10 +4,10 @@ namespace NuKeeper.Abstractions.Configuration
 {
     public class FileSettingsCache : IFileSettingsCache
     {
-        private readonly FileSettingsReader _reader;
+        private readonly IFileSettingsReader _reader;
         private FileSettings _settings;
 
-        public FileSettingsCache(FileSettingsReader reader)
+        public FileSettingsCache(IFileSettingsReader reader)
         {
             _reader = reader;
         }

diff --git a/NuKeeper.Abstractions/Configuration/FileSettingsReader.cs b/NuKeeper.Abstractions/Configuration/FileSettingsReader.cs
@@ -4,7 +4,7 @@
 
 namespace NuKeeper.Abstractions.Configuration
 {
-    public class FileSettingsReader
+    public class FileSettingsReader : IFileSettingsReader
     {
         private readonly INuKeeperLogger _logger;
 

diff --git a/NuKeeper.Abstractions/Configuration/IFileSettingsReader.cs b/NuKeeper.Abstractions/Configuration/IFileSettingsReader.cs
@@ -0,0 +1,7 @@
+namespace NuKeeper.Abstractions.Configuration
+{
+    public interface IFileSettingsReader
+    {
+        FileSettings Read(string folder);
+    }
+}
diff --git a/NuKeeper.Abstractions/NuKeeper.Abstractions.csproj b/NuKeeper.Abstractions/NuKeeper.Abstractions.csproj
@@ -10,7 +10,8 @@
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
-    <PackageReference Include="NuGet.Protocol" Version="5.6.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" />
+    <PackageReference Include="NuGet.Protocol" Version="5.7.0" />
   </ItemGroup>
 
 </Project>
diff --git a/NuKeeper.AzureDevOps/AzureDevOpsRestClient.cs b/NuKeeper.AzureDevOps/AzureDevOpsRestClient.cs
@@ -19,10 +19,13 @@ public class AzureDevOpsRestClient
         private readonly HttpClient _client;
         private readonly INuKeeperLogger _logger;
 
-        public AzureDevOpsRestClient(HttpClient client, INuKeeperLogger logger, string personalAccessToken)
+        public AzureDevOpsRestClient(IHttpClientFactory clientFactory, INuKeeperLogger logger,
+            string personalAccessToken, Uri apiBaseAddress)
         {
-            _client = client ?? throw new ArgumentNullException(nameof(client));
             _logger = logger;
+
+            _client = clientFactory.CreateClient();
+            _client.BaseAddress = apiBaseAddress;
             _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             _client.DefaultRequestHeaders.Authorization =
                 new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($"{string.Empty}:{personalAccessToken}")));

diff --git a/NuKeeper.AzureDevOps/AzureDevopsPlatform.cs b/NuKeeper.AzureDevOps/AzureDevopsPlatform.cs
@@ -13,11 +13,13 @@ namespace NuKeeper.AzureDevOps
     public class AzureDevOpsPlatform : ICollaborationPlatform
     {
         private readonly INuKeeperLogger _logger;
+        private readonly IHttpClientFactory _clientFactory;
         private AzureDevOpsRestClient _client;
 
-        public AzureDevOpsPlatform(INuKeeperLogger logger)
+        public AzureDevOpsPlatform(INuKeeperLogger logger, IHttpClientFactory clientFactory)
         {
             _logger = logger;
+            _clientFactory = clientFactory;
         }
 
         public void Initialise(AuthSettings settings)
@@ -27,11 +29,7 @@ public void Initialise(AuthSettings settings)
                 throw new ArgumentNullException(nameof(settings));
             }
 
-            var httpClient = new HttpClient
-            {
-                BaseAddress = settings.ApiBase
-            };
-            _client = new AzureDevOpsRestClient(httpClient, _logger, settings.Token);
+            _client = new AzureDevOpsRestClient(_clientFactory, _logger, settings.Token, settings.ApiBase);
         }
 
         public Task<User> GetCurrentUser()

diff --git a/NuKeeper.BitBucket/BitbucketPlatform.cs b/NuKeeper.BitBucket/BitbucketPlatform.cs
@@ -16,22 +16,20 @@ namespace NuKeeper.BitBucket
     public class BitbucketPlatform : ICollaborationPlatform
     {
         private readonly INuKeeperLogger _logger;
+        private readonly IHttpClientFactory _clientFactory;
         private BitbucketRestClient _client;
         private AuthSettings _settings;
 
-        public BitbucketPlatform(INuKeeperLogger logger)
+        public BitbucketPlatform(INuKeeperLogger logger, IHttpClientFactory clientFactory)
         {
             _logger = logger;
+            _clientFactory = clientFactory;
         }
 
         public void Initialise(AuthSettings settings)
         {
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
-            var httpClient = new HttpClient
-            {
-                BaseAddress = settings.ApiBase
-            };
-            _client = new BitbucketRestClient(httpClient, _logger, settings.Username, settings.Token);
+            _client = new BitbucketRestClient(_clientFactory, _logger, settings.Username, settings.Token, settings.ApiBase);
         }
 
         public Task<User> GetCurrentUser()

diff --git a/NuKeeper.BitBucket/BitbucketRestClient.cs b/NuKeeper.BitBucket/BitbucketRestClient.cs
@@ -21,11 +21,13 @@ public class BitbucketRestClient
         private readonly HttpClient _client;
         private readonly INuKeeperLogger _logger;
 
-        public BitbucketRestClient(HttpClient client, INuKeeperLogger logger, string username, string appPassword)
+        public BitbucketRestClient(IHttpClientFactory clientFactory, INuKeeperLogger logger, string username,
+            string appPassword, Uri apiBaseAddress)
         {
-            _client = client ?? throw new ArgumentNullException(nameof(client));
             _logger = logger;
 
+            _client = clientFactory.CreateClient();
+            _client.BaseAddress = apiBaseAddress;
             var byteArray = Encoding.ASCII.GetBytes($"{username}:{appPassword}");
             _client.DefaultRequestHeaders.Authorization =
                 new AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray));

diff --git a/NuKeeper.Git.Tests/GitCmdDiscoveryDriverTest.cs b/NuKeeper.Git.Tests/GitCmdDiscoveryDriverTest.cs
@@ -1,5 +1,4 @@
 using NuKeeper.Abstractions.Logging;
-using NuKeeper.Git;
 using NuKeeper.Inspection.Files;
 using NuKeeper.Inspection.Logging;
 using NUnit.Framework;

diff --git a/NuKeeper.Git.Tests/GitCmdDriverTest.cs b/NuKeeper.Git.Tests/GitCmdDriverTest.cs
@@ -3,11 +3,9 @@
 using NuKeeper.Inspection.Logging;
 using NUnit.Framework;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 

diff --git a/NuKeeper.Git.Tests/NuKeeper.Git.Tests.csproj b/NuKeeper.Git.Tests/NuKeeper.Git.Tests.csproj
@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/NuKeeper.Git/GitCmdDiscoveryDriver.cs b/NuKeeper.Git/GitCmdDiscoveryDriver.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Text.RegularExpressions;
 

diff --git a/NuKeeper.Git/GitCmdDriver.cs b/NuKeeper.Git/GitCmdDriver.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using NuKeeper.Abstractions.CollaborationModels;
 using NuKeeper.Abstractions.Git;
 using NuKeeper.Abstractions.Inspections.Files;
 using NuKeeper.Abstractions.Logging;

diff --git a/NuKeeper.Git/LibGit2SharpDiscoveryDriver.cs b/NuKeeper.Git/LibGit2SharpDiscoveryDriver.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using LibGit2Sharp;

diff --git a/NuKeeper.Git/LibGit2SharpDriver.cs b/NuKeeper.Git/LibGit2SharpDriver.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 using LibGit2Sharp;

diff --git a/NuKeeper.Git/NuKeeper.Git.csproj b/NuKeeper.Git/NuKeeper.Git.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
+    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0034" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuKeeper.GitHub.Tests/NuKeeper.GitHub.Tests.csproj b/NuKeeper.GitHub.Tests/NuKeeper.GitHub.Tests.csproj
@@ -13,10 +13,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/NuKeeper.Gitea.Tests/GiteaSettingsReaderTests.cs b/NuKeeper.Gitea.Tests/GiteaSettingsReaderTests.cs
@@ -1,10 +1,10 @@
 using System;
+using System.Net.Http;
 using System.Threading.Tasks;
 using NSubstitute;
 using NuKeeper.Abstractions.CollaborationPlatform;
 using NuKeeper.Abstractions.Configuration;
 using NuKeeper.Abstractions.Git;
-using NuKeeper.Gitea;
 using NUnit.Framework;
 
 namespace NuKeeper.Gitea.Tests
@@ -21,7 +21,9 @@ public void Setup()
         {
             _environmentVariablesProvider = Substitute.For<IEnvironmentVariablesProvider>();
             _gitDiscovery = Substitute.For<IGitDiscoveryDriver>();
-            _giteaSettingsReader = new GiteaSettingsReader(_gitDiscovery, _environmentVariablesProvider);
+            var httpClientFactory = Substitute.For<IHttpClientFactory>();
+            httpClientFactory.CreateClient().Returns(new HttpClient());
+            _giteaSettingsReader = new GiteaSettingsReader(_gitDiscovery, _environmentVariablesProvider, httpClientFactory);
         }
 
         [Test]

diff --git a/NuKeeper.Gitea.Tests/NuKeeper.Gitea.Tests.csproj b/NuKeeper.Gitea.Tests/NuKeeper.Gitea.Tests.csproj
@@ -13,10 +13,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/NuKeeper.Gitea/GiteaPlatform.cs b/NuKeeper.Gitea/GiteaPlatform.cs
@@ -14,11 +14,13 @@ namespace NuKeeper.Gitea
     public class GiteaPlatform : ICollaborationPlatform
     {
         private readonly INuKeeperLogger _logger;
+        private readonly IHttpClientFactory _clientFactory;
         private GiteaRestClient _client;
 
-        public GiteaPlatform(INuKeeperLogger logger)
+        public GiteaPlatform(INuKeeperLogger logger, IHttpClientFactory clientFactory)
         {
             _logger = logger;
+            _clientFactory = clientFactory;
         }
 
         public void Initialise(AuthSettings settings)
@@ -28,12 +30,7 @@ public void Initialise(AuthSettings settings)
                 throw new ArgumentNullException(nameof(settings));
             }
 
-            var httpClient = new HttpClient
-            {
-                BaseAddress = settings.ApiBase
-            };
-
-            _client = new GiteaRestClient(httpClient, settings.Token, _logger);
+            _client = new GiteaRestClient(_clientFactory, settings.Token, _logger, settings.ApiBase);
         }
 
         public async Task<User> GetCurrentUser()

diff --git a/NuKeeper.Gitea/GiteaRestClient.cs b/NuKeeper.Gitea/GiteaRestClient.cs
@@ -20,11 +20,13 @@ public class GiteaRestClient
         private readonly HttpClient _client;
         private readonly INuKeeperLogger _logger;
 
-        public GiteaRestClient(HttpClient client, string token, INuKeeperLogger logger)
+        public GiteaRestClient(IHttpClientFactory clientFactory, string token, INuKeeperLogger logger,
+            Uri apiBaseAddress)
         {
-            _client = client ?? throw new ArgumentNullException(nameof(client));
             _logger = logger;
 
+            _client = clientFactory.CreateClient();
+            _client.BaseAddress = apiBaseAddress;
             _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", token);
         }

diff --git a/NuKeeper.Gitea/GiteaSettingsReader.cs b/NuKeeper.Gitea/GiteaSettingsReader.cs
@@ -17,10 +17,13 @@ public class GiteaSettingsReader : ISettingsReader
         private const string UrlPattern = "https://yourgiteaserver/{owner}/{repo}.git";
         private const string ApiBaseAdress = "api/v1/";
         private readonly IGitDiscoveryDriver _gitDriver;
+        private readonly IHttpClientFactory _clientFactory;
 
-        public GiteaSettingsReader(IGitDiscoveryDriver gitDiscoveryDriver, IEnvironmentVariablesProvider environmentVariablesProvider)
+        public GiteaSettingsReader(IGitDiscoveryDriver gitDiscoveryDriver, IEnvironmentVariablesProvider environmentVariablesProvider,
+            IHttpClientFactory clientFactory)
         {
             _environmentVariablesProvider = environmentVariablesProvider;
+            _clientFactory = clientFactory;
             _gitDriver = gitDiscoveryDriver;
         }
 
@@ -34,11 +37,8 @@ public async Task<bool> CanRead(Uri repositoryUri)
             try
             {
                 // There is no real identifier for gitea repos so try to get the gitea swagger json
-                var client = new HttpClient()
-                {
-                    BaseAddress = GetBaseAddress(repositoryUri)
-                };
-
+                var client = _clientFactory.CreateClient();
+                client.BaseAddress = GetBaseAddress(repositoryUri);
                 client.DefaultRequestHeaders.Accept.Add(
                     new MediaTypeWithQualityHeaderValue("application/json"));
 

diff --git a/NuKeeper.Gitea/Model/PullRequest.cs b/NuKeeper.Gitea/Model/PullRequest.cs
@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace NuKeeper.Gitea.Model

diff --git a/NuKeeper.Gitlab.Tests/NuKeeper.Gitlab.Tests.csproj b/NuKeeper.Gitlab.Tests/NuKeeper.Gitlab.Tests.csproj
@@ -15,10 +15,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>