Use targetBranch when running in a Azure DevOps Pipeline

.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/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,24 +80,27 @@ 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;
         }
 
         private async Task<RepositorySettings> CreateSettingsFromLocal(Uri repositoryUri, string targetBranch)
         {
-            var remoteInfo = new RemoteInfo();
+            var remoteInfo = new RemoteInfo()
+            {
+                BranchName = targetBranch,
+            };
 
             var localCopy = repositoryUri;
             if (await _gitDriver.IsGitRepo(repositoryUri))
@@ -138,7 +141,8 @@ private async Task<RepositorySettings> CreateSettingsFromLocal(Uri repositoryUri
                     pathParts[0],  //org
                     repositoryUri, //uri
                     Uri.UnescapeDataString(pathParts[1]),  // project
-                    Uri.UnescapeDataString(pathParts[3])   // reponame
+                    Uri.UnescapeDataString(pathParts[3]),  // reponame
+                    remoteInfo
                     );
             }
             else if (indexOfGit == 1 && pathParts.Length == 3)
@@ -147,7 +151,8 @@ private async Task<RepositorySettings> CreateSettingsFromLocal(Uri repositoryUri
                     null,          //org
                     repositoryUri, //uri
                     Uri.UnescapeDataString(pathParts[0]),  // project
-                    Uri.UnescapeDataString(pathParts[2])   // reponame
+                    Uri.UnescapeDataString(pathParts[2]),  // reponame
+                    remoteInfo
                     );
             }
             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.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/NuKeeper.Inspection.Tests.csproj

@@ -7,14 +7,14 @@
     <CodeAnalysisRuleSet>..\CodeAnalysisRulesForTests.ruleset</CodeAnalysisRuleSet>
   </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.Integration.Tests/Engine/RepositoryFilterTests.cs

@@ -37,12 +37,10 @@ public async Task ShouldNotFilterOutADotnetRepository()
         }
 
         private RepositoryFilter MakeRepositoryFilter()
-        {
-            const string testKeyWithOnlyPublicAccess = "c13d2ce7774d39ae99ddaad46bd69c3d459b9992";
-
+        {            
             var collaborationFactory = Substitute.For<ICollaborationFactory>();
             var gitHubClient = new OctokitClient(NukeeperLogger);
-            gitHubClient.Initialise(new AuthSettings(new Uri("https://api.github.com"), testKeyWithOnlyPublicAccess));
+            gitHubClient.Initialise(new AuthSettings(new Uri("https://api.github.com"), ""));
             collaborationFactory.CollaborationPlatform.Returns(gitHubClient);
 
             return new RepositoryFilter(collaborationFactory, NukeeperLogger);

NuKeeper.Integration.Tests/NuGet/Process/DotNetUpdatePackageCommandTests.cs

@@ -109,6 +109,13 @@ public async Task ShouldUpdateDotnetClassicWithPackageReference()
             await ExecuteValidUpdateTest(_testDotNetClassicProject, PackageReferenceType.ProjectFileOldStyle);
         }
 
+        [Test]
+        public async Task ShouldUpdateProjectFilenameWithSpaces()
+        {
+            await ExecuteValidUpdateTest(_testDotNetClassicProject, PackageReferenceType.ProjectFileOldStyle, "Project With Spaces.csproj");
+        }
+
+
         private async Task ExecuteValidUpdateTest(
             string testProjectContents,
             PackageReferenceType packageReferenceType,

NuKeeper.Integration.Tests/NuKeeper.Integration.Tests.csproj

@@ -4,18 +4,18 @@
     <CodeAnalysisRuleSet>..\CodeAnalysisRulesForTests.ruleset</CodeAnalysisRuleSet>
   </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>
-    <PackageReference Include="Octokit" Version="0.48.0" />
+    <PackageReference Include="Octokit" Version="0.50.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NuKeeper.Inspection\NuKeeper.Inspection.csproj" />

NuKeeper.Tests/Engine/NugetRestoreTests.cs

@@ -0,0 +1,51 @@
+using NSubstitute;
+using NuKeeper.Abstractions.Logging;
+using NuKeeper.Abstractions.NuGet;
+using NuKeeper.Update.Process;
+using NuKeeper.Update.ProcessRunner;
+using NUnit.Framework;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+
+namespace NuKeeper.Tests.Engine
+{
+    [TestFixture]
+    public class NugetRestoreTests
+    {
+        [Test]
+        public async Task WhenNugetRestoreIsCalledThenArgsIncludePackageDirectory()
+        {
+            var logger = Substitute.For<INuKeeperLogger>();
+            var nuGetPath = Substitute.For<INuGetPath>();
+            var monoExecuter = Substitute.For<IMonoExecutor>();
+            var externalProcess = Substitute.For<IExternalProcess>();
+            var file = new FileInfo("packages.config");
+            nuGetPath.Executable.Returns(@"c:\DoesNotExist\nuget.exe");
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                externalProcess.Run(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>()).Returns(new ProcessOutput("", "", 0));
+            }
+            else
+            {
+                monoExecuter.CanRun().Returns(true);
+                monoExecuter.Run(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>()).Returns(new ProcessOutput("", "", 0));
+            }
+            var cmd = new NuGetFileRestoreCommand(logger, nuGetPath, monoExecuter, externalProcess);
+
+            await cmd.Invoke(file, NuGetSources.GlobalFeed);
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                await externalProcess.Received(1).Run(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>());
+                await externalProcess.ReceivedWithAnyArgs().Run(Arg.Any<string>(), Arg.Any<string>(), $"restore {file.Name} - Source ${NuGetSources.GlobalFeed} -NonInteractive -PackagesDirectory ..\\packages", Arg.Any<bool>());
+            }
+            else
+            {
+                logger.DidNotReceiveWithAnyArgs().Error(Arg.Any<string>(), Arg.Any<System.Exception>());
+                await monoExecuter.Received(1).Run(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>());
+                await monoExecuter.ReceivedWithAnyArgs().Run(Arg.Any<string>(), Arg.Any<string>(), $"restore {file.Name} - Source ${NuGetSources.GlobalFeed} -NonInteractive -PackagesDirectory ..\\packages", Arg.Any<bool>());
+            }
+        }
+    }
+}

NuKeeper.Tests/NuKeeper.Tests.csproj

@@ -4,18 +4,18 @@
     <CodeAnalysisRuleSet>..\CodeAnalysisRulesForTests.ruleset</CodeAnalysisRuleSet>
   </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>
-    <PackageReference Include="SimpleInjector" Version="5.1.0" />
+    <PackageReference Include="SimpleInjector" Version="5.3.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NuKeeper.Abstractions\NuKeeper.Abstractions.csproj" />