fix: nuget source management fixes

2chevskii · Jan 23, 2024 · e7de2d7 · e7de2d7
1 parent 1d72196
commit e7de2d7
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 28 deletions.
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -53,6 +53,9 @@
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"
         },
+        "NugetFeed": {
+          "type": "string"
+        },
         "Partition": {
           "type": "string",
           "description": "Partition to use on CI"
@@ -86,8 +89,11 @@
               "CompileTests",
               "CopyLibrariesToArtifactsDirectory",
               "CreateGitHubRelease",
+              "DownloadReleaseAssets",
+              "NugetPush",
               "Pack",
               "Restore",
+              "TestAddSource",
               "UnitTest"
             ]
           }
@@ -110,8 +116,11 @@
               "CompileTests",
               "CopyLibrariesToArtifactsDirectory",
               "CreateGitHubRelease",
+              "DownloadReleaseAssets",
+              "NugetPush",
               "Pack",
               "Restore",
+              "TestAddSource",
               "UnitTest"
             ]
           }

diff --git a/build/Build.cs b/build/Build.cs
@@ -1,8 +1,4 @@
-using Components;
 using Nuke.Common;
-using Nuke.Common.IO;
-using Nuke.Common.ProjectModel;
-using Nuke.Common.Tools.GitVersion;
 
 class Build : NukeBuild, IPack, IClean, INugetPush
 {

diff --git a/build/Components/Configuration.cs b/build/Components/Configuration.cs
@@ -1,6 +1,4 @@
-using System;
 using System.ComponentModel;
-using System.Linq;
 using Nuke.Common.Tooling;
 
 [TypeConverter(typeof(TypeConverter<Configuration>))]

diff --git a/build/Components/ICreateGitHubRelease.cs b/build/Components/ICreateGitHubRelease.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/build/Components/IHazNugetSourceList.cs b/build/Components/IHazNugetSourceList.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using JetBrains.Annotations;
+using Nuke.Common.Tooling;
+using Nuke.Common.Tools.NuGet;
+using Serilog;
+
+
+interface IHazNugetSourceList
+{
+    IEnumerable<NugetSource> NugetSources => NugetSource.GetSources();
+
+    bool HasNugetSource(Uri uri) => HasNugetSource(uri.Host);
+    bool HasNugetSource(string name) => NugetSources.Any(source => source.Name == name);
+
+    public struct NugetSource
+    {
+        [CanBeNull]
+        static IEnumerable<NugetSource> _sources;
+
+        static readonly Regex NameEnabledRegex = new Regex(
+            @"\d+\.\s*([a-zA-Z0-9_\.-]+)\s+\[(Enabled|Disabled)\]"
+        );
+
+        public string Name;
+        public string Uri;
+        public bool Enabled;
+
+        public static IEnumerable<NugetSource> GetSources()
+        {
+            if (_sources == null)
+                _sources = ParseAll(
+                    NuGetTasks
+                        .NuGetSourcesList(settings =>
+                            settings.SetFormat(NuGetSourcesListFormat.Detailed)
+                        )
+                        .Skip(1)
+                        .ToList()
+                );
+
+            return _sources;
+        }
+
+        public static NugetSource Parse(IEnumerable<Output> lines)
+        {
+            var firstLine = lines.First().Text;
+            var nameEnabledMatch = NameEnabledRegex.Match(firstLine);
+            var name = nameEnabledMatch.Groups[1].Value;
+
+            var enabledString = nameEnabledMatch.Groups[2].Value;
+
+            Log.Information("Enabled string: {Str}", enabledString);
+
+            var isEnabled = ParseEnabled(enabledString);
+            var uri = lines.Skip(1).First().Text.Trim();
+
+            return new NugetSource
+            {
+                Name = name,
+                Enabled = isEnabled,
+                Uri = uri
+            };
+        }
+
+        public static IEnumerable<NugetSource> ParseAll(IReadOnlyList<Output> lines)
+        {
+            for (int i = 0; i < lines.Count; i += 2)
+            {
+                var thisLine = lines[i];
+                var nextLine = lines[i + 1];
+                var source = Parse([thisLine, nextLine]);
+                yield return source;
+            }
+        }
+
+        static bool ParseEnabled(string str)
+        {
+            return str switch
+            {
+                "Enabled" or "E" => true,
+                "Disabled" or "D" => false
+            };
+        }
+    }
+}
diff --git a/build/Components/INugetPush.cs b/build/Components/INugetPush.cs
@@ -8,38 +8,36 @@
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.NuGet;
 using Octokit;
-using Serilog;
 using FileMode = System.IO.FileMode;
 
-namespace Components;
-
-interface INugetPush : INukeBuild, ICreateGitHubRelease
+interface INugetPush : INukeBuild, ICreateGitHubRelease, IHazNugetSourceList
 {
     string NugetApiKey => EnvironmentInfo.GetVariable("NUGET_API_KEY");
 
     [Parameter]
     Uri NugetFeed => TryGetValue(() => NugetFeed);
 
+    string NugetSourceName => NugetFeed.Host;
+
+    Target EnsureHasNugetSource =>
+        _ =>
+            _.OnlyWhenDynamic(() => !HasNugetSource(NugetSourceName))
+                .Executes(
+                    () =>
+                        NuGetTasks.NuGetSourcesAdd(settings =>
+                            settings.SetName(NugetSourceName).SetSource(NugetFeed.ToString())
+                        )
+                );
+
     Target NugetPush =>
         _ =>
             _.Requires(() => !string.IsNullOrEmpty(NugetApiKey))
                 .Requires(() => NugetFeed)
                 .Executes(() =>
                 {
-                    try
-                    {
-                        DotNetTasks.DotNetNuGetAddSource(settings =>
-                            settings.SetName(NugetFeed.Host).SetSource(NugetFeed.ToString())
-                        );
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Error("Add source error: {Error}", e.ToString());
-                    }
-
                     DotNetTasks.DotNetNuGetPush(settings =>
                         settings
-                            .SetSource(NugetFeed.Host)
+                            .SetSource(NugetSourceName)
                             .SetApiKey(NugetApiKey)
                             .CombineWith(
                                 PackagesDirectory.GlobFiles("*.nupkg"),

diff --git a/build/Components/IPack.cs b/build/Components/IPack.cs
@@ -1,5 +1,4 @@
 using Nuke.Common;
-using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
 
 interface IPack : ICompile

diff --git a/build/Components/ITest.cs b/build/Components/ITest.cs
@@ -1,7 +1,5 @@
-using System;
-using Extensions;
+using Extensions;
 using Nuke.Common;
-using Nuke.Common.CI.GitHubActions;
 using Nuke.Common.IO;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <PackageDownload Include="GitVersion.Tool" Version="[6.0.0-beta.4]" />
+    <PackageDownload Include="NuGet.CommandLine" Version="[6.8.0]" />
   </ItemGroup>
 
 </Project>