From a7961f3d21aca970d51de65d0ec105cdc3dbc109 Mon Sep 17 00:00:00 2001 From: filipw Date: Mon, 10 Dec 2018 20:12:51 +0100 Subject: [PATCH 1/3] roslyn 2.10.0 --- Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 195d2e3a..0a3ce0d7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,8 +3,8 @@ - - + + From ee571fdbc1993b0eea4c0e80b971d7b6445c5087 Mon Sep 17 00:00:00 2001 From: Aaron Hardin Date: Fri, 11 Jan 2019 11:18:04 -0600 Subject: [PATCH 2/3] Register the _replType if specified, otherwise use the default Repl #1298 --- src/ScriptCs.Hosting/RuntimeServices.cs | 3 +-- test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) 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()); builder.RegisterType(_scriptEngineType).As().SingleInstance(); builder.RegisterType(_scriptExecutorType).As().SingleInstance(); - builder.RegisterType(_replType).As().SingleInstance(); + builder.RegisterType(_replType ?? typeof(Repl)).As().SingleInstance(); builder.RegisterType().SingleInstance(); - builder.RegisterType().As().SingleInstance(); builder.RegisterType().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().ShouldBeType(typeof(MockVisualStudioSolutionWriter)); } + [Fact] + public void ShouldRegisterTheOverriddenRepl() + { + var mock = new Mock(); + _overrides[ typeof( IRepl ) ] = mock.Object.GetType(); + _runtimeServices.Container.Resolve().ShouldBeType( mock.Object.GetType() ); + } + [Fact] public void ShouldLogOnDebugAnAssemblyLoadFailure() { From 112de2f219fa64dd55ecc0129f834d787e596af6 Mon Sep 17 00:00:00 2001 From: filipw Date: Fri, 29 May 2020 14:37:58 +0200 Subject: [PATCH 3/3] moved package versions to Directory.Build.targets --- Directory.Build.targets | 2 +- ScriptCs.sln | 10 ++++++++-- .../ScriptCs.Engine.Roslyn.csproj | 2 +- .../ScriptCs.Engine.Roslyn.Tests.csproj | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) 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 @@ - + 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.Engine.Roslyn/ScriptCs.Engine.Roslyn.csproj b/src/ScriptCs.Engine.Roslyn/ScriptCs.Engine.Roslyn.csproj index 1d946da1..e88e280a 100644 --- a/src/ScriptCs.Engine.Roslyn/ScriptCs.Engine.Roslyn.csproj +++ b/src/ScriptCs.Engine.Roslyn/ScriptCs.Engine.Roslyn.csproj @@ -15,7 +15,7 @@ - + diff --git a/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj b/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj index db416e31..bb8f8ea1 100644 --- a/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj +++ b/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj @@ -11,7 +11,7 @@ - +