palingennesia

Author: Akronae

Proteus.Core/BinaryReader.cs

@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 
 namespace Proteus.Core
 {

Proteus.Core/BinarySerializer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 
 namespace Proteus.Core
 {

Proteus.Core/BinaryWriter.cs

@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 
 namespace Proteus.Core
 {

Proteus.Core/LoadedAssembliesGenericTypesProvider.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 
 namespace Proteus.Core
 {

Proteus.Core/Proteus.Core.csproj

@@ -13,7 +13,6 @@
         <RepositoryUrl>https://github.com/Akronae/Proteus</RepositoryUrl>
     </PropertyGroup>
     <ItemGroup>
-      <PackageReference Include="Chresimos.Core" Version="2019.10.4.154236" />
       <PackageReference Include="FluentAssertions" Version="5.9.0" />
     </ItemGroup>
 
@@ -23,5 +22,11 @@
     </Target>
 
     <!-- Third party libraries -->
-    
+    <ItemGroup>
+        <Reference Include="Chresimos.Core">
+            <HintPath>..\..\Chresimos\Chresimos.Core\bin\Debug\netstandard2.0\Chresimos.Core.dll</HintPath>
+            <SpecificVersion>false</SpecificVersion>
+            <PrivateAssets>all</PrivateAssets>
+        </Reference>
+    </ItemGroup>
 </Project>

Proteus.Core/Serializer.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 
 namespace Proteus.Core
 {
@@ -68,7 +68,7 @@ public byte[] Serialize (object obj, Type objectType, out int serializedLength)
             }
 
             serializedLength = writer.BufferIndex;
-            return writer.Buffer;
+            return writer.UsedBuffer;
         }
 
         public object Deserialize (Type type, byte[] data, out int bytesConsumed)

Proteus.Core/VoidGenericTypesProvider.cs

@@ -1,5 +1,5 @@
 using System;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 
 namespace Proteus.Core
 {

Proteus.Test/Proteus.Test.csproj

@@ -16,4 +16,11 @@
       <ProjectReference Include="..\Proteus.Core\Proteus.Core.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <Reference Include="Chresimos.Core">
+            <HintPath>..\..\Chresimos\Chresimos.Core\bin\Debug\netstandard2.0\Chresimos.Core.dll</HintPath>
+            <SpecificVersion>false</SpecificVersion>
+            <PrivateAssets>all</PrivateAssets>
+        </Reference>
+    </ItemGroup>
 </Project>

Proteus.Test/Serializer/Collection.cs

@@ -1,6 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 using Xunit;
 
 namespace Proteus.Test.Serializer

Proteus.Test/Serializer/ComplexObject.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 using FluentAssertions;
 using Proteus.Core;
 using Xunit;

Proteus.Test/Serializer/Generic.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Chresimos.Core;
+using Chresimos.Core.Utils;
 using FluentAssertions;
 using Proteus.Core;
 using Xunit;