Fix non-determinism in target feed creation (#8320)

alexperovich · web-flow · commit 34bc5b1611e1 · 2022-01-06T20:20:52.000Z
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigV3.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigV3.cs
@@ -241,7 +241,7 @@ private void CreateStablePackagesFeedIfNeeded()
 
         private string GetFeedOverride(string feed)
         {
-            foreach (var prefix in FeedOverrides.Keys)
+            foreach (var prefix in FeedOverrides.Keys.OrderByDescending(f => f.Length))
             {
                 if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
                 {
@@ -254,7 +254,7 @@ private string GetFeedOverride(string feed)
 
         private string GetFeedSasUri(string feed)
         {
-            foreach (var prefix in FeedSasUris.Keys)
+            foreach (var prefix in FeedSasUris.Keys.OrderByDescending(f => f.Length))
             {
                 if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
                 {
@@ -267,7 +267,7 @@ private string GetFeedSasUri(string feed)
 
         private string GetFeedKey(string feed)
         {
-            foreach (var prefix in FeedKeys.Keys)
+            foreach (var prefix in FeedKeys.Keys.OrderByDescending(f => f.Length))
             {
                 if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
                 {

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private void CreateStablePackagesFeedIfNeeded()`
`241`	`241`
`242`	`242`	`private string GetFeedOverride(string feed)`
`243`	`243`	`{`
`244`		`- foreach (var prefix in FeedOverrides.Keys)`
	`244`	`+ foreach (var prefix in FeedOverrides.Keys.OrderByDescending(f => f.Length))`
`245`	`245`	`{`
`246`	`246`	`if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))`
`247`	`247`	`{`
`@@ -254,7 +254,7 @@ private string GetFeedOverride(string feed)`
`254`	`254`
`255`	`255`	`private string GetFeedSasUri(string feed)`
`256`	`256`	`{`
`257`		`- foreach (var prefix in FeedSasUris.Keys)`
	`257`	`+ foreach (var prefix in FeedSasUris.Keys.OrderByDescending(f => f.Length))`
`258`	`258`	`{`
`259`	`259`	`if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))`
`260`	`260`	`{`
`@@ -267,7 +267,7 @@ private string GetFeedSasUri(string feed)`
`267`	`267`
`268`	`268`	`private string GetFeedKey(string feed)`
`269`	`269`	`{`
`270`		`- foreach (var prefix in FeedKeys.Keys)`
	`270`	`+ foreach (var prefix in FeedKeys.Keys.OrderByDescending(f => f.Length))`
`271`	`271`	`{`
`272`	`272`	`if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))`
`273`	`273`	`{`