From 5a21c5d738aa034c246503f9e7c659513ac6cab2 Mon Sep 17 00:00:00 2001 From: Luca <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Sat, 25 May 2024 18:13:17 +0200 Subject: [PATCH 1/5] Update tests.yaml --- .github/workflows/tests.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4ea912df..3e5b29ad 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -7,7 +7,7 @@ on: branches: [ main ] env: - VERSION: 3.5.0.2 + VERSION: 3.6.0.0 jobs: build: @@ -38,18 +38,6 @@ jobs: dotnet-version: '8.0.x' include-prerelease: true - - name: Setup .NET Core SDK 7.0.x - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '7.0.x' - include-prerelease: true - - - name: Setup .NET Core SDK 6.0.x - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Test run: dotnet test /p:EnableWindowsTargeting=true --filter "Category!=FlakeyNetwork" From 549ab3e666075c5de8c4378c728ec3a1ac93c448 Mon Sep 17 00:00:00 2001 From: Luca <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Sat, 25 May 2024 18:23:13 +0200 Subject: [PATCH 2/5] remove macos tests --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3e5b29ad..a5416c7f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,7 +23,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v2 From b7832ce67cae9e1204a19813097deaf43bef42db Mon Sep 17 00:00:00 2001 From: EzioTheDeadPoet <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Sat, 25 May 2024 18:42:04 +0200 Subject: [PATCH 3/5] disable nexus api tests (until some way to test in gh workflows with OAuth2, can get implemented) --- Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs | 4 +++- Wabbajack.Networking.NexusApi.Test/Startup.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs b/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs index d32c82a4..5885c915 100644 --- a/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs +++ b/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs @@ -1,3 +1,4 @@ +/* TODO: Fix LOGIN with automated tests using System.Linq; using System.Threading.Tasks; using Xunit; @@ -40,4 +41,5 @@ public class NexusApiTests var (links, _) = await _api.DownloadLink("skyrimspecialedition", 12604, file.FileId); Assert.True(links.Length > 0); } -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/Wabbajack.Networking.NexusApi.Test/Startup.cs b/Wabbajack.Networking.NexusApi.Test/Startup.cs index 02d96c28..e47d3a7e 100644 --- a/Wabbajack.Networking.NexusApi.Test/Startup.cs +++ b/Wabbajack.Networking.NexusApi.Test/Startup.cs @@ -1,3 +1,4 @@ +/* TODO: Fix LOGIN with automated tests using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Wabbajack.Services.OSIntegrated; @@ -17,4 +18,5 @@ public class Startup { loggerFactory.AddProvider(new XunitTestOutputLoggerProvider(accessor, delegate { return true; })); } -} \ No newline at end of file +} +*/ \ No newline at end of file From f36bd51414bcb879b6edec2861165a014d8a7123 Mon Sep 17 00:00:00 2001 From: Luca <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Sat, 25 May 2024 18:55:01 +0200 Subject: [PATCH 4/5] Update NexusApiTests.cs --- Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs b/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs index 5885c915..c30c6661 100644 --- a/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs +++ b/Wabbajack.Networking.NexusApi.Test/NexusApiTests.cs @@ -1,4 +1,3 @@ -/* TODO: Fix LOGIN with automated tests using System.Linq; using System.Threading.Tasks; using Xunit; @@ -42,4 +41,3 @@ public class NexusApiTests Assert.True(links.Length > 0); } } -*/ \ No newline at end of file From ebd50a5b60514096c888120d258de60253a20967 Mon Sep 17 00:00:00 2001 From: Luca <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Sat, 25 May 2024 18:55:32 +0200 Subject: [PATCH 5/5] Update Startup.cs --- Wabbajack.Networking.NexusApi.Test/Startup.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Wabbajack.Networking.NexusApi.Test/Startup.cs b/Wabbajack.Networking.NexusApi.Test/Startup.cs index e47d3a7e..b1d6bab6 100644 --- a/Wabbajack.Networking.NexusApi.Test/Startup.cs +++ b/Wabbajack.Networking.NexusApi.Test/Startup.cs @@ -1,4 +1,3 @@ -/* TODO: Fix LOGIN with automated tests using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Wabbajack.Services.OSIntegrated; @@ -19,4 +18,3 @@ public class Startup loggerFactory.AddProvider(new XunitTestOutputLoggerProvider(accessor, delegate { return true; })); } } -*/ \ No newline at end of file