LT22418: take flle not found; try using \r\n

Change-Id: Ibf2f647c5306b37c77f826a47ec78e1c73065501

Author: AndyBlack

Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/PcPatrInvokerTests.cs

@@ -32,6 +32,9 @@ public void PcPatrInvokerTest()
 		{
 			// Check for the existence of the PcPatr executable
 			Assert.IsTrue(File.Exists(Path.Combine(FwDirectoryFinder.ExeOrDllDirectory, "pcpatr64.exe")));
+			// Check for the existence of the PcPatr batch and take files
+			Assert.IsTrue(File.Exists(Path.Combine(Path.GetTempPath(), "PcPatrFLEx.bat")));
+			Assert.IsTrue(File.Exists(Path.Combine(Path.GetTempPath(), "PcPatrFLEx.tak")));
 			string grammarFile = "Invoker.grm";
 			File.Copy(Path.Combine(TestDataDir, grammarFile), Path.Combine(Path.GetTempPath(), grammarFile), true);
 			string anaFile = Path.Combine(TestDataDir, "Invoker.ana");

Src/Utilities/pcpatrflex/DisambiguateInFLExDB/PCPatrInvoker.cs

@@ -50,14 +50,14 @@ private void CreateBatchFile()
 		{
 			BatchFile = Path.Combine(Path.GetTempPath(), "PcPatrFLEx.bat");
 			StringBuilder sbBatchFile = new StringBuilder();
-			sbBatchFile.Append("@echo off\n");
+			sbBatchFile.Append("@echo off\r\n");
 			sbBatchFile.Append("cd \"");
 			sbBatchFile.Append(Path.GetTempPath());
-			sbBatchFile.Append("\"\n\"");
+			sbBatchFile.Append("\"\r\n\"");
 			sbBatchFile.Append(GetPcPatr64ExePath());
 			sbBatchFile.Append("\\pcpatr64\" -t ");
 			sbBatchFile.Append(takeFileName);
-			sbBatchFile.Append("\n");
+			sbBatchFile.Append("\r\n");
 			File.WriteAllText(BatchFile, sbBatchFile.ToString());
 			Console.WriteLine("\nbatch file =");
 			Console.WriteLine("=================================================");
@@ -119,13 +119,13 @@ private void CreateTakeFile()
 			//StringBuilder sbTakeFileShortPath = new StringBuilder(255);
 			//int i = GetShortPathName(takeFile, sbTakeFileShortPath, sbTakeFileShortPath.Capacity);
 			var sbTake = new StringBuilder();
-			sbTake.Append("set comment |\n");
+			sbTake.Append("set comment |\r\n");
 			sbTake.Append("log ");
 			sbTake.Append(logFileName);
-			sbTake.Append("\n");
+			sbTake.Append("\r\n");
 			sbTake.Append("load grammar ");
 			sbTake.Append(GrammarFile);
-			sbTake.Append("\n");
+			sbTake.Append("\r\n");
 			// See if the failure we're getting in GitHub is due to not finding the grammr file:
 			// We'll put it in the temp directory now.
 			//StringBuilder sbGrammarFileShortPath = new StringBuilder(255);
@@ -135,24 +135,24 @@ private void CreateTakeFile()
 			//	sbGrammarFileShortPath.Capacity
 			//);
 			//sbTake.Append(sbGrammarFileShortPath.ToString() + "\n");
-			sbTake.Append("set timing on\n");
-			sbTake.Append("set gloss on\n");
-			sbTake.Append("set features all\n");
+			sbTake.Append("set timing on\r\n");
+			sbTake.Append("set gloss on\r\n");
+			sbTake.Append("set features all\r\n");
 			HandleRootGloss(sbTake);
-			sbTake.Append("set tree xml\n");
+			sbTake.Append("set tree xml\r\n");
 			sbTake.Append("set ambiguities ");
 			sbTake.Append(MaxAmbiguities);
-			sbTake.Append("\n");
+			sbTake.Append("\r\n");
 			if (!TimeLimit.Equals("0"))
 			{
 				sbTake.Append("set limit ");
 				sbTake.Append(TimeLimit);
-				sbTake.Append("\n");
+				sbTake.Append("\r\n");
 			}
-			sbTake.Append("set write-ample-parses on\n");
+			sbTake.Append("set write-ample-parses on\r\n");
 			// since the batch fle defaults to the temp directory, we just use the invoker files as they are
-			sbTake.Append("file disambiguate Invoker.ana Invoker.and\n");
-			sbTake.Append("exit\n");
+			sbTake.Append("file disambiguate Invoker.ana Invoker.and\r\n");
+			sbTake.Append("exit\r\n");
 			File.WriteAllText(takeFile, sbTake.ToString());
 			AndFile = Path.Combine(Path.GetTempPath(), "Invoker.and");
 			Console.WriteLine("\ntake file =");