Serialize paths using POSIX directory separators.

Stewart Miles · Stewart Miles · commit a4931411f56f · 2019-09-27T14:55:33.000-07:00
Paths in AndroidResolverDependencies.xml were stored with platform specific
directory separators which caused the file to change when a Unity project
was modified on Windows vs. macOS / Linux machines.

Bug: 141772114
Change-Id: Iff79935b2756c4cd85a068b149d5e7b6b51d5a09
diff --git a/source/PlayServicesResolver/src/PlayServicesResolver.cs b/source/PlayServicesResolver/src/PlayServicesResolver.cs
@@ -118,7 +118,7 @@ public void WriteToFile() {
                         writer.WriteStartElement("files");
                         foreach (var assetPath in SortSet(Files)) {
                             writer.WriteStartElement("file");
-                            writer.WriteValue(assetPath);
+                            writer.WriteValue(FileUtils.PosixPathSeparators(assetPath));
                             writer.WriteEndElement();
                         }
                         writer.WriteEndElement();
diff --git a/source/PlayServicesResolver/src/SettingsDialog.cs b/source/PlayServicesResolver/src/SettingsDialog.cs
@@ -337,7 +337,8 @@ public void OnGUI() {
                         path.Substring(startOfPath, path.Length - startOfPath);;
                 }
                 if (!previousPackageDir.Equals(settings.packageDir)) {
-                    settings.packageDir = ValidatePackageDir(settings.packageDir);
+                    settings.packageDir =
+                        FileUtils.PosixPathSeparators(ValidatePackageDir(settings.packageDir));
                 }
                 GUILayout.EndHorizontal();
                 settings.packageDir = EditorGUILayout.TextField(settings.packageDir);

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public void WriteToFile() {`
`118`	`118`	`writer.WriteStartElement("files");`
`119`	`119`	`foreach (var assetPath in SortSet(Files)) {`
`120`	`120`	`writer.WriteStartElement("file");`
`121`		`- writer.WriteValue(assetPath);`
	`121`	`+ writer.WriteValue(FileUtils.PosixPathSeparators(assetPath));`
`122`	`122`	`writer.WriteEndElement();`
`123`	`123`	`}`
`124`	`124`	`writer.WriteEndElement();`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,8 @@ public void OnGUI() {`
`337`	`337`	`path.Substring(startOfPath, path.Length - startOfPath);;`
`338`	`338`	`}`
`339`	`339`	`if (!previousPackageDir.Equals(settings.packageDir)) {`
`340`		`- settings.packageDir = ValidatePackageDir(settings.packageDir);`
	`340`	`+ settings.packageDir =`
	`341`	`+ FileUtils.PosixPathSeparators(ValidatePackageDir(settings.packageDir));`
`341`	`342`	`}`
`342`	`343`	`GUILayout.EndHorizontal();`
`343`	`344`	`settings.packageDir = EditorGUILayout.TextField(settings.packageDir);`