1 files changed, 8 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/ResXFileCodeGenerator.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/ResXFileCodeGenerator.cs
index eb091e0788..057f2196e5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/ResXFileCodeGenerator.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/ResXFileCodeGenerator.cs
@@ -73,9 +73,14 @@ namespace MonoDevelop.Ide.CustomTools
 			}
 
 			var outputfile = file.FilePath.ChangeExtension (".Designer." + provider.FileExtension);
-			var codeNamespace = CustomToolService.GetFileNamespace (file, outputfile);
-			var name = provider.CreateValidIdentifier (file.FilePath.FileNameWithoutExtension);
-			var resourcesNamespace = dnp.GetDefaultNamespace (outputfile);
+
+			//use the Visual Studio naming polict, so it matches code generated by VS
+			var codeNamespace = CustomToolService.GetFileNamespace (file, outputfile, true);
+
+			//no need to escape/cleanup, StronglyTypedResourceBuilder does that
+			var name = file.FilePath.FileNameWithoutExtension;
+
+			var resourcesNamespace = dnp.GetDefaultNamespace (outputfile, true);
 
 			var rd = new Dictionary<object, object> ();
 			var filePath = file.FilePath;