Skip to content

Prepare Auto-Update #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnakinRaW merged 9 commits into from
May 23, 2025
Merged

Prepare Auto-Update #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
72ea47e
update deps
AnakinRaW Apr 12, 2025
a370d51
do not publish symbols
AnakinRaW Apr 12, 2025
5dab720
update deps
AnakinRaW Apr 17, 2025
d83e19d
update deps
AnakinRaW Apr 26, 2025
dbdd52d
syntax
AnakinRaW Apr 26, 2025
15a16af
update deps
AnakinRaW May 2, 2025
f0ca888
simplification
AnakinRaW May 10, 2025
59b5a3f
update deps
AnakinRaW May 14, 2025
9bf2549
prepare manual release in CI/CD
AnakinRaW May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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 }}
Expand Down
31 changes: 21 additions & 10 deletions src/ModVerify.CliApp/ModVerify.CliApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,29 @@
<RootNamespace>AET.ModVerifyTool</RootNamespace>
<AssemblyName>ModVerify</AssemblyName>
<ApplicationIcon>$(RepoRootPath)aet.ico</ApplicationIcon>
<Title>AET.ModVerify.CommandLine</Title>
<Product>AET.ModVerify</Product>
<Description>Application that allows to verify to verify game modifications for Empire at War / Forces of Corruption against a set of common rules.</Description>
<PackageId>AlamoEngineTools.ModVerify.CliApp</PackageId>
</PropertyGroup>

<PropertyGroup>
<Title>ModVerify Console Application</Title>
<Product>AET.ModVerify</Product>
<Description>Console application that analyzes game modifications for Empire at War / Forces of Corruption for common errors.</Description>
<PackageTags>alamo,petroglyph,glyphx</PackageTags>
</PropertyGroup>

<PropertyGroup>
<InvariantGlobalization>true</InvariantGlobalization>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Infrastructure" Version="4.0.35" />
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Infrastructure.Steam" Version="4.0.35" />
<PackageReference Include="Figgle" Version="0.5.1" />
<PackageReference Include="IndexRange" Version="1.0.3" Condition="$(TargetFramework) == 'net48'">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -28,17 +40,17 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
<PackageReference Include="IsExternalInit" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
<PackageReference Include="Required" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -53,7 +65,6 @@
</PropertyGroup>

<ItemGroup>
<!--<ProjectReference Include="..\..\..\ModdingToolBase\src\Updater\AppUpdaterFramework\AppUpdaterFramework.csproj" />-->
<ProjectReference Include="..\ModVerify\ModVerify.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ModVerify.CliApp/ModVerifyApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private async Task<IReadOnlyCollection<VerificationError>> Verify(VerifyInstalla
initProgress,
false,
CancellationToken.None).ConfigureAwait(false);
_logger?.LogInformation($"Game Engine created");
_logger?.LogInformation("Game Engine created");
}
finally
{
Expand Down
6 changes: 1 addition & 5 deletions src/ModVerify.CliApp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ private static void ConfigureLogging(ILoggingBuilder loggingBuilder, IFileSystem
loggingBuilder.AddSerilog(fileLogger);

var cLogger = new LoggerConfiguration()

.WriteTo.Console(
logLevel,
theme: AnsiConsoleTheme.Code,
Expand All @@ -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);
Expand Down
15 changes: 9 additions & 6 deletions src/ModVerify/ModVerify.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<Title>AET.ModVerify</Title>
<Product>AET.ModVerify</Product>
<Description>Provides interfaces and classes to verify Empire at War / Forces of Corruption game modifications.</Description>
<PackageId>AlamoEngineTools.ModVerify</PackageId>
<RootNamespace>AET.ModVerify</RootNamespace>
<AssemblyName>AET.ModVerify</AssemblyName>
</PropertyGroup>

<PropertyGroup>
<Title>ModVerify Core</Title>
<Product>AET.ModVerify</Product>
<Description>Provides interfaces and classes to verify Empire at War / Forces of Corruption game modifications.</Description>
<PackageTags>alamo,petroglyph,glyphx</PackageTags>
</PropertyGroup>

Expand All @@ -22,8 +25,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.4" />
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.3.4" />
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.8" />
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.3.8" />
<PackageReference Include="IsExternalInit" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -32,7 +35,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="9.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.5" />

</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ItemGroup>
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Files.MEG" Version="2.1.7" />
<PackageReference Include="AlamoEngineTools.PG.StarWarsGame.Files.MTD" Version="2.1.7" />
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.4" />
<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.3.8" />
<PackageReference Include="IsExternalInit" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -38,7 +38,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.1" />
<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PG.StarWarsGame.Files.ALO\PG.StarWarsGame.Files.ALO.csproj" />
Expand Down
Loading