Left over fixes need for rename / removal of VB

glennblock · glennblock · commit aff720d1e36b · 2016-02-28T21:50:04.000-08:00
diff --git a/build/Build.proj b/build/Build.proj
@@ -78,7 +78,6 @@
     <ItemGroup>
       <NuGetProjects Include="$(Root)src\ScriptCs.Contracts\ScriptCs.Contracts.csproj" />
       <NuGetProjects Include="$(Root)src\ScriptCs.Core\ScriptCs.Core.csproj" />
-      <NuGetProjects Include="$(Root)src\ScriptCs.VisualBasic\ScriptCs.VisualBasic.csproj" />
       <NuGetProjects Include="$(Root)src\ScriptCs.Hosting\ScriptCs.Hosting.csproj" />
       <NuGetProjects Include="$(Root)src\ScriptCs.Engine.Roslyn\ScriptCs.Engine.Roslyn.csproj" />
       <NuGetProjects Include="$(Root)src\ScriptCs.Engine.Mono\ScriptCs.Engine.Mono.csproj" />
diff --git a/src/ScriptCs.Hosting/ScriptServicesBuilder.cs b/src/ScriptCs.Hosting/ScriptServicesBuilder.cs
@@ -96,7 +96,7 @@ public IScriptServicesBuilder LoadModules(string extension, params string[] modu
         {
             var engineModule = _typeResolver.ResolveType("Mono.Runtime") != null || moduleNames.Contains("mono")
                 ? "mono"
-                : "csharp";
+                : "roslyn";
 
             moduleNames = moduleNames.Union(new[] { engineModule }).ToArray();
 
diff --git a/test/ScriptCs.Hosting.Tests/ModuleLoaderTests.cs b/test/ScriptCs.Hosting.Tests/ModuleLoaderTests.cs
@@ -114,10 +114,10 @@ public void ShouldNotInitializeModulesThatAreNotSetToAutoload()
             [Fact]
             public void ShouldLoadEngineAssemblyByHandIfItsTheOnlyModule()
             {
-                var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["csharp"]);
+                var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["roslyn"]);
                 _mockAssemblyUtility.Setup(x => x.LoadFile(path));
                 var loader = new ModuleLoader(_mockAssemblyResolver.Object, _logProvider, (a, c) => { }, _getModules, _mockFileSystem.Object, _mockAssemblyUtility.Object);
-                loader.Load(null, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "csharp");
+                loader.Load(null, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "roslyn");
 
                 _mockAssemblyUtility.Verify(x => x.LoadFile(path), Times.Once());
             }
@@ -130,19 +130,19 @@ public void ShouldLoadEngineModuleFromFile()
 
                 var config = new ModuleConfiguration(true, string.Empty, false, LogLevel.Debug, true,
                     new Dictionary<Type, object> {{typeof (string), "not loaded"}});
-                loader.Load(config, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "csharp");
+                loader.Load(config, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "roslyn");
 
                 config.Overrides[typeof(string)].ShouldEqual("module loaded");
             }
 
             [Fact]
             public void ShouldNotLoadEngineAssemblyByHandIfItsTheOnlyModuleButExtensionIsNotDefault()
             {
-                var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["csharp"]);
+                var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["roslyn"]);
                 _mockAssemblyUtility.Setup(x => x.LoadFile(path));
                 var loader = new ModuleLoader(_mockAssemblyResolver.Object, _logProvider, (a, c) => { }, _getModules, _mockFileSystem.Object, _mockAssemblyUtility.Object);
 
-                loader.Load(null, new string[0], "c:\\foo", ".fsx", "csharp");
+                loader.Load(null, new string[0], "c:\\foo", ".fsx", "roslyn");
                 _mockAssemblyUtility.Verify(x => x.LoadFile(It.IsAny<string>()), Times.Never);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public IScriptServicesBuilder LoadModules(string extension, params string[] modu`
`96`	`96`	`{`
`97`	`97`	`var engineModule = _typeResolver.ResolveType("Mono.Runtime") != null \|\| moduleNames.Contains("mono")`
`98`	`98`	`? "mono"`
`99`		`- : "csharp";`
	`99`	`+ : "roslyn";`
`100`	`100`
`101`	`101`	`moduleNames = moduleNames.Union(new[] { engineModule }).ToArray();`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -114,10 +114,10 @@ public void ShouldNotInitializeModulesThatAreNotSetToAutoload()`
`114`	`114`	`[Fact]`
`115`	`115`	`public void ShouldLoadEngineAssemblyByHandIfItsTheOnlyModule()`
`116`	`116`	`{`
`117`		`- var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["csharp"]);`
	`117`	`+ var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["roslyn"]);`
`118`	`118`	`_mockAssemblyUtility.Setup(x => x.LoadFile(path));`
`119`	`119`	`var loader = new ModuleLoader(_mockAssemblyResolver.Object, _logProvider, (a, c) => { }, _getModules, _mockFileSystem.Object, _mockAssemblyUtility.Object);`
`120`		`- loader.Load(null, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "csharp");`
	`120`	`+ loader.Load(null, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "roslyn");`
`121`	`121`
`122`	`122`	`_mockAssemblyUtility.Verify(x => x.LoadFile(path), Times.Once());`
`123`	`123`	`}`
`@@ -130,19 +130,19 @@ public void ShouldLoadEngineModuleFromFile()`
`130`	`130`
`131`	`131`	`var config = new ModuleConfiguration(true, string.Empty, false, LogLevel.Debug, true,`
`132`	`132`	`new Dictionary<Type, object> {{typeof (string), "not loaded"}});`
`133`		`- loader.Load(config, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "csharp");`
	`133`	`+ loader.Load(config, new string[0], "c:\\foo", ModuleLoader.DefaultCSharpExtension, "roslyn");`
`134`	`134`
`135`	`135`	`config.Overrides[typeof(string)].ShouldEqual("module loaded");`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`[Fact]`
`139`	`139`	`public void ShouldNotLoadEngineAssemblyByHandIfItsTheOnlyModuleButExtensionIsNotDefault()`
`140`	`140`	`{`
`141`		`- var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["csharp"]);`
	`141`	`+ var path = Path.Combine("c:\\foo", ModuleLoader.DefaultCSharpModules["roslyn"]);`
`142`	`142`	`_mockAssemblyUtility.Setup(x => x.LoadFile(path));`
`143`	`143`	`var loader = new ModuleLoader(_mockAssemblyResolver.Object, _logProvider, (a, c) => { }, _getModules, _mockFileSystem.Object, _mockAssemblyUtility.Object);`
`144`	`144`
`145`		`- loader.Load(null, new string[0], "c:\\foo", ".fsx", "csharp");`
	`145`	`+ loader.Load(null, new string[0], "c:\\foo", ".fsx", "roslyn");`
`146`	`146`	`_mockAssemblyUtility.Verify(x => x.LoadFile(It.IsAny<string>()), Times.Never);`
`147`	`147`	`}`
`148`	`148`