Merge pull request #7131 from davidkline-ms/macConfiguratorFix

keveleigh · web-flow · commit 726902a9989d · 2020-01-23T12:02:53.000-08:00
Mac fix: Remove hardcoded '\' in GetPackageCache
diff --git a/Assets/MixedRealityToolkit/Utilities/Editor/FileUtilities.cs b/Assets/MixedRealityToolkit/Utilities/Editor/FileUtilities.cs
@@ -42,7 +42,7 @@ public static FileInfo[] FindFilesInPackageCache(string fileName)
         /// </returns>
         public static DirectoryInfo GetPackageCache()
         {
-            const string packageCacheFolderName = @"Library\PackageCache";
+            string packageCacheFolderName = Path.Combine("Library", "PackageCache");
 
             DirectoryInfo projectRoot = new DirectoryInfo(Application.dataPath).Parent;
             return new DirectoryInfo(Path.Combine(projectRoot.FullName, packageCacheFolderName));

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static FileInfo[] FindFilesInPackageCache(string fileName)`
`42`	`42`	`/// </returns>`
`43`	`43`	`public static DirectoryInfo GetPackageCache()`
`44`	`44`	`{`
`45`		`- const string packageCacheFolderName = @"Library\PackageCache";`
	`45`	`+ string packageCacheFolderName = Path.Combine("Library", "PackageCache");`
`46`	`46`
`47`	`47`	`DirectoryInfo projectRoot = new DirectoryInfo(Application.dataPath).Parent;`
`48`	`48`	`return new DirectoryInfo(Path.Combine(projectRoot.FullName, packageCacheFolderName));`