1 files changed, 35 insertions, 56 deletions

diff --git a/src/WixToolset.Data/NonClosingStreamWrapper.cs b/src/WixToolset.Data/NonClosingStreamWrapper.cs
index 53d17d4d..a2d3be6a 100644
--- a/src/WixToolset.Data/NonClosingStreamWrapper.cs
+++ b/src/WixToolset.Data/NonClosingStreamWrapper.cs
@@ -18,88 +18,67 @@ namespace WixToolset.Data
             this.stream = stream;
         }
 
-        public override bool CanRead { get { return this.stream.CanRead; } }
+        public override bool CanRead => this.stream.CanRead;
 
-        public override bool CanSeek { get { return this.stream.CanSeek; } }
+        public override bool CanSeek => this.stream.CanSeek;
 
-        public override bool CanTimeout { get { return this.stream.CanTimeout; } }
+        public override bool CanTimeout => this.stream.CanTimeout;
 
-        public override bool CanWrite { get { return this.stream.CanWrite; } }
+        public override bool CanWrite => this.stream.CanWrite;
 
-        public override long Length { get { return this.stream.Length; } }
+        public override long Length => this.stream.Length;
 
-        public override long Position { get { return this.stream.Position; } set { this.stream.Position = value; } }
-
-        public override int ReadTimeout { get { return this.stream.ReadTimeout; } set { this.stream.ReadTimeout = value; } }
-
-        public override int WriteTimeout { get { return this.stream.WriteTimeout; } set { this.stream.WriteTimeout = value; } }
-
-        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        public override long Position
         {
-            return this.stream.BeginRead(buffer, offset, count, callback, state);
+            get => this.stream.Position;
+            set => this.stream.Position = value;
         }
 
-        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        public override int ReadTimeout
         {
-            return this.stream.BeginWrite(buffer, offset, count, callback, state);
+            get => this.stream.ReadTimeout;
+            set => this.stream.ReadTimeout = value;
         }
 
-        public override void Close()
+        public override int WriteTimeout
         {
-            // Do not pass through the call since this is what we are overriding.
+            get => this.stream.WriteTimeout;
+            set => this.stream.WriteTimeout = value;
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                this.stream.Flush();
-            }
-        }
+        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) => this.stream.BeginRead(buffer, offset, count, callback, state);
 
-        public override int EndRead(IAsyncResult asyncResult)
-        {
-            return this.stream.EndRead(asyncResult);
-        }
+        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) => this.stream.BeginWrite(buffer, offset, count, callback, state);
 
-        public override void EndWrite(IAsyncResult asyncResult)
-        {
-            this.stream.EndWrite(asyncResult);
-        }
+        public override int EndRead(IAsyncResult asyncResult) => this.stream.EndRead(asyncResult);
 
-        public override void Flush()
-        {
-            this.stream.Flush();
-        }
+        public override void EndWrite(IAsyncResult asyncResult) => this.stream.EndWrite(asyncResult);
 
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            return this.stream.Read(buffer, offset, count);
-        }
+        public override void Flush() => this.stream.Flush();
 
-        public override int ReadByte()
-        {
-            return this.stream.ReadByte();
-        }
+        public override int Read(byte[] buffer, int offset, int count) => this.stream.Read(buffer, offset, count);
 
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            return this.stream.Seek(offset, origin);
-        }
+        public override int ReadByte() => this.stream.ReadByte();
 
-        public override void SetLength(long value)
-        {
-            this.stream.SetLength(value);
-        }
+        public override long Seek(long offset, SeekOrigin origin) => this.stream.Seek(offset, origin);
+
+        public override void SetLength(long value) => this.stream.SetLength(value);
 
-        public override void Write(byte[] buffer, int offset, int count)
+        public override void Write(byte[] buffer, int offset, int count) => this.stream.Write(buffer, offset, count);
+
+        public override void WriteByte(byte value) => this.stream.WriteByte(value);
+
+        public override void Close()
         {
-            this.stream.Write(buffer, offset, count);
+            // Do not pass through the call since this is what we are overriding.
         }
 
-        public override void WriteByte(byte value)
+        protected override void Dispose(bool disposing)
         {
-            this.stream.WriteByte(value);
+            if (disposing)
+            {
+                this.stream.Flush();
+            }
         }
     }
 }