Revert "Trying things to figure out why linux unit test fails"

This reverts commit 4d4059b. Signed-off-by: CodeTiger <[email protected]>
CycloneDX · Oct 14, 2023 · fc76c9b · fc76c9b
1 parent 17773ea
commit fc76c9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -42,7 +42,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         framework: ['net6.0','net7.0']
     timeout-minutes: 30
 

diff --git a/CycloneDX/Runner.cs b/CycloneDX/Runner.cs
@@ -46,15 +46,13 @@ public Runner(IFileSystem fileSystem = null,
                       IProjectFileService projectFileService = null,
                       ISolutionFileService solutionFileService = null)
         {
-            var testfileSystem = new FileSystem();
-
             this.fileSystem = fileSystem ?? new FileSystem() ;
             this.dotnetCommandService = dotnetCommandService ?? new DotnetCommandService();
-            this.projectAssetsFileService = projectAssetsFileService ?? new ProjectAssetsFileService(testfileSystem, this.dotnetCommandService, () => new AssetFileReader());
-            this.dotnetUtilsService = dotnetUtilsService ?? new DotnetUtilsService(testfileSystem, this.dotnetCommandService);
-            this.packagesFileService = packagesFileService ?? new PackagesFileService(testfileSystem);
-            this.projectFileService = projectFileService ?? new ProjectFileService(testfileSystem, this.dotnetUtilsService, this.packagesFileService, this.projectAssetsFileService);
-            this.solutionFileService = solutionFileService ?? new SolutionFileService(testfileSystem, this.projectFileService);
+            this.projectAssetsFileService = projectAssetsFileService ?? new ProjectAssetsFileService(this.fileSystem, this.dotnetCommandService, () => new AssetFileReader());
+            this.dotnetUtilsService = dotnetUtilsService ?? new DotnetUtilsService(this.fileSystem, this.dotnetCommandService);
+            this.packagesFileService = packagesFileService ?? new PackagesFileService(this.fileSystem);
+            this.projectFileService = projectFileService ?? new ProjectFileService(this.fileSystem, this.dotnetUtilsService, this.packagesFileService, this.projectAssetsFileService);
+            this.solutionFileService = solutionFileService ?? new SolutionFileService(this.fileSystem, this.projectFileService);
         }
         public async Task<int> HandleCommandAsync(string outputDirectory,
                                       string SolutionOrProjectFile = default,