Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit e6db679

Browse files
beolutzJérémie Bertrand
authored andcommitted
Custom FileSystem Support (#11)
Custom FileSystem Support
1 parent 29afcf3 commit e6db679

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/ScriptCs.ComponentModel.Composition.Test/ScriptCsCatalogFacts.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,6 @@ private static MEFHost GetComposedMefHost(ScriptCsCatalog catalog)
744744
var batch = new CompositionBatch();
745745
var mefHost = new MEFHost();
746746
batch.AddPart(mefHost);
747-
748747
// act
749748
container.Compose(batch);
750749

@@ -775,6 +774,8 @@ private static Mock<IFileSystem> GetMockFileSystem(string[] fileNames, string[]
775774
fileSystem.SetupGet(f => f.BinFolder).Returns("scriptcs_bin");
776775
fileSystem.SetupGet(f => f.DllCacheFolder).Returns(".scriptcs_cache");
777776
fileSystem.SetupGet(f => f.NugetFile).Returns("scriptcs_nuget.config");
777+
fileSystem.SetupGet(f => f.GlobalFolder).Returns(@"c:\workingdirectory");
778+
fileSystem.SetupGet(f => f.HostBin).Returns(Environment.CurrentDirectory);
778779
fileSystem.SetupGet(f => f.CurrentDirectory).Returns(@"c:\workingdirectory");
779780
fileSystem.Setup(f => f.GetWorkingDirectory(It.IsAny<string>())).Returns(@"c:\workingdirectory");
780781
fileSystem.Setup(f => f.DirectoryExists(It.IsAny<string>())).Returns<string>((directory) => directory.EndsWith("_plugins"));

src/ScriptCs.ComponentModel.Composition/ScriptCsCatalog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ private ScriptServices CreateScriptServices()
492492
var console = new ScriptConsole();
493493
var logProvider = new ColoredConsoleLogProvider(LogLevel.Info, console);
494494

495-
var initializationServices = new InitializationServices(logProvider);
495+
var initializationServices = new InitializationServices(logProvider, new Dictionary<Type, object> { { typeof(IFileSystem), _options.FileSystem } });
496496
initializationServices.GetAppDomainAssemblyResolver().Initialize();
497497

498498
var scriptServicesBuilder = new ScriptServicesBuilder(console, logProvider, null, null, initializationServices);

0 commit comments

Comments
 (0)