eliminate resource file

coverlet-coverage · Jan 29, 2024 · ab442d2 · ab442d2
1 parent 5d40f5c
commit ab442d2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 309 deletions.
diff --git a/src/coverlet.collector/DataCollection/AttachmentManager.cs b/src/coverlet.collector/DataCollection/AttachmentManager.cs
@@ -4,7 +4,6 @@
 using System;
 using System.ComponentModel;
 using System.IO;
-using coverlet.collector.Resources;
 using Coverlet.Collector.Utilities;
 using Coverlet.Collector.Utilities.Interfaces;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
@@ -109,7 +108,7 @@ private string SaveCoverageReport(string report, string reportFileName)
       }
       catch (Exception ex)
       {
-        string errorMessage = string.Format(Resources.FailedToSaveCoverageReport, CoverletConstants.DataCollectorName, reportFileName, _reportDirectory);
+        string errorMessage = $"{CoverletConstants.DataCollectorName}: Failed to save coverage report '{reportFileName}' in directory '{_reportDirectory}'";
         throw new CoverletDataCollectorException(errorMessage, ex);
       }
     }
@@ -168,8 +167,7 @@ private void CleanupReportDirectory()
       }
       catch (Exception ex)
       {
-        string errorMessage = string.Format(Resources.FailedToCleanupReportDirectory, CoverletConstants.DataCollectorName, _reportDirectory);
-        throw new CoverletDataCollectorException(errorMessage, ex);
+        throw new CoverletDataCollectorException($"{CoverletConstants.DataCollectorName}: Failed to cleanup report directory: '{_reportDirectory}'", ex);
       }
     }
   }

diff --git a/src/coverlet.collector/DataCollection/CoverageManager.cs b/src/coverlet.collector/DataCollection/CoverageManager.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using coverlet.collector.Resources;
 using Coverlet.Collector.Utilities;
 using Coverlet.Collector.Utilities.Interfaces;
 using Coverlet.Core;
@@ -68,7 +67,7 @@ public void InstrumentModules()
       }
       catch (Exception ex)
       {
-        string errorMessage = string.Format(Resources.InstrumentationException, CoverletConstants.DataCollectorName);
+        string errorMessage = $"{CoverletConstants.DataCollectorName}: Failed to instrument modules";
         throw new CoverletDataCollectorException(errorMessage, ex);
       }
     }
@@ -96,7 +95,7 @@ private CoverageResult GetCoverageResult()
       }
       catch (Exception ex)
       {
-        string errorMessage = string.Format(Resources.CoverageResultException, CoverletConstants.DataCollectorName);
+        string errorMessage = $"{CoverletConstants.DataCollectorName}: Failed to get coverage result";
         throw new CoverletDataCollectorException(errorMessage, ex);
       }
     }
@@ -114,8 +113,7 @@ private CoverageResult GetCoverageResult()
       }
       catch (Exception ex)
       {
-        string errorMessage = string.Format(Resources.CoverageReportException, CoverletConstants.DataCollectorName);
-        throw new CoverletDataCollectorException(errorMessage, ex);
+        throw new CoverletDataCollectorException($"{CoverletConstants.DataCollectorName}: Failed to get coverage report", ex);
       }
     }
   }

diff --git a/src/coverlet.collector/DataCollection/CoverletSettingsParser.cs b/src/coverlet.collector/DataCollection/CoverletSettingsParser.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
-using coverlet.collector.Resources;
 using Coverlet.Collector.Utilities;
 
 namespace Coverlet.Collector.DataCollection
@@ -72,8 +71,7 @@ private static string ParseTestModule(IEnumerable<string> testModules)
       // Validate if at least one source present.
       if (testModules == null || !testModules.Any())
       {
-        string errorMessage = string.Format(Resources.NoTestModulesFound, CoverletConstants.DataCollectorName);
-        throw new CoverletDataCollectorException(errorMessage);
+        throw new CoverletDataCollectorException($"{CoverletConstants.DataCollectorName}: No test modules found");
       }
 
       // Note:

diff --git a/src/coverlet.collector/InProcDataCollection/CoverletInProcDataCollector.cs b/src/coverlet.collector/InProcDataCollection/CoverletInProcDataCollector.cs
@@ -5,7 +5,6 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Text;
-using coverlet.collector.Resources;
 using Coverlet.Collector.Utilities;
 using Coverlet.Core.Instrumentation;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
@@ -76,8 +75,7 @@ public void TestSessionEnd(TestSessionEndArgs testSessionEndArgs)
           if (_enableExceptionLog)
           {
             _eqtTrace.Error("{0}: Failed to unload module with error: {1}", CoverletConstants.InProcDataCollectorName, ex);
-            string errorMessage = string.Format(Resources.FailedToUnloadModule, CoverletConstants.InProcDataCollectorName);
-            throw new CoverletDataCollectorException(errorMessage, ex);
+            throw new CoverletDataCollectorException($"{CoverletConstants.InProcDataCollectorName}: Failed to unload module", ex);
           }
         }
       }

diff --git a/src/coverlet.collector/Resources/Resources.Designer.cs b/src/coverlet.collector/Resources/Resources.Designer.cs
diff --git a/src/coverlet.collector/Resources/Resources.resx b/src/coverlet.collector/Resources/Resources.resx