Merge pull request #1790 from mono/revert-1787-c9-fix-50415monodevelop-6.2.0.1757

Revert "[Core] Fix bug #50415 - XS keeps rewriting greater than symbol in csp…"

4 files changed, 4 insertions, 54 deletions

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildObject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildObject.cs
index cc82162c1e..40894626db 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildObject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildObject.cs
@@ -237,7 +237,7 @@ namespace MonoDevelop.Projects.MSBuild
 						lastAttr = aname;
 						var val = WriteAttribute (aname);
 						if (val != null)
-							WriteEscapedAttribute (writer, aname, val);
+							writer.WriteAttributeString (aname, val);
 					} else
 						lastAttr = null;
 				} while (unknownIndex < unknownAttributes.Length || knownIndex < knownAtts.Length);
@@ -247,7 +247,7 @@ namespace MonoDevelop.Projects.MSBuild
 					var aname = knownAtts [i];
 					var val = WriteAttribute (aname);
 					if (val != null)
-						WriteEscapedAttribute (writer, aname, val);
+						writer.WriteAttributeString (aname, val);
 				}
 			}
 
@@ -258,20 +258,6 @@ namespace MonoDevelop.Projects.MSBuild
 			MSBuildWhitespace.Write (EndWhitespace, writer);
 		}
 
-		static char [] escapeExceptions = new char [] { '<', '>' };
-
-		void WriteEscapedAttribute (XmlWriter writer, string name, string value)
-		{
-			if (value != null && value.IndexOfAny (escapeExceptions) != -1) {
-				value = value.Replace ("&", "&amp;").Replace ("\"", "&quot;");
-				writer.WriteStartAttribute (name);
-				writer.WriteRaw (value);
-				writer.WriteEndAttribute ();
-			}
-			else
-				writer.WriteAttributeString (name, value);
-		}
-
 		internal bool WasReadAsEmptyElement {
 			get {
 				return emptyElementMode == EmptyElementMode.Empty;
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs
index 730f97bfda..c9fd457a9d 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs
@@ -1248,8 +1248,7 @@ namespace MonoDevelop.Projects
 				"attribute-order.csproj",
 				"custom-namespace.csproj",
 				"multiple-prop-definition.csproj",
-				"env-vars-prop.csproj",
-				"transform.csproj"
+				"env-vars-prop.csproj"
 				//"ICSharpCode.NRefactory.Cecil.csproj"
 			)]
 			string project)
diff --git a/main/tests/test-projects/msbuild-project-test/test.csproj b/main/tests/test-projects/msbuild-project-test/test.csproj
index d34c8a79be..011a1ecd0a 100755
--- a/main/tests/test-projects/msbuild-project-test/test.csproj
+++ b/main/tests/test-projects/msbuild-project-test/test.csproj
@@ -49,7 +49,7 @@
     <None Include="*.txt">
     	<Meta2>$(Configuration)</Meta2>
     </None>
-    <Transformed Include="@(None -> WithMetadataValue('Meta2', 'Debug'))">
+    <Transformed Include="@(None -&gt; WithMetadataValue('Meta2', 'Debug'))">
         <Meta3>$(Configuration)</Meta3>
     </Transformed>
   </ItemGroup>
diff --git a/main/tests/test-projects/roundtrip-test-projects/transform.csproj b/main/tests/test-projects/roundtrip-test-projects/transform.csproj
deleted file mode 100755
index 8c2ba95a82..0000000000
--- a/main/tests/test-projects/roundtrip-test-projects/transform.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4A9E3523-48F0-4BDF-A0F4-49DAD4431FAB}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ConsoleProject</RootNamespace>
-    <AssemblyName>ConsoleProject</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-	<Test Include="@(DeployJar->'$(JavaOutputPath)%(Filename)%(Extension)')" />
-  </ItemGroup>
-</Project>