Merge branch 'release/6.0.4xx' into release/7.0.1xx

Author: Jason Zhai

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildPropertyParser.cs

@@ -65,6 +65,21 @@ void ParseUnquotedValue() {
             while(TryConsume(out char? c) && c != ';') {
                 currentValue.Append(c);
             }
+            // we're either at the end or 
+            if (AtEnd()) return;
+            // we're just past a semicolon
+            // if semicolon, we need to check if there are any other = in the string (signifying property pairs)
+            if (input.IndexOf('=', currentPos) != -1) {
+                // there are more = in the string, so eject and let a new key/value pair be parsed
+                return;
+            } else {
+                currentValue.Append(';');
+                // there are no more = in the string, so consume the remainder of the string
+                while(TryConsume(out char? c))
+                {
+                    currentValue.Append(c);
+                }
+            }
         }
 
         void ParseValue() {

src/Cli/dotnet/OptionForwardingExtensions.cs

@@ -22,8 +22,7 @@ public static ForwardedOption<string[]> ForwardAsProperty(this ForwardedOption<s
             .SetForwardingFunction((optionVals) =>
                 optionVals
                     .SelectMany(Microsoft.DotNet.Cli.Utils.MSBuildPropertyParser.ParseProperties)
-                    // must escape semicolon-delimited property values when forwarding them to MSBuild
-                    .Select(keyValue => $"{option.Aliases.FirstOrDefault()}:{keyValue.key}={keyValue.value.Replace(";", "%3B")}")
+                    .Select(keyValue => $"{option.Aliases.FirstOrDefault()}:{keyValue.key}={keyValue.value}")
                 );
 
         public static Option<T> ForwardAsMany<T>(this ForwardedOption<T> option, Func<T, IEnumerable<string>> format) => option.SetForwardingFunction(format);

src/Tests/dotnet.Tests/ParserTests/MSBuildArgumentCommandLineParserTests.cs

@@ -48,10 +48,11 @@ public void MSBuildArgumentsAreForwardedCorrectly(string[] arguments, bool build
         [Theory]
         [InlineData(new string[] { "-p:teamcity_buildConfName=\"Build, Test and Publish\"" }, new string[] { "--property:teamcity_buildConfName=\"Build, Test and Publish\"" })]
         [InlineData(new string[] { "-p:prop1=true", "-p:prop2=false" }, new string[] { "--property:prop1=true", "--property:prop2=false" })]
-        [InlineData(new string[] { "-p:prop1=\".;/opt/usr\"" }, new string[] { "--property:prop1=\".%3B/opt/usr\"" })]
-        [InlineData(new string[] { "-p:prop1=true;prop2=false;prop3=\"wut\";prop4=\"1;2;3\"" }, new string[]{ "--property:prop1=true", "--property:prop2=false", "--property:prop3=\"wut\"", "--property:prop4=\"1%3B2%3B3\""})]
-        [InlineData(new string[] { "-p:prop4=\"1;2;3\"" }, new string[]{ "--property:prop4=\"1%3B2%3B3\""})]
-        [InlineData(new string[] { "-p:prop4=\"1 ;2 ;3 \"" }, new string[]{ "--property:prop4=\"1 %3B2 %3B3 \""})]
+        [InlineData(new string[] { "-p:prop1=\".;/opt/usr\"" }, new string[] { "--property:prop1=\".;/opt/usr\"" })]
+        [InlineData(new string[] { "-p:prop1=true;prop2=false;prop3=\"wut\";prop4=\"1;2;3\"" }, new string[]{ "--property:prop1=true", "--property:prop2=false", "--property:prop3=\"wut\"", "--property:prop4=\"1;2;3\""})]
+        [InlineData(new string[] { "-p:prop4=\"1;2;3\"" }, new string[]{ "--property:prop4=\"1;2;3\""})]
+        [InlineData(new string[] { "-p:prop4=\"1 ;2 ;3 \"" }, new string[]{ "--property:prop4=\"1 ;2 ;3 \""})]
+        [InlineData(new string[] { "-p:RuntimeIdentifiers=linux-x64;linux-arm64" }, new string[]{ "--property:RuntimeIdentifiers=linux-x64;linux-arm64"})]
         public void Can_pass_msbuild_properties_safely(string[] tokens, string[] forwardedTokens) {
             var forwardingFunction = (CommonOptions.PropertiesOption as ForwardedOption<string[]>).GetForwardingFunction();
             var result = CommonOptions.PropertiesOption.Parse(tokens);