diff --git a/Directory.Build.targets b/Directory.Build.targets
index 0a3ce0d7..eb7be3ec 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -3,7 +3,7 @@
     <PackageReference Update="Autofac" Version="4.6.2" />
     <PackageReference Update="Autofac.Mef" Version="4.0.0" />
     <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
-    <PackageReference Update="Microsoft.CodeAnalysis.Scripting" Version="2.10.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.Scripting" Version="3.6.0" />
     <PackageReference Update="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Update="Microsoft.Web.Xdt" Version="2.1.2" />
     <PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
diff --git a/ScriptCs.sln b/ScriptCs.sln
index 774a8420..756ee82f 100644
--- a/ScriptCs.sln
+++ b/ScriptCs.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2003
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptCs", "src\ScriptCs\ScriptCs.csproj", "{25080671-1A80-4041-B9C7-260578FF4849}"
 EndProject
@@ -30,6 +30,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptCs.Engine.Roslyn", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptCs.Tests.Acceptance", "test\ScriptCs.Tests.Acceptance\ScriptCs.Tests.Acceptance.csproj", "{10684649-2922-41F5-AB9B-20B127CBF92C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C5ABCEF-82F9-4850-B2B8-1D7B73D9C5C3}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/src/ScriptCs.Hosting/RuntimeServices.cs b/src/ScriptCs.Hosting/RuntimeServices.cs
index 199338d5..9a07390c 100644
--- a/src/ScriptCs.Hosting/RuntimeServices.cs
+++ b/src/ScriptCs.Hosting/RuntimeServices.cs
@@ -55,9 +55,8 @@ protected override IContainer CreateContainer()
             builder.RegisterInstance(this.LogProvider).Exported(x => x.As<ILogProvider>());
             builder.RegisterType(_scriptEngineType).As<IScriptEngine>().SingleInstance();
             builder.RegisterType(_scriptExecutorType).As<IScriptExecutor>().SingleInstance();
-            builder.RegisterType(_replType).As<IRepl>().SingleInstance();
+            builder.RegisterType(_replType ?? typeof(Repl)).As<IRepl>().SingleInstance();
             builder.RegisterType<ScriptServices>().SingleInstance();
-            builder.RegisterType<Repl>().As<IRepl>().SingleInstance();
             builder.RegisterType<Printers>().SingleInstance();
 
             RegisterLineProcessors(builder);
diff --git a/test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs b/test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs
index 5a80b7af..b5b888c3 100644
--- a/test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs
+++ b/test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs
@@ -271,6 +271,14 @@ public void ShouldRegisterTheOverriddenVisualStudioSolutionWriter()
                 _runtimeServices.Container.Resolve<IVisualStudioSolutionWriter>().ShouldBeType(typeof(MockVisualStudioSolutionWriter));
             }
 
+            [Fact]
+            public void ShouldRegisterTheOverriddenRepl()
+            {
+                var mock = new Mock<IRepl>();
+                _overrides[ typeof( IRepl ) ] = mock.Object.GetType();
+                _runtimeServices.Container.Resolve<IRepl>().ShouldBeType( mock.Object.GetType() );
+            }
+
             [Fact]
             public void ShouldLogOnDebugAnAssemblyLoadFailure()
             {