Upgrades with news NETStandard.Library 2.0.0-preview2

Author: inmem

DuplicityKeys.Core.sample/DuplicityKeys.Core.sample.csproj

@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FriendlyCSharp.Databases" Version="2.0.0-preview" />
+    <PackageReference Include="FriendlyCSharp.Databases" Version="2.0.0-preview2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.0-preview1-002111-00" />
+    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.0-preview2-25407-01" />
   </ItemGroup>
 </Project>

FriendlyCSharp.Databases/FriendlyCSharp.Databases.csproj

@@ -13,12 +13,12 @@
 
 The B-tree is a generalization of a binary search tree in that a node can have more than two children (Comer 1979, p. 123). Unlike self-balancing binary search trees, the B-tree is optimized for systems that read and write large blocks of data.
 </Description>
-    <PackageReleaseNotes>Upgrades with news NETStandard.Library 2.0.0-preview</PackageReleaseNotes>
+    <PackageReleaseNotes>Upgrades with news NETStandard.Library 2.0.0-preview2</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.0.0-preview</Version>
+    <Version>2.0.0-preview2</Version>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
   </PropertyGroup>
@@ -32,7 +32,7 @@ The B-tree is a generalization of a binary search tree in that a node can have m
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="NETStandard.Library" Version="2.0.0-preview1-25301-01" />
+    <PackageReference Update="NETStandard.Library" Version="2.0.0-preview2-25401-01" />
   </ItemGroup>
 
 </Project>

FriendlyCSharp.Databases/Storage/FcsInmemStream.cs

@@ -312,6 +312,7 @@ public virtual void Delete(long offset, long offsetNew)
     {
       Dispose(true);
       //GC.SuppressFinalize(this);
+      base.Dispose(true);
     }
     /////////////////////////////////////////////
     protected override void Dispose(bool disposing)
@@ -392,7 +393,47 @@ public override long Position
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public override int Read(byte[] buffer, int offset, int count)
     {
-      throw new NotImplementedException("Cannot Read() to this FcsInmemStream<T>.");
+      if (!_bFuncPosition)
+        throw new NotImplementedException("Cannot Read() to this FcsInmemStream<T>.");
+      if (!CanRead)
+        return 0;
+
+      int sizeT = Marshal.SizeOf<T>();
+      int countT = Math.Abs(count) / sizeT;
+      if ((count > 0) && (countT <= 0))
+        countT = sizeT;
+      countT &= 0xFFFF;
+      if (_bFuncException)
+      {
+        if (buffer == null)
+          throw new ArgumentOutOfRangeException(nameof(buffer));
+        if ((offset < 0) || (offset >= buffer.Length))
+          throw new ArgumentOutOfRangeException(nameof(offset));
+        if ((count <= 0) || (count + offset > buffer.Length))
+          throw new ArgumentOutOfRangeException(nameof(count));
+      }
+
+      long lengthTemp = Length;
+      long position = Position;
+      if (position == lengthTemp) // foreach must return 0
+        return 0;
+      if ((position < 0) || (position > lengthTemp))
+        throw new ArgumentOutOfRangeException(nameof(Position));
+
+      if (position + countT > lengthTemp)
+        countT = (UInt16)(lengthTemp - position);
+      T[] aValue = new T[countT];
+      int iRead = _BlockCopyInternal(true, position, aValue, 0, countT);
+      //
+      int size = iRead * sizeT;
+      IntPtr ptr = Marshal.AllocHGlobal(size);
+      Marshal.StructureToPtr(aValue, ptr, false);
+      Marshal.Copy(ptr, buffer, offset, size);
+      Marshal.FreeHGlobal(ptr);
+      //
+      lock (_lockAppend)
+        Position = position + iRead;
+      return iRead * sizeT;
     }
     /////////////////////////////////////////////
     public virtual int Read(out T value)

README.md

@@ -7,15 +7,15 @@ A library of cross platform C# data structures. Generic [**B-tree**](https://en.
 ## B-Tree generic class
 #### [FcsBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsBTreeN.cs) \[where TKey : struct, IComparable<TKey>\]
    + `Methods:` BtnAddFirst, BtnCompares, BtnUpdates, BtnAdd, BtnDeleteAll, BtnFind, BtnFirst, BtnLast, BtnNext, BtnPrev, BtnSearch, BtnSearchPrev, BtnUpdate and BtnUsedKeys.
-#### [FcsDuplValueFastBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsDuplValueFastBTreeN.cs) \[where TKey : struct, IComparable<TKey>\] - [new 2.0.0-preview](https://www.nuget.org/packages/FriendlyCSharp.Databases/2.0.0-preview), [INSTALL](#install)
+#### [FcsDuplValueFastBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsDuplValueFastBTreeN.cs) \[where TKey : struct, IComparable<TKey>\] - [new 2.0.0-preview2](https://www.nuget.org/packages/FriendlyCSharp.Databases/2.0.0-preview2), [INSTALL](#install)
    + `Methods:` BtnAddFirst, BtnCompares, BtnUpdates, BtnAdd, BtnDeleteAll, BtnFind, BtnFirst, BtnLast, BtnNext, BtnPrev, BtnSearch, BtnSearchPrev, BtnUpdate and BtnUsedKeys.
    + `Methods:` BtnFastFind, BtnFastFirst, BtnFastLast, BtnFastNext, BtnFastPrev, BtnFastSearch, BtnFastSearchPrev.
 #### [FcsFastBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsFastBTreeN.cs) \[where TKey : struct, IComparable<TKey>\]
    + `Methods:` BtnAddFirst, BtnCompares, BtnUpdates, BtnAdd, BtnDeleteAll, BtnFind, BtnFirst, BtnLast, BtnNext, BtnPrev, BtnSearch, BtnSearchPrev, BtnUpdate and BtnUsedKeys.
    + `Methods:` BtnFastFind, BtnFastFirst, BtnFastLast, BtnFastNext, BtnFastPrev, BtnFastSearch, BtnFastSearchPrev.
 #### [FcsLockBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsLockBTreeN.cs) \[where TKey : struct, IComparable<TKey>\]
    + `Methods:` BtnAddFirst, BtnCompares, BtnUpdates, BtnAdd, BtnDeleteAll, BtnFind, BtnFirst, BtnLast, BtnNext, BtnPrev, BtnSearch, BtnSearchPrev, BtnUpdate and BtnUsedKeys.
-#### [FcsKeyFastBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsKeyFastBTreeN.cs) \[where TKey : struct\] - [new 2.0.0-preview](https://www.nuget.org/packages/FriendlyCSharp.Databases/2.0.0-preview), [INSTALL](#install)
+#### [FcsKeyFastBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsKeyFastBTreeN.cs) \[where TKey : struct\] - [new 2.0.0-preview2](https://www.nuget.org/packages/FriendlyCSharp.Databases/2.0.0-preview2), [INSTALL](#install)
    + `Methods:` BtnAdd, BtnDeleteAll, BtnFind, BtnFirst, BtnLast, BtnNext, BtnPrev, BtnSearch, BtnSearchPrev, BtnUpdate and BtnUsedKeys.
    + `Methods:` BtnFastFind, BtnFastFirst, BtnFastLast, BtnFastNext, BtnFastPrev, BtnFastSearch, BtnFastSearchPrev.
 #### [FcsFastLockBTreeN<TKey, TValue>](FriendlyCSharp.Databases/BTreeN/FcsFastLockBTreeN.cs) \[where TKey : struct, IComparable<TKey>\]
@@ -26,7 +26,7 @@ A library of cross platform C# data structures. Generic [**B-tree**](https://en.
 * [BtnEnumerator.Core.sample](Samples/BtnEnumerator.Core.sample), [BtnEnumerator.NET.sample](Samples/BtnEnumerator.NET.sample)
 * [FcsFastBTreeN.Core.benchmark](Samples/FcsFastBTreeN.Core.benchmark), [FcsFastBTreeN.NET.benchmark](Samples/FcsFastBTreeN.NET.benchmark)
 * [MultipleKeys.Core.sample](Samples/MultipleKeys.Core.sample), [MultipleKeys.NET.sample](Samples/MultipleKeys.NET.sample)
-* **new** [DuplicityKeys.Core.sample](DuplicityKeys.Core.sample) - [Microsoft.NETCore.App 2.0.0-preview1](https://www.nuget.org/packages/Microsoft.NETCore.App/2.0.0-preview1-002111-00), [NETStandard.Library 2.0.0-preview1](https://www.nuget.org/packages/NETStandard.Library/2.0.0-preview1-25301-01), [INSTALL](#install)
+* **new** [DuplicityKeys.Core.sample](DuplicityKeys.Core.sample) - [Microsoft.NETCore.App 2.0.0-preview2](https://www.nuget.org/packages/Microsoft.NETCore.App/2.0.0-preview2-25407-01), [NETStandard.Library 2.0.0-preview2](https://www.nuget.org/packages/NETStandard.Library/2.0.0-preview2-25401-01), [INSTALL](#install)
 
 ### Performance
 A [**B-tree**](https://en.wikipedia.org/wiki/B-tree) of order m is a tree which satisfies the following properties:
@@ -289,14 +289,14 @@ The benchmark was configured as follows:
  　
 ## INSTALL
 
-Instal Visual Studio 2017 version 15.3 preview
-* [A fresh update to Visual Studio 2017 and the next preview](https://blogs.msdn.microsoft.com/visualstudio/2017/05/10/update-to-visual-studio-2017-and-next-preview/)
-* [Visual Studio 2017 (version 15.3 - Preview) Release Notes](https://www.visualstudio.com/en-us/news/releasenotes/vs2017-preview-relnotes)
-* [Announcing .NET Core 2.0 Preview 1](https://blogs.msdn.microsoft.com/dotnet/2017/05/10/announcing-net-core-2-0-preview-1/)
-* [Chanel 9 - Build 2017 - .NET Standard 2.0 and .NET Core 2.0](https://channel9.msdn.com/Events/Build/2017/C9L18)
-* [.NET Framework 4.6.1 supporting .NET Standard 2.0](https://github.com/dotnet/standard/blob/master/docs/netstandard-20/README.md#net-framework-461-supporting-net-standard-20)
+Instal Visual Studio 2017 version 15.3.0 preview 3.0 & .NET Core 2.0 preview 2 
+* [Pre-release Visual Studio 2017 | Visual Studio Preview](https://www.visualstudio.com/vs/preview/)
+* [Visual Studio 2017 (version 15.3 - Preview 3.0) Release Notes](https://www.visualstudio.com/en-us/news/releasenotes/vs2017-preview-relnotes)
+* [Announcing .NET Core 2.0 Preview 2](https://blogs.msdn.microsoft.com/dotnet/2017/06/28/announcing-net-core-2-0-preview-2/)
+* [GitHUB .NET Core](https://github.com/dotnet/core/tree/master/release-notes)
+* [.NET Core 2.0 preview 2 download](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.0-preview2-download.md)
 
-Install via Nuget Package Manager [version 2.0.0-preview](https://www.nuget.org/packages/FriendlyCSharp.Databases/2.0.0-preview)
+Install via Nuget Package Manager [version 2.0.0-preview2](https://www.nuget.org/packages/FriendlyCSharp.Databases/2.0.0-preview2)
 
 ```
 PM> Install-Package FriendlyCSharp.Databases -pre