diff --git a/src/Marten.Testing/ability_to_use_an_existing_connection_and_transaction.cs b/src/Marten.Testing/ability_to_use_an_existing_connection_and_transaction.cs
index d878779a97..f8f88efcc2 100644
--- a/src/Marten.Testing/ability_to_use_an_existing_connection_and_transaction.cs
+++ b/src/Marten.Testing/ability_to_use_an_existing_connection_and_transaction.cs
@@ -21,6 +21,7 @@ public ability_to_use_an_existing_connection_and_transaction(ITestOutputHelper o
             theStore.BulkInsertDocuments(targets);
         }
 
+#if NET46
         // SAMPLE: passing-in-existing-connections-and-transactions
         public void samples(IDocumentStore store, NpgsqlConnection connection, NpgsqlTransaction transaction)
         {
@@ -59,7 +60,8 @@ public void samples(IDocumentStore store, NpgsqlConnection connection, NpgsqlTra
                 });
             }
         }
-        // ENDSAMPLE
+        // ENDSAMPLE 
+#endif
 
 
 #if NET46 || NETCOREAPP2_0
diff --git a/src/Marten/DocumentStore.cs b/src/Marten/DocumentStore.cs
index b73f5aead6..5a9c52bfa1 100644
--- a/src/Marten/DocumentStore.cs
+++ b/src/Marten/DocumentStore.cs
@@ -1,356 +1,356 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using Baseline;
-using Marten.Events;
-using Marten.Events.Projections;
-using Marten.Events.Projections.Async;
-using Marten.Linq;
-using Marten.Linq.QueryHandlers;
-using Marten.Schema;
-using Marten.Services;
-using Marten.Storage;
-using Marten.Transforms;
-using Remotion.Linq.Parsing.Structure;
-using IsolationLevel = System.Data.IsolationLevel;
-
-namespace Marten
-{
-
-    /// <summary>
-    /// The main entry way to using Marten
-    /// </summary>
-    public class DocumentStore : IDocumentStore
-    {
-        private readonly IQueryParser _parser = new MartenQueryParser();
-
-        /// <summary>
-        /// Quick way to stand up a DocumentStore to the given database connection
-        /// in the "development" mode for auto-creating schema objects as needed
-        /// with the default behaviors
-        /// </summary>
-        /// <param name="connectionString"></param>
-        /// <returns></returns>
-        public static DocumentStore For(string connectionString)
-        {
-            return For(_ =>
-            {
-                _.AutoCreateSchemaObjects = AutoCreate.All;
-                _.Connection(connectionString);
-            });
-        }
-
-        /// <summary>
-        /// Configures a DocumentStore for an existing StoreOptions type
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public static DocumentStore For<T>() where T : StoreOptions, new()
-        {
-            return new DocumentStore(new T());
-        }
-
-        /// <summary>
-        /// Configures a DocumentStore by defining the StoreOptions settings first
-        /// </summary>
-        /// <param name="configure"></param>
-        /// <returns></returns>
-        public static DocumentStore For(Action<StoreOptions> configure)
-        {
-            var options = new StoreOptions();
-            configure(options);
-
-            return new DocumentStore(options);
-        }
-
-        /// <summary>
-        /// Creates a new DocumentStore with the supplied StoreOptions
-        /// </summary>
-        /// <param name="options"></param>
-        public DocumentStore(StoreOptions options)
-        {            
-            options.ApplyConfiguration();
-            options.CreatePatching();
-            options.Validate();
-            Options = options;
-
-            _logger = options.Logger();
-
-            Tenancy = options.Tenancy;
-
-            if (options.CreateDatabases != null)
-            {
-                IDatabaseGenerator databaseGenerator = new DatabaseGenerator();                
-                databaseGenerator.CreateDatabases(Tenancy, options.CreateDatabases);
-            }
-
-            Tenancy.Initialize();            
-
-            Schema = Tenancy.Schema;
-
-            Storage = options.Storage;
-
-            Storage.PostProcessConfiguration();
-
-            Serializer = options.Serializer();
-
-            if (options.UseCharBufferPooling)
-            {
-                _writerPool = new CharArrayTextWriter.Pool();
-            }
-
-            Advanced = new AdvancedOptions(this);
-
-            Diagnostics = new Diagnostics(this);
-
-            Transform = new DocumentTransforms(this, Tenancy.Default);
-
-            options.InitialData.Each(x => x.Populate(this));
-
-            Parser = new MartenExpressionParser(Serializer, options);
-
-            HandlerFactory = new QueryHandlerFactory(this);
-
-            Events = options.Events;
-        }
-
-        public ITenancy Tenancy { get; }
-
-        public EventGraph Events { get; }
-
-        internal IQueryHandlerFactory HandlerFactory { get; }
-
-        internal MartenExpressionParser Parser { get; }
-
-        private readonly IMartenLogger _logger;
-        private readonly CharArrayTextWriter.IPool _writerPool;
-
-        public StorageFeatures Storage { get; }
-        public ISerializer Serializer { get; }
-
-        public virtual void Dispose()
-        {
-            _writerPool.Dispose();
-        }
-
-
-        public StoreOptions Options { get; }
-
-        public IDocumentSchema Schema { get; }
-        public AdvancedOptions Advanced { get; }
-
-        public void BulkInsert<T>(T[] documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly, int batchSize = 1000)
-        {
-            var bulkInsertion = new BulkInsertion(Tenancy.Default, Options, _writerPool);
-            bulkInsertion.BulkInsert(documents, mode, batchSize);
-        }
-
-        public void BulkInsertDocuments(IEnumerable<object> documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly, int batchSize = 1000)
-        {
-            var bulkInsertion = new BulkInsertion(Tenancy.Default, Options, _writerPool);
-            bulkInsertion.BulkInsertDocuments(documents, mode, batchSize);
-        }
-
-        public void BulkInsert<T>(string tenantId, T[] documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly,
-            int batchSize = 1000)
-        {
-            var bulkInsertion = new BulkInsertion(Tenancy[tenantId], Options, _writerPool);
-            bulkInsertion.BulkInsert(documents, mode, batchSize);
-        }
-
-        public void BulkInsertDocuments(string tenantId, IEnumerable<object> documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly,
-            int batchSize = 1000)
-        {
-            var bulkInsertion = new BulkInsertion(Tenancy[tenantId], Options, _writerPool);
-            bulkInsertion.BulkInsertDocuments(documents, mode, batchSize);
-        }
-
-        public IDiagnostics Diagnostics { get; }
-
-        public IDocumentSession OpenSession(SessionOptions options)
-        {
-            return openSession(options);
-        }
-
-        public IDocumentSession OpenSession(DocumentTracking tracking = DocumentTracking.IdentityOnly,
-            IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
-        {
-            return openSession(new SessionOptions
-            {
-                Tracking = tracking,
-                IsolationLevel = isolationLevel
-            });
-        }
-
-        public IDocumentSession OpenSession(string tenantId, DocumentTracking tracking = DocumentTracking.IdentityOnly,
-            IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
-        {
-            return openSession(new SessionOptions
-            {
-                Tracking = tracking,
-                IsolationLevel = isolationLevel,
-                TenantId = tenantId
-            });
-        }
-
-        private IDocumentSession openSession(SessionOptions options)
-        {
-            var sessionPool = CreateWriterPool();
-            var map = createMap(options.Tracking, sessionPool, options.Listeners);
-
-            var tenant = Tenancy[options.TenantId];
-
-            var connection = buildManagedConnection(options, tenant, CommandRunnerMode.Transactional);
-
-
-            var session = new DocumentSession(this, connection, _parser, map, tenant, options.ConcurrencyChecks, options.Listeners);
-            connection.BeginSession();
-
-            session.Logger = _logger.StartSession(session);
-
-            return session;
-        }
-
-        private static IManagedConnection buildManagedConnection(SessionOptions options, ITenant tenant,
-            CommandRunnerMode commandRunnerMode)
-        {
-            // Hate crap like this, but if we don't control the transation, use External to direct
-            // IManagedConnection not to call commit or rollback
-            if (!options.OwnsTransactionLifecycle && commandRunnerMode != CommandRunnerMode.ReadOnly)
-            {
-                commandRunnerMode = CommandRunnerMode.External;
-            }
-
-            if (options.Transaction != null) options.Connection = options.Transaction.Connection;
-
-
-
-#if NET46 || NETSTANDARD2_0
-            if (options.Connection == null && options.DotNetTransaction != null)
-            {
-                var connection = tenant.CreateConnection();
-                connection.Open();
-                
-
-                options.Connection = connection;
-            }
-
-            if (options.DotNetTransaction != null)
-            {
-                options.Connection.EnlistTransaction(options.DotNetTransaction);
-                options.OwnsTransactionLifecycle = false;
-            }
-#endif
-
-            if (options.Connection == null)
-            {
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using Baseline;
+using Marten.Events;
+using Marten.Events.Projections;
+using Marten.Events.Projections.Async;
+using Marten.Linq;
+using Marten.Linq.QueryHandlers;
+using Marten.Schema;
+using Marten.Services;
+using Marten.Storage;
+using Marten.Transforms;
+using Remotion.Linq.Parsing.Structure;
+using IsolationLevel = System.Data.IsolationLevel;
+
+namespace Marten
+{
+
+    /// <summary>
+    /// The main entry way to using Marten
+    /// </summary>
+    public class DocumentStore : IDocumentStore
+    {
+        private readonly IQueryParser _parser = new MartenQueryParser();
+
+        /// <summary>
+        /// Quick way to stand up a DocumentStore to the given database connection
+        /// in the "development" mode for auto-creating schema objects as needed
+        /// with the default behaviors
+        /// </summary>
+        /// <param name="connectionString"></param>
+        /// <returns></returns>
+        public static DocumentStore For(string connectionString)
+        {
+            return For(_ =>
+            {
+                _.AutoCreateSchemaObjects = AutoCreate.All;
+                _.Connection(connectionString);
+            });
+        }
+
+        /// <summary>
+        /// Configures a DocumentStore for an existing StoreOptions type
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public static DocumentStore For<T>() where T : StoreOptions, new()
+        {
+            return new DocumentStore(new T());
+        }
+
+        /// <summary>
+        /// Configures a DocumentStore by defining the StoreOptions settings first
+        /// </summary>
+        /// <param name="configure"></param>
+        /// <returns></returns>
+        public static DocumentStore For(Action<StoreOptions> configure)
+        {
+            var options = new StoreOptions();
+            configure(options);
+
+            return new DocumentStore(options);
+        }
+
+        /// <summary>
+        /// Creates a new DocumentStore with the supplied StoreOptions
+        /// </summary>
+        /// <param name="options"></param>
+        public DocumentStore(StoreOptions options)
+        {            
+            options.ApplyConfiguration();
+            options.CreatePatching();
+            options.Validate();
+            Options = options;
+
+            _logger = options.Logger();
+
+            Tenancy = options.Tenancy;
+
+            if (options.CreateDatabases != null)
+            {
+                IDatabaseGenerator databaseGenerator = new DatabaseGenerator();                
+                databaseGenerator.CreateDatabases(Tenancy, options.CreateDatabases);
+            }
+
+            Tenancy.Initialize();            
+
+            Schema = Tenancy.Schema;
+
+            Storage = options.Storage;
+
+            Storage.PostProcessConfiguration();
+
+            Serializer = options.Serializer();
+
+            if (options.UseCharBufferPooling)
+            {
+                _writerPool = new CharArrayTextWriter.Pool();
+            }
+
+            Advanced = new AdvancedOptions(this);
+
+            Diagnostics = new Diagnostics(this);
+
+            Transform = new DocumentTransforms(this, Tenancy.Default);
+
+            options.InitialData.Each(x => x.Populate(this));
+
+            Parser = new MartenExpressionParser(Serializer, options);
+
+            HandlerFactory = new QueryHandlerFactory(this);
+
+            Events = options.Events;
+        }
+
+        public ITenancy Tenancy { get; }
+
+        public EventGraph Events { get; }
+
+        internal IQueryHandlerFactory HandlerFactory { get; }
+
+        internal MartenExpressionParser Parser { get; }
+
+        private readonly IMartenLogger _logger;
+        private readonly CharArrayTextWriter.IPool _writerPool;
+
+        public StorageFeatures Storage { get; }
+        public ISerializer Serializer { get; }
+
+        public virtual void Dispose()
+        {
+            _writerPool.Dispose();
+        }
+
+
+        public StoreOptions Options { get; }
+
+        public IDocumentSchema Schema { get; }
+        public AdvancedOptions Advanced { get; }
+
+        public void BulkInsert<T>(T[] documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly, int batchSize = 1000)
+        {
+            var bulkInsertion = new BulkInsertion(Tenancy.Default, Options, _writerPool);
+            bulkInsertion.BulkInsert(documents, mode, batchSize);
+        }
+
+        public void BulkInsertDocuments(IEnumerable<object> documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly, int batchSize = 1000)
+        {
+            var bulkInsertion = new BulkInsertion(Tenancy.Default, Options, _writerPool);
+            bulkInsertion.BulkInsertDocuments(documents, mode, batchSize);
+        }
+
+        public void BulkInsert<T>(string tenantId, T[] documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly,
+            int batchSize = 1000)
+        {
+            var bulkInsertion = new BulkInsertion(Tenancy[tenantId], Options, _writerPool);
+            bulkInsertion.BulkInsert(documents, mode, batchSize);
+        }
+
+        public void BulkInsertDocuments(string tenantId, IEnumerable<object> documents, BulkInsertMode mode = BulkInsertMode.InsertsOnly,
+            int batchSize = 1000)
+        {
+            var bulkInsertion = new BulkInsertion(Tenancy[tenantId], Options, _writerPool);
+            bulkInsertion.BulkInsertDocuments(documents, mode, batchSize);
+        }
+
+        public IDiagnostics Diagnostics { get; }
+
+        public IDocumentSession OpenSession(SessionOptions options)
+        {
+            return openSession(options);
+        }
+
+        public IDocumentSession OpenSession(DocumentTracking tracking = DocumentTracking.IdentityOnly,
+            IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
+        {
+            return openSession(new SessionOptions
+            {
+                Tracking = tracking,
+                IsolationLevel = isolationLevel
+            });
+        }
+
+        public IDocumentSession OpenSession(string tenantId, DocumentTracking tracking = DocumentTracking.IdentityOnly,
+            IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
+        {
+            return openSession(new SessionOptions
+            {
+                Tracking = tracking,
+                IsolationLevel = isolationLevel,
+                TenantId = tenantId
+            });
+        }
+
+        private IDocumentSession openSession(SessionOptions options)
+        {
+            var sessionPool = CreateWriterPool();
+            var map = createMap(options.Tracking, sessionPool, options.Listeners);
+
+            var tenant = Tenancy[options.TenantId];
+
+            var connection = buildManagedConnection(options, tenant, CommandRunnerMode.Transactional);
+
+
+            var session = new DocumentSession(this, connection, _parser, map, tenant, options.ConcurrencyChecks, options.Listeners);
+            connection.BeginSession();
+
+            session.Logger = _logger.StartSession(session);
+
+            return session;
+        }
+
+        private static IManagedConnection buildManagedConnection(SessionOptions options, ITenant tenant,
+            CommandRunnerMode commandRunnerMode)
+        {
+            // Hate crap like this, but if we don't control the transation, use External to direct
+            // IManagedConnection not to call commit or rollback
+            if (!options.OwnsTransactionLifecycle && commandRunnerMode != CommandRunnerMode.ReadOnly)
+            {
+                commandRunnerMode = CommandRunnerMode.External;
+            }
+
+            if (options.Transaction != null) options.Connection = options.Transaction.Connection;
+
+
+
+#if NET46 || NETSTANDARD2_0
+            if (options.Connection == null && options.DotNetTransaction != null)
+            {
+                var connection = tenant.CreateConnection();
+                connection.Open();
+                
+
+                options.Connection = connection;
+            }
+
+            if (options.DotNetTransaction != null)
+            {
+                options.Connection.EnlistTransaction(options.DotNetTransaction);
+                options.OwnsTransactionLifecycle = false;
+            }
+#endif
+
+            if (options.Connection == null)
+            {
                 return tenant.OpenConnection(commandRunnerMode, options.IsolationLevel, options.Timeout);
-            }
-            else
-            {
-                return new ManagedConnection(options, commandRunnerMode);
-            }
-
-        }
-
-        internal CharArrayTextWriter.Pool CreateWriterPool()
-        {
-            return Options.UseCharBufferPooling ? new CharArrayTextWriter.Pool(_writerPool) : null;
-        }
-
-        private IIdentityMap createMap(DocumentTracking tracking, CharArrayTextWriter.IPool sessionPool, IEnumerable<IDocumentSessionListener> localListeners)
-        {
-            switch (tracking)
-            {
-                case DocumentTracking.None:
-                    return new NulloIdentityMap(Serializer);
-
-                case DocumentTracking.IdentityOnly:
-                    return new IdentityMap(Serializer, Options.Listeners.Concat(localListeners));
-
-                case DocumentTracking.DirtyTracking:
-                    return new DirtyTrackingIdentityMap(Serializer, Options.Listeners.Concat(localListeners), sessionPool);
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(tracking));
-            }
-        }
-
-        public IDocumentSession DirtyTrackedSession(IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
-        {
-            return OpenSession(DocumentTracking.DirtyTracking, isolationLevel);
-        }
-
-        public IDocumentSession DirtyTrackedSession(string tenantId, IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
-        {
-            return OpenSession(tenantId, DocumentTracking.DirtyTracking, isolationLevel);
-        }
-
-        public IDocumentSession LightweightSession(IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
-        {
-            return OpenSession(DocumentTracking.None, isolationLevel);
-        }
-
-        public IDocumentSession LightweightSession(string tenantId, IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
-        {
-            return OpenSession(tenantId, DocumentTracking.None, isolationLevel);
-        }
-
-        public IQuerySession QuerySession(SessionOptions options)
-        {
-            var parser = new MartenQueryParser();
-
-            var tenant = Tenancy[options.TenantId];
-
-            var connection = buildManagedConnection(options, tenant, CommandRunnerMode.ReadOnly);
-
-            var session = new QuerySession(this,
-                connection, parser,
-                new NulloIdentityMap(Serializer), tenant);
-
-	        connection.BeginSession();
-
-			session.Logger = _logger.StartSession(session);
-
-            return session;
-        }
-
-        public IQuerySession QuerySession()
-        {
-            return QuerySession(Marten.Storage.Tenancy.DefaultTenantId);
-        }
-
-        public IQuerySession QuerySession(string tenantId)
-        {
-            var parser = new MartenQueryParser();
-
-            var tenant = Tenancy[tenantId];
-            var connection = tenant.OpenConnection(CommandRunnerMode.ReadOnly);
-
-            var session = new QuerySession(this,
-                connection, parser,
-                new NulloIdentityMap(Serializer), tenant);
-
-			connection.BeginSession();
-
-            session.Logger = _logger.StartSession(session);
-
-            return session;
-        }
-
-        public IDocumentTransforms Transform { get; }
-
-        public IDaemon BuildProjectionDaemon(Type[] viewTypes = null, IDaemonLogger logger = null, DaemonSettings settings = null, IProjection[] projections = null)
-        {
-            Tenancy.Default.EnsureStorageExists(typeof(EventStream));
-
-            if (projections == null)
-            {
-                projections = viewTypes?.Select(x => Events.ProjectionFor(x)).Where(x => x != null).ToArray() ?? Events.AsyncProjections.ToArray();
-            }
-
-            return new Daemon(this, Tenancy.Default, settings ?? new DaemonSettings(), logger ?? new NulloDaemonLogger(), projections);
-        }
-    }
+            }
+            else
+            {
+                return new ManagedConnection(options, commandRunnerMode);
+            }
+
+        }
+
+        internal CharArrayTextWriter.Pool CreateWriterPool()
+        {
+            return Options.UseCharBufferPooling ? new CharArrayTextWriter.Pool(_writerPool) : null;
+        }
+
+        private IIdentityMap createMap(DocumentTracking tracking, CharArrayTextWriter.IPool sessionPool, IEnumerable<IDocumentSessionListener> localListeners)
+        {
+            switch (tracking)
+            {
+                case DocumentTracking.None:
+                    return new NulloIdentityMap(Serializer);
+
+                case DocumentTracking.IdentityOnly:
+                    return new IdentityMap(Serializer, Options.Listeners.Concat(localListeners));
+
+                case DocumentTracking.DirtyTracking:
+                    return new DirtyTrackingIdentityMap(Serializer, Options.Listeners.Concat(localListeners), sessionPool);
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(tracking));
+            }
+        }
+
+        public IDocumentSession DirtyTrackedSession(IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
+        {
+            return OpenSession(DocumentTracking.DirtyTracking, isolationLevel);
+        }
+
+        public IDocumentSession DirtyTrackedSession(string tenantId, IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
+        {
+            return OpenSession(tenantId, DocumentTracking.DirtyTracking, isolationLevel);
+        }
+
+        public IDocumentSession LightweightSession(IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
+        {
+            return OpenSession(DocumentTracking.None, isolationLevel);
+        }
+
+        public IDocumentSession LightweightSession(string tenantId, IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
+        {
+            return OpenSession(tenantId, DocumentTracking.None, isolationLevel);
+        }
+
+        public IQuerySession QuerySession(SessionOptions options)
+        {
+            var parser = new MartenQueryParser();
+
+            var tenant = Tenancy[options.TenantId];
+
+            var connection = buildManagedConnection(options, tenant, CommandRunnerMode.ReadOnly);
+
+            var session = new QuerySession(this,
+                connection, parser,
+                new NulloIdentityMap(Serializer), tenant);
+
+	        connection.BeginSession();
+
+			session.Logger = _logger.StartSession(session);
+
+            return session;
+        }
+
+        public IQuerySession QuerySession()
+        {
+            return QuerySession(Marten.Storage.Tenancy.DefaultTenantId);
+        }
+
+        public IQuerySession QuerySession(string tenantId)
+        {
+            var parser = new MartenQueryParser();
+
+            var tenant = Tenancy[tenantId];
+            var connection = tenant.OpenConnection(CommandRunnerMode.ReadOnly);
+
+            var session = new QuerySession(this,
+                connection, parser,
+                new NulloIdentityMap(Serializer), tenant);
+
+			connection.BeginSession();
+
+            session.Logger = _logger.StartSession(session);
+
+            return session;
+        }
+
+        public IDocumentTransforms Transform { get; }
+
+        public IDaemon BuildProjectionDaemon(Type[] viewTypes = null, IDaemonLogger logger = null, DaemonSettings settings = null, IProjection[] projections = null)
+        {
+            Tenancy.Default.EnsureStorageExists(typeof(EventStream));
+
+            if (projections == null)
+            {
+                projections = viewTypes?.Select(x => Events.ProjectionFor(x)).Where(x => x != null).ToArray() ?? Events.AsyncProjections.ToArray();
+            }
+
+            return new Daemon(this, Tenancy.Default, settings ?? new DaemonSettings(), logger ?? new NulloDaemonLogger(), projections);
+        }
+    }
 }
\ No newline at end of file