Add three comma delimeter logic back (#323)

Author: yangpanMS

.pipelines/azure-pipelines-linux.yml

@@ -16,7 +16,7 @@ resources:
     options: --entrypoint=""
 
 variables:
-  VcVersion : 1.14.30
+  VcVersion : 1.14.31
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

.pipelines/azure-pipelines.yml

@@ -18,7 +18,7 @@ pool:
   vmImage: windows-latest
 
 variables:
-  VcVersion : 1.14.30
+  VcVersion : 1.14.31
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/TextParserExtensionsTests.cs

@@ -137,14 +137,23 @@ public void TextParserExtensionsParseVcDelimeteredParameters()
                 { "key3", "v3a;v3b" }
             }, result);
 
-            string complexExample = "key1=v1a;v1b,v1 c;key2=value2;key3=v 3 a;;v3b,,,key4=v4a,,,v4b;v4c;;;v4d";
+            string exampleWithEqualSign = "key1=v1a;v1b,v1c,,,key2=value2a=value2b,,,key3=v3a;v3b";
+            result = TextParsingExtensions.ParseVcDelimiteredParameters(exampleWithEqualSign);
+            CollectionAssert.AreEqual(new Dictionary<string, string>
+            {
+                { "key1", "v1a;v1b,v1c" },
+                { "key2", "value2a=value2b" },
+                { "key3", "v3a;v3b" }
+            }, result);
+
+            string complexExample = "key1=v1a;v1b,v1 c;key2=value2;key3=v 3 a;;v3b;key4=v4a;v4b;v4c;;;v4d";
             result = TextParsingExtensions.ParseVcDelimiteredParameters(complexExample);
             CollectionAssert.AreEqual(new Dictionary<string, string>
             {
                 { "key1", "v1a;v1b,v1 c" },
                 { "key2", "value2" },
                 { "key3", "v 3 a;;v3b" },
-                { "key4", "v4a,,,v4b;v4c;;;v4d" }
+                { "key4", "v4a;v4b;v4c;;;v4d" }
             }, result);
         }
     }

src/VirtualClient/VirtualClient.Contracts/Parser/TextParsingExtensions.cs

@@ -111,23 +111,45 @@ public static IDictionary<string, string> Sectionize(string text, Regex delimite
         public static IDictionary<string, IConvertible> ParseVcDelimiteredParameters(string text)
         {
             IDictionary<string, IConvertible> delimitedValues = new Dictionary<string, IConvertible>(StringComparer.OrdinalIgnoreCase);
-            string[] segments = text.Split('=', StringSplitOptions.TrimEntries);
-            // Only start at second segment and end at second to last segment
-            // Because first segment is the key for first pair, and last segment is the value for last pair.
-            string key = segments[0];
-            for (int i = 1; i < segments.Length - 1; i++)
+
+            if (text.Contains(",,,"))
             {
-                // This is just to 
-                int lastCommaIndex = segments[i].LastIndexOf(",,,");
-                int lastSemicolonIndex = segments[i].LastIndexOf(';');
-                int splitIndex = Math.Max(lastCommaIndex, lastSemicolonIndex);
-
-                string value = segments[i].Substring(0, splitIndex);
-                delimitedValues.Add(key, value);
-                key = segments[i].Substring(splitIndex).Trim(';').Trim(',');
+                // If the list contains three comma",,,", use this as delimeter
+                string[] delimitedProperties = text.Split(",,,", StringSplitOptions.RemoveEmptyEntries);
+
+                if (delimitedProperties?.Any() == true)
+                {
+                    foreach (string property in delimitedProperties)
+                    {
+                        if (property.Contains("=", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            string key = property.Substring(0, property.IndexOf("=", StringComparison.Ordinal));
+                            string value = property.Substring(property.IndexOf("=", StringComparison.Ordinal) + 1);
+                            delimitedValues[key.Trim()] = value.Trim();
+                        }
+                    }
+                }
             }
+            else
+            {
+                string[] segments = text.Split('=', StringSplitOptions.TrimEntries);
+                // Only start at second segment and end at second to last segment
+                // Because first segment is the key for first pair, and last segment is the value for last pair.
+                string key = segments[0];
+                for (int i = 1; i < segments.Length - 1; i++)
+                {
+                    // This is just to 
+                    int lastCommaIndex = segments[i].LastIndexOf(",,,");
+                    int lastSemicolonIndex = segments[i].LastIndexOf(';');
+                    int splitIndex = Math.Max(lastCommaIndex, lastSemicolonIndex);
+
+                    string value = segments[i].Substring(0, splitIndex);
+                    delimitedValues.Add(key, value);
+                    key = segments[i].Substring(splitIndex).Trim(';').Trim(',');
+                }
 
-            delimitedValues.Add(key, segments[segments.Length - 1]);
+                delimitedValues.Add(key, segments[segments.Length - 1]);
+            }
 
             return delimitedValues;
         }