Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -42,11 +42,9 @@ namespace MonoTests.System.Security.Policy {
private string AdjustNewLine (string s)
{
#if NET_2_0
// no spaces are used in Fx 2.0
while (s.IndexOf ("\r\n ") != -1)
s = s.Replace ("\r\n ", "\r\n");
#endif
if (Environment.NewLine != "\r\n")
s = s.Replace ("\r\n", Environment.NewLine);
return s;