diff --git a/Gemfile.lock b/Gemfile.lock
index 0ed929071..df3b5d943 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    view_component (3.5.0)
+    view_component (3.6.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -333,9 +333,6 @@ DEPENDENCIES
   jbuilder (~> 2)
   m (~> 1)
   minitest (~> 5.18)
-  net-imap
-  net-pop
-  net-smtp
   pry (~> 0.13)
   puma (~> 6)
   rails (~> 7.0.0)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 54d384483..7c7e0d955 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -10,6 +10,8 @@ nav_order: 5
 
 ## main
 
+## 3.6.0
+
 * Refer to `helpers` in `NameError` message in development and test environments.
 
     *Simon Fish*
diff --git a/docs/_data/library.yml b/docs/_data/library.yml
index a99e3342c..b04df676e 100644
--- a/docs/_data/library.yml
+++ b/docs/_data/library.yml
@@ -1 +1 @@
-version: 3.5.0
+version: 3.6.0
diff --git a/lib/view_component/version.rb b/lib/view_component/version.rb
index cc0c9e583..792015941 100644
--- a/lib/view_component/version.rb
+++ b/lib/view_component/version.rb
@@ -3,7 +3,7 @@
 module ViewComponent
   module VERSION
     MAJOR = 3
-    MINOR = 5
+    MINOR = 6
     PATCH = 0
     PRE = nil
 
diff --git a/test/sandbox/test/generators/preview_generator_test.rb b/test/sandbox/test/generators/preview_generator_test.rb
index 361c01ac0..436e6e86c 100644
--- a/test/sandbox/test/generators/preview_generator_test.rb
+++ b/test/sandbox/test/generators/preview_generator_test.rb
@@ -3,6 +3,9 @@
 require "test_helper"
 require "rails/generators/preview/component_generator"
 
+# See: https://github.com/rails/rails/pull/47752#issuecomment-1720256371
+require "active_record"
+
 Rails.application.load_generators
 
 class PreviewGeneratorTest < Rails::Generators::TestCase