removed hook manager selection, added net8.0 support to pipelines

SvetlovA · Nov 23, 2023 · 542578e · 542578e
1 parent f00e6db
commit 542578e
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 81 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -7,19 +7,15 @@ on:
   workflow_dispatch:
   workflow_call:
 jobs:
-# MonoMod tests
-  buildAndTestUbuntuMonoMod:
+  buildAndTestUbuntu:
     uses: ./.github/workflows/build_and_test_job.yaml
     with:
       os: ubuntu-latest
-      hook_manager_type: MonoMod
-  buildAndTestWindowsMonoMod:
+  buildAndTestWindows:
     uses: ./.github/workflows/build_and_test_job.yaml
     with:
       os: windows-latest
-      hook_manager_type: MonoMod
-  buildAndTestMacMonoMod:
+  buildAndTestMac:
     uses: ./.github/workflows/build_and_test_job.yaml
     with:
       os: macos-latest
-      hook_manager_type: MonoMod
diff --git a/.github/workflows/build_and_test_job.yaml b/.github/workflows/build_and_test_job.yaml
@@ -11,27 +11,14 @@ on:
         - windows-latest
         - macos-latest
         default: windows-latest
-      hook_manager_type:
-        type: choice
-        description: 'Run tests on special hook manager type. Possible hook manager types: Harmony, Native, MonoMod. Default: MonoMod'
-        required: true
-        options:
-        - MonoMod
-        default: MonoMod
   workflow_call:
     inputs:
       os:
         type: string
         required: true
         default: ubuntu-latest
-      hook_manager_type:
-        type: string
-        required: true
-        default: MonoMod
 jobs:
   buildAndTest:
-    env:
-      HOOK_MANAGER_TYPE: ${{ inputs.hook_manager_type }}
     runs-on: ${{ inputs.os }}
     steps:
     - uses: actions/checkout@v4
@@ -43,6 +30,7 @@ jobs:
           5.0.x
           6.0.x
           7.0.x
+          8.0.x
     - name: Restore dependencies
       run: dotnet restore src
     - name: Build
@@ -58,4 +46,5 @@ jobs:
         dotnet test --framework net5.0 --no-build --configuration Release --verbosity normal
         dotnet test --framework net6.0 --no-build --configuration Release --verbosity normal
         dotnet test --framework net7.0 --no-build --configuration Release --verbosity normal
+        dotnet test --framework net8.0 --no-build --configuration Release --verbosity normal
       working-directory: ./src
diff --git a/.github/workflows/github_publish.yaml b/.github/workflows/github_publish.yaml
@@ -9,7 +9,6 @@ jobs:
       - uses: ./.github/workflows/build_and_test_job.yaml
         with:
           os: ubuntu-latest
-          hook_manager_type: MonoMod
       - name: Pack
         run: dotnet pack --no-build --configuration Release --output packages src/StaticMock/StaticMock.csproj
       - name: Prepare

diff --git a/.github/workflows/nuget_publish.yaml b/.github/workflows/nuget_publish.yaml
@@ -9,7 +9,6 @@ jobs:
       - uses: ./.github/workflows/build_and_test_job.yaml
         with:
           os: ubuntu-latest
-          hook_manager_type: MonoMod
       - name: Pack
         run: dotnet pack --no-build --configuration Release --output packages src/StaticMock/StaticMock.csproj
       - name: Push

diff --git a/src/StaticMock.Tests/AssemblySetup.cs b/src/StaticMock.Tests/AssemblySetup.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Configuration;
-using NUnit.Framework;
-using StaticMock.Tests.Settings;
+using NUnit.Framework;
 
 namespace StaticMock.Tests;
 
@@ -10,12 +8,6 @@ public class AssemblySetup
     [OneTimeSetUp]
     public void Setup()
     {
-        var configuration = new ConfigurationBuilder()
-            .AddJsonFile("appsettings.json")
-            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("HOOK_MANAGER_TYPE")}.json", optional: true)
-            .Build();
-
-        var appSettings = AppSettingsReader.ReadSettings(configuration);
-        Console.WriteLine($"Hook manager type: {appSettings.HookManagerType}");
+        Console.WriteLine($".NET Version: {Environment.Version}");
     }
 }
diff --git a/src/StaticMock.Tests/Settings/AppSettingsReader.cs b/src/StaticMock.Tests/Settings/AppSettingsReader.cs
diff --git a/src/StaticMock.Tests/Settings/Config/AppSettingsConfigEntity.cs b/src/StaticMock.Tests/Settings/Config/AppSettingsConfigEntity.cs
diff --git a/src/StaticMock.Tests/Settings/Entities/AppSettings.cs b/src/StaticMock.Tests/Settings/Entities/AppSettings.cs
diff --git a/src/StaticMock.Tests/StaticMock.Tests.csproj b/src/StaticMock.Tests/StaticMock.Tests.csproj
@@ -26,13 +26,4 @@
     <ProjectReference Include="..\StaticMock\StaticMock.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="appsettings.MonoMod.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/src/StaticMock.Tests/appsettings.MonoMod.json b/src/StaticMock.Tests/appsettings.MonoMod.json
diff --git a/src/StaticMock.Tests/appsettings.json b/src/StaticMock.Tests/appsettings.json