From 72ea47e547ab1d65f562ed89a6f7cef554bb6339 Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Sat, 12 Apr 2025 15:44:48 +0200 Subject: [PATCH 1/9] update deps --- src/ModVerify.CliApp/ModVerify.CliApp.csproj | 16 ++++++++++------ src/ModVerify/ModVerify.csproj | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ModVerify.CliApp/ModVerify.CliApp.csproj b/src/ModVerify.CliApp/ModVerify.CliApp.csproj index 61c0a3b..78b056c 100644 --- a/src/ModVerify.CliApp/ModVerify.CliApp.csproj +++ b/src/ModVerify.CliApp/ModVerify.CliApp.csproj @@ -13,6 +13,11 @@ alamo,petroglyph,glyphx + + true + en + + @@ -28,11 +33,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -53,7 +58,6 @@ - diff --git a/src/ModVerify/ModVerify.csproj b/src/ModVerify/ModVerify.csproj index e5f5b7d..68a0c05 100644 --- a/src/ModVerify/ModVerify.csproj +++ b/src/ModVerify/ModVerify.csproj @@ -32,7 +32,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From a370d510e9dc689a73764ea321a12a47eb7b8e87 Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Sat, 12 Apr 2025 15:45:21 +0200 Subject: [PATCH 2/9] do not publish symbols --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0cd9f9..5451462 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,9 +25,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 - name: Create NetFramework Release - run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net48 --output ./releases/net48 + run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net48 --output ./releases/net48 /p:DebugType=None /p:DebugSymbols=false - name: Create Net Core Release - run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net9.0 --output ./releases/net9.0 + run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net9.0 --output ./releases/net9.0 /p:DebugType=None /p:DebugSymbols=false - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: From 5dab7200c1be5479fc9baa4b05d1913cffeb2edf Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Thu, 17 Apr 2025 10:53:36 +0200 Subject: [PATCH 3/9] update deps --- src/ModVerify.CliApp/ModVerify.CliApp.csproj | 13 ++++++++++--- src/ModVerify/ModVerify.csproj | 9 ++++++--- .../PG.StarWarsGame.Engine.csproj | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/ModVerify.CliApp/ModVerify.CliApp.csproj b/src/ModVerify.CliApp/ModVerify.CliApp.csproj index 78b056c..5dd43a4 100644 --- a/src/ModVerify.CliApp/ModVerify.CliApp.csproj +++ b/src/ModVerify.CliApp/ModVerify.CliApp.csproj @@ -6,10 +6,13 @@ AET.ModVerifyTool ModVerify $(RepoRootPath)aet.ico - AET.ModVerify.CommandLine - AET.ModVerify - Application that allows to verify to verify game modifications for Empire at War / Forces of Corruption against a set of common rules. AlamoEngineTools.ModVerify.CliApp + + + + ModVerify Console Application + AET.ModVerify + Console application that analyzes game modifications for Empire at War / Forces of Corruption for common errors. alamo,petroglyph,glyphx @@ -22,6 +25,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModVerify/ModVerify.csproj b/src/ModVerify/ModVerify.csproj index 68a0c05..e14111c 100644 --- a/src/ModVerify/ModVerify.csproj +++ b/src/ModVerify/ModVerify.csproj @@ -2,12 +2,15 @@ netstandard2.0;netstandard2.1 - AET.ModVerify - AET.ModVerify - Provides interfaces and classes to verify Empire at War / Forces of Corruption game modifications. AlamoEngineTools.ModVerify AET.ModVerify AET.ModVerify + + + + ModVerify Core + AET.ModVerify + Provides interfaces and classes to verify Empire at War / Forces of Corruption game modifications. alamo,petroglyph,glyphx diff --git a/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj b/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj index 84d9730..c8b72ea 100644 --- a/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj +++ b/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj @@ -38,7 +38,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From d83e19dacd6aaa242dc1d10ea24ce9725b0a0aa1 Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Sat, 26 Apr 2025 09:53:32 +0200 Subject: [PATCH 4/9] update deps --- src/ModVerify/ModVerify.csproj | 4 ++-- .../PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ModVerify/ModVerify.csproj b/src/ModVerify/ModVerify.csproj index e14111c..8640f5b 100644 --- a/src/ModVerify/ModVerify.csproj +++ b/src/ModVerify/ModVerify.csproj @@ -25,8 +25,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj b/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj index c8b72ea..6055649 100644 --- a/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj +++ b/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -38,7 +38,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From dbdd52d9f1f6deb598bdfda02bec33a929977bbb Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Sat, 26 Apr 2025 14:20:12 +0200 Subject: [PATCH 5/9] syntax --- src/ModVerify.CliApp/ModVerifyApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ModVerify.CliApp/ModVerifyApp.cs b/src/ModVerify.CliApp/ModVerifyApp.cs index 1270725..5cefc40 100644 --- a/src/ModVerify.CliApp/ModVerifyApp.cs +++ b/src/ModVerify.CliApp/ModVerifyApp.cs @@ -72,7 +72,7 @@ private async Task> Verify(VerifyInstalla initProgress, false, CancellationToken.None).ConfigureAwait(false); - _logger?.LogInformation($"Game Engine created"); + _logger?.LogInformation("Game Engine created"); } finally { From 15a16af18ead2b246056e55769f6254ca795cc66 Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Fri, 2 May 2025 14:23:42 +0200 Subject: [PATCH 6/9] update deps --- src/ModVerify.CliApp/ModVerify.CliApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ModVerify.CliApp/ModVerify.CliApp.csproj b/src/ModVerify.CliApp/ModVerify.CliApp.csproj index 5dd43a4..f9fa32d 100644 --- a/src/ModVerify.CliApp/ModVerify.CliApp.csproj +++ b/src/ModVerify.CliApp/ModVerify.CliApp.csproj @@ -50,7 +50,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all From f0ca888a47b75f344f72f51ff53743eed430e86d Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Sat, 10 May 2025 10:36:46 +0200 Subject: [PATCH 7/9] simplification --- src/ModVerify.CliApp/Program.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ModVerify.CliApp/Program.cs b/src/ModVerify.CliApp/Program.cs index 7c88edb..3ac92ba 100644 --- a/src/ModVerify.CliApp/Program.cs +++ b/src/ModVerify.CliApp/Program.cs @@ -236,7 +236,6 @@ private static void ConfigureLogging(ILoggingBuilder loggingBuilder, IFileSystem loggingBuilder.AddSerilog(fileLogger); var cLogger = new LoggerConfiguration() - .WriteTo.Console( logLevel, theme: AnsiConsoleTheme.Code, @@ -248,10 +247,7 @@ private static void ConfigureLogging(ILoggingBuilder loggingBuilder, IFileSystem var source = value.ToString().AsSpan().Trim('\"'); - if (source.StartsWith(ModVerifyRootNameSpace.AsSpan())) - return true; - - return false; + return source.StartsWith(ModVerifyRootNameSpace.AsSpan()); }) .CreateLogger(); loggingBuilder.AddSerilog(cLogger); From 59b5a3f00b5d5445fecf1c4a1013ce412d47b80f Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Wed, 14 May 2025 19:50:28 +0200 Subject: [PATCH 8/9] update deps --- src/ModVerify.CliApp/ModVerify.CliApp.csproj | 10 +++++----- src/ModVerify/ModVerify.csproj | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ModVerify.CliApp/ModVerify.CliApp.csproj b/src/ModVerify.CliApp/ModVerify.CliApp.csproj index f9fa32d..3ca41b6 100644 --- a/src/ModVerify.CliApp/ModVerify.CliApp.csproj +++ b/src/ModVerify.CliApp/ModVerify.CliApp.csproj @@ -40,11 +40,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModVerify/ModVerify.csproj b/src/ModVerify/ModVerify.csproj index 8640f5b..fecceb2 100644 --- a/src/ModVerify/ModVerify.csproj +++ b/src/ModVerify/ModVerify.csproj @@ -35,7 +35,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 9bf25493a5cb4a2ef635fe1915864c4db79efef0 Mon Sep 17 00:00:00 2001 From: AnakinRaW Date: Fri, 23 May 2025 11:41:43 +0200 Subject: [PATCH 9/9] prepare manual release in CI/CD --- .github/workflows/release.yml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5451462..7ff6b7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,23 @@ on: branches: [ main ] pull_request: branches: [ main ] + workflow_dispatch: + inputs: + branch: + description: "The branch to a release to" + required: true + +env: + TOOL_PROJ_PATH: ./src/ModVerify.CliApp/ModVerify.CliApp.csproj + CREATOR_PROJ_PATH: ./Modules/ModdingToolBase/src/AnakinApps/ApplicationManifestCreator/ApplicationManifestCreator.csproj + UPLOADER_PROJ_PATH: ./Modules/ModdingToolBase/src/AnakinApps/FtpUploader/FtpUploader.csproj + TOOL_EXE: ModVerify.exe + UPDATER_EXE: AnakinRaW.ExternalUpdater.exe + MANIFEST_CREATOR: AnakinRaW.ApplicationManifestCreator.dll + SFTP_UPLOADER: AnakinRaW.FtpUploader.dll + ORIGIN_BASE: https://republicatwar.com/downloads/ModVerify + ORIGIN_BASE_PART: downloads/ModVerify/ + BRANCH_NAME: ${{ github.event.inputs.branch || 'stable' }} jobs: @@ -25,9 +42,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 - name: Create NetFramework Release - run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net48 --output ./releases/net48 /p:DebugType=None /p:DebugSymbols=false + run: dotnet publish ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net48 --output ./releases/net48 /p:DebugType=None /p:DebugSymbols=false - name: Create Net Core Release - run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net9.0 --output ./releases/net9.0 /p:DebugType=None /p:DebugSymbols=false + run: dotnet publish ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net9.0 --output ./releases/net9.0 /p:DebugType=None /p:DebugSymbols=false - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: @@ -38,8 +55,9 @@ jobs: deploy: name: Deploy + # Deploy on push to main or manual trigger if: | - github.ref == 'refs/heads/main' && github.event_name == 'push' + (github.ref == 'refs/heads/main' && github.event_name == 'push') || github.event_name == 'workflow_dispatch' needs: [pack] runs-on: ubuntu-latest steps: @@ -58,6 +76,9 @@ jobs: - uses: dotnet/nbgv@v0.4.2 id: nbgv - name: Create GitHub release + # Create a GitHub release on push to main only + if: | + github.ref == 'refs/heads/main' && github.event_name == 'push' uses: softprops/action-gh-release@v2 with: name: v${{ steps.nbgv.outputs.SemVer2 }}