FailOnGitError added

.azure-build.yml

@@ -1,7 +1,7 @@
 strategy:
   matrix:
     Linux:
-      imageName: 'ubuntu-16.04'
+      imageName: 'ubuntu-latest'
     Windows:
       imageName: 'windows-2019'
     Mac:

Docker/SDK2.1/Dockerfile → Docker/SDK5.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1
+FROM mcr.microsoft.com/dotnet/sdk:5.0-focal
 ARG NUKEEPER_VERSION=0.34.0
 RUN dotnet tool install --global NuKeeper --version $NUKEEPER_VERSION
 ENV PATH="${PATH}:/root/.dotnet/tools"

NuKeeper.Abstractions.Tests/NuKeeper.Abstractions.Tests.csproj

@@ -10,14 +10,14 @@
     <ProjectReference Include="..\NuKeeper.Abstractions\NuKeeper.Abstractions.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

NuKeeper.Abstractions/Configuration/AuthSettings.cs

@@ -4,6 +4,13 @@ namespace NuKeeper.Abstractions.Configuration
 {
     public class AuthSettings
     {
+        /// <summary>
+        /// Provide the credentials required to authenticate against a different repository providers.
+        /// </summary>
+        /// <param name="apiBase">Repository URLs e.g. https://dev.azure.com/ or https://api.github.com/ or https://developer.atlassian.com/bitbucket/api/2/reference/</param>
+        /// <param name="token">Personal Access Tokens or Client Secret. The GitHub client with use anonymous authentication it the token is blank. I.e. public repositories</param>
+        /// <param name="username"></param>
+        /// <remarks>See <seealso cref="NuKeeper.Abstractions.CollaborationPlatform.CollaborationPlatformSettings"/> for a similar model.</remarks>
         public AuthSettings(Uri apiBase, string token, string username = null)
         {
             ApiBase = apiBase;

NuKeeper.Abstractions/Configuration/FileSettings.cs

@@ -44,6 +44,7 @@ public class FileSettings
 
         public string GitCliPath { get; set; }
         public int? MaxOpenPullRequests { get; set; }
+        public bool? ThrowOnGitError { get; set; }
 
         public static FileSettings Empty()
         {

NuKeeper.Abstractions/Configuration/UserSettings.cs

@@ -16,6 +16,7 @@ public class UserSettings
 
         public UsePrerelease UsePrerelease { get; set; }
 
+        public bool ThrowOnGitError { get; set; }
 
         public OutputFormat OutputFormat { get; set; }
         public OutputDestination OutputDestination { get; set; }

NuKeeper.Abstractions/NuKeeper.Abstractions.csproj

@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    <PackageReference Include="NuGet.Protocol" Version="5.8.0" />
+    <PackageReference Include="NuGet.Protocol" Version="5.11.0" />
   </ItemGroup>
 
 </Project>

NuKeeper.AzureDevOps/AzureDevOpsSettingsReader.cs

@@ -47,7 +47,7 @@ public override async Task<RepositorySettings> RepositorySettings(Uri repository
 
             var settings = repositoryUri.IsFile
                 ? await CreateSettingsFromLocal(repositoryUri, targetBranch)
-                : CreateSettingsFromRemote(repositoryUri);
+                : CreateSettingsFromRemote(repositoryUri, targetBranch);
 
             if (settings == null)
             {
@@ -59,7 +59,7 @@ public override async Task<RepositorySettings> RepositorySettings(Uri repository
             return settings;
         }
 
-        private static RepositorySettings CreateSettingsFromRemote(Uri repositoryUri)
+        private static RepositorySettings CreateSettingsFromRemote(Uri repositoryUri, string targetBranch)
         {
             // URL pattern is
             // https://dev.azure.com/{org}/{project}/_git/{repo}/
@@ -80,17 +80,17 @@ private static RepositorySettings CreateSettingsFromRemote(Uri repositoryUri)
                     pathParts[0],  //org
                     repositoryUri, //uri
                     Uri.UnescapeDataString(pathParts[1]),  // project
-                    Uri.UnescapeDataString(pathParts[3])   // reponame
-                    );
+                    Uri.UnescapeDataString(pathParts[3]),   // reponame
+                    new RemoteInfo { BranchName = targetBranch });
             }
             else if (indexOfGit == 1 && pathParts.Length == 3)
             {
                 return CreateRepositorySettings(
                     null,          //org
                     repositoryUri, //uri
                     Uri.UnescapeDataString(pathParts[0]),  // project
-                    Uri.UnescapeDataString(pathParts[2])   // reponame
-                    );
+                    Uri.UnescapeDataString(pathParts[2]),   // reponame
+                    new RemoteInfo { BranchName = targetBranch });
             }
             return null;
         }

NuKeeper.Git.Tests/NuKeeper.Git.Tests.csproj

@@ -15,14 +15,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

NuKeeper.Git/LibGit2SharpDriver.cs

@@ -180,12 +180,19 @@ public Task Commit(string message)
         {
             return Task.Run(() =>
             {
-                _logger.Detailed($"Git commit with message '{message}'");
-                using (var repo = MakeRepo())
+                try
+                {
+                    _logger.Detailed($"Git commit with message '{message}'");
+                    using (var repo = MakeRepo())
+                    {
+                        var signature = GetSignature(repo);
+                        GitCommands.Stage(repo, "*");
+                        repo.Commit(message, signature, signature);
+                    }
+                }
+                catch (EmptyCommitException)
                 {
-                    var signature = GetSignature(repo);
-                    GitCommands.Stage(repo, "*");
-                    repo.Commit(message, signature, signature);
+                    _logger.Normal($"Empty commit with message '{message}' is ignored");
                 }
             });
         }

NuKeeper.GitHub.Tests/NuKeeper.GitHub.Tests.csproj

@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

NuKeeper.GitHub/NuKeeper.GitHub.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="0.48.0" />
+    <PackageReference Include="Octokit" Version="0.50.0" />
   </ItemGroup>
 
   <ItemGroup>

NuKeeper.GitHub/OctokitClient.cs

@@ -40,12 +40,20 @@ public void Initialise(AuthSettings settings)
             }
 
             _apiBase = settings.ApiBase;
+            Credentials creds;
+            if (string.IsNullOrWhiteSpace(settings.Token))
+            {
+                creds = Credentials.Anonymous;
+            }
+            else
+            {
+                creds = new Credentials(settings.Token, AuthenticationType.Oauth);
+            }
 
             _client = new GitHubClient(new ProductHeaderValue("NuKeeper"), _apiBase)
             {
-                Credentials = new Credentials(settings.Token)
+                Credentials = creds
             };
-
             _initialised = true;
         }
 
@@ -206,7 +214,6 @@ public async Task<SearchCodeResult> Search(SearchCodeRequest search)
                 {
                     repos.Add(repo.Owner, repo.Name);
                 }
-
                 var result = await _client.Search.SearchCode(
                     new Octokit.SearchCodeRequest()
                     {

NuKeeper.Gitea.Tests/NuKeeper.Gitea.Tests.csproj

@@ -9,14 +9,14 @@
   </PropertyGroup>
 
    <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

NuKeeper.Gitlab.Tests/NuKeeper.Gitlab.Tests.csproj

@@ -10,14 +10,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

NuKeeper.Inspection.Tests/NuGetApi/ApiPackageLookupTests.cs

@@ -25,7 +25,8 @@ public async Task WhenNoPackagesAreFound()
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             Assert.That(updates, Is.Not.Null);
             Assert.That(updates.Major, Is.Null);
@@ -48,7 +49,8 @@ public async Task WhenThereIsOnlyOneVersion()
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             Assert.That(updates, Is.Not.Null);
 
@@ -74,7 +76,8 @@ public async Task WhenMajorVersionChangesAreAllowed(VersionChange dataRange,
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -98,7 +101,8 @@ public async Task WhenMinorVersionChangesAreAllowed(VersionChange dataRange,
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Minor,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -122,7 +126,8 @@ public async Task WhenPatchVersionChangesAreAllowed(VersionChange dataRange,
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Patch,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -132,7 +137,7 @@ public async Task WhenPatchVersionChangesAreAllowed(VersionChange dataRange,
         private static IPackageVersionsLookup MockVersionLookup(List<PackageSearchMetadata> actualResults)
         {
             var allVersions = Substitute.For<IPackageVersionsLookup>();
-            allVersions.Lookup(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<NuGetSources>())
+            allVersions.Lookup(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<NuGetSources>())
                 .Returns(actualResults);
             return allVersions;
         }