- v10.0.2

Author: eben-roux

Shuttle.Core.Streams.Tests/Shuttle.Core.Streams.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

Shuttle.Core.Streams.Tests/StreamExtensionsFixture.cs

@@ -50,7 +50,7 @@ public void Should_be_able_to_make_a_readonly_copy_of_a_stream()
             Assert.AreEqual(5, output.Position);
             Assert.AreEqual(5, stream.Position);
 
-            var copy = stream.CopyMemoryStream();
+            var copy = stream.Copy();
 
             Assert.AreEqual(5, copy.Length);
             Assert.AreEqual(0, copy.Position);

Shuttle.Core.Streams/Properties/AssemblyInfo.cs

@@ -1,30 +1,10 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-#if NET46
-[assembly: AssemblyTitle(".NET Framework 4.6")]
-#endif
-
 #if NET461
 [assembly: AssemblyTitle(".NET Framework 4.6.1")]
 #endif
 
-#if NET462
-[assembly: AssemblyTitle(".NET Framework 4.6.2")]
-#endif
-
-#if NET47
-[assembly: AssemblyTitle(".NET Framework 4.7")]
-#endif
-
-#if NET471
-[assembly: AssemblyTitle(".NET Framework 4.7.1")]
-#endif
-
-#if NETCOREAPP2_0
-[assembly: AssemblyTitle(".NET Core 2.0")]
-#endif
-
 #if NETCOREAPP2_1
 [assembly: AssemblyTitle(".NET Core 2.1")]
 #endif
@@ -33,10 +13,10 @@
 [assembly: AssemblyTitle(".NET Standard 2.0")]
 #endif
 
-[assembly: AssemblyVersion("10.0.1.0")]
+[assembly: AssemblyVersion("10.0.2.0")]
 [assembly: AssemblyCopyright("Copyright © Eben Roux 2018")]
 [assembly: AssemblyProduct("Shuttle.Core.Streams")]
 [assembly: AssemblyCompany("Shuttle")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyInformationalVersion("10.0.1")]
+[assembly: AssemblyInformationalVersion("10.0.2")]
 [assembly: ComVisible(false)]

Shuttle.Core.Streams/Shuttle.Core.Streams.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;net461;net462;net47;net471;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
@@ -16,4 +16,19 @@
     <PackageReference Include="Shuttle.Core.Contract" Version="10.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>

Shuttle.Core.Streams/StreamExtensions.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using Shuttle.Core.Contract;
 
@@ -19,46 +20,38 @@ public static byte[] ToBytes(this Stream stream)
         }
 
         /// <summary>
-        ///     Copies the stream to a new MemoryStream object without copying the internal buffer.
-        ///     This method returning the same result as the <see cref="Copy"/> method when the instance it not a <see cref="MemoryStream"/>
+        /// Returns a copy of the given stream.  The underlying type used is a `MemoryStream` and if the given `stream` is a `MemoryStream` the operation will attempt to use internal buffer if exposed and return a read-only stream; else a standard `MemoryStream` is used and the `stream` data copied to the that.
         /// </summary>
-        /// <param name="stream">Input stream</param>
-        /// <returns>Memory stream</returns>
-        public static MemoryStream CopyMemoryStream(this Stream stream)
+        /// <param name="stream">The `Stream` instance that contains the source data.</param>
+        /// <returns>A new `MemoryStream` object.</returns>
+        public static Stream Copy(this Stream stream)
         {
             Guard.AgainstNull(stream, nameof(stream));
 
-            if (stream is MemoryStream)
+            MemoryStream result;
+
+            if (stream is MemoryStream ms && ms.TryGetBuffer(out var buffer))
             {
-                var ms = (MemoryStream) stream;
-                if (ms.TryGetBuffer(out var buffer))
-                {
-                    return new MemoryStream(buffer.Array, buffer.Offset, (int) ms.Length, false, true);
-                }
+                result = new MemoryStream(buffer.Array ?? throw new InvalidOperationException(Resources.CopyBufferArrayException), buffer.Offset, (int)ms.Length, false, true);
             }
-        
-            return (MemoryStream)Copy(stream);
-        }
-
-        public static Stream Copy(this Stream stream)
-        {
-            Guard.AgainstNull(stream, nameof(stream));
-
-            var result = new MemoryStream {Capacity = (int) stream.Length};
+            else
+            {
+                result = new MemoryStream {Capacity = (int) stream.Length};
 
-            var originalPosition = stream.Position;
+                var originalPosition = stream.Position;
 
-            try
-            {
-                stream.Seek(0, SeekOrigin.Begin);
+                try
+                {
+                    stream.Seek(0, SeekOrigin.Begin);
 
-                stream.CopyTo(result);
+                    stream.CopyTo(result);
 
-                result.Seek(0, SeekOrigin.Begin);
-            }
-            finally
-            {
-                stream.Seek(originalPosition, SeekOrigin.Begin);
+                    result.Seek(0, SeekOrigin.Begin);
+                }
+                finally
+                {
+                    stream.Seek(originalPosition, SeekOrigin.Begin);
+                }
             }
 
             return result;