Merge pull request #53 from ScottyMac52/removeParallelForEach

Release 2.4.1
ScottyMac52 · Apr 2, 2019 · 96f4a94 · 96f4a94
2 parents 238c342 + dc45647
commit 96f4a94
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 474 deletions.
diff --git a/MFDSettingsManager/Mappers/ConfigSectionModelMapper.cs b/MFDSettingsManager/Mappers/ConfigSectionModelMapper.cs
@@ -38,9 +38,9 @@ internal static ModulesConfiguration MapFromConfigurationSection(MFDConfiguratio
             logger.Info($"Loading {moduleList.Count} Modules...");
             logger.Info(logSep);
 
-            Parallel.ForEach(moduleList, (currentModule, threadState, threadNumber) =>
+            moduleList.ForEach(currentModule =>  
             {
-                logger.Info($"Thread: {threadNumber} Loading the Module named {currentModule.DisplayName} as {currentModule.ModuleName} using {currentModule.FileName}...");
+                logger.Info($"Loading the Module named {currentModule.DisplayName} as {currentModule.ModuleName} using {currentModule.FileName}...");
                 var modelModule = ConvertFromConfigSectionModule(moduleConfigurations, currentModule);
 
                 // Add the Configurations
@@ -86,7 +86,7 @@ internal static ModulesConfiguration MapFromConfigurationSection(MFDConfiguratio
                     }
                 });
 
-                logger.Info($"Thread: {threadNumber} Loaded Module named {modelModule.DisplayName} as {modelModule.ModuleName} with {modelModule.Configurations.Count} Configurations.");
+                logger.Info($"Loaded Module named {modelModule.DisplayName} as {modelModule.ModuleName} with {modelModule.Configurations.Count} Configurations.");
                 logger.Info(logSep);
                 moduleConfigurations.Modules.Add(modelModule);
             });

diff --git a/MFDSettingsManager/Properties/AssemblyInfo.cs b/MFDSettingsManager/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.4.1.0")]
+[assembly: AssemblyFileVersion("2.4.1.0")]
diff --git a/MFDisplay/MFDisplay.csproj b/MFDisplay/MFDisplay.csproj
@@ -308,7 +308,7 @@
     <None Include="MFDisplay_TemporaryKey.pfx" />
     <Content Include="mfdsettings.config">
       <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>

diff --git a/MFDisplay/Properties/AssemblyInfo.cs b/MFDisplay/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.4.1.0")]
+[assembly: AssemblyFileVersion("2.4.1.0")]