Remove dependency on Winton.DomainModelling.Abstractions. (#19)

Author: Choc13

.travis.yml

@@ -9,16 +9,15 @@ env:
 matrix:
   include:
     - os: linux
-      dist: xenial
-      dotnet: 2.2
+      dist: bionic
+      dotnet: 3.1
     - os: osx 
-      osx_image: xcode9 # OSX 10.12
-      dotnet: 2.2.104
+      osx_image: xcode11.2
+      dotnet: 3.1.100
       before_install:
         - ulimit -n 4096
 script:
-  - dotnet build -c Release
-  - dotnet test -c Release --no-build --filter Integration!=true
+  - dotnet test -c Release --filter Integration!=true
 notifications:
   on_success: always
   on_failure: always

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Winton
+Copyright 2018-2020 Winton
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -461,6 +461,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

Winton.DomainModelling.DocumentDb.sln.DotSettings

@@ -5,7 +5,7 @@ environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOCUMENT_DB_URI: https://localhost:8081
   DOCUMENT_DB_KEY: C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration:
     - Release
 skip_tags: true
@@ -14,7 +14,7 @@ install:
     - ps: Import-Module "C:\Program Files\Azure Cosmos DB Emulator\PSModules\Microsoft.Azure.CosmosDB.Emulator"
     - ps: Start-CosmosDbEmulator -NoUI -Timeout 0
 before_build:
-    - dotnet tool install -g GitVersion.Tool --version 4.0.1-beta1-58
+    - dotnet tool install -g GitVersion.Tool
     - dotnet gitversion /l console /output buildserver
 build_script:
     - dotnet build -c Release -p:Version=%GitVersion_NuGetVersion%
@@ -28,7 +28,7 @@ nuget:
 deploy:
 - provider: NuGet
   api_key:
-    secure: K7GBfAz5cr3lqVzn2+KbM45GA2ZeDjOpgnDU2jpw76PxBL2Qph3OBcfXWuGb+wwD
+    secure: +CD+4G+gMInD/BjNvO24NW9u1udGdsx0fUi6bh0muNezQ9fP0sHnS1f96f0OXUy6
   on:
     branch:
     - master

appveyor.yml

@@ -1,44 +1,35 @@
 // Copyright (c) Winton. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using System;
 using Newtonsoft.Json;
 
 namespace Winton.DomainModelling.DocumentDb
 {
-    internal sealed class EntityDocument<TEntity, TEntityId, TDto>
-        where TEntity : Entity<TEntityId>
-        where TEntityId : IEquatable<TEntityId>
+    internal sealed class EntityDocument<T>
     {
         [JsonConstructor]
-        private EntityDocument(TDto entity, string id, string type)
+        private EntityDocument(string id, string type, T entity)
         {
-            Dto = entity;
+            Entity = entity;
             Id = id;
             Type = type;
         }
 
-        [JsonProperty(PropertyName = "Entity")]
-        public TDto Dto { get; }
+        public T Entity { get; }
 
         [JsonProperty(PropertyName = "id")]
         public string Id { get; }
 
         public string Type { get; }
 
-        public static EntityDocument<TEntity, TEntityId, TDto> Create(TEntity entity, TDto dto)
+        internal static EntityDocument<T> Create(string id, string type, T entity)
         {
-            return new EntityDocument<TEntity, TEntityId, TDto>(dto, GetDocumentId(entity.Id), GetDocumentType());
+            return new EntityDocument<T>(CreateId(id, type), type, entity);
         }
 
-        public static string GetDocumentId(TEntityId id)
+        internal static string CreateId(string id, string type)
         {
-            return $"{GetDocumentType()}_{JsonConvert.SerializeObject(id)}";
-        }
-
-        public static string GetDocumentType()
-        {
-            return typeof(TEntity).Name;
+            return $"{type}_{id}";
         }
     }
 }