diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a0cd9f9..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
+ 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
+ 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 }}
diff --git a/src/ModVerify.CliApp/ModVerify.CliApp.csproj b/src/ModVerify.CliApp/ModVerify.CliApp.csproj
index 61c0a3b..3ca41b6 100644
--- a/src/ModVerify.CliApp/ModVerify.CliApp.csproj
+++ b/src/ModVerify.CliApp/ModVerify.CliApp.csproj
@@ -6,17 +6,29 @@
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
+
+ true
+ en
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -28,17 +40,17 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
@@ -53,7 +65,6 @@
-
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
{
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);
diff --git a/src/ModVerify/ModVerify.csproj b/src/ModVerify/ModVerify.csproj
index e5f5b7d..fecceb2 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
@@ -22,8 +25,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -32,7 +35,7 @@
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 84d9730..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
-
+