Refactoring.

Eliminated [Serializable] attributes in Generator classes as no longer needed.

Reqnroll.Generator/DefaultDependencyProvider.cs

@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Configuration;
 using Reqnroll.BoDi;
 using Reqnroll.Configuration;
 using Reqnroll.Generator.Configuration;
@@ -21,6 +22,10 @@ public virtual void RegisterDefaults(ObjectContainer container)
         {
             container.RegisterTypeAs<FileSystem, IFileSystem>();
 
+            container.RegisterTypeAs<ConfigurationManager, IConfigurationManager>();
+            container.RegisterTypeAs<MicrosoftConfiguration_RuntimeConfigurationLoader, IMS_ConfigurationLoader>();
+
+
             container.RegisterTypeAs<GeneratorConfigurationProvider, IGeneratorConfigurationProvider>();
             container.RegisterTypeAs<InProcGeneratorInfoProvider, IGeneratorInfoProvider>();
             container.RegisterTypeAs<TestGenerator, ITestGenerator>();

Reqnroll.Generator/Interfaces/FeatureFileInput.cs

@@ -3,16 +3,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
-    /// 
-    /// 
-    /// <summary>
-    /// Represents the information related to a feature file as an input of the generation
-    /// </summary>
-    [Serializable]
     public class FeatureFileInput
     {
         /// <summary>

Reqnroll.Generator/Interfaces/GenerationSettings.cs

@@ -2,16 +2,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {  
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
-    /// 
-    /// 
-   /// <summary>
-   /// Settings for test generation
-   /// </summary>
-    [Serializable]
     public class GenerationSettings
     {
         /// <summary>

Reqnroll.Generator/Interfaces/ITestGenerator.cs

@@ -3,10 +3,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
     public interface ITestGenerator : IDisposable
     {
         TestGeneratorResult GenerateTestFile(FeatureFileInput featureFileInput, GenerationSettings settings);

Reqnroll.Generator/Interfaces/ITestGeneratorFactory.cs

@@ -3,10 +3,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization across AppDomains
     public interface ITestGeneratorFactory
     {
         Version GetGeneratorVersion();

Reqnroll.Generator/Interfaces/ProjectPlatformSettings.cs

@@ -2,11 +2,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization across appdomains
-    [Serializable]
     public class ProjectPlatformSettings
     {
         /// <summary>

Reqnroll.Generator/Interfaces/ProjectSettings.cs

@@ -3,11 +3,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
-    [Serializable]
     public class ProjectSettings
     {
         /// <summary>

Reqnroll.Generator/Interfaces/ReqnrollConfigurationHolder.cs

@@ -4,11 +4,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
-    [Serializable]
     public class ReqnrollConfigurationHolder : IReqnrollConfigurationHolder
     {
         private readonly string xmlString;

Reqnroll.Generator/Interfaces/TestGenerationError.cs

@@ -4,11 +4,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
-    [Serializable]
     public class TestGenerationError
     {
         /// <summary>

Reqnroll.Generator/Interfaces/TestGeneratorFactoryAttribute.cs

@@ -2,10 +2,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
     [AttributeUsage(AttributeTargets.Assembly)]
     public class TestGeneratorFactoryAttribute : Attribute
     {

Reqnroll.Generator/Interfaces/TestGeneratorResult.cs

@@ -4,11 +4,6 @@
 
 namespace Reqnroll.Generator.Interfaces
 {
-    /// IMPORTANT
-    /// This class is used for interop with the Visual Studio Extension
-    /// DO NOT REMOVE OR RENAME FIELDS!
-    /// This breaks binary serialization accross appdomains
-    [Serializable]
     public class TestGeneratorResult
     {
         /// <summary>

Reqnroll.Tools.MsBuild.Generation/GenerateFeatureFileCodeBehindTaskContainerBuilder.cs

@@ -7,6 +7,8 @@
 using Reqnroll.EnvironmentAccess;
 using Reqnroll.Generator.Configuration;
 using Reqnroll.Generator.Project;
+using Microsoft.Extensions.Configuration;
+using System.ComponentModel;
 
 namespace Reqnroll.Tools.MsBuild.Generation
 {
@@ -47,6 +49,10 @@ public IObjectContainer BuildRootContainer(
             objectContainer.RegisterTypeAs<AppInsightsEventSerializer, IAppInsightsEventSerializer>();
             objectContainer.RegisterTypeAs<HttpClientWrapper, HttpClientWrapper>();
             objectContainer.RegisterTypeAs<AnalyticsEventProvider, IAnalyticsEventProvider>();
+
+            objectContainer.RegisterTypeAs<ConfigurationManager, IConfigurationManager>();
+            objectContainer.RegisterTypeAs<MicrosoftConfiguration_RuntimeConfigurationLoader, IMS_ConfigurationLoader>();
+
             objectContainer.RegisterTypeAs<ConfigurationLoader, IConfigurationLoader>();
             objectContainer.RegisterTypeAs<GeneratorConfigurationProvider, IGeneratorConfigurationProvider>();
             objectContainer.RegisterTypeAs<ProjectReader, IReqnrollProjectReader>();

Reqnroll/Configuration/ConfigurationLoader.cs

@@ -14,12 +14,14 @@ public class ConfigurationLoader : IConfigurationLoader
     {
         //private readonly ObjectContainer _objectContainer;
         private readonly JsonConfigurationLoader _jsonConfigurationLoader;
+        private readonly IMS_ConfigurationLoader _msConfigurationLoader;
         private readonly IReqnrollJsonLocator _reqnrollJsonLocator;
 
-        public ConfigurationLoader(IReqnrollJsonLocator reqnrollJsonLocator)
+        public ConfigurationLoader(IReqnrollJsonLocator reqnrollJsonLocator, IMS_ConfigurationLoader mS_ConfigurationLoader)
         {
             _reqnrollJsonLocator = reqnrollJsonLocator;
             _jsonConfigurationLoader = new JsonConfigurationLoader();
+            _msConfigurationLoader = mS_ConfigurationLoader;
         }
 
         private static CultureInfo DefaultFeatureLanguage => CultureInfo.GetCultureInfo(ConfigDefaults.FeatureLanguage);
@@ -139,7 +141,7 @@ private ReqnrollConfiguration LoadJson(ReqnrollConfiguration reqnrollConfigurati
         {
             var jsonFilePath = _reqnrollJsonLocator.GetReqnrollJsonFilePath();
 
-            return new MSE_RuntimeConfigurationLoader().LoadConfiguration(reqnrollConfiguration, jsonFilePath);
+            return _msConfigurationLoader.Load(reqnrollConfiguration);
         }
 
         private ReqnrollConfiguration LoadJson(ReqnrollConfiguration reqnrollConfiguration, string jsonContent)

Reqnroll/Configuration/IMS_ConfigurationLoader.cs

@@ -0,0 +1,8 @@
+namespace Reqnroll.Configuration
+{
+    public interface IMS_ConfigurationLoader
+    {
+        public ReqnrollConfiguration Load(ReqnrollConfiguration reqnrollConfiguration);
+
+    }
+}

Reqnroll/Configuration/JsonConfig/JsonConfigurationLoader.cs

@@ -21,14 +21,7 @@ public ReqnrollConfiguration LoadJson(ReqnrollConfiguration reqnrollConfiguratio
             return configuration;
         }
 
-        public ReqnrollConfiguration LoadJson(ReqnrollConfiguration reqnrollConfiguration, JsonConfig jsonConfig)
-        {
-            var configuration = ApplyJsonConfig(reqnrollConfiguration, jsonConfig);
-            configuration.ConfigSourceText = jsonConfig.ToJson();
-            return configuration;
-
-        }
-        private static ReqnrollConfiguration ApplyJsonConfig(ReqnrollConfiguration reqnrollConfiguration, JsonConfig jsonConfig)
+        public static ReqnrollConfiguration ApplyJsonConfig(ReqnrollConfiguration reqnrollConfiguration, JsonConfig jsonConfig)
         {
             var containerRegistrationCollection = reqnrollConfiguration.CustomDependencies;
             var generatorContainerRegistrationCollection = reqnrollConfiguration.GeneratorCustomDependencies;

Reqnroll/Configuration/MicrosoftConfiguration_RuntimeConfigurationLoader.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Net.NetworkInformation;
+using System.Text;
+using Microsoft.Extensions.Configuration;
+using Reqnroll.Configuration.JsonConfig;
+using Reqnroll.Tracing;
+using SpecFlow.Internal.Json;
+
+namespace Reqnroll.Configuration
+{
+    public class MicrosoftConfiguration_RuntimeConfigurationLoader : IMS_ConfigurationLoader
+     {
+        private readonly string _jsonConfigurationFilePath;
+        private readonly IConfigurationManager _configurationManager;
+
+        public MicrosoftConfiguration_RuntimeConfigurationLoader(IReqnrollJsonLocator reqnrollJsonLocator, IConfigurationManager configurationManager)
+        {
+            _jsonConfigurationFilePath = reqnrollJsonLocator.GetReqnrollJsonFilePath();
+            if (_jsonConfigurationFilePath != null)
+            {
+                configurationManager.AddJsonFile(_jsonConfigurationFilePath, optional: true, reloadOnChange: false);
+                configurationManager.AddEnvironmentVariables(prefix: "REQNROLL__");
+                _configurationManager = configurationManager;
+                //configurationManager.Build();
+                // Build not necessary as IConfigurationManager automatically rebuilds when sources are changed
+            }
+
+        }
+
+
+        public ReqnrollConfiguration Load(ReqnrollConfiguration reqnrollConfiguration)
+        {
+            var config = _configurationManager.Get<JsonConfig.JsonConfig>();
+            var configuration = JsonConfigurationLoader.ApplyJsonConfig(reqnrollConfiguration, config);
+            configuration.ConfigSourceText = config.ToJson();
+            return configuration;
+        }
+
+    }
+}

Reqnroll/Infrastructure/DefaultDependencyProvider.cs

@@ -16,6 +16,7 @@
 using Reqnroll.Time;
 using Reqnroll.Tracing;
 using Reqnroll.PlatformCompatibility;
+using Microsoft.Extensions.Configuration;
 
 namespace Reqnroll.Infrastructure
 {
@@ -27,6 +28,8 @@ public virtual void RegisterGlobalContainerDefaults(ObjectContainer container)
         {
             container.RegisterTypeAs<DefaultTestRunContext, ITestRunContext>();
             container.RegisterTypeAs<DefaultRuntimeConfigurationProvider, IRuntimeConfigurationProvider>();
+            container.RegisterTypeAs<ConfigurationManager, IConfigurationManager>(); 
+            container.RegisterTypeAs<MicrosoftConfiguration_RuntimeConfigurationLoader, IMS_ConfigurationLoader>();
 
             container.RegisterTypeAs<TestRunnerManager, ITestRunnerManager>();
 

Tests/Reqnroll.GeneratorTests/MsBuildProjectReaderTests.cs

@@ -19,8 +19,9 @@ private void Should_parse_csproj_file_correctly(string csprojPath, string langua
             string projectFilePath = Path.Combine(directoryName, csprojPath);
 
             var reqnrollJsonLocatorMock = new Mock<IReqnrollJsonLocator>();
+            var microsoftExtensionsConfigurationLoaderMock = new Mock<IMS_ConfigurationLoader>();
 
-            var configurationLoader = new ConfigurationLoader(reqnrollJsonLocatorMock.Object);
+            var configurationLoader = new ConfigurationLoader(reqnrollJsonLocatorMock.Object, microsoftExtensionsConfigurationLoaderMock.Object);
             var generatorConfigurationProvider = new GeneratorConfigurationProvider(configurationLoader);
             var projectLanguageReader = new ProjectLanguageReader();
             var reader = new ProjectReader(generatorConfigurationProvider, projectLanguageReader);

Tests/Reqnroll.RuntimeTests/Configuration/MSEConfigurationLoaderTests.cs

@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
+using Moq;
 using FluentAssertions;
 using System.IO;
 using System.Reflection;
@@ -14,12 +15,19 @@ namespace Reqnroll.RuntimeTests.Configuration
 {
     public class MSEConfigurationLoaderTests
     {
-        private string configFilePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Configuration\\reqnroll_config_test.json");
+        private IReqnrollJsonLocator GetStubJsonLocator()
+        {
+            var stubJsonLocatorMock = new Mock<IReqnrollJsonLocator>();
+            stubJsonLocatorMock.Setup(x => x.GetReqnrollJsonFilePath()).Returns(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Configuration\\reqnroll_config_test.json"));
+            return stubJsonLocatorMock.Object;
+        }
+        //private string configFilePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Configuration\\reqnroll_config_test.json");
 
         [Fact]
         public void Can_Load_From_JsonFile()
         {
-            var runtimeConfig = new MSE_RuntimeConfigurationLoader().LoadConfiguration(ConfigurationLoader.GetDefault(), configFilePath);
+            var runtimeConfig = new MicrosoftConfiguration_RuntimeConfigurationLoader(GetStubJsonLocator(), new Microsoft.Extensions.Configuration.ConfigurationManager())
+                .Load(ConfigurationLoader.GetDefault());
             runtimeConfig.FeatureLanguage.TwoLetterISOLanguageName.Should().Be("hu");
         }
         [Fact]
@@ -29,7 +37,8 @@ public void Can_Load_Override_From_Environment()
             //                    ""language"": { ""feature"": ""de"" }
             //                }";
             Environment.SetEnvironmentVariable("REQNROLL__language__feature", "de");
-            var runtimeConfig = new MSE_RuntimeConfigurationLoader().LoadConfiguration(ConfigurationLoader.GetDefault(), configFilePath);
+            var runtimeConfig = new MicrosoftConfiguration_RuntimeConfigurationLoader(GetStubJsonLocator(), new Microsoft.Extensions.Configuration.ConfigurationManager())
+                .Load(ConfigurationLoader.GetDefault());
 
             runtimeConfig.FeatureLanguage.TwoLetterISOLanguageName.Should().Be("de");
             Environment.SetEnvironmentVariable("REQNROLL__language__feature", null);