Merge pull request #7138 from julenka/fix_mac_generatorwindow

keveleigh · web-flow · commit ef92c578154a · 2020-01-23T19:06:21.000-08:00
Mac fix: remove another hardcoded '\' when creating mrtk auth-generated
diff --git a/Assets/MixedRealityToolkit/Utilities/Editor/Setup/MixedRealityToolkitFiles.cs b/Assets/MixedRealityToolkit/Utilities/Editor/Setup/MixedRealityToolkitFiles.cs
@@ -421,13 +421,13 @@ private static void TryToCreateGeneratedFolder(string folderPath)
             if (generatedDirs == null || !generatedDirs.Any())
             {
                 string parentFolderPath = Directory.GetParent(folderPath).FullName;
-                string generatedFolderPath = parentFolderPath + "\\" + "MixedRealityToolkit.Generated";
+                string generatedFolderPath = Path.Combine(parentFolderPath, "MixedRealityToolkit.Generated");
                 if (!Directory.Exists(generatedFolderPath))
                 {
                     Directory.CreateDirectory(generatedFolderPath);
                 }
 
-                string generatedSentinelFilePath = generatedFolderPath + "\\" + "MRTK.Generated.sentinel";
+                string generatedSentinelFilePath = Path.Combine(generatedFolderPath, "MRTK.Generated.sentinel");
                 if (!File.Exists(generatedSentinelFilePath))
                 {
                     // Make sure we create and dispose/close the filestream just created

Original file line number	Diff line number	Diff line change
`@@ -421,13 +421,13 @@ private static void TryToCreateGeneratedFolder(string folderPath)`
`421`	`421`	`if (generatedDirs == null \|\| !generatedDirs.Any())`
`422`	`422`	`{`
`423`	`423`	`string parentFolderPath = Directory.GetParent(folderPath).FullName;`
`424`		`- string generatedFolderPath = parentFolderPath + "\\" + "MixedRealityToolkit.Generated";`
	`424`	`+ string generatedFolderPath = Path.Combine(parentFolderPath, "MixedRealityToolkit.Generated");`
`425`	`425`	`if (!Directory.Exists(generatedFolderPath))`
`426`	`426`	`{`
`427`	`427`	`Directory.CreateDirectory(generatedFolderPath);`
`428`	`428`	`}`
`429`	`429`
`430`		`- string generatedSentinelFilePath = generatedFolderPath + "\\" + "MRTK.Generated.sentinel";`
	`430`	`+ string generatedSentinelFilePath = Path.Combine(generatedFolderPath, "MRTK.Generated.sentinel");`
`431`	`431`	`if (!File.Exists(generatedSentinelFilePath))`
`432`	`432`	`{`
`433`	`433`	`// Make sure we create and dispose/close the filestream just created`