Skip to content

Commit 89a3b95

Browse files
AnakinRaWAnakinRaW
authored
Merge pull request #20 from AlamoEngine-Tools/develop
Prepare Auto-Update
2 parents 090a6ca + 9bf2549 commit 89a3b95

6 files changed

Lines changed: 58 additions & 27 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@ on:
55
branches: [ main ]
66
pull_request:
77
branches: [ main ]
8+
workflow_dispatch:
9+
inputs:
10+
branch:
11+
description: "The branch to a release to"
12+
required: true
13+
14+
env:
15+
TOOL_PROJ_PATH: ./src/ModVerify.CliApp/ModVerify.CliApp.csproj
16+
CREATOR_PROJ_PATH: ./Modules/ModdingToolBase/src/AnakinApps/ApplicationManifestCreator/ApplicationManifestCreator.csproj
17+
UPLOADER_PROJ_PATH: ./Modules/ModdingToolBase/src/AnakinApps/FtpUploader/FtpUploader.csproj
18+
TOOL_EXE: ModVerify.exe
19+
UPDATER_EXE: AnakinRaW.ExternalUpdater.exe
20+
MANIFEST_CREATOR: AnakinRaW.ApplicationManifestCreator.dll
21+
SFTP_UPLOADER: AnakinRaW.FtpUploader.dll
22+
ORIGIN_BASE: https://republicatwar.com/downloads/ModVerify
23+
ORIGIN_BASE_PART: downloads/ModVerify/
24+
BRANCH_NAME: ${{ github.event.inputs.branch || 'stable' }}
825

926
jobs:
1027

@@ -25,9 +42,9 @@ jobs:
2542
- name: Setup .NET
2643
uses: actions/setup-dotnet@v4
2744
- name: Create NetFramework Release
28-
run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net48 --output ./releases/net48
45+
run: dotnet publish ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net48 --output ./releases/net48 /p:DebugType=None /p:DebugSymbols=false
2946
- name: Create Net Core Release
30-
run: dotnet publish .\src\ModVerify.CliApp\ModVerify.CliApp.csproj --configuration Release -f net9.0 --output ./releases/net9.0
47+
run: dotnet publish ${{ env.TOOL_PROJ_PATH }} --configuration Release -f net9.0 --output ./releases/net9.0 /p:DebugType=None /p:DebugSymbols=false
3148
- name: Upload a Build Artifact
3249
uses: actions/upload-artifact@v4
3350
with:
@@ -38,8 +55,9 @@ jobs:
3855

3956
deploy:
4057
name: Deploy
58+
# Deploy on push to main or manual trigger
4159
if: |
42-
github.ref == 'refs/heads/main' && github.event_name == 'push'
60+
(github.ref == 'refs/heads/main' && github.event_name == 'push') || github.event_name == 'workflow_dispatch'
4361
needs: [pack]
4462
runs-on: ubuntu-latest
4563
steps:
@@ -58,6 +76,9 @@ jobs:
5876
- uses: dotnet/nbgv@v0.4.2
5977
id: nbgv
6078
- name: Create GitHub release
79+
# Create a GitHub release on push to main only
80+
if: |
81+
github.ref == 'refs/heads/main' && github.event_name == 'push'
6182
uses: softprops/action-gh-release@v2
6283
with:
6384
name: v${{ steps.nbgv.outputs.SemVer2 }}

‎src/ModVerify.CliApp/ModVerify.CliApp.csproj‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,29 @@
66
<RootNamespace>AET.ModVerifyTool</RootNamespace>
77
<AssemblyName>ModVerify</AssemblyName>
88
<ApplicationIcon>$(RepoRootPath)aet.ico</ApplicationIcon>
9-
<Title>AET.ModVerify.CommandLine</Title>
10-
<Product>AET.ModVerify</Product>
11-
<Description>Application that allows to verify to verify game modifications for Empire at War / Forces of Corruption against a set of common rules.</Description>
129
<PackageId>AlamoEngineTools.ModVerify.CliApp</PackageId>
10+
</PropertyGroup>
11+
12+
<PropertyGroup>
13+
<Title>ModVerify Console Application</Title>
14+
<Product>AET.ModVerify</Product>
15+
<Description>Console application that analyzes game modifications for Empire at War / Forces of Corruption for common errors.</Description>
1316
<PackageTags>alamo,petroglyph,glyphx</PackageTags>
1417
</PropertyGroup>
1518

19+
<PropertyGroup>
20+
<InvariantGlobalization>true</InvariantGlobalization>
21+
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
22+
</PropertyGroup>
23+
1624
<ItemGroup>
1725
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Infrastructure" Version="4.0.35" />
1826
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Infrastructure.Steam" Version="4.0.35" />
1927
<PackageReference Include="Figgle" Version="0.5.1" />
28+
<PackageReference Include="IndexRange" Version="1.0.3" Condition="$(TargetFramework) == 'net48'">
29+
<PrivateAssets>all</PrivateAssets>
30+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
31+
</PackageReference>
2032
<PackageReference Include="Nullable" Version="1.3.1">
2133
<PrivateAssets>all</PrivateAssets>
2234
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -28,17 +40,17 @@
2840
<PrivateAssets>all</PrivateAssets>
2941
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3042
</PackageReference>
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
32-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
35-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
47+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
3648
<PackageReference Include="IsExternalInit" Version="1.0.3">
3749
<PrivateAssets>all</PrivateAssets>
3850
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3951
</PackageReference>
4052
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
41-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
53+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
4254
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
4355
<PackageReference Include="Required" Version="1.0.0">
4456
<PrivateAssets>all</PrivateAssets>
@@ -53,7 +65,6 @@
5365
</PropertyGroup>
5466

5567
<ItemGroup>
56-
<!--<ProjectReference Include="..\..\..\ModdingToolBase\src\Updater\AppUpdaterFramework\AppUpdaterFramework.csproj" />-->
5768
<ProjectReference Include="..\ModVerify\ModVerify.csproj" />
5869
</ItemGroup>
5970

‎src/ModVerify.CliApp/ModVerifyApp.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private async Task<IReadOnlyCollection<VerificationError>> Verify(VerifyInstalla
7272
initProgress,
7373
false,
7474
CancellationToken.None).ConfigureAwait(false);
75-
_logger?.LogInformation($"Game Engine created");
75+
_logger?.LogInformation("Game Engine created");
7676
}
7777
finally
7878
{

‎src/ModVerify.CliApp/Program.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ private static void ConfigureLogging(ILoggingBuilder loggingBuilder, IFileSystem
236236
loggingBuilder.AddSerilog(fileLogger);
237237

238238
var cLogger = new LoggerConfiguration()
239-
240239
.WriteTo.Console(
241240
logLevel,
242241
theme: AnsiConsoleTheme.Code,
@@ -248,10 +247,7 @@ private static void ConfigureLogging(ILoggingBuilder loggingBuilder, IFileSystem
248247

249248
var source = value.ToString().AsSpan().Trim('\"');
250249

251-
if (source.StartsWith(ModVerifyRootNameSpace.AsSpan()))
252-
return true;
253-
254-
return false;
250+
return source.StartsWith(ModVerifyRootNameSpace.AsSpan());
255251
})
256252
.CreateLogger();
257253
loggingBuilder.AddSerilog(cLogger);

‎src/ModVerify/ModVerify.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
5-
<Title>AET.ModVerify</Title>
6-
<Product>AET.ModVerify</Product>
7-
<Description>Provides interfaces and classes to verify Empire at War / Forces of Corruption game modifications.</Description>
85
<PackageId>AlamoEngineTools.ModVerify</PackageId>
96
<RootNamespace>AET.ModVerify</RootNamespace>
107
<AssemblyName>AET.ModVerify</AssemblyName>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<Title>ModVerify Core</Title>
12+
<Product>AET.ModVerify</Product>
13+
<Description>Provides interfaces and classes to verify Empire at War / Forces of Corruption game modifications.</Description>
1114
<PackageTags>alamo,petroglyph,glyphx</PackageTags>
1215
</PropertyGroup>
1316

@@ -22,8 +25,8 @@
2225
</PropertyGroup>
2326

2427
<ItemGroup>
25-
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.4" />
26-
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.3.4" />
28+
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.8" />
29+
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.3.8" />
2730
<PackageReference Include="IsExternalInit" Version="1.0.3">
2831
<PrivateAssets>all</PrivateAssets>
2932
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -32,7 +35,7 @@
3235
<PrivateAssets>all</PrivateAssets>
3336
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3437
</PackageReference>
35-
<PackageReference Include="System.Text.Json" Version="9.0.3" />
38+
<PackageReference Include="System.Text.Json" Version="9.0.5" />
3639

3740
</ItemGroup>
3841

‎src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ItemGroup>
2626
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Files.MEG" Version="2.1.7" />
2727
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Files.MTD" Version="2.1.7" />
28-
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.4" />
28+
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.8" />
2929
<PackageReference Include="IsExternalInit" Version="1.0.3">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -38,7 +38,7 @@
3838
<PrivateAssets>all</PrivateAssets>
3939
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4040
</PackageReference>
41-
<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.1" />
41+
<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.3" />
4242
</ItemGroup>
4343
<ItemGroup>
4444
<ProjectReference Include="..\PG.StarWarsGame.Files.ALO\PG.StarWarsGame.Files.ALO.csproj" />

0 commit comments

Comments
 (0)