Jan 2, 2024 · Dec 7, 2023 · Dec 8, 2023 · Dec 20, 2023 · Jan 2, 2024
diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
    <Compile Include="System\Net\Mail\SmtpFailedRecipientsException.cs" />
    <Compile Include="System\Net\Mail\SmtpStatusCode.cs" />
    <Compile Include="System\Net\DelegatedStream.cs" />
    <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs"
             Link="Common\System\Text\ValueStringBuilder.cs" />
    <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs"
             Link="Common\DisableRuntimeMarshalling.cs" />
    <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs"
diff --git a/src/libraries/System.Net.Mail/src/System/Net/Mail/MailAddressCollection.cs b/src/libraries/System.Net.Mail/src/System/Net/Mail/MailAddressCollection.cs

        internal string Encode(int charsConsumed, bool allowUnicode)
        {
 string encodedAddresses =string.Empty;
 var encodedAddresses =new ValueStringBuilder(stackalloc char[256]);

            //encode each address individually (except the first), fold and separate with a comma
            foreach (MailAddress address in this)
            {
                if (string.IsNullOrEmpty(encodedAddresses))
                if (encodedAddresses.Length == 0)
                {
                    //no need to append a comma to the first one because it may be the only one.
                    encodedAddresses =address.Encode(charsConsumed, allowUnicode);
                    encodedAddresses.Append(address.Encode(charsConsumed, allowUnicode));
                }
                else
                {
                    //appending another one, append a comma to separate and then fold and add the encoded address
                    //the charsConsumed will be 1 because only the first line needs to account for the header itself for
                    //line length; subsequent lines have a single whitespace character because they are folded here
                    encodedAddresses += ", " + address.Encode(1, allowUnicode);
                    encodedAddresses.Append(", ");
                    encodedAddresses.Append(address.Encode(1, allowUnicode));
                }
            }
            return encodedAddresses;
            return encodedAddresses.ToString();
        }
    }
 }
diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
             Link="Common\System\HexConverter.cs" />
    <Compile Include="$(CommonPath)System\Obsoletions.cs"
             Link="Common\System\Obsoletions.cs" />
    <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs"
             Link="Common\System\Text\ValueStringBuilder.cs" />
  </ItemGroup>
  <!-- Unix specific files -->
  <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'unix'">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,6 +68,8 @@
		<Compile Include="System\Net\Mail\SmtpFailedRecipientsException.cs" />
		<Compile Include="System\Net\Mail\SmtpStatusCode.cs" />
		<Compile Include="System\Net\DelegatedStream.cs" />
		<Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs"
		Link="Common\System\Text\ValueStringBuilder.cs" />
		<Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs"
		Link="Common\DisableRuntimeMarshalling.cs" />
		<Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,25 +51,26 @@ internal void ParseValue(string addresses)

		internal string Encode(int charsConsumed, bool allowUnicode)
		{
		string encodedAddresses =string.Empty;
		var encodedAddresses =new ValueStringBuilder(stackalloc char[256]);

		//encode each address individually (except the first), fold and separate with a comma
		foreach (MailAddress address in this)
		{
		if (string.IsNullOrEmpty(encodedAddresses))
		if (encodedAddresses.Length == 0)
		{
		//no need to append a comma to the first one because it may be the only one.
		encodedAddresses =address.Encode(charsConsumed, allowUnicode);
		encodedAddresses.Append(address.Encode(charsConsumed, allowUnicode));
		}
		else
		{
		//appending another one, append a comma to separate and then fold and add the encoded address
		//the charsConsumed will be 1 because only the first line needs to account for the header itself for
		//line length; subsequent lines have a single whitespace character because they are folded here
		encodedAddresses += ", " + address.Encode(1, allowUnicode);
		encodedAddresses.Append(", ");
		encodedAddresses.Append(address.Encode(1, allowUnicode));
		}
		}
		return encodedAddresses;
		return encodedAddresses.ToString();
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,6 +142,8 @@
		Link="Common\System\HexConverter.cs" />
		<Compile Include="$(CommonPath)System\Obsoletions.cs"
		Link="Common\System\Obsoletions.cs" />
		<Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs"
		Link="Common\System\Text\ValueStringBuilder.cs" />
		</ItemGroup>
		<!-- Unix specific files -->
		<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'unix'">
Expand Down