From 42f651d00058058b262424c468e8c7e7906c376b Mon Sep 17 00:00:00 2001 From: Kevin Hahn Date: Wed, 17 Jul 2024 09:01:14 +0700 Subject: [PATCH 1/2] rename library from Crdt to SIL.Harmony --- harmony.sln | 10 +++++----- src/Crdt.Sample/Crdt.Sample.csproj | 13 ------------- .../ChangeEntity.cs | 2 +- .../CommitBase.cs | 5 +++-- .../CommitMetadata.cs | 2 +- .../CrdtConstants.cs | 2 +- .../HybridDateTime.cs | 2 +- .../QueryHelpers.cs | 2 +- .../SIL.Harmony.Core.csproj} | 4 ++-- .../ServerCommit.cs | 2 +- src/{Crdt.Core => SIL.Harmony.Core}/SyncState.cs | 2 +- .../Linq2dbKernel.cs | 6 +++--- .../SIL.Harmony.Linq2db.csproj} | 4 ++-- .../Changes/AddAntonymReferenceChange.cs | 10 +++++----- .../Changes/EditExampleChange.cs | 10 +++++----- .../Changes/NewDefinitionChange.cs | 10 +++++----- .../Changes/NewExampleChange.cs | 10 +++++----- .../Changes/NewWordChange.cs | 10 +++++----- .../Changes/SetWordNoteChange.cs | 10 +++++----- .../Changes/SetWordTextChange.cs | 10 +++++----- .../CrdtSampleKernel.cs | 10 +++++----- .../Models/Definition.cs | 8 ++++---- .../Models/Example.cs | 6 +++--- .../Models/Word.cs | 6 +++--- src/SIL.Harmony.Sample/SIL.Harmony.Sample.csproj | 13 +++++++++++++ .../SampleDbContext.cs | 8 ++++---- .../CommitTests.cs | 10 +++++----- .../DataModelIntegrityTests.cs | 4 ++-- ...ts.CanAddReferenceBetweenEntries.verified.txt | 0 .../DataModelReferenceTests.cs | 8 ++++---- ...mpleChanges.WriteMultipleCommits.verified.txt | 0 ...g2ChangesAtOnceWithMergedHistory.verified.txt | 0 ...ngeDoesNotEffectTheFirstSnapshot.verified.txt | 0 ...ges.WritingAChangeMakesASnapshot.verified.txt | 0 ...gACommitWithMultipleChangesWorks.verified.txt | 0 .../DataModelSimpleChanges.cs | 14 +++++++------- .../DataModelTestBase.cs | 16 ++++++++-------- .../DataQueryTests.cs | 4 ++-- .../Db/QueryHelperTests.cs | 8 ++++---- .../DbContextTests.VerifyModel.verified.txt | 0 .../DbContextTests.cs | 6 +++--- .../DefinitionTests.cs | 6 +++--- .../ExampleSentenceTests.cs | 8 ++++---- .../GlobalUsings.cs | 0 .../Mocks/MockTimeProvider.cs | 4 ++-- .../ModelSnapshotTests.cs | 4 ++-- .../ModuleInit.cs | 8 ++++---- .../RepositoryTests.cs | 12 ++++++------ .../SIL.Harmony.Tests.csproj} | 6 +++--- .../SnapshotTests.cs | 4 ++-- .../SyncTests.cs | 4 ++-- src/{Crdt => SIL.Harmony}/Changes/Change.cs | 6 +++--- .../Changes/ChangeContext.cs | 4 ++-- .../Changes/CreateChange.cs | 4 ++-- .../Changes/DeleteChange.cs | 4 ++-- src/{Crdt => SIL.Harmony}/Changes/EditChange.cs | 4 ++-- .../Changes/SetOrderChange.cs | 4 ++-- src/{Crdt => SIL.Harmony}/Commit.cs | 8 ++++---- .../CommitValidationException.cs | 2 +- src/{Crdt => SIL.Harmony}/CrdtConfig.cs | 8 ++++---- src/{Crdt => SIL.Harmony}/CrdtKernel.cs | 6 +++--- src/{Crdt => SIL.Harmony}/DataModel.cs | 10 +++++----- .../Db/CrdtDbContextOptionsExtensions.cs | 4 ++-- src/{Crdt => SIL.Harmony}/Db/CrdtRepository.cs | 10 +++++----- src/{Crdt => SIL.Harmony}/Db/DbSetExtensions.cs | 2 +- .../Db/EntityConfig/ChangeEntityConfig.cs | 6 +++--- .../Db/EntityConfig/CommitEntityConfig.cs | 4 ++-- .../Db/EntityConfig/SnapshotEntityConfig.cs | 4 ++-- src/{Crdt => SIL.Harmony}/Db/ICrdtDbContext.cs | 6 +++--- src/{Crdt => SIL.Harmony}/Db/ObjectSnapshot.cs | 8 ++++---- .../Entities/IObjectBase.cs | 2 +- src/{Crdt => SIL.Harmony}/Entities/IPolyType.cs | 2 +- .../Helpers/DerivedTypeHelper.cs | 4 ++-- src/{Crdt => SIL.Harmony}/ISyncable.cs | 4 ++-- src/{Crdt => SIL.Harmony}/ModelSnapshot.cs | 4 ++-- .../SIL.Harmony.csproj} | 6 +++--- src/{Crdt => SIL.Harmony}/SnapshotWorker.cs | 10 +++++----- src/{Crdt => SIL.Harmony}/SyncHelper.cs | 4 ++-- 78 files changed, 222 insertions(+), 221 deletions(-) delete mode 100644 src/Crdt.Sample/Crdt.Sample.csproj rename src/{Crdt.Core => SIL.Harmony.Core}/ChangeEntity.cs (92%) rename src/{Crdt.Core => SIL.Harmony.Core}/CommitBase.cs (94%) rename src/{Crdt.Core => SIL.Harmony.Core}/CommitMetadata.cs (95%) rename src/{Crdt.Core => SIL.Harmony.Core}/CrdtConstants.cs (92%) rename src/{Crdt.Core => SIL.Harmony.Core}/HybridDateTime.cs (99%) rename src/{Crdt.Core => SIL.Harmony.Core}/QueryHelpers.cs (99%) rename src/{Crdt.Core/Crdt.Core.csproj => SIL.Harmony.Core/SIL.Harmony.Core.csproj} (77%) rename src/{Crdt.Core => SIL.Harmony.Core}/ServerCommit.cs (97%) rename src/{Crdt.Core => SIL.Harmony.Core}/SyncState.cs (89%) rename src/{Crdt.Linq2db => SIL.Harmony.Linq2db}/Linq2dbKernel.cs (95%) rename src/{Crdt.Linq2db/Crdt.Linq2db.csproj => SIL.Harmony.Linq2db/SIL.Harmony.Linq2db.csproj} (70%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Changes/AddAntonymReferenceChange.cs (82%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Changes/EditExampleChange.cs (85%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Changes/NewDefinitionChange.cs (84%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Changes/NewExampleChange.cs (90%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Changes/NewWordChange.cs (72%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Changes/SetWordNoteChange.cs (68%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Changes/SetWordTextChange.cs (84%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/CrdtSampleKernel.cs (90%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Models/Definition.cs (88%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Models/Example.cs (92%) rename src/{Crdt.Sample => SIL.Harmony.Sample}/Models/Word.cs (88%) create mode 100644 src/SIL.Harmony.Sample/SIL.Harmony.Sample.csproj rename src/{Crdt.Sample => SIL.Harmony.Sample}/SampleDbContext.cs (84%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/CommitTests.cs (96%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelIntegrityTests.cs (94%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelReferenceTests.CanAddReferenceBetweenEntries.verified.txt (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelReferenceTests.cs (95%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelSimpleChanges.WriteMultipleCommits.verified.txt (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelSimpleChanges.WritingA2ndChangeDoesNotEffectTheFirstSnapshot.verified.txt (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelSimpleChanges.WritingAChangeMakesASnapshot.verified.txt (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelSimpleChanges.WritingACommitWithMultipleChangesWorks.verified.txt (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelSimpleChanges.cs (97%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataModelTestBase.cs (94%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DataQueryTests.cs (89%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/Db/QueryHelperTests.cs (98%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DbContextTests.VerifyModel.verified.txt (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DbContextTests.cs (97%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/DefinitionTests.cs (97%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/ExampleSentenceTests.cs (95%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/GlobalUsings.cs (100%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/Mocks/MockTimeProvider.cs (91%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/ModelSnapshotTests.cs (98%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/ModuleInit.cs (93%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/RepositoryTests.cs (98%) rename src/{Crdt.Tests/Crdt.Tests.csproj => SIL.Harmony.Tests/SIL.Harmony.Tests.csproj} (88%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/SnapshotTests.cs (97%) rename src/{Crdt.Tests => SIL.Harmony.Tests}/SyncTests.cs (98%) rename src/{Crdt => SIL.Harmony}/Changes/Change.cs (94%) rename src/{Crdt => SIL.Harmony}/Changes/ChangeContext.cs (90%) rename src/{Crdt => SIL.Harmony}/Changes/CreateChange.cs (87%) rename src/{Crdt => SIL.Harmony}/Changes/DeleteChange.cs (85%) rename src/{Crdt => SIL.Harmony}/Changes/EditChange.cs (87%) rename src/{Crdt => SIL.Harmony}/Changes/SetOrderChange.cs (94%) rename src/{Crdt => SIL.Harmony}/Commit.cs (89%) rename src/{Crdt => SIL.Harmony}/CommitValidationException.cs (83%) rename src/{Crdt => SIL.Harmony}/CrdtConfig.cs (98%) rename src/{Crdt => SIL.Harmony}/CrdtKernel.cs (96%) rename src/{Crdt => SIL.Harmony}/DataModel.cs (98%) rename src/{Crdt => SIL.Harmony}/Db/CrdtDbContextOptionsExtensions.cs (92%) rename src/{Crdt => SIL.Harmony}/Db/CrdtRepository.cs (98%) rename src/{Crdt => SIL.Harmony}/Db/DbSetExtensions.cs (98%) rename src/{Crdt => SIL.Harmony}/Db/EntityConfig/ChangeEntityConfig.cs (91%) rename src/{Crdt => SIL.Harmony}/Db/EntityConfig/CommitEntityConfig.cs (95%) rename src/{Crdt => SIL.Harmony}/Db/EntityConfig/SnapshotEntityConfig.cs (94%) rename src/{Crdt => SIL.Harmony}/Db/ICrdtDbContext.cs (90%) rename src/{Crdt => SIL.Harmony}/Db/ObjectSnapshot.cs (95%) rename src/{Crdt => SIL.Harmony}/Entities/IObjectBase.cs (96%) rename src/{Crdt => SIL.Harmony}/Entities/IPolyType.cs (91%) rename src/{Crdt => SIL.Harmony}/Helpers/DerivedTypeHelper.cs (95%) rename src/{Crdt => SIL.Harmony}/ISyncable.cs (95%) rename src/{Crdt => SIL.Harmony}/ModelSnapshot.cs (93%) rename src/{Crdt/Crdt.csproj => SIL.Harmony/SIL.Harmony.csproj} (73%) rename src/{Crdt => SIL.Harmony}/SnapshotWorker.cs (98%) rename src/{Crdt => SIL.Harmony}/SyncHelper.cs (98%) diff --git a/harmony.sln b/harmony.sln index 24e97f3..8fc9d10 100644 --- a/harmony.sln +++ b/harmony.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Core", "src\Crdt.Core\Crdt.Core.csproj", "{9AD0CB91-4C08-4CA8-B65A-9B9217F316B2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Core", "src\SIL.Harmony.Core\SIL.Harmony.Core.csproj", "{9AD0CB91-4C08-4CA8-B65A-9B9217F316B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt", "src\Crdt\Crdt.csproj", "{C4F67DF7-7DA3-4BA6-93E1-13C12AC1B027}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony", "src\SIL.Harmony\SIL.Harmony.csproj", "{C4F67DF7-7DA3-4BA6-93E1-13C12AC1B027}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Sample", "src\Crdt.Sample\Crdt.Sample.csproj", "{AA69420C-9569-4374-8434-6804AA7EC9AE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Sample", "src\SIL.Harmony.Sample\SIL.Harmony.Sample.csproj", "{AA69420C-9569-4374-8434-6804AA7EC9AE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ycs", "src\Ycs\Ycs.csproj", "{BAB394E4-AC1F-4E9B-BA18-88FA70341C1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Tests", "src\Crdt.Tests\Crdt.Tests.csproj", "{58A1DABF-1662-4E1E-A3B7-9F3AC7FC678F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Tests", "src\SIL.Harmony.Tests\SIL.Harmony.Tests.csproj", "{58A1DABF-1662-4E1E-A3B7-9F3AC7FC678F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Linq2db", "src\Crdt.Linq2db\Crdt.Linq2db.csproj", "{8EB807F6-C548-4016-856E-2ACCA5603036}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Linq2db", "src\SIL.Harmony.Linq2db\SIL.Harmony.Linq2db.csproj", "{8EB807F6-C548-4016-856E-2ACCA5603036}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{321635F9-11D9-4B45-A2F8-F3B70E9A4196}" ProjectSection(SolutionItems) = preProject diff --git a/src/Crdt.Sample/Crdt.Sample.csproj b/src/Crdt.Sample/Crdt.Sample.csproj deleted file mode 100644 index dbd787a..0000000 --- a/src/Crdt.Sample/Crdt.Sample.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - Crdt.Sample - - - - - - - - - diff --git a/src/Crdt.Core/ChangeEntity.cs b/src/SIL.Harmony.Core/ChangeEntity.cs similarity index 92% rename from src/Crdt.Core/ChangeEntity.cs rename to src/SIL.Harmony.Core/ChangeEntity.cs index 915ea1f..fec7213 100644 --- a/src/Crdt.Core/ChangeEntity.cs +++ b/src/SIL.Harmony.Core/ChangeEntity.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Crdt.Core; +namespace SIL.Harmony.Core; public class ChangeEntity { diff --git a/src/Crdt.Core/CommitBase.cs b/src/SIL.Harmony.Core/CommitBase.cs similarity index 94% rename from src/Crdt.Core/CommitBase.cs rename to src/SIL.Harmony.Core/CommitBase.cs index 10018df..57556ce 100644 --- a/src/Crdt.Core/CommitBase.cs +++ b/src/SIL.Harmony.Core/CommitBase.cs @@ -2,12 +2,13 @@ using System.Diagnostics.CodeAnalysis; using System.IO.Hashing; using System.Text.Json.Serialization; +using SIL; -namespace Crdt.Core; +namespace SIL.Harmony.Core; /// /// most basic commit, does not contain any change data, that's stored in -/// this class is not meant to be inherited from directly, use or instead +/// this class is not meant to be inherited from directly, use or instead /// public abstract class CommitBase { diff --git a/src/Crdt.Core/CommitMetadata.cs b/src/SIL.Harmony.Core/CommitMetadata.cs similarity index 95% rename from src/Crdt.Core/CommitMetadata.cs rename to src/SIL.Harmony.Core/CommitMetadata.cs index a2167e0..8a4ad9e 100644 --- a/src/Crdt.Core/CommitMetadata.cs +++ b/src/SIL.Harmony.Core/CommitMetadata.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Crdt.Core; +namespace SIL.Harmony.Core; public class CommitMetadata { diff --git a/src/Crdt.Core/CrdtConstants.cs b/src/SIL.Harmony.Core/CrdtConstants.cs similarity index 92% rename from src/Crdt.Core/CrdtConstants.cs rename to src/SIL.Harmony.Core/CrdtConstants.cs index 7471e59..215eca9 100644 --- a/src/Crdt.Core/CrdtConstants.cs +++ b/src/SIL.Harmony.Core/CrdtConstants.cs @@ -1,4 +1,4 @@ -namespace Crdt.Core; +namespace SIL.Harmony.Core; public static class CrdtConstants { diff --git a/src/Crdt.Core/HybridDateTime.cs b/src/SIL.Harmony.Core/HybridDateTime.cs similarity index 99% rename from src/Crdt.Core/HybridDateTime.cs rename to src/SIL.Harmony.Core/HybridDateTime.cs index e141107..e3a2510 100644 --- a/src/Crdt.Core/HybridDateTime.cs +++ b/src/SIL.Harmony.Core/HybridDateTime.cs @@ -1,5 +1,5 @@  -namespace Crdt.Core; +namespace SIL.Harmony.Core; /// /// Hybrid date time represents a hybrid logical clock that combines a datetime and a counter. diff --git a/src/Crdt.Core/QueryHelpers.cs b/src/SIL.Harmony.Core/QueryHelpers.cs similarity index 99% rename from src/Crdt.Core/QueryHelpers.cs rename to src/SIL.Harmony.Core/QueryHelpers.cs index 99795b4..14f65b0 100644 --- a/src/Crdt.Core/QueryHelpers.cs +++ b/src/SIL.Harmony.Core/QueryHelpers.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; -namespace Crdt.Core; +namespace SIL.Harmony.Core; public static class QueryHelpers { diff --git a/src/Crdt.Core/Crdt.Core.csproj b/src/SIL.Harmony.Core/SIL.Harmony.Core.csproj similarity index 77% rename from src/Crdt.Core/Crdt.Core.csproj rename to src/SIL.Harmony.Core/SIL.Harmony.Core.csproj index bcab251..d0ac008 100644 --- a/src/Crdt.Core/Crdt.Core.csproj +++ b/src/SIL.Harmony.Core/SIL.Harmony.Core.csproj @@ -1,10 +1,10 @@  - Crdt.Core + SIL.Harmony.Core - + diff --git a/src/Crdt.Core/ServerCommit.cs b/src/SIL.Harmony.Core/ServerCommit.cs similarity index 97% rename from src/Crdt.Core/ServerCommit.cs rename to src/SIL.Harmony.Core/ServerCommit.cs index b2d3c8c..535ee84 100644 --- a/src/Crdt.Core/ServerCommit.cs +++ b/src/SIL.Harmony.Core/ServerCommit.cs @@ -2,7 +2,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace Crdt.Core; +namespace SIL.Harmony.Core; public class ServerCommit : CommitBase { diff --git a/src/Crdt.Core/SyncState.cs b/src/SIL.Harmony.Core/SyncState.cs similarity index 89% rename from src/Crdt.Core/SyncState.cs rename to src/SIL.Harmony.Core/SyncState.cs index b60bbde..b8ac0d4 100644 --- a/src/Crdt.Core/SyncState.cs +++ b/src/SIL.Harmony.Core/SyncState.cs @@ -1,4 +1,4 @@ -namespace Crdt.Core; +namespace SIL.Harmony.Core; public record SyncState(Dictionary ClientHeads); diff --git a/src/Crdt.Linq2db/Linq2dbKernel.cs b/src/SIL.Harmony.Linq2db/Linq2dbKernel.cs similarity index 95% rename from src/Crdt.Linq2db/Linq2dbKernel.cs rename to src/SIL.Harmony.Linq2db/Linq2dbKernel.cs index a0ff93d..f92d87c 100644 --- a/src/Crdt.Linq2db/Linq2dbKernel.cs +++ b/src/SIL.Harmony.Linq2db/Linq2dbKernel.cs @@ -1,5 +1,5 @@ -using Crdt.Core; -using Crdt.Db; +using SIL.Harmony.Core; +using SIL.Harmony.Db; using LinqToDB; using LinqToDB.AspNet.Logging; using LinqToDB.EntityFrameworkCore; @@ -8,7 +8,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Crdt.Linq2db; +namespace SIL.Harmony.Linq2db; public static class Linq2dbKernel { diff --git a/src/Crdt.Linq2db/Crdt.Linq2db.csproj b/src/SIL.Harmony.Linq2db/SIL.Harmony.Linq2db.csproj similarity index 70% rename from src/Crdt.Linq2db/Crdt.Linq2db.csproj rename to src/SIL.Harmony.Linq2db/SIL.Harmony.Linq2db.csproj index 8284e4c..7338ee0 100644 --- a/src/Crdt.Linq2db/Crdt.Linq2db.csproj +++ b/src/SIL.Harmony.Linq2db/SIL.Harmony.Linq2db.csproj @@ -1,11 +1,11 @@  - Crdt.Linq2db + SIL.Harmony.Linq2db - + diff --git a/src/Crdt.Sample/Changes/AddAntonymReferenceChange.cs b/src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs similarity index 82% rename from src/Crdt.Sample/Changes/AddAntonymReferenceChange.cs rename to src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs index ee92382..6bb678b 100644 --- a/src/Crdt.Sample/Changes/AddAntonymReferenceChange.cs +++ b/src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs @@ -1,9 +1,9 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Sample.Models; -namespace Crdt.Sample.Changes; +namespace SIL.Harmony.Sample.Changes; public class AddAntonymReferenceChange(Guid entityId, Guid antonymId) : EditChange(entityId), ISelfNamedType diff --git a/src/Crdt.Sample/Changes/EditExampleChange.cs b/src/SIL.Harmony.Sample/Changes/EditExampleChange.cs similarity index 85% rename from src/Crdt.Sample/Changes/EditExampleChange.cs rename to src/SIL.Harmony.Sample/Changes/EditExampleChange.cs index 67ca5c5..2f2c276 100644 --- a/src/Crdt.Sample/Changes/EditExampleChange.cs +++ b/src/SIL.Harmony.Sample/Changes/EditExampleChange.cs @@ -1,11 +1,11 @@ using System.Text.Json.Serialization; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Sample.Models; using Ycs; -namespace Crdt.Sample.Changes; +namespace SIL.Harmony.Sample.Changes; public class EditExampleChange : EditChange, ISelfNamedType { diff --git a/src/Crdt.Sample/Changes/NewDefinitionChange.cs b/src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs similarity index 84% rename from src/Crdt.Sample/Changes/NewDefinitionChange.cs rename to src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs index 8d8f50b..845b696 100644 --- a/src/Crdt.Sample/Changes/NewDefinitionChange.cs +++ b/src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs @@ -1,9 +1,9 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Sample.Models; -namespace Crdt.Sample.Changes; +namespace SIL.Harmony.Sample.Changes; public class NewDefinitionChange(Guid entityId) : CreateChange(entityId), ISelfNamedType { diff --git a/src/Crdt.Sample/Changes/NewExampleChange.cs b/src/SIL.Harmony.Sample/Changes/NewExampleChange.cs similarity index 90% rename from src/Crdt.Sample/Changes/NewExampleChange.cs rename to src/SIL.Harmony.Sample/Changes/NewExampleChange.cs index 771e3a4..a293ed3 100644 --- a/src/Crdt.Sample/Changes/NewExampleChange.cs +++ b/src/SIL.Harmony.Sample/Changes/NewExampleChange.cs @@ -1,11 +1,11 @@ using System.Text.Json.Serialization; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Sample.Models; using Ycs; -namespace Crdt.Sample.Changes; +namespace SIL.Harmony.Sample.Changes; public class NewExampleChange : CreateChange, ISelfNamedType { diff --git a/src/Crdt.Sample/Changes/NewWordChange.cs b/src/SIL.Harmony.Sample/Changes/NewWordChange.cs similarity index 72% rename from src/Crdt.Sample/Changes/NewWordChange.cs rename to src/SIL.Harmony.Sample/Changes/NewWordChange.cs index 09ea634..e116e3a 100644 --- a/src/Crdt.Sample/Changes/NewWordChange.cs +++ b/src/SIL.Harmony.Sample/Changes/NewWordChange.cs @@ -1,9 +1,9 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Sample.Models; -namespace Crdt.Sample.Changes; +namespace SIL.Harmony.Sample.Changes; public class NewWordChange(Guid entityId, string text, string? note = null) : CreateChange(entityId), ISelfNamedType { diff --git a/src/Crdt.Sample/Changes/SetWordNoteChange.cs b/src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs similarity index 68% rename from src/Crdt.Sample/Changes/SetWordNoteChange.cs rename to src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs index e3fbb4b..7e4b0b7 100644 --- a/src/Crdt.Sample/Changes/SetWordNoteChange.cs +++ b/src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs @@ -1,9 +1,9 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Sample.Models; -namespace Crdt.Sample.Changes; +namespace SIL.Harmony.Sample.Changes; public class SetWordNoteChange(Guid entityId, string note) : EditChange(entityId), ISelfNamedType { diff --git a/src/Crdt.Sample/Changes/SetWordTextChange.cs b/src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs similarity index 84% rename from src/Crdt.Sample/Changes/SetWordTextChange.cs rename to src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs index e8f09ce..a8b9aa5 100644 --- a/src/Crdt.Sample/Changes/SetWordTextChange.cs +++ b/src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs @@ -1,9 +1,9 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Sample.Models; -namespace Crdt.Sample.Changes; +namespace SIL.Harmony.Sample.Changes; /// /// set text is used in many tests as a simple change that either creates a word, or updates the text of a word. diff --git a/src/Crdt.Sample/CrdtSampleKernel.cs b/src/SIL.Harmony.Sample/CrdtSampleKernel.cs similarity index 90% rename from src/Crdt.Sample/CrdtSampleKernel.cs rename to src/SIL.Harmony.Sample/CrdtSampleKernel.cs index 7aaaaa2..4a8969c 100644 --- a/src/Crdt.Sample/CrdtSampleKernel.cs +++ b/src/SIL.Harmony.Sample/CrdtSampleKernel.cs @@ -1,12 +1,12 @@ using System.Diagnostics; -using Crdt.Changes; -using Crdt.Linq2db; -using Crdt.Sample.Changes; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Linq2db; +using SIL.Harmony.Sample.Changes; +using SIL.Harmony.Sample.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -namespace Crdt.Sample; +namespace SIL.Harmony.Sample; public static class CrdtSampleKernel { diff --git a/src/Crdt.Sample/Models/Definition.cs b/src/SIL.Harmony.Sample/Models/Definition.cs similarity index 88% rename from src/Crdt.Sample/Models/Definition.cs rename to src/SIL.Harmony.Sample/Models/Definition.cs index 4e74ec6..fbb972d 100644 --- a/src/Crdt.Sample/Models/Definition.cs +++ b/src/SIL.Harmony.Sample/Models/Definition.cs @@ -1,8 +1,8 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; -namespace Crdt.Sample.Models; +namespace SIL.Harmony.Sample.Models; public class Definition : IObjectBase, IOrderableCrdt { diff --git a/src/Crdt.Sample/Models/Example.cs b/src/SIL.Harmony.Sample/Models/Example.cs similarity index 92% rename from src/Crdt.Sample/Models/Example.cs rename to src/SIL.Harmony.Sample/Models/Example.cs index 93a5592..92491a8 100644 --- a/src/Crdt.Sample/Models/Example.cs +++ b/src/SIL.Harmony.Sample/Models/Example.cs @@ -1,9 +1,9 @@ using System.Text.Json.Serialization; -using Crdt.Core; -using Crdt.Entities; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; using Ycs; -namespace Crdt.Sample.Models; +namespace SIL.Harmony.Sample.Models; public class Example: IObjectBase { diff --git a/src/Crdt.Sample/Models/Word.cs b/src/SIL.Harmony.Sample/Models/Word.cs similarity index 88% rename from src/Crdt.Sample/Models/Word.cs rename to src/SIL.Harmony.Sample/Models/Word.cs index 6a5525d..3cc701d 100644 --- a/src/Crdt.Sample/Models/Word.cs +++ b/src/SIL.Harmony.Sample/Models/Word.cs @@ -1,7 +1,7 @@ -using Crdt.Core; -using Crdt.Entities; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; -namespace Crdt.Sample.Models; +namespace SIL.Harmony.Sample.Models; public class Word : IObjectBase { diff --git a/src/SIL.Harmony.Sample/SIL.Harmony.Sample.csproj b/src/SIL.Harmony.Sample/SIL.Harmony.Sample.csproj new file mode 100644 index 0000000..00e6969 --- /dev/null +++ b/src/SIL.Harmony.Sample/SIL.Harmony.Sample.csproj @@ -0,0 +1,13 @@ + + + + SIL.Harmony.Sample + + + + + + + + + diff --git a/src/Crdt.Sample/SampleDbContext.cs b/src/SIL.Harmony.Sample/SampleDbContext.cs similarity index 84% rename from src/Crdt.Sample/SampleDbContext.cs rename to src/SIL.Harmony.Sample/SampleDbContext.cs index ae6676e..ecea716 100644 --- a/src/Crdt.Sample/SampleDbContext.cs +++ b/src/SIL.Harmony.Sample/SampleDbContext.cs @@ -1,10 +1,10 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Db; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Db; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; -namespace Crdt.Sample; +namespace SIL.Harmony.Sample; public class SampleDbContext(DbContextOptionsoptions, IOptions crdtConfig): DbContext(options), ICrdtDbContext { diff --git a/src/Crdt.Tests/CommitTests.cs b/src/SIL.Harmony.Tests/CommitTests.cs similarity index 96% rename from src/Crdt.Tests/CommitTests.cs rename to src/SIL.Harmony.Tests/CommitTests.cs index e06f803..1f5aea7 100644 --- a/src/Crdt.Tests/CommitTests.cs +++ b/src/SIL.Harmony.Tests/CommitTests.cs @@ -1,12 +1,12 @@ using System.IO.Hashing; using System.Text.Json; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Sample; -using Crdt.Sample.Changes; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Sample; +using SIL.Harmony.Sample.Changes; using Microsoft.Extensions.DependencyInjection; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class CommitTests { diff --git a/src/Crdt.Tests/DataModelIntegrityTests.cs b/src/SIL.Harmony.Tests/DataModelIntegrityTests.cs similarity index 94% rename from src/Crdt.Tests/DataModelIntegrityTests.cs rename to src/SIL.Harmony.Tests/DataModelIntegrityTests.cs index 60a967f..9cacb88 100644 --- a/src/Crdt.Tests/DataModelIntegrityTests.cs +++ b/src/SIL.Harmony.Tests/DataModelIntegrityTests.cs @@ -1,6 +1,6 @@ -using Crdt.Sample.Models; +using SIL.Harmony.Sample.Models; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class DataModelIntegrityTests : DataModelTestBase { diff --git a/src/Crdt.Tests/DataModelReferenceTests.CanAddReferenceBetweenEntries.verified.txt b/src/SIL.Harmony.Tests/DataModelReferenceTests.CanAddReferenceBetweenEntries.verified.txt similarity index 100% rename from src/Crdt.Tests/DataModelReferenceTests.CanAddReferenceBetweenEntries.verified.txt rename to src/SIL.Harmony.Tests/DataModelReferenceTests.CanAddReferenceBetweenEntries.verified.txt diff --git a/src/Crdt.Tests/DataModelReferenceTests.cs b/src/SIL.Harmony.Tests/DataModelReferenceTests.cs similarity index 95% rename from src/Crdt.Tests/DataModelReferenceTests.cs rename to src/SIL.Harmony.Tests/DataModelReferenceTests.cs index d12db6a..c8dfc31 100644 --- a/src/Crdt.Tests/DataModelReferenceTests.cs +++ b/src/SIL.Harmony.Tests/DataModelReferenceTests.cs @@ -1,7 +1,7 @@ -using Crdt.Changes; -using Crdt.Sample.Changes; -using Crdt.Sample.Models; -using Crdt.Tests; +using SIL.Harmony.Changes; +using SIL.Harmony.Sample.Changes; +using SIL.Harmony.Sample.Models; +using SIL.Harmony.Tests; namespace Tests; diff --git a/src/Crdt.Tests/DataModelSimpleChanges.WriteMultipleCommits.verified.txt b/src/SIL.Harmony.Tests/DataModelSimpleChanges.WriteMultipleCommits.verified.txt similarity index 100% rename from src/Crdt.Tests/DataModelSimpleChanges.WriteMultipleCommits.verified.txt rename to src/SIL.Harmony.Tests/DataModelSimpleChanges.WriteMultipleCommits.verified.txt diff --git a/src/Crdt.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt b/src/SIL.Harmony.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt similarity index 100% rename from src/Crdt.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt rename to src/SIL.Harmony.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt diff --git a/src/Crdt.Tests/DataModelSimpleChanges.WritingA2ndChangeDoesNotEffectTheFirstSnapshot.verified.txt b/src/SIL.Harmony.Tests/DataModelSimpleChanges.WritingA2ndChangeDoesNotEffectTheFirstSnapshot.verified.txt similarity index 100% rename from src/Crdt.Tests/DataModelSimpleChanges.WritingA2ndChangeDoesNotEffectTheFirstSnapshot.verified.txt rename to src/SIL.Harmony.Tests/DataModelSimpleChanges.WritingA2ndChangeDoesNotEffectTheFirstSnapshot.verified.txt diff --git a/src/Crdt.Tests/DataModelSimpleChanges.WritingAChangeMakesASnapshot.verified.txt b/src/SIL.Harmony.Tests/DataModelSimpleChanges.WritingAChangeMakesASnapshot.verified.txt similarity index 100% rename from src/Crdt.Tests/DataModelSimpleChanges.WritingAChangeMakesASnapshot.verified.txt rename to src/SIL.Harmony.Tests/DataModelSimpleChanges.WritingAChangeMakesASnapshot.verified.txt diff --git a/src/Crdt.Tests/DataModelSimpleChanges.WritingACommitWithMultipleChangesWorks.verified.txt b/src/SIL.Harmony.Tests/DataModelSimpleChanges.WritingACommitWithMultipleChangesWorks.verified.txt similarity index 100% rename from src/Crdt.Tests/DataModelSimpleChanges.WritingACommitWithMultipleChangesWorks.verified.txt rename to src/SIL.Harmony.Tests/DataModelSimpleChanges.WritingACommitWithMultipleChangesWorks.verified.txt diff --git a/src/Crdt.Tests/DataModelSimpleChanges.cs b/src/SIL.Harmony.Tests/DataModelSimpleChanges.cs similarity index 97% rename from src/Crdt.Tests/DataModelSimpleChanges.cs rename to src/SIL.Harmony.Tests/DataModelSimpleChanges.cs index 906a9b8..b1def18 100644 --- a/src/Crdt.Tests/DataModelSimpleChanges.cs +++ b/src/SIL.Harmony.Tests/DataModelSimpleChanges.cs @@ -1,11 +1,11 @@ using Argon; -using Crdt; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Db; -using Crdt.Sample.Changes; -using Crdt.Sample.Models; -using Crdt.Tests; +using SIL.Harmony; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Db; +using SIL.Harmony.Sample.Changes; +using SIL.Harmony.Sample.Models; +using SIL.Harmony.Tests; using Microsoft.EntityFrameworkCore; namespace Tests; diff --git a/src/Crdt.Tests/DataModelTestBase.cs b/src/SIL.Harmony.Tests/DataModelTestBase.cs similarity index 94% rename from src/Crdt.Tests/DataModelTestBase.cs rename to src/SIL.Harmony.Tests/DataModelTestBase.cs index f6e1843..c359a72 100644 --- a/src/Crdt.Tests/DataModelTestBase.cs +++ b/src/SIL.Harmony.Tests/DataModelTestBase.cs @@ -1,15 +1,15 @@ -using Crdt.Changes; -using Crdt.Core; -using Crdt.Db; -using Crdt.Sample; -using Crdt.Sample.Changes; -using Crdt.Sample.Models; -using Crdt.Tests.Mocks; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; +using SIL.Harmony.Db; +using SIL.Harmony.Sample; +using SIL.Harmony.Sample.Changes; +using SIL.Harmony.Sample.Models; +using SIL.Harmony.Tests.Mocks; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class DataModelTestBase : IAsyncLifetime { diff --git a/src/Crdt.Tests/DataQueryTests.cs b/src/SIL.Harmony.Tests/DataQueryTests.cs similarity index 89% rename from src/Crdt.Tests/DataQueryTests.cs rename to src/SIL.Harmony.Tests/DataQueryTests.cs index 729be70..a2ac334 100644 --- a/src/Crdt.Tests/DataQueryTests.cs +++ b/src/SIL.Harmony.Tests/DataQueryTests.cs @@ -1,7 +1,7 @@ -using Crdt.Sample.Models; +using SIL.Harmony.Sample.Models; using Microsoft.EntityFrameworkCore; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class DataQueryTests: DataModelTestBase { diff --git a/src/Crdt.Tests/Db/QueryHelperTests.cs b/src/SIL.Harmony.Tests/Db/QueryHelperTests.cs similarity index 98% rename from src/Crdt.Tests/Db/QueryHelperTests.cs rename to src/SIL.Harmony.Tests/Db/QueryHelperTests.cs index ac26c40..89f474d 100644 --- a/src/Crdt.Tests/Db/QueryHelperTests.cs +++ b/src/SIL.Harmony.Tests/Db/QueryHelperTests.cs @@ -1,8 +1,8 @@ -using Crdt.Core; -using Crdt.Db; -using Crdt.Tests.Mocks; +using SIL.Harmony.Core; +using SIL.Harmony.Db; +using SIL.Harmony.Tests.Mocks; -namespace Crdt.Tests.Db; +namespace SIL.Harmony.Tests.Db; public class QueryHelperTests { diff --git a/src/Crdt.Tests/DbContextTests.VerifyModel.verified.txt b/src/SIL.Harmony.Tests/DbContextTests.VerifyModel.verified.txt similarity index 100% rename from src/Crdt.Tests/DbContextTests.VerifyModel.verified.txt rename to src/SIL.Harmony.Tests/DbContextTests.VerifyModel.verified.txt diff --git a/src/Crdt.Tests/DbContextTests.cs b/src/SIL.Harmony.Tests/DbContextTests.cs similarity index 97% rename from src/Crdt.Tests/DbContextTests.cs rename to src/SIL.Harmony.Tests/DbContextTests.cs index 3d72ff0..723d933 100644 --- a/src/Crdt.Tests/DbContextTests.cs +++ b/src/SIL.Harmony.Tests/DbContextTests.cs @@ -1,11 +1,11 @@ -using Crdt.Core; -using Crdt.Tests; +using SIL.Harmony.Core; +using SIL.Harmony.Tests; using LinqToDB; using LinqToDB.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class DbContextTests: DataModelTestBase { diff --git a/src/Crdt.Tests/DefinitionTests.cs b/src/SIL.Harmony.Tests/DefinitionTests.cs similarity index 97% rename from src/Crdt.Tests/DefinitionTests.cs rename to src/SIL.Harmony.Tests/DefinitionTests.cs index 4f69007..5281548 100644 --- a/src/Crdt.Tests/DefinitionTests.cs +++ b/src/SIL.Harmony.Tests/DefinitionTests.cs @@ -1,8 +1,8 @@ -using Crdt.Changes; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Sample.Models; using Microsoft.EntityFrameworkCore; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class DefinitionTests : DataModelTestBase { diff --git a/src/Crdt.Tests/ExampleSentenceTests.cs b/src/SIL.Harmony.Tests/ExampleSentenceTests.cs similarity index 95% rename from src/Crdt.Tests/ExampleSentenceTests.cs rename to src/SIL.Harmony.Tests/ExampleSentenceTests.cs index f5f1087..259c6c9 100644 --- a/src/Crdt.Tests/ExampleSentenceTests.cs +++ b/src/SIL.Harmony.Tests/ExampleSentenceTests.cs @@ -1,8 +1,8 @@ -using Crdt.Changes; -using Crdt.Sample.Changes; -using Crdt.Sample.Models; +using SIL.Harmony.Changes; +using SIL.Harmony.Sample.Changes; +using SIL.Harmony.Sample.Models; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class ExampleSentenceTests : DataModelTestBase { diff --git a/src/Crdt.Tests/GlobalUsings.cs b/src/SIL.Harmony.Tests/GlobalUsings.cs similarity index 100% rename from src/Crdt.Tests/GlobalUsings.cs rename to src/SIL.Harmony.Tests/GlobalUsings.cs diff --git a/src/Crdt.Tests/Mocks/MockTimeProvider.cs b/src/SIL.Harmony.Tests/Mocks/MockTimeProvider.cs similarity index 91% rename from src/Crdt.Tests/Mocks/MockTimeProvider.cs rename to src/SIL.Harmony.Tests/Mocks/MockTimeProvider.cs index 42a662b..921673a 100644 --- a/src/Crdt.Tests/Mocks/MockTimeProvider.cs +++ b/src/SIL.Harmony.Tests/Mocks/MockTimeProvider.cs @@ -1,6 +1,6 @@ -using Crdt.Core; +using SIL.Harmony.Core; -namespace Crdt.Tests.Mocks; +namespace SIL.Harmony.Tests.Mocks; public class MockTimeProvider: IHybridDateTimeProvider { diff --git a/src/Crdt.Tests/ModelSnapshotTests.cs b/src/SIL.Harmony.Tests/ModelSnapshotTests.cs similarity index 98% rename from src/Crdt.Tests/ModelSnapshotTests.cs rename to src/SIL.Harmony.Tests/ModelSnapshotTests.cs index 9578c96..04bbcf9 100644 --- a/src/Crdt.Tests/ModelSnapshotTests.cs +++ b/src/SIL.Harmony.Tests/ModelSnapshotTests.cs @@ -1,7 +1,7 @@ -using Crdt.Sample.Models; +using SIL.Harmony.Sample.Models; using Microsoft.EntityFrameworkCore; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class ModelSnapshotTests : DataModelTestBase { diff --git a/src/Crdt.Tests/ModuleInit.cs b/src/SIL.Harmony.Tests/ModuleInit.cs similarity index 93% rename from src/Crdt.Tests/ModuleInit.cs rename to src/SIL.Harmony.Tests/ModuleInit.cs index a0c668c..4b820ae 100644 --- a/src/Crdt.Tests/ModuleInit.cs +++ b/src/SIL.Harmony.Tests/ModuleInit.cs @@ -1,12 +1,12 @@ using System.Linq.Expressions; using System.Runtime.CompilerServices; using Argon; -using Crdt.Core; -using Crdt.Db; -using Crdt.Sample; +using SIL.Harmony.Core; +using SIL.Harmony.Db; +using SIL.Harmony.Sample; using Microsoft.Extensions.DependencyInjection; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class ModuleInit { diff --git a/src/Crdt.Tests/RepositoryTests.cs b/src/SIL.Harmony.Tests/RepositoryTests.cs similarity index 98% rename from src/Crdt.Tests/RepositoryTests.cs rename to src/SIL.Harmony.Tests/RepositoryTests.cs index 887e0b5..b5a7609 100644 --- a/src/Crdt.Tests/RepositoryTests.cs +++ b/src/SIL.Harmony.Tests/RepositoryTests.cs @@ -1,12 +1,12 @@ -using Crdt.Core; -using Crdt.Db; -using Crdt.Sample; -using Crdt.Sample.Models; -using Crdt.Tests.Mocks; +using SIL.Harmony.Core; +using SIL.Harmony.Db; +using SIL.Harmony.Sample; +using SIL.Harmony.Sample.Models; +using SIL.Harmony.Tests.Mocks; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class RepositoryTests : IAsyncLifetime { diff --git a/src/Crdt.Tests/Crdt.Tests.csproj b/src/SIL.Harmony.Tests/SIL.Harmony.Tests.csproj similarity index 88% rename from src/Crdt.Tests/Crdt.Tests.csproj rename to src/SIL.Harmony.Tests/SIL.Harmony.Tests.csproj index fc12795..615050f 100644 --- a/src/Crdt.Tests/Crdt.Tests.csproj +++ b/src/SIL.Harmony.Tests/SIL.Harmony.Tests.csproj @@ -3,7 +3,7 @@ false true - Crdt.Tests + SIL.Harmony.Tests @@ -29,8 +29,8 @@ - - + + diff --git a/src/Crdt.Tests/SnapshotTests.cs b/src/SIL.Harmony.Tests/SnapshotTests.cs similarity index 97% rename from src/Crdt.Tests/SnapshotTests.cs rename to src/SIL.Harmony.Tests/SnapshotTests.cs index 5eda8c1..3967228 100644 --- a/src/Crdt.Tests/SnapshotTests.cs +++ b/src/SIL.Harmony.Tests/SnapshotTests.cs @@ -1,7 +1,7 @@ -using Crdt.Sample.Models; +using SIL.Harmony.Sample.Models; using Microsoft.EntityFrameworkCore; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class SnapshotTests : DataModelTestBase { diff --git a/src/Crdt.Tests/SyncTests.cs b/src/SIL.Harmony.Tests/SyncTests.cs similarity index 98% rename from src/Crdt.Tests/SyncTests.cs rename to src/SIL.Harmony.Tests/SyncTests.cs index 42d4bdf..df043c2 100644 --- a/src/Crdt.Tests/SyncTests.cs +++ b/src/SIL.Harmony.Tests/SyncTests.cs @@ -1,6 +1,6 @@ -using Crdt.Sample.Models; +using SIL.Harmony.Sample.Models; -namespace Crdt.Tests; +namespace SIL.Harmony.Tests; public class SyncTests : IAsyncLifetime { diff --git a/src/Crdt/Changes/Change.cs b/src/SIL.Harmony/Changes/Change.cs similarity index 94% rename from src/Crdt/Changes/Change.cs rename to src/SIL.Harmony/Changes/Change.cs index f9ac59f..837883e 100644 --- a/src/Crdt/Changes/Change.cs +++ b/src/SIL.Harmony/Changes/Change.cs @@ -1,8 +1,8 @@ using System.Text.Json.Serialization; -using Crdt.Core; -using Crdt.Entities; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; -namespace Crdt.Changes; +namespace SIL.Harmony.Changes; [JsonPolymorphic(TypeDiscriminatorPropertyName = CrdtConstants.ChangeDiscriminatorProperty)] public interface IChange diff --git a/src/Crdt/Changes/ChangeContext.cs b/src/SIL.Harmony/Changes/ChangeContext.cs similarity index 90% rename from src/Crdt/Changes/ChangeContext.cs rename to src/SIL.Harmony/Changes/ChangeContext.cs index 17d0851..d589374 100644 --- a/src/Crdt/Changes/ChangeContext.cs +++ b/src/SIL.Harmony/Changes/ChangeContext.cs @@ -1,6 +1,6 @@ -using Crdt.Db; +using SIL.Harmony.Db; -namespace Crdt.Changes; +namespace SIL.Harmony.Changes; public class ChangeContext { diff --git a/src/Crdt/Changes/CreateChange.cs b/src/SIL.Harmony/Changes/CreateChange.cs similarity index 87% rename from src/Crdt/Changes/CreateChange.cs rename to src/SIL.Harmony/Changes/CreateChange.cs index 50bf341..ed2ac78 100644 --- a/src/Crdt/Changes/CreateChange.cs +++ b/src/SIL.Harmony/Changes/CreateChange.cs @@ -1,6 +1,6 @@ -using Crdt.Entities; +using SIL.Harmony.Entities; -namespace Crdt.Changes; +namespace SIL.Harmony.Changes; public abstract class CreateChange(Guid entityId) : Change(entityId) where T : IObjectBase diff --git a/src/Crdt/Changes/DeleteChange.cs b/src/SIL.Harmony/Changes/DeleteChange.cs similarity index 85% rename from src/Crdt/Changes/DeleteChange.cs rename to src/SIL.Harmony/Changes/DeleteChange.cs index e24c836..c945a60 100644 --- a/src/Crdt/Changes/DeleteChange.cs +++ b/src/SIL.Harmony/Changes/DeleteChange.cs @@ -1,6 +1,6 @@ -using Crdt.Entities; +using SIL.Harmony.Entities; -namespace Crdt.Changes; +namespace SIL.Harmony.Changes; public class DeleteChange(Guid entityId) : EditChange(entityId), IPolyType where T : IPolyType, IObjectBase diff --git a/src/Crdt/Changes/EditChange.cs b/src/SIL.Harmony/Changes/EditChange.cs similarity index 87% rename from src/Crdt/Changes/EditChange.cs rename to src/SIL.Harmony/Changes/EditChange.cs index b6548f0..73c6458 100644 --- a/src/Crdt/Changes/EditChange.cs +++ b/src/SIL.Harmony/Changes/EditChange.cs @@ -1,6 +1,6 @@ -using Crdt.Entities; +using SIL.Harmony.Entities; -namespace Crdt.Changes; +namespace SIL.Harmony.Changes; public abstract class EditChange(Guid entityId) : Change(entityId) where T : IObjectBase diff --git a/src/Crdt/Changes/SetOrderChange.cs b/src/SIL.Harmony/Changes/SetOrderChange.cs similarity index 94% rename from src/Crdt/Changes/SetOrderChange.cs rename to src/SIL.Harmony/Changes/SetOrderChange.cs index b5b5cef..091a0ba 100644 --- a/src/Crdt/Changes/SetOrderChange.cs +++ b/src/SIL.Harmony/Changes/SetOrderChange.cs @@ -1,6 +1,6 @@ -using Crdt.Entities; +using SIL.Harmony.Entities; -namespace Crdt.Changes; +namespace SIL.Harmony.Changes; public interface IOrderableCrdt { diff --git a/src/Crdt/Commit.cs b/src/SIL.Harmony/Commit.cs similarity index 89% rename from src/Crdt/Commit.cs rename to src/SIL.Harmony/Commit.cs index ffcd31d..c95fd8b 100644 --- a/src/Crdt/Commit.cs +++ b/src/SIL.Harmony/Commit.cs @@ -1,9 +1,9 @@ using System.Text.Json.Serialization; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Db; +using SIL.Harmony.Core; +using SIL.Harmony.Changes; +using SIL.Harmony.Db; -namespace Crdt; +namespace SIL.Harmony; public class Commit : CommitBase { diff --git a/src/Crdt/CommitValidationException.cs b/src/SIL.Harmony/CommitValidationException.cs similarity index 83% rename from src/Crdt/CommitValidationException.cs rename to src/SIL.Harmony/CommitValidationException.cs index c9efa7e..f8f1844 100644 --- a/src/Crdt/CommitValidationException.cs +++ b/src/SIL.Harmony/CommitValidationException.cs @@ -1,4 +1,4 @@ -namespace Crdt; +namespace SIL.Harmony; public class CommitValidationException: Exception { diff --git a/src/Crdt/CrdtConfig.cs b/src/SIL.Harmony/CrdtConfig.cs similarity index 98% rename from src/Crdt/CrdtConfig.cs rename to src/SIL.Harmony/CrdtConfig.cs index 1ab9e61..94159b9 100644 --- a/src/Crdt/CrdtConfig.cs +++ b/src/SIL.Harmony/CrdtConfig.cs @@ -1,12 +1,12 @@ using System.Text.Json; using System.Text.Json.Serialization.Metadata; -using Crdt.Changes; -using Crdt.Db; -using Crdt.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using SIL.Harmony.Changes; +using SIL.Harmony.Db; +using SIL.Harmony.Entities; -namespace Crdt; +namespace SIL.Harmony; public class CrdtConfig { diff --git a/src/Crdt/CrdtKernel.cs b/src/SIL.Harmony/CrdtKernel.cs similarity index 96% rename from src/Crdt/CrdtKernel.cs rename to src/SIL.Harmony/CrdtKernel.cs index 0a5bdea..7a4f85c 100644 --- a/src/Crdt/CrdtKernel.cs +++ b/src/SIL.Harmony/CrdtKernel.cs @@ -1,10 +1,10 @@ using System.Text.Json; -using Crdt.Core; -using Crdt.Db; +using SIL.Harmony.Core; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; +using SIL.Harmony.Db; -namespace Crdt; +namespace SIL.Harmony; public static class CrdtKernel { diff --git a/src/Crdt/DataModel.cs b/src/SIL.Harmony/DataModel.cs similarity index 98% rename from src/Crdt/DataModel.cs rename to src/SIL.Harmony/DataModel.cs index c721c92..1adc21c 100644 --- a/src/Crdt/DataModel.cs +++ b/src/SIL.Harmony/DataModel.cs @@ -1,11 +1,11 @@ using System.Text.Json; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Db; -using Crdt.Entities; +using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; +using SIL.Harmony.Changes; +using SIL.Harmony.Db; +using SIL.Harmony.Entities; -namespace Crdt; +namespace SIL.Harmony; public record SyncResults(Commit[] MissingFromLocal, Commit[] MissingFromRemote, bool IsSynced); diff --git a/src/Crdt/Db/CrdtDbContextOptionsExtensions.cs b/src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs similarity index 92% rename from src/Crdt/Db/CrdtDbContextOptionsExtensions.cs rename to src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs index c04f843..10a48e2 100644 --- a/src/Crdt/Db/CrdtDbContextOptionsExtensions.cs +++ b/src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs @@ -1,8 +1,8 @@ using System.Text.Json; -using Crdt.Db.EntityConfig; using Microsoft.EntityFrameworkCore; +using SIL.Harmony.Db.EntityConfig; -namespace Crdt.Db; +namespace SIL.Harmony.Db; public static class CrdtDbContextModelExtensions { diff --git a/src/Crdt/Db/CrdtRepository.cs b/src/SIL.Harmony/Db/CrdtRepository.cs similarity index 98% rename from src/Crdt/Db/CrdtRepository.cs rename to src/SIL.Harmony/Db/CrdtRepository.cs index 65817f1..7cbe821 100644 --- a/src/Crdt/Db/CrdtRepository.cs +++ b/src/SIL.Harmony/Db/CrdtRepository.cs @@ -1,14 +1,14 @@ using System.Linq.Expressions; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Helpers; +using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.Options; +using SIL.Harmony.Changes; +using SIL.Harmony.Entities; +using SIL.Harmony.Helpers; -namespace Crdt.Db; +namespace SIL.Harmony.Db; internal class CrdtRepository(ICrdtDbContext _dbContext, IOptions crdtConfig, DateTimeOffset? ignoreChangesAfter = null) { diff --git a/src/Crdt/Db/DbSetExtensions.cs b/src/SIL.Harmony/Db/DbSetExtensions.cs similarity index 98% rename from src/Crdt/Db/DbSetExtensions.cs rename to src/SIL.Harmony/Db/DbSetExtensions.cs index 4e8c59d..73e2e4b 100644 --- a/src/Crdt/Db/DbSetExtensions.cs +++ b/src/SIL.Harmony/Db/DbSetExtensions.cs @@ -1,4 +1,4 @@ -namespace Crdt.Db; +namespace SIL.Harmony.Db; //todo, I would like to move these extensions into QueryHelperTests but that's in Core and ObjectSnapshot is not part of core public static class DbSetExtensions diff --git a/src/Crdt/Db/EntityConfig/ChangeEntityConfig.cs b/src/SIL.Harmony/Db/EntityConfig/ChangeEntityConfig.cs similarity index 91% rename from src/Crdt/Db/EntityConfig/ChangeEntityConfig.cs rename to src/SIL.Harmony/Db/EntityConfig/ChangeEntityConfig.cs index c3d09c6..fadd671 100644 --- a/src/Crdt/Db/EntityConfig/ChangeEntityConfig.cs +++ b/src/SIL.Harmony/Db/EntityConfig/ChangeEntityConfig.cs @@ -1,11 +1,11 @@ using System.Runtime.Serialization; using System.Text.Json; -using Crdt.Changes; -using Crdt.Core; +using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using SIL.Harmony.Changes; -namespace Crdt.Db.EntityConfig; +namespace SIL.Harmony.Db.EntityConfig; public class ChangeEntityConfig(JsonSerializerOptions jsonSerializerOptions) : IEntityTypeConfiguration> { diff --git a/src/Crdt/Db/EntityConfig/CommitEntityConfig.cs b/src/SIL.Harmony/Db/EntityConfig/CommitEntityConfig.cs similarity index 95% rename from src/Crdt/Db/EntityConfig/CommitEntityConfig.cs rename to src/SIL.Harmony/Db/EntityConfig/CommitEntityConfig.cs index db5a5b1..5fbcf41 100644 --- a/src/Crdt/Db/EntityConfig/CommitEntityConfig.cs +++ b/src/SIL.Harmony/Db/EntityConfig/CommitEntityConfig.cs @@ -1,9 +1,9 @@ using System.Text.Json; -using Crdt.Core; +using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace Crdt.Db.EntityConfig; +namespace SIL.Harmony.Db.EntityConfig; public class CommitEntityConfig : IEntityTypeConfiguration { diff --git a/src/Crdt/Db/EntityConfig/SnapshotEntityConfig.cs b/src/SIL.Harmony/Db/EntityConfig/SnapshotEntityConfig.cs similarity index 94% rename from src/Crdt/Db/EntityConfig/SnapshotEntityConfig.cs rename to src/SIL.Harmony/Db/EntityConfig/SnapshotEntityConfig.cs index c2c46a6..47c65ce 100644 --- a/src/Crdt/Db/EntityConfig/SnapshotEntityConfig.cs +++ b/src/SIL.Harmony/Db/EntityConfig/SnapshotEntityConfig.cs @@ -1,10 +1,10 @@ using System.Runtime.Serialization; using System.Text.Json; -using Crdt.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using SIL.Harmony.Entities; -namespace Crdt.Db.EntityConfig; +namespace SIL.Harmony.Db.EntityConfig; public class SnapshotEntityConfig(JsonSerializerOptions jsonSerializerOptions) : IEntityTypeConfiguration { diff --git a/src/Crdt/Db/ICrdtDbContext.cs b/src/SIL.Harmony/Db/ICrdtDbContext.cs similarity index 90% rename from src/Crdt/Db/ICrdtDbContext.cs rename to src/SIL.Harmony/Db/ICrdtDbContext.cs index 6a14112..70f9801 100644 --- a/src/Crdt/Db/ICrdtDbContext.cs +++ b/src/SIL.Harmony/Db/ICrdtDbContext.cs @@ -1,10 +1,10 @@ -using Crdt.Changes; -using Crdt.Core; +using SIL.Harmony.Changes; +using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace Crdt.Db; +namespace SIL.Harmony.Db; public interface ICrdtDbContext { diff --git a/src/Crdt/Db/ObjectSnapshot.cs b/src/SIL.Harmony/Db/ObjectSnapshot.cs similarity index 95% rename from src/Crdt/Db/ObjectSnapshot.cs rename to src/SIL.Harmony/Db/ObjectSnapshot.cs index e7c17e9..e9715ea 100644 --- a/src/Crdt/Db/ObjectSnapshot.cs +++ b/src/SIL.Harmony/Db/ObjectSnapshot.cs @@ -1,10 +1,10 @@ using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -using Crdt.Core; -using Crdt.Entities; -using Crdt.Helpers; +using SIL.Harmony.Core; +using SIL.Harmony.Entities; +using SIL.Harmony.Helpers; -namespace Crdt.Db; +namespace SIL.Harmony.Db; public record SimpleSnapshot( Guid Id, diff --git a/src/Crdt/Entities/IObjectBase.cs b/src/SIL.Harmony/Entities/IObjectBase.cs similarity index 96% rename from src/Crdt/Entities/IObjectBase.cs rename to src/SIL.Harmony/Entities/IObjectBase.cs index 87e560e..0d6366d 100644 --- a/src/Crdt/Entities/IObjectBase.cs +++ b/src/SIL.Harmony/Entities/IObjectBase.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Crdt.Entities; +namespace SIL.Harmony.Entities; [JsonPolymorphic] public interface IObjectBase: IPolyType diff --git a/src/Crdt/Entities/IPolyType.cs b/src/SIL.Harmony/Entities/IPolyType.cs similarity index 91% rename from src/Crdt/Entities/IPolyType.cs rename to src/SIL.Harmony/Entities/IPolyType.cs index 32e8088..e7b2089 100644 --- a/src/Crdt/Entities/IPolyType.cs +++ b/src/SIL.Harmony/Entities/IPolyType.cs @@ -1,4 +1,4 @@ -namespace Crdt.Entities; +namespace SIL.Harmony.Entities; /// /// used to denote a type with a name, used for polymorphic serialization (where there's a type property that discriminates between different types) diff --git a/src/Crdt/Helpers/DerivedTypeHelper.cs b/src/SIL.Harmony/Helpers/DerivedTypeHelper.cs similarity index 95% rename from src/Crdt/Helpers/DerivedTypeHelper.cs rename to src/SIL.Harmony/Helpers/DerivedTypeHelper.cs index 9e4b373..fff0619 100644 --- a/src/Crdt/Helpers/DerivedTypeHelper.cs +++ b/src/SIL.Harmony/Helpers/DerivedTypeHelper.cs @@ -1,8 +1,8 @@ using System.Runtime.CompilerServices; using System.Text.Json.Serialization.Metadata; -using Crdt.Entities; +using SIL.Harmony.Entities; -namespace Crdt.Helpers; +namespace SIL.Harmony.Helpers; internal static class DerivedTypeHelper { diff --git a/src/Crdt/ISyncable.cs b/src/SIL.Harmony/ISyncable.cs similarity index 95% rename from src/Crdt/ISyncable.cs rename to src/SIL.Harmony/ISyncable.cs index 0d385e6..22df057 100644 --- a/src/Crdt/ISyncable.cs +++ b/src/SIL.Harmony/ISyncable.cs @@ -1,6 +1,6 @@ -using Crdt.Core; +using SIL.Harmony.Core; -namespace Crdt; +namespace SIL.Harmony; public interface ISyncable { diff --git a/src/Crdt/ModelSnapshot.cs b/src/SIL.Harmony/ModelSnapshot.cs similarity index 93% rename from src/Crdt/ModelSnapshot.cs rename to src/SIL.Harmony/ModelSnapshot.cs index 7e668b3..96e3a48 100644 --- a/src/Crdt/ModelSnapshot.cs +++ b/src/SIL.Harmony/ModelSnapshot.cs @@ -1,6 +1,6 @@ -using Crdt.Db; +using SIL.Harmony.Db; -namespace Crdt; +namespace SIL.Harmony; public class ModelSnapshot { diff --git a/src/Crdt/Crdt.csproj b/src/SIL.Harmony/SIL.Harmony.csproj similarity index 73% rename from src/Crdt/Crdt.csproj rename to src/SIL.Harmony/SIL.Harmony.csproj index d7d1edb..2844de2 100644 --- a/src/Crdt/Crdt.csproj +++ b/src/SIL.Harmony/SIL.Harmony.csproj @@ -1,11 +1,11 @@ - Crdt + SIL.Harmony - + @@ -17,7 +17,7 @@ - + diff --git a/src/Crdt/SnapshotWorker.cs b/src/SIL.Harmony/SnapshotWorker.cs similarity index 98% rename from src/Crdt/SnapshotWorker.cs rename to src/SIL.Harmony/SnapshotWorker.cs index a5567e1..68dcaa4 100644 --- a/src/Crdt/SnapshotWorker.cs +++ b/src/SIL.Harmony/SnapshotWorker.cs @@ -1,12 +1,12 @@ using System.Diagnostics; using System.Linq.Expressions; -using Crdt.Changes; -using Crdt.Core; -using Crdt.Db; -using Crdt.Entities; +using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; +using SIL.Harmony.Changes; +using SIL.Harmony.Db; +using SIL.Harmony.Entities; -namespace Crdt; +namespace SIL.Harmony; /// /// helper service to update snapshots and apply commits to them, has mutable state, don't reuse diff --git a/src/Crdt/SyncHelper.cs b/src/SIL.Harmony/SyncHelper.cs similarity index 98% rename from src/Crdt/SyncHelper.cs rename to src/SIL.Harmony/SyncHelper.cs index 0042a52..4e108fe 100644 --- a/src/Crdt/SyncHelper.cs +++ b/src/SIL.Harmony/SyncHelper.cs @@ -1,7 +1,7 @@ using System.Text.Json; -using Crdt.Core; +using SIL.Harmony.Core; -namespace Crdt; +namespace SIL.Harmony; internal static class SyncHelper { From d78344a97c1bc3eb9b6c8fecd0f056883f20d272 Mon Sep 17 00:00:00 2001 From: Kevin Hahn Date: Wed, 17 Jul 2024 09:02:10 +0700 Subject: [PATCH 2/2] remove unused `using` statements --- src/SIL.Harmony.Core/CommitBase.cs | 5 +---- src/SIL.Harmony.Core/CommitMetadata.cs | 4 +--- src/SIL.Harmony.Linq2db/Linq2dbKernel.cs | 2 -- src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs | 1 - src/SIL.Harmony.Sample/Changes/EditExampleChange.cs | 1 - src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs | 1 - src/SIL.Harmony.Sample/Changes/NewExampleChange.cs | 1 - src/SIL.Harmony.Sample/Changes/NewWordChange.cs | 1 - src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs | 1 - src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs | 1 - src/SIL.Harmony.Sample/Models/Definition.cs | 1 - src/SIL.Harmony.Sample/Models/Example.cs | 1 - src/SIL.Harmony.Sample/Models/Word.cs | 3 +-- src/SIL.Harmony.Tests/DataModelSimpleChanges.cs | 2 -- src/SIL.Harmony.Tests/DataModelTestBase.cs | 1 - src/SIL.Harmony.Tests/DbContextTests.cs | 1 - src/SIL.Harmony.Tests/ModuleInit.cs | 1 - src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs | 1 - src/SIL.Harmony/Db/CrdtRepository.cs | 3 +-- src/SIL.Harmony/Db/ICrdtDbContext.cs | 2 -- src/SIL.Harmony/SnapshotWorker.cs | 1 - src/Ycs/Protocols/SyncProtocol.cs | 3 --- src/Ycs/Structs/ContentAny.cs | 2 -- src/Ycs/Structs/ContentBinary.cs | 3 --- src/Ycs/Structs/ContentDeleted.cs | 2 -- src/Ycs/Structs/ContentDoc.cs | 3 --- src/Ycs/Structs/ContentEmbed.cs | 3 --- src/Ycs/Structs/ContentFormat.cs | 3 --- src/Ycs/Structs/ContentJson.cs | 1 - src/Ycs/Structs/ContentString.cs | 2 -- src/Ycs/Structs/ContentType.cs | 3 --- src/Ycs/Structs/IContent.cs | 2 -- src/Ycs/Structs/Item.cs | 2 -- src/Ycs/Types/AbstractType.cs | 4 ---- src/Ycs/Types/YArray.cs | 2 -- src/Ycs/Types/YArrayBase.cs | 4 ---- src/Ycs/Types/YMap.cs | 2 -- src/Ycs/Types/YText.cs | 2 -- src/Ycs/Utils/AbsolutePosition.cs | 1 - src/Ycs/Utils/DeleteSet.cs | 2 -- src/Ycs/Utils/EncodingUtils.cs | 4 ---- src/Ycs/Utils/ID.cs | 2 -- src/Ycs/Utils/IUpdateDecoder.cs | 3 --- src/Ycs/Utils/IUpdateEncoder.cs | 3 --- src/Ycs/Utils/RelativePosition.cs | 3 --- src/Ycs/Utils/Snapshot.cs | 5 ----- src/Ycs/Utils/StructStore.cs | 4 ---- src/Ycs/Utils/Transaction.cs | 3 --- src/Ycs/Utils/UndoManager.cs | 4 ---- src/Ycs/Utils/UpdateDecoderV2.cs | 3 --- src/Ycs/Utils/UpdateEncoderV2.cs | 3 --- src/Ycs/Utils/YDoc.cs | 4 ---- src/Ycs/Utils/YEvent.cs | 3 --- src/Ycs/lib0/Decoding/AbstractStreamDecoder.cs | 2 -- src/Ycs/lib0/Decoding/IDecoder.cs | 2 -- src/Ycs/lib0/Decoding/IncUintOptRleDecoder.cs | 2 -- src/Ycs/lib0/Decoding/IntDiffDecoder.cs | 2 -- src/Ycs/lib0/Decoding/IntDiffOptRleDecoder.cs | 2 -- src/Ycs/lib0/Decoding/RleDecoder.cs | 1 - src/Ycs/lib0/Decoding/RleIntDiffDecoder.cs | 1 - src/Ycs/lib0/Decoding/StringDecoder.cs | 2 -- src/Ycs/lib0/Decoding/UintOptRleDecoder.cs | 2 -- src/Ycs/lib0/Encoding/AbstractStreamEncoder.cs | 2 -- src/Ycs/lib0/Encoding/IEncoder.cs | 2 -- src/Ycs/lib0/Encoding/StringEncoder.cs | 2 -- src/Ycs/lib0/StreamDecodingExtensions.cs | 3 --- src/Ycs/lib0/StreamEncodingExtensions.cs | 2 -- 67 files changed, 4 insertions(+), 148 deletions(-) diff --git a/src/SIL.Harmony.Core/CommitBase.cs b/src/SIL.Harmony.Core/CommitBase.cs index 57556ce..47dc6a7 100644 --- a/src/SIL.Harmony.Core/CommitBase.cs +++ b/src/SIL.Harmony.Core/CommitBase.cs @@ -1,8 +1,5 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using System.IO.Hashing; +using System.IO.Hashing; using System.Text.Json.Serialization; -using SIL; namespace SIL.Harmony.Core; diff --git a/src/SIL.Harmony.Core/CommitMetadata.cs b/src/SIL.Harmony.Core/CommitMetadata.cs index 8a4ad9e..eae61f5 100644 --- a/src/SIL.Harmony.Core/CommitMetadata.cs +++ b/src/SIL.Harmony.Core/CommitMetadata.cs @@ -1,6 +1,4 @@ -using System.Text.Json.Serialization; - -namespace SIL.Harmony.Core; +namespace SIL.Harmony.Core; public class CommitMetadata { diff --git a/src/SIL.Harmony.Linq2db/Linq2dbKernel.cs b/src/SIL.Harmony.Linq2db/Linq2dbKernel.cs index f92d87c..5c32565 100644 --- a/src/SIL.Harmony.Linq2db/Linq2dbKernel.cs +++ b/src/SIL.Harmony.Linq2db/Linq2dbKernel.cs @@ -1,6 +1,4 @@ using SIL.Harmony.Core; -using SIL.Harmony.Db; -using LinqToDB; using LinqToDB.AspNet.Logging; using LinqToDB.EntityFrameworkCore; using LinqToDB.Mapping; diff --git a/src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs b/src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs index 6bb678b..c6c0846 100644 --- a/src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs +++ b/src/SIL.Harmony.Sample/Changes/AddAntonymReferenceChange.cs @@ -1,5 +1,4 @@ using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Sample/Changes/EditExampleChange.cs b/src/SIL.Harmony.Sample/Changes/EditExampleChange.cs index 2f2c276..a66810d 100644 --- a/src/SIL.Harmony.Sample/Changes/EditExampleChange.cs +++ b/src/SIL.Harmony.Sample/Changes/EditExampleChange.cs @@ -1,6 +1,5 @@ using System.Text.Json.Serialization; using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using SIL.Harmony.Sample.Models; using Ycs; diff --git a/src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs b/src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs index 845b696..7660d10 100644 --- a/src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs +++ b/src/SIL.Harmony.Sample/Changes/NewDefinitionChange.cs @@ -1,5 +1,4 @@ using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Sample/Changes/NewExampleChange.cs b/src/SIL.Harmony.Sample/Changes/NewExampleChange.cs index a293ed3..c18671c 100644 --- a/src/SIL.Harmony.Sample/Changes/NewExampleChange.cs +++ b/src/SIL.Harmony.Sample/Changes/NewExampleChange.cs @@ -1,6 +1,5 @@ using System.Text.Json.Serialization; using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using SIL.Harmony.Sample.Models; using Ycs; diff --git a/src/SIL.Harmony.Sample/Changes/NewWordChange.cs b/src/SIL.Harmony.Sample/Changes/NewWordChange.cs index e116e3a..5762b07 100644 --- a/src/SIL.Harmony.Sample/Changes/NewWordChange.cs +++ b/src/SIL.Harmony.Sample/Changes/NewWordChange.cs @@ -1,5 +1,4 @@ using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs b/src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs index 7e4b0b7..d3623ee 100644 --- a/src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs +++ b/src/SIL.Harmony.Sample/Changes/SetWordNoteChange.cs @@ -1,5 +1,4 @@ using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs b/src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs index a8b9aa5..c425db1 100644 --- a/src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs +++ b/src/SIL.Harmony.Sample/Changes/SetWordTextChange.cs @@ -1,5 +1,4 @@ using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Sample/Models/Definition.cs b/src/SIL.Harmony.Sample/Models/Definition.cs index fbb972d..0154768 100644 --- a/src/SIL.Harmony.Sample/Models/Definition.cs +++ b/src/SIL.Harmony.Sample/Models/Definition.cs @@ -1,5 +1,4 @@ using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Entities; namespace SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Sample/Models/Example.cs b/src/SIL.Harmony.Sample/Models/Example.cs index 92491a8..bc8ef0f 100644 --- a/src/SIL.Harmony.Sample/Models/Example.cs +++ b/src/SIL.Harmony.Sample/Models/Example.cs @@ -1,5 +1,4 @@ using System.Text.Json.Serialization; -using SIL.Harmony.Core; using SIL.Harmony.Entities; using Ycs; diff --git a/src/SIL.Harmony.Sample/Models/Word.cs b/src/SIL.Harmony.Sample/Models/Word.cs index 3cc701d..143a425 100644 --- a/src/SIL.Harmony.Sample/Models/Word.cs +++ b/src/SIL.Harmony.Sample/Models/Word.cs @@ -1,5 +1,4 @@ -using SIL.Harmony.Core; -using SIL.Harmony.Entities; +using SIL.Harmony.Entities; namespace SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Tests/DataModelSimpleChanges.cs b/src/SIL.Harmony.Tests/DataModelSimpleChanges.cs index b1def18..cc389f1 100644 --- a/src/SIL.Harmony.Tests/DataModelSimpleChanges.cs +++ b/src/SIL.Harmony.Tests/DataModelSimpleChanges.cs @@ -1,7 +1,5 @@ -using Argon; using SIL.Harmony; using SIL.Harmony.Changes; -using SIL.Harmony.Core; using SIL.Harmony.Db; using SIL.Harmony.Sample.Changes; using SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Tests/DataModelTestBase.cs b/src/SIL.Harmony.Tests/DataModelTestBase.cs index c359a72..8ad5a89 100644 --- a/src/SIL.Harmony.Tests/DataModelTestBase.cs +++ b/src/SIL.Harmony.Tests/DataModelTestBase.cs @@ -1,6 +1,5 @@ using SIL.Harmony.Changes; using SIL.Harmony.Core; -using SIL.Harmony.Db; using SIL.Harmony.Sample; using SIL.Harmony.Sample.Changes; using SIL.Harmony.Sample.Models; diff --git a/src/SIL.Harmony.Tests/DbContextTests.cs b/src/SIL.Harmony.Tests/DbContextTests.cs index 723d933..33cc0a1 100644 --- a/src/SIL.Harmony.Tests/DbContextTests.cs +++ b/src/SIL.Harmony.Tests/DbContextTests.cs @@ -1,5 +1,4 @@ using SIL.Harmony.Core; -using SIL.Harmony.Tests; using LinqToDB; using LinqToDB.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; diff --git a/src/SIL.Harmony.Tests/ModuleInit.cs b/src/SIL.Harmony.Tests/ModuleInit.cs index 4b820ae..a6ac92d 100644 --- a/src/SIL.Harmony.Tests/ModuleInit.cs +++ b/src/SIL.Harmony.Tests/ModuleInit.cs @@ -2,7 +2,6 @@ using System.Runtime.CompilerServices; using Argon; using SIL.Harmony.Core; -using SIL.Harmony.Db; using SIL.Harmony.Sample; using Microsoft.Extensions.DependencyInjection; diff --git a/src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs b/src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs index 10a48e2..f2f26fa 100644 --- a/src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs +++ b/src/SIL.Harmony/Db/CrdtDbContextOptionsExtensions.cs @@ -1,4 +1,3 @@ -using System.Text.Json; using Microsoft.EntityFrameworkCore; using SIL.Harmony.Db.EntityConfig; diff --git a/src/SIL.Harmony/Db/CrdtRepository.cs b/src/SIL.Harmony/Db/CrdtRepository.cs index 7cbe821..ef63447 100644 --- a/src/SIL.Harmony/Db/CrdtRepository.cs +++ b/src/SIL.Harmony/Db/CrdtRepository.cs @@ -1,5 +1,4 @@ -using System.Linq.Expressions; -using SIL.Harmony.Core; +using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.Storage; diff --git a/src/SIL.Harmony/Db/ICrdtDbContext.cs b/src/SIL.Harmony/Db/ICrdtDbContext.cs index 70f9801..9d40fe2 100644 --- a/src/SIL.Harmony/Db/ICrdtDbContext.cs +++ b/src/SIL.Harmony/Db/ICrdtDbContext.cs @@ -1,5 +1,3 @@ -using SIL.Harmony.Changes; -using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/src/SIL.Harmony/SnapshotWorker.cs b/src/SIL.Harmony/SnapshotWorker.cs index 68dcaa4..11507e5 100644 --- a/src/SIL.Harmony/SnapshotWorker.cs +++ b/src/SIL.Harmony/SnapshotWorker.cs @@ -1,4 +1,3 @@ -using System.Diagnostics; using System.Linq.Expressions; using SIL.Harmony.Core; using Microsoft.EntityFrameworkCore; diff --git a/src/Ycs/Protocols/SyncProtocol.cs b/src/Ycs/Protocols/SyncProtocol.cs index c2e0360..8701299 100644 --- a/src/Ycs/Protocols/SyncProtocol.cs +++ b/src/Ycs/Protocols/SyncProtocol.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.IO; - namespace Ycs { internal static class SyncProtocol diff --git a/src/Ycs/Structs/ContentAny.cs b/src/Ycs/Structs/ContentAny.cs index 6012aa5..1c85915 100644 --- a/src/Ycs/Structs/ContentAny.cs +++ b/src/Ycs/Structs/ContentAny.cs @@ -5,9 +5,7 @@ // ------------------------------------------------------------------------------ using System.Collections; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; namespace Ycs { diff --git a/src/Ycs/Structs/ContentBinary.cs b/src/Ycs/Structs/ContentBinary.cs index fc0301f..4a088d2 100644 --- a/src/Ycs/Structs/ContentBinary.cs +++ b/src/Ycs/Structs/ContentBinary.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; - namespace Ycs { public class ContentBinary : IContentEx diff --git a/src/Ycs/Structs/ContentDeleted.cs b/src/Ycs/Structs/ContentDeleted.cs index 4ffb9c9..c03dc77 100644 --- a/src/Ycs/Structs/ContentDeleted.cs +++ b/src/Ycs/Structs/ContentDeleted.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; namespace Ycs diff --git a/src/Ycs/Structs/ContentDoc.cs b/src/Ycs/Structs/ContentDoc.cs index 176a8c0..581b686 100644 --- a/src/Ycs/Structs/ContentDoc.cs +++ b/src/Ycs/Structs/ContentDoc.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; - namespace Ycs { internal class ContentDoc : IContentEx diff --git a/src/Ycs/Structs/ContentEmbed.cs b/src/Ycs/Structs/ContentEmbed.cs index dc5be5c..6553357 100644 --- a/src/Ycs/Structs/ContentEmbed.cs +++ b/src/Ycs/Structs/ContentEmbed.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; - namespace Ycs { public class ContentEmbed : IContentEx diff --git a/src/Ycs/Structs/ContentFormat.cs b/src/Ycs/Structs/ContentFormat.cs index bee7736..55b82cd 100644 --- a/src/Ycs/Structs/ContentFormat.cs +++ b/src/Ycs/Structs/ContentFormat.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; - namespace Ycs { public class ContentFormat : IContentEx diff --git a/src/Ycs/Structs/ContentJson.cs b/src/Ycs/Structs/ContentJson.cs index 3ee6719..48f8698 100644 --- a/src/Ycs/Structs/ContentJson.cs +++ b/src/Ycs/Structs/ContentJson.cs @@ -4,7 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.Collections.Generic; using System.Diagnostics; namespace Ycs diff --git a/src/Ycs/Structs/ContentString.cs b/src/Ycs/Structs/ContentString.cs index 49e6ae5..8551315 100644 --- a/src/Ycs/Structs/ContentString.cs +++ b/src/Ycs/Structs/ContentString.cs @@ -4,9 +4,7 @@ // // ------------------------------------------------------------------------------ -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Text; namespace Ycs diff --git a/src/Ycs/Structs/ContentType.cs b/src/Ycs/Structs/ContentType.cs index 0e61536..82e9b15 100644 --- a/src/Ycs/Structs/ContentType.cs +++ b/src/Ycs/Structs/ContentType.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; - namespace Ycs { public class ContentType : IContentEx diff --git a/src/Ycs/Structs/IContent.cs b/src/Ycs/Structs/IContent.cs index 6ca3f27..5018fab 100644 --- a/src/Ycs/Structs/IContent.cs +++ b/src/Ycs/Structs/IContent.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.Collections.Generic; - namespace Ycs { public interface IContent diff --git a/src/Ycs/Structs/Item.cs b/src/Ycs/Structs/Item.cs index 9e82e0c..e1b9782 100644 --- a/src/Ycs/Structs/Item.cs +++ b/src/Ycs/Structs/Item.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; namespace Ycs diff --git a/src/Ycs/Types/AbstractType.cs b/src/Ycs/Types/AbstractType.cs index 7790f6d..ee3e79b 100644 --- a/src/Ycs/Types/AbstractType.cs +++ b/src/Ycs/Types/AbstractType.cs @@ -4,10 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Linq; - namespace Ycs { public class YEventArgs diff --git a/src/Ycs/Types/YArray.cs b/src/Ycs/Types/YArray.cs index 725d988..17e03c8 100644 --- a/src/Ycs/Types/YArray.cs +++ b/src/Ycs/Types/YArray.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.Collections.Generic; - namespace Ycs { public class YArrayEvent : YEvent diff --git a/src/Ycs/Types/YArrayBase.cs b/src/Ycs/Types/YArrayBase.cs index 1a81c2a..1f0b7ed 100644 --- a/src/Ycs/Types/YArrayBase.cs +++ b/src/Ycs/Types/YArrayBase.cs @@ -4,11 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Threading; namespace Ycs { diff --git a/src/Ycs/Types/YMap.cs b/src/Ycs/Types/YMap.cs index 662e3be..df0f480 100644 --- a/src/Ycs/Types/YMap.cs +++ b/src/Ycs/Types/YMap.cs @@ -5,8 +5,6 @@ // ------------------------------------------------------------------------------ using System.Collections; -using System.Collections.Generic; -using System.Linq; namespace Ycs { diff --git a/src/Ycs/Types/YText.cs b/src/Ycs/Types/YText.cs index 16dad74..6905e60 100644 --- a/src/Ycs/Types/YText.cs +++ b/src/Ycs/Types/YText.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Text; namespace Ycs diff --git a/src/Ycs/Utils/AbsolutePosition.cs b/src/Ycs/Utils/AbsolutePosition.cs index 1366d61..e10f11d 100644 --- a/src/Ycs/Utils/AbsolutePosition.cs +++ b/src/Ycs/Utils/AbsolutePosition.cs @@ -4,7 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; using System.Diagnostics; namespace Ycs diff --git a/src/Ycs/Utils/DeleteSet.cs b/src/Ycs/Utils/DeleteSet.cs index e365091..23eb80a 100644 --- a/src/Ycs/Utils/DeleteSet.cs +++ b/src/Ycs/Utils/DeleteSet.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; namespace Ycs diff --git a/src/Ycs/Utils/EncodingUtils.cs b/src/Ycs/Utils/EncodingUtils.cs index 1f4e32f..f629754 100644 --- a/src/Ycs/Utils/EncodingUtils.cs +++ b/src/Ycs/Utils/EncodingUtils.cs @@ -4,11 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; namespace Ycs { diff --git a/src/Ycs/Utils/ID.cs b/src/Ycs/Utils/ID.cs index 2554984..09d6667 100644 --- a/src/Ycs/Utils/ID.cs +++ b/src/Ycs/Utils/ID.cs @@ -4,9 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/Utils/IUpdateDecoder.cs b/src/Ycs/Utils/IUpdateDecoder.cs index 2ed168a..93f2a54 100644 --- a/src/Ycs/Utils/IUpdateDecoder.cs +++ b/src/Ycs/Utils/IUpdateDecoder.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.IO; - namespace Ycs { internal interface IDSDecoder : IDisposable diff --git a/src/Ycs/Utils/IUpdateEncoder.cs b/src/Ycs/Utils/IUpdateEncoder.cs index b5317f2..6aa5b12 100644 --- a/src/Ycs/Utils/IUpdateEncoder.cs +++ b/src/Ycs/Utils/IUpdateEncoder.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.IO; - namespace Ycs { internal interface IDSEncoder : IDisposable diff --git a/src/Ycs/Utils/RelativePosition.cs b/src/Ycs/Utils/RelativePosition.cs index ca66a71..b87bf74 100644 --- a/src/Ycs/Utils/RelativePosition.cs +++ b/src/Ycs/Utils/RelativePosition.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.IO; - namespace Ycs { /// diff --git a/src/Ycs/Utils/Snapshot.cs b/src/Ycs/Utils/Snapshot.cs index 6591cf2..c8c6785 100644 --- a/src/Ycs/Utils/Snapshot.cs +++ b/src/Ycs/Utils/Snapshot.cs @@ -4,11 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; - namespace Ycs { public sealed class Snapshot : IEquatable diff --git a/src/Ycs/Utils/StructStore.cs b/src/Ycs/Utils/StructStore.cs index 29aa43b..ca3acf2 100644 --- a/src/Ycs/Utils/StructStore.cs +++ b/src/Ycs/Utils/StructStore.cs @@ -4,11 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; namespace Ycs { diff --git a/src/Ycs/Utils/Transaction.cs b/src/Ycs/Utils/Transaction.cs index 43c7371..6c1f32d 100644 --- a/src/Ycs/Utils/Transaction.cs +++ b/src/Ycs/Utils/Transaction.cs @@ -4,10 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; namespace Ycs { diff --git a/src/Ycs/Utils/UndoManager.cs b/src/Ycs/Utils/UndoManager.cs index 2b026c5..07820ce 100644 --- a/src/Ycs/Utils/UndoManager.cs +++ b/src/Ycs/Utils/UndoManager.cs @@ -4,10 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Linq; - namespace Ycs { public class StackItem diff --git a/src/Ycs/Utils/UpdateDecoderV2.cs b/src/Ycs/Utils/UpdateDecoderV2.cs index bb40250..d29344d 100644 --- a/src/Ycs/Utils/UpdateDecoderV2.cs +++ b/src/Ycs/Utils/UpdateDecoderV2.cs @@ -4,10 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/Utils/UpdateEncoderV2.cs b/src/Ycs/Utils/UpdateEncoderV2.cs index f529fb8..918bf9e 100644 --- a/src/Ycs/Utils/UpdateEncoderV2.cs +++ b/src/Ycs/Utils/UpdateEncoderV2.cs @@ -4,10 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/Utils/YDoc.cs b/src/Ycs/Utils/YDoc.cs index 05557cd..4c63f61 100644 --- a/src/Ycs/Utils/YDoc.cs +++ b/src/Ycs/Utils/YDoc.cs @@ -4,11 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; namespace Ycs { diff --git a/src/Ycs/Utils/YEvent.cs b/src/Ycs/Utils/YEvent.cs index 5a44a6e..7826eb4 100644 --- a/src/Ycs/Utils/YEvent.cs +++ b/src/Ycs/Utils/YEvent.cs @@ -4,9 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Linq; - namespace Ycs { public class ChangesCollection diff --git a/src/Ycs/lib0/Decoding/AbstractStreamDecoder.cs b/src/Ycs/lib0/Decoding/AbstractStreamDecoder.cs index 8b45c3a..e9b491c 100644 --- a/src/Ycs/lib0/Decoding/AbstractStreamDecoder.cs +++ b/src/Ycs/lib0/Decoding/AbstractStreamDecoder.cs @@ -4,9 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/lib0/Decoding/IDecoder.cs b/src/Ycs/lib0/Decoding/IDecoder.cs index 8dbd188..bb1eb6c 100644 --- a/src/Ycs/lib0/Decoding/IDecoder.cs +++ b/src/Ycs/lib0/Decoding/IDecoder.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; - namespace Ycs { /// diff --git a/src/Ycs/lib0/Decoding/IncUintOptRleDecoder.cs b/src/Ycs/lib0/Decoding/IncUintOptRleDecoder.cs index 21ff752..60da339 100644 --- a/src/Ycs/lib0/Decoding/IncUintOptRleDecoder.cs +++ b/src/Ycs/lib0/Decoding/IncUintOptRleDecoder.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.IO; - namespace Ycs { /// diff --git a/src/Ycs/lib0/Decoding/IntDiffDecoder.cs b/src/Ycs/lib0/Decoding/IntDiffDecoder.cs index 7103077..063b3af 100644 --- a/src/Ycs/lib0/Decoding/IntDiffDecoder.cs +++ b/src/Ycs/lib0/Decoding/IntDiffDecoder.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.IO; - namespace Ycs { /// diff --git a/src/Ycs/lib0/Decoding/IntDiffOptRleDecoder.cs b/src/Ycs/lib0/Decoding/IntDiffOptRleDecoder.cs index 82fcf81..f427e07 100644 --- a/src/Ycs/lib0/Decoding/IntDiffOptRleDecoder.cs +++ b/src/Ycs/lib0/Decoding/IntDiffOptRleDecoder.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.IO; - namespace Ycs { /// diff --git a/src/Ycs/lib0/Decoding/RleDecoder.cs b/src/Ycs/lib0/Decoding/RleDecoder.cs index 0da98c7..ee3a223 100644 --- a/src/Ycs/lib0/Decoding/RleDecoder.cs +++ b/src/Ycs/lib0/Decoding/RleDecoder.cs @@ -5,7 +5,6 @@ // ------------------------------------------------------------------------------ using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/lib0/Decoding/RleIntDiffDecoder.cs b/src/Ycs/lib0/Decoding/RleIntDiffDecoder.cs index 57bb517..74aa07a 100644 --- a/src/Ycs/lib0/Decoding/RleIntDiffDecoder.cs +++ b/src/Ycs/lib0/Decoding/RleIntDiffDecoder.cs @@ -5,7 +5,6 @@ // ------------------------------------------------------------------------------ using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/lib0/Decoding/StringDecoder.cs b/src/Ycs/lib0/Decoding/StringDecoder.cs index ce47ca1..5d28230 100644 --- a/src/Ycs/lib0/Decoding/StringDecoder.cs +++ b/src/Ycs/lib0/Decoding/StringDecoder.cs @@ -4,9 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/lib0/Decoding/UintOptRleDecoder.cs b/src/Ycs/lib0/Decoding/UintOptRleDecoder.cs index 5e0814d..1b2857d 100644 --- a/src/Ycs/lib0/Decoding/UintOptRleDecoder.cs +++ b/src/Ycs/lib0/Decoding/UintOptRleDecoder.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System.IO; - namespace Ycs { /// diff --git a/src/Ycs/lib0/Encoding/AbstractStreamEncoder.cs b/src/Ycs/lib0/Encoding/AbstractStreamEncoder.cs index 6bce1ba..d8771dd 100644 --- a/src/Ycs/lib0/Encoding/AbstractStreamEncoder.cs +++ b/src/Ycs/lib0/Encoding/AbstractStreamEncoder.cs @@ -4,9 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; using System.Diagnostics; -using System.IO; namespace Ycs { diff --git a/src/Ycs/lib0/Encoding/IEncoder.cs b/src/Ycs/lib0/Encoding/IEncoder.cs index f94afa9..e964096 100644 --- a/src/Ycs/lib0/Encoding/IEncoder.cs +++ b/src/Ycs/lib0/Encoding/IEncoder.cs @@ -4,8 +4,6 @@ // // ------------------------------------------------------------------------------ -using System; - namespace Ycs { /// diff --git a/src/Ycs/lib0/Encoding/StringEncoder.cs b/src/Ycs/lib0/Encoding/StringEncoder.cs index 51c4d55..fe26666 100644 --- a/src/Ycs/lib0/Encoding/StringEncoder.cs +++ b/src/Ycs/lib0/Encoding/StringEncoder.cs @@ -4,9 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; using System.Diagnostics; -using System.IO; using System.Text; namespace Ycs diff --git a/src/Ycs/lib0/StreamDecodingExtensions.cs b/src/Ycs/lib0/StreamDecodingExtensions.cs index 2f133a6..f145061 100644 --- a/src/Ycs/lib0/StreamDecodingExtensions.cs +++ b/src/Ycs/lib0/StreamDecodingExtensions.cs @@ -4,10 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Runtime.CompilerServices; using System.Text; diff --git a/src/Ycs/lib0/StreamEncodingExtensions.cs b/src/Ycs/lib0/StreamEncodingExtensions.cs index 0c995c5..bfd9450 100644 --- a/src/Ycs/lib0/StreamEncodingExtensions.cs +++ b/src/Ycs/lib0/StreamEncodingExtensions.cs @@ -4,9 +4,7 @@ // // ------------------------------------------------------------------------------ -using System; using System.Collections; -using System.IO; using System.Runtime.CompilerServices; using System.Text;