update harmony repo, renames Crdt to SIL.Harmony

sillsdev · Jul 26, 2024 · 73525c2 · 73525c2
1 parent 256319b
commit 73525c2
Show file tree

Hide file tree

Showing 31 changed files with 61 additions and 61 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
  [submodule "backend/harmony"]
 	path = backend/harmony
-	url = https://github.com/hahn-kev/harmony.git
+	url = https://github.com/sillsdev/harmony.git
 	branch = main
diff --git a/LexBox.sln b/LexBox.sln
@@ -33,9 +33,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LcmCrdt", "backend\FwLite\L
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LcmCrdt.Tests", "backend\FwLite\LcmCrdt.Tests\LcmCrdt.Tests.csproj", "{7D874D9B-1CA9-49E9-8B03-91B5C324E938}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt", "backend\harmony\src\Crdt\Crdt.csproj", "{740C8FF5-8006-4047-8C52-53873C2DD7C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony", "backend\harmony\src\SIL.Harmony\SIL.Harmony.csproj", "{740C8FF5-8006-4047-8C52-53873C2DD7C4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Core", "backend\harmony\src\Crdt.Core\Crdt.Core.csproj", "{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Core", "backend\harmony\src\SIL.Harmony.Core\SIL.Harmony.Core.csproj", "{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FwDataMiniLcmBridge", "backend\FwLite\FwDataMiniLcmBridge\FwDataMiniLcmBridge.csproj", "{279197B6-EC06-4DE0-94F8-625379C3AD83}"
 EndProject

diff --git a/backend/FwLite/LcmCrdt.Tests/Changes/JsonPatchChangeTests.cs b/backend/FwLite/LcmCrdt.Tests/Changes/JsonPatchChangeTests.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Crdt.Entities;
+using SIL.Harmony.Entities;
 using LcmCrdt.Changes;
 using LcmCrdt.Objects;
 using SystemTextJsonPatch;

diff --git a/backend/FwLite/LcmCrdt.Tests/LcmCrdt.Tests.csproj b/backend/FwLite/LcmCrdt.Tests/LcmCrdt.Tests.csproj
@@ -22,7 +22,7 @@
     <ItemGroup>
         <Using Include="Xunit"/>
         <Using Include="FluentAssertions"/>
-        <Using Include="Crdt"/>
+        <Using Include="SIL.Harmony"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/backend/FwLite/LcmCrdt.Tests/LexboxApiTests.cs b/backend/FwLite/LcmCrdt.Tests/LexboxApiTests.cs
@@ -1,5 +1,5 @@
-using Crdt;
-using Crdt.Db;
+using SIL.Harmony;
+using SIL.Harmony.Db;
 using LcmCrdt.Changes;
 using LcmCrdt.Tests.Mocks;
 using Microsoft.EntityFrameworkCore;

diff --git a/backend/FwLite/LcmCrdt/Changes/AddSemanticDomainChange.cs b/backend/FwLite/LcmCrdt/Changes/AddSemanticDomainChange.cs
@@ -1,5 +1,5 @@
-using Crdt.Changes;
-using Crdt.Entities;
+using SIL.Harmony.Changes;
+using SIL.Harmony.Entities;
 using MiniLcm;
 
 namespace LcmCrdt.Changes;

diff --git a/backend/FwLite/LcmCrdt/Changes/CreatePartOfSpeechChange.cs b/backend/FwLite/LcmCrdt/Changes/CreatePartOfSpeechChange.cs
@@ -1,6 +1,6 @@
-using Crdt;
-using Crdt.Changes;
-using Crdt.Entities;
+using SIL.Harmony;
+using SIL.Harmony.Changes;
+using SIL.Harmony.Entities;
 using MiniLcm;
 using PartOfSpeech = LcmCrdt.Objects.PartOfSpeech;
 

diff --git a/backend/FwLite/LcmCrdt/Changes/JsonPatchChange.cs b/backend/FwLite/LcmCrdt/Changes/JsonPatchChange.cs
@@ -1,10 +1,10 @@
 using System.Buffers;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Crdt;
-using Crdt.Changes;
-using Crdt.Db;
-using Crdt.Entities;
+using SIL.Harmony;
+using SIL.Harmony.Changes;
+using SIL.Harmony.Db;
+using SIL.Harmony.Entities;
 using SystemTextJsonPatch;
 using SystemTextJsonPatch.Internal;
 using SystemTextJsonPatch.Operations;

diff --git a/backend/FwLite/LcmCrdt/Changes/RemoveSemanticDomainChange.cs b/backend/FwLite/LcmCrdt/Changes/RemoveSemanticDomainChange.cs
@@ -1,5 +1,5 @@
-using Crdt.Changes;
-using Crdt.Entities;
+using SIL.Harmony.Changes;
+using SIL.Harmony.Entities;
 
 namespace LcmCrdt.Changes;
 

diff --git a/backend/FwLite/LcmCrdt/CrdtLexboxApi.cs b/backend/FwLite/LcmCrdt/CrdtLexboxApi.cs
@@ -1,8 +1,8 @@
 using System.Linq.Expressions;
 using System.Text.Json;
-using Crdt.Core;
-using Crdt;
-using Crdt.Changes;
+using SIL.Harmony.Core;
+using SIL.Harmony;
+using SIL.Harmony.Changes;
 using LcmCrdt.Changes;
 using MiniLcm;
 using LinqToDB;

diff --git a/backend/FwLite/LcmCrdt/CurrentProjectService.cs b/backend/FwLite/LcmCrdt/CurrentProjectService.cs
@@ -1,4 +1,4 @@
-using Crdt.Db;
+using SIL.Harmony.Db;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 

diff --git a/backend/FwLite/LcmCrdt/LcmCrdt.csproj b/backend/FwLite/LcmCrdt/LcmCrdt.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\harmony\src\Crdt\Crdt.csproj" />
+      <ProjectReference Include="..\..\harmony\src\SIL.Harmony\SIL.Harmony.csproj" />
       <ProjectReference Include="..\MiniLcm\MiniLcm.csproj" />
     </ItemGroup>
 </Project>
diff --git a/backend/FwLite/LcmCrdt/LcmCrdtDbContext.cs b/backend/FwLite/LcmCrdt/LcmCrdtDbContext.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
-using Crdt;
-using Crdt.Db;
+using SIL.Harmony;
+using SIL.Harmony.Db;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.Extensions.Options;

diff --git a/backend/FwLite/LcmCrdt/LcmCrdtKernel.cs b/backend/FwLite/LcmCrdt/LcmCrdtKernel.cs
@@ -1,8 +1,8 @@
 using System.Text.Json;
-using Crdt;
-using Crdt.Core;
-using Crdt;
-using Crdt.Changes;
+using SIL.Harmony;
+using SIL.Harmony.Core;
+using SIL.Harmony;
+using SIL.Harmony.Changes;
 using LcmCrdt.Changes;
 using LcmCrdt.Objects;
 using LinqToDB;

diff --git a/backend/FwLite/LcmCrdt/Objects/Entry.cs b/backend/FwLite/LcmCrdt/Objects/Entry.cs
@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Text.Json.Serialization;
-using Crdt;
-using Crdt.Entities;
+using SIL.Harmony;
+using SIL.Harmony.Entities;
 using LinqToDB;
 using MiniLcm;
 

diff --git a/backend/FwLite/LcmCrdt/Objects/SemanticDomain.cs b/backend/FwLite/LcmCrdt/Objects/SemanticDomain.cs
@@ -1,5 +1,5 @@
-using Crdt;
-using Crdt.Entities;
+using SIL.Harmony;
+using SIL.Harmony.Entities;
 
 namespace LcmCrdt.Objects;
 

diff --git a/backend/FwLite/LcmCrdt/Objects/WritingSystem.cs b/backend/FwLite/LcmCrdt/Objects/WritingSystem.cs
@@ -1,7 +1,7 @@
-using Crdt;
-using Crdt.Changes;
-using Crdt.Db;
-using Crdt.Entities;
+using SIL.Harmony;
+using SIL.Harmony.Changes;
+using SIL.Harmony.Db;
+using SIL.Harmony.Entities;
 using MiniLcm;
 
 namespace LcmCrdt.Objects;

diff --git a/backend/FwLite/LcmCrdt/ProjectsService.cs b/backend/FwLite/LcmCrdt/ProjectsService.cs
@@ -1,5 +1,5 @@
-using Crdt;
-using Crdt.Db;
+using SIL.Harmony;
+using SIL.Harmony.Db;
 using LcmCrdt.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

diff --git a/backend/FwLite/LocalWebApp/BackgroundSyncService.cs b/backend/FwLite/LocalWebApp/BackgroundSyncService.cs
@@ -1,5 +1,5 @@
 using System.Threading.Channels;
-using Crdt;
+using SIL.Harmony;
 using LcmCrdt;
 using LocalWebApp.Auth;
 using Microsoft.Extensions.Options;

diff --git a/backend/FwLite/LocalWebApp/CrdtHttpSyncService.cs b/backend/FwLite/LocalWebApp/CrdtHttpSyncService.cs
@@ -1,6 +1,6 @@
-using Crdt.Core;
-using Crdt;
-using Crdt.Db;
+using SIL.Harmony.Core;
+using SIL.Harmony;
+using SIL.Harmony.Db;
 using LcmCrdt;
 using LocalWebApp.Auth;
 using Refit;

diff --git a/backend/FwLite/LocalWebApp/LocalAppKernel.cs b/backend/FwLite/LocalWebApp/LocalAppKernel.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Crdt;
+using SIL.Harmony;
 using FwDataMiniLcmBridge;
 using LcmCrdt;
 using LocalWebApp.Services;

diff --git a/backend/FwLite/LocalWebApp/Routes/ActivityRoutes.cs b/backend/FwLite/LocalWebApp/Routes/ActivityRoutes.cs
@@ -1,6 +1,6 @@
-using Crdt.Changes;
-using Crdt.Core;
-using Crdt.Db;
+using SIL.Harmony.Changes;
+using SIL.Harmony.Core;
+using SIL.Harmony.Db;
 using LcmCrdt;
 using LocalWebApp.Hubs;
 using Microsoft.EntityFrameworkCore;

diff --git a/backend/FwLite/LocalWebApp/Routes/HistoryRoutes.cs b/backend/FwLite/LocalWebApp/Routes/HistoryRoutes.cs
@@ -1,8 +1,8 @@
-using Crdt;
-using Crdt.Changes;
-using Crdt.Core;
-using Crdt.Db;
-using Crdt.Entities;
+using SIL.Harmony;
+using SIL.Harmony.Changes;
+using SIL.Harmony.Core;
+using SIL.Harmony.Db;
+using SIL.Harmony.Entities;
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using LocalWebApp.Hubs;

diff --git a/backend/FwLite/LocalWebApp/Routes/ImportRoutes.cs b/backend/FwLite/LocalWebApp/Routes/ImportRoutes.cs
@@ -1,4 +1,4 @@
- using Crdt.Db;
+ using SIL.Harmony.Db;
  using LocalWebApp.Services;
  using Microsoft.OpenApi.Models;
 using MiniLcm;

diff --git a/backend/FwLite/LocalWebApp/Routes/TestRoutes.cs b/backend/FwLite/LocalWebApp/Routes/TestRoutes.cs
@@ -1,5 +1,5 @@
-using Crdt.Core;
-using Crdt.Db;
+using SIL.Harmony.Core;
+using SIL.Harmony.Db;
 using LocalWebApp.Hubs;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.OpenApi.Models;

diff --git a/backend/FwLite/LocalWebApp/SyncService.cs b/backend/FwLite/LocalWebApp/SyncService.cs
@@ -1,4 +1,4 @@
-using Crdt;
+using SIL.Harmony;
 using LcmCrdt;
 using LocalWebApp.Auth;
 

diff --git a/backend/LexBoxApi/LexBoxApi.csproj b/backend/LexBoxApi/LexBoxApi.csproj
@@ -55,7 +55,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\harmony\src\Crdt.Core\Crdt.Core.csproj" />
+      <ProjectReference Include="..\harmony\src\SIL.Harmony.Core\SIL.Harmony.Core.csproj" />
       <ProjectReference Include="..\LexCore\LexCore.csproj" />
       <ProjectReference Include="..\LexData\LexData.csproj" />
       <ProjectReference Include="..\LfClassicData\LfClassicData.csproj" />

diff --git a/backend/LexData/Entities/CommitEntityConfiguration.cs b/backend/LexData/Entities/CommitEntityConfiguration.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Crdt.Core;
+using SIL.Harmony.Core;
 using LexCore.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;

diff --git a/backend/LexData/LexData.csproj b/backend/LexData/LexData.csproj
@@ -25,7 +25,7 @@
 </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\harmony\src\Crdt.Core\Crdt.Core.csproj" />
+      <ProjectReference Include="..\harmony\src\SIL.Harmony.Core\SIL.Harmony.Core.csproj" />
       <ProjectReference Include="..\LexCore\LexCore.csproj" />
     </ItemGroup>
 

diff --git a/backend/Testing/LexCore/CrdtServerCommitTests.cs b/backend/Testing/LexCore/CrdtServerCommitTests.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Crdt.Core;
+using SIL.Harmony.Core;
 using LexData;
 using LexData.Entities;
 using Microsoft.EntityFrameworkCore;

diff --git a/backend/harmony b/backend/harmony