Tests fixes

3 files changed, 35 insertions, 33 deletions

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index cefa515..f6e2edd 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -48,7 +48,7 @@ jobs:
         (matrix.host == 'ubuntu-latest' && matrix.os == 'linux' && matrix.arch != 'arm') 
         || (matrix.host == 'macos-latest' && matrix.os == 'osx' && matrix.arch != 'arm')
         || (matrix.host == 'windows-latest' && matrix.os == 'win' && matrix.arch != 'arm')
-      run: dotnet test ${{ env.TESTS_PATH }} -c ${{ env.CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }}
+      run: dotnet test ${{ env.TESTS_PATH }} -c ${{ env.CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }} -p:PublishSingleFile=true $SC_OPS -p:IncludeAllContentForSelfExtract=true
     - name: Upload artifact
       if: |
         (matrix.host == 'ubuntu-latest' && matrix.os == 'linux') 
diff --git a/Benchmarks/Program.cs b/Benchmarks/Program.cs
index 7844739..317f19e 100644
--- a/Benchmarks/Program.cs
+++ b/Benchmarks/Program.cs
@@ -5,6 +5,8 @@ namespace com.clusterrr.Famicom.NesTiler.Benchmarks
 {
     public class Benchmarks
     {
+        const string ImagesPath = "Images";
+
         static void Main()
         {
             var summary = BenchmarkRunner.Run<Benchmarks>();
@@ -14,112 +16,112 @@ namespace com.clusterrr.Famicom.NesTiler.Benchmarks
         [Benchmark]
         public void BenchmarkBelayaAkula()
         {
-            var imagePath = @"Images\belaya_akula.gif";
+            var imagePath = Path.Combine(ImagesPath, "belaya_akula.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkBuhanka()
         {
-            var imagePath = @"Images\buhanka.gif";
+            var imagePath = Path.Combine(ImagesPath, "buhanka.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkChernobyl()
         {
-            var imagePath = @"Images\chernobyl.gif";
+            var imagePath = Path.Combine(ImagesPath, "chernobyl.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkDira()
         {
-            var imagePath = @"Images\dira.gif";
+            var imagePath = Path.Combine(ImagesPath, "dira.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkGlaza()
         {
-            var imagePath = @"Images\glaza.gif";
+            var imagePath = Path.Combine(ImagesPath, "glaza.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkGorgona()
         {
-            var imagePath = @"Images\gorgona.gif";
+            var imagePath = Path.Combine(ImagesPath, "gorgona.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkMyatejl()
         {
-            var imagePath = @"Images\myatej.gif";
+            var imagePath = Path.Combine(ImagesPath, "myatej.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkPagoda()
         {
-            var imagePath = @"Images\pagoda.gif";
+            var imagePath = Path.Combine(ImagesPath, "pagoda.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkRayon4()
         {
-            var imagePath = @"Images\rayon4.gif";
+            var imagePath = Path.Combine(ImagesPath, "rayon4.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkShkola()
         {
-            var imagePath = @"Images\shkola.gif";
+            var imagePath = Path.Combine(ImagesPath, "shkola.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkSindikat()
         {
-            var imagePath = @"Images\sindikat.gif";
+            var imagePath = Path.Combine(ImagesPath, "sindikat.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkSputnik()
         {
-            var imagePath = @"Images\sputnik.gif";
+            var imagePath = Path.Combine(ImagesPath, "sputnik.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkSworm()
         {
-            var imagePath = @"Images\sworm.gif";
+            var imagePath = Path.Combine(ImagesPath, "sworm.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkTrailerPark()
         {
-            var imagePath = @"Images\trailer-park.gif";
+            var imagePath = Path.Combine(ImagesPath, "trailer-park.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkWarfaceLogo()
         {
-            var imagePath = @"Images\warface_logo.gif";
+            var imagePath = Path.Combine(ImagesPath, "warface_logo.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
         [Benchmark]
         public void BenchmarkZapravka()
         {
-            var imagePath = @"Images\zapravka.gif";
+            var imagePath = Path.Combine(ImagesPath, "zapravka.gif");
             DoBenchmarkSplit4(imagePath);
         }
 
diff --git a/Tests/Program.cs b/Tests/Program.cs
index 5a50225..53e8d0a 100644
--- a/Tests/Program.cs
+++ b/Tests/Program.cs
@@ -7,112 +7,112 @@ namespace com.clusterrr.Famicom.NesTiler.Benchmarks
         [Test]
         public void TestBelayaAkula()
         {
-            var imagePath = @"Images\belaya_akula.gif";
+            var imagePath = Path.Combine(@"Images", "belaya_akula.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestBuhanka()
         {
-            var imagePath = @"Images\buhanka.gif";
+            var imagePath = Path.Combine(@"Images", "buhanka.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestChernobyl()
         {
-            var imagePath = @"Images\chernobyl.gif";
+            var imagePath = Path.Combine(@"Images", "chernobyl.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestDira()
         {
-            var imagePath = @"Images\dira.gif";
+            var imagePath = Path.Combine(@"Images", "dira.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestGlaza()
         {
-            var imagePath = @"Images\glaza.gif";
+            var imagePath = Path.Combine(@"Images", "glaza.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestGorgona()
         {
-            var imagePath = @"Images\gorgona.gif";
+            var imagePath = Path.Combine(@"Images", "gorgona.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestMyatejl()
         {
-            var imagePath = @"Images\myatej.gif";
+            var imagePath = Path.Combine(@"Images", "myatej.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestPagoda()
         {
-            var imagePath = @"Images\pagoda.gif";
+            var imagePath = Path.Combine(@"Images", "pagoda.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestRayon4()
         {
-            var imagePath = @"Images\rayon4.gif";
+            var imagePath = Path.Combine(@"Images", "rayon4.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestShkola()
         {
-            var imagePath = @"Images\shkola.gif";
+            var imagePath = Path.Combine(@"Images", "shkola.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestSindikat()
         {
-            var imagePath = @"Images\sindikat.gif";
+            var imagePath = Path.Combine(@"Images", "sindikat.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestSputnik()
         {
-            var imagePath = @"Images\sputnik.gif";
+            var imagePath = Path.Combine(@"Images", "sputnik.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestSworm()
         {
-            var imagePath = @"Images\sworm.gif";
+            var imagePath = Path.Combine(@"Images", "sworm.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestTrailerPark()
         {
-            var imagePath = @"Images\trailer-park.gif";
+            var imagePath = Path.Combine(@"Images", "trailer-park.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestWarfaceLogo()
         {
-            var imagePath = @"Images\warface_logo.gif";
+            var imagePath = Path.Combine(@"Images", "warface_logo.gif");
             DoTestSplit4(imagePath);
         }
 
         [Test]
         public void TestZapravka()
         {
-            var imagePath = @"Images\zapravka.gif";
+            var imagePath = Path.Combine(@"Images", "zapravka.gif");
             DoTestSplit4(imagePath);
         }