Fix duplicate GUID problem

.gitignore

@@ -12,6 +12,7 @@ artifacts/
 lib/downloads/
 .idea/
 .vs/
+*.bak
 
 src/SIL.LCModel.Core/KernelInterfaces/Kernel.cs
 src/SIL.LCModel/Infrastructure/Impl/Generated*.cs

src/SIL.LCModel/Application/ApplicationServices/XmlImportData.cs

@@ -996,9 +996,14 @@ private void ReadXmlObject(XmlReader xrdr, FieldInfo fi, ICmObject objToUse)
 					Debug.Assert(cmo != null);
 					break;
 				case "PhBdryMarker":
+					IPhBdryMarkerRepository repository = m_cache.ServiceLocator.GetInstance<IPhBdryMarkerRepository>();
 					IPhBdryMarkerFactory factory = m_cache.ServiceLocator.GetInstance<IPhBdryMarkerFactory>();
 					Guid guid = Guid.Parse(xrdr.GetAttribute("Guid"));
-					cmo = factory.Create(guid, (IPhPhonemeSet)fi.Owner);
+					IPhBdryMarker marker;
+					if (repository.TryGetObject(guid, out marker))
+						cmo = marker;
+					else
+						cmo = factory.Create(guid, (IPhPhonemeSet)fi.Owner);
 					// Remove the default code added by PhTerminalUnit.SetDefaultValuesAfterInit in OverridesLing_Lex.
 					(cmo as PhBdryMarker).CodesOS.Clear();
 					break;

tests/SIL.LCModel.Tests/DomainServices/PhonologyServicesTest.cs

@@ -90,24 +90,6 @@ private void SetDefaultVernacularWritingSystem(LcmCache cache, CoreWritingSystem
 				m_cache.ServiceLocator.WritingSystems.DefaultVernacularWritingSystem = vernWritingSystem);
 		}
 
-		/// <summary>
-		/// Test all projects in a directory.
-		/// </summary>
-		/// <param name="directory"></param>
-		private void TestProjects(string directory)
-		{
-			foreach (string subDirectory in Directory.GetDirectories(directory, "*"))
-			{
-				foreach (string project in Directory.GetFiles(subDirectory, "*.fwdata"))
-				{
-					Console.WriteLine("Testing " + project);
-					CreateTestCache();
-					TestProject(subDirectory, project);
-					DestroyTestCache();
-				}
-			}
-		}
-
 		private void TestProject(string projectsDirectory, string dbFileName)
 		{
 			var projectId = new TestProjectId(BackendProviderType.kXML, dbFileName);
@@ -1241,11 +1223,5 @@ public void TestPhonologicalFeatures()
 				TestXml(xdoc, xdoc2);
 			}
 		}
-
-		// [Test]
-		public void TestPCProjects()
-		{
-			TestProjects("C:\\Users\\PC\\source\\repos\\FieldWorks\\DistFiles\\Projects");
-		}
 	}
 }