From ada10bfdb5f0afc04ee8b80c16471accd4e79ddd Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Fri, 5 Apr 2024 02:25:03 -0700 Subject: [PATCH 1/3] Fix 16071 --- .../FSharp.DependencyManager.Utilities.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs index 875ccec4dd2..bf73fa1826c 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs @@ -320,7 +320,7 @@ module internal Utilities = // https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json // Use enabled feeds only (see NuGet.Commands.ListSourceRunner.Run) and strip off the flags. let pattern = - @"(\s*\d+\.+\s*)(?'name'\S*)(\s*)\[(?'enabled'Enabled|Disabled)\](\s*)$(\s*)(?'uri'\S*)" + @"(\s*\d+\.+\s*)(?'name'\S*)(\s*)\[(?'enabled'Enabled|Disabled)\](\s*)$(\s*)(?'uri'[^\0]+)*$" let regex = new Regex(pattern, RegexOptions.Multiline ||| RegexOptions.ExplicitCapture) From 3cfdf624a60f93cf1a1e5a65c04fb2498fce789e Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Sat, 6 Apr 2024 04:46:55 -0700 Subject: [PATCH 2/3] tweaks --- .../FSharp.DependencyManager.Utilities.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs index bf73fa1826c..5be184d37b1 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs @@ -320,10 +320,10 @@ module internal Utilities = // https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json // Use enabled feeds only (see NuGet.Commands.ListSourceRunner.Run) and strip off the flags. let pattern = - @"(\s*\d+\.+\s*)(?'name'\S*)(\s*)\[(?'enabled'Enabled|Disabled)\](\s*)$(\s*)(?'uri'[^\0]+)*$" + @"(\s*\d+\.+\s*)(?'name'\S*)(\s*)\[(?'enabled'Enabled|Disabled)\](\s*)(?'uri'[^\0\r\n]*)" let regex = - new Regex(pattern, RegexOptions.Multiline ||| RegexOptions.ExplicitCapture) + new Regex(pattern, RegexOptions.ExplicitCapture) let sourcelist = String.concat Environment.NewLine stdOut From 2973660bf7fabbc4db393a76d00b595fccd629b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 05:07:39 +0000 Subject: [PATCH 3/3] Automated command ran: fantomas Co-authored-by: KevinRansom <5175830+KevinRansom@users.noreply.github.com> --- .../FSharp.DependencyManager.Utilities.fs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs index 5be184d37b1..3cbac354977 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs @@ -322,8 +322,7 @@ module internal Utilities = let pattern = @"(\s*\d+\.+\s*)(?'name'\S*)(\s*)\[(?'enabled'Enabled|Disabled)\](\s*)(?'uri'[^\0\r\n]*)" - let regex = - new Regex(pattern, RegexOptions.ExplicitCapture) + let regex = new Regex(pattern, RegexOptions.ExplicitCapture) let sourcelist = String.concat Environment.NewLine stdOut