Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
16d4337
Bump the all-deps group across 1 directory with 9 updates
dependabot[bot] Apr 9, 2025
0e3521b
Merge pull request #168 from AlamoEngine-Tools/dependabot/nuget/devel…
AnakinRaW Apr 9, 2025
54a9628
Bump the all-deps group across 1 directory with 4 updates
dependabot[bot] Apr 25, 2025
cba5373
Merge pull request #170 from AlamoEngine-Tools/dependabot/nuget/devel…
AnakinRaW May 2, 2025
a8017d0
Bump xunit.runner.visualstudio from 3.0.2 to 3.1.0 in the all-deps group
dependabot[bot] May 6, 2025
cc85ff8
Merge pull request #171 from AlamoEngine-Tools/dependabot/nuget/devel…
AnakinRaW May 7, 2025
a1f38fd
Bump AnakinRaW.CommonUtilities.FileSystem and 5 others
dependabot[bot] Jun 6, 2025
dedd72d
Merge pull request #173 from AlamoEngine-Tools/dependabot/nuget/sampl…
AnakinRaW Jun 9, 2025
2438567
Bump the all-deps group with 3 updates
dependabot[bot] Jun 10, 2025
3caa09a
Merge pull request #175 from AlamoEngine-Tools/dependabot/nuget/test/…
AnakinRaW Jun 10, 2025
05d38e9
Bump the all-deps group with 4 updates
dependabot[bot] Jun 11, 2025
4d81044
Merge pull request #176 from AlamoEngine-Tools/dependabot/nuget/sampl…
AnakinRaW Jun 11, 2025
4057e83
Bump the all-deps group with 6 updates
dependabot[bot] Jul 14, 2025
4bedc26
Merge pull request #179 from AlamoEngine-Tools/dependabot/nuget/sampl…
AnakinRaW Jul 14, 2025
b112d04
Bump the actions-deps group across 1 directory with 2 updates
dependabot[bot] Aug 12, 2025
0d1ab90
update deps
AnakinRaW Aug 16, 2025
eb562ea
Merge pull request #190 from AlamoEngine-Tools/dependabot/github_acti…
AnakinRaW Aug 17, 2025
1c561df
Bump the all-deps group with 5 updates
dependabot[bot] Sep 10, 2025
66256f0
Merge pull request #193 from AlamoEngine-Tools/dependabot/nuget/sampl…
AnakinRaW Sep 10, 2025
6c159e2
Bump the all-deps group with 5 updates
dependabot[bot] Oct 7, 2025
893cfb5
Merge pull request #204 from AlamoEngine-Tools/dependabot/nuget/devel…
AnakinRaW Oct 7, 2025
fe5a0a1
Bump the actions-deps group across 1 directory with 5 updates
dependabot[bot] Nov 21, 2025
478cbd2
Merge pull request #223 from AlamoEngine-Tools/dependabot/github_acti…
AnakinRaW Dec 7, 2025
27bcff5
update deps
AnakinRaW Dec 7, 2025
47a2ff6
Logging
AnakinRaW Dec 7, 2025
5ffe2f8
update deps
AnakinRaW Dec 8, 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
12 changes: 6 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: 'csharp'
- name: Autobuild
uses: github/codeql-action/autobuild@v3
uses: github/codeql-action/autobuild@v4
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'
- name: Create packages
run: dotnet pack --configuration Release --output ./packages
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: NuGet packages
path: packages/*.*
Expand All @@ -40,12 +40,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v4
- uses: actions/download-artifact@v4
uses: actions/setup-dotnet@v5
- uses: actions/download-artifact@v6
with:
name: NuGet packages
path: packages
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'

- name: Build & Test in Release Mode
run: dotnet test --configuration Release --logger "GitHubActions"
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
<PrivateAssets>all</PrivateAssets>
<Version>3.7.115</Version>
<Version>3.9.50</Version>
</PackageReference>
<PackageReference Include="SauceControl.InheritDoc" Version="2.0.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
Expand Down
93 changes: 0 additions & 93 deletions PetroGlyphGameInfrastructure.sln

This file was deleted.

16 changes: 16 additions & 0 deletions PetroGlyphGameInfrastructure.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Solution>
<Folder Name="/src/">
<Project Path="src/AET.SteamAbstraction/AET.SteamAbstraction.csproj" />
<Project Path="src/PG.StarWarsGame.Infrastructure.Clients.Steam/PG.StarWarsGame.Infrastructure.Clients.Steam.csproj" />
<Project Path="src/PG.StarWarsGame.Infrastructure/PG.StarWarsGame.Infrastructure.csproj" />
</Folder>
<Folder Name="/test/">
<Project Path="test/AET.SteamAbstraction.Test/AET.SteamAbstraction.Test.csproj" />
<Project Path="test/AET.SteamAbstraction.Testing/AET.SteamAbstraction.Testing.csproj" />
<Project Path="test/PG.StarWarsGame.Infrastructure.Clients.Steam.Test/PG.StarWarsGame.Infrastructure.Clients.Steam.Test.csproj" />
<Project Path="test/PG.StarWarsGame.Infrastructure.Test/PG.StarWarsGame.Infrastructure.Test.csproj" />
<Project Path="test/PG.StarWarsGame.Infrastructure.Testing/PG.StarWarsGame.Infrastructure.Testing.csproj" />
<Project Path="test/PG.TestingUtilities/PG.TestingUtilities.csproj" />
</Folder>
<Project Path="sampleApp/SampleApplication.csproj" />
</Solution>
6 changes: 3 additions & 3 deletions sampleApp/SampleApplication.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/AET.SteamAbstraction/AET.SteamAbstraction.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>AET.SteamAbstraction</AssemblyName>
Expand All @@ -21,16 +21,16 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.1.8" />
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.3.9" />
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageReference Include="AnakinRaW.CommonUtilities" Version="12.1.8" />
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
<PackageReference Include="AnakinRaW.CommonUtilities" Version="12.3.9" />
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.3.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/AET.SteamAbstraction/Library/SteamLibrary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public IEnumerable<SteamAppManifest> GetApps()
}
catch (SteamException e)
{
_logger?.LogWarning(e, $"Could not read game manifest file '{manifestFile}': {e.Message}");
_logger?.LogWarning(e, "Could not read game manifest file '{ManifestFile}': {Message}", manifestFile, e.Message);
}
}
return apps;
Expand Down
8 changes: 4 additions & 4 deletions src/AET.SteamAbstraction/Library/SteamLibraryFinder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ public IEnumerable<ISteamLibrary> FindLibraries(IDirectoryInfo steamInstallDir)

private bool TryCreateLibraryFromLocation(IDirectoryInfo libraryLocation, bool isDefault, [NotNullWhen(true)] out SteamLibrary? library)
{
_logger?.LogTrace($"Try creating steam library from location '{libraryLocation.FullName}'");
_logger?.LogTrace("Try creating steam library from location '{Library}'", libraryLocation.FullName);
library = null;

if (!libraryLocation.Exists)
{
_logger?.LogTrace($"Steam library location '{libraryLocation.FullName}' does not exist. Library not created.");
_logger?.LogTrace("Steam library location '{Library}' does not exist. Library not created.", libraryLocation.FullName);
return false;
}

Expand All @@ -59,7 +59,7 @@ private bool TryCreateLibraryFromLocation(IDirectoryInfo libraryLocation, bool i
var steamDll = _fileSystem.Path.Combine(libraryLocation.FullName, SteamDllFileName);
if (!_fileSystem.File.Exists(steamDll))
{
_logger?.LogTrace($"Steam library location '{libraryLocation.FullName}' does not contain 'steam.dll'. Library not created.");
_logger?.LogTrace("Steam library location '{Library}' does not contain 'steam.dll'. Library not created.", libraryLocation.FullName);
return false;
}
}
Expand All @@ -75,7 +75,7 @@ private bool TryCreateLibraryFromLocation(IDirectoryInfo libraryLocation, bool i
var libraryVdf = _fileSystem.Path.Combine(libraryLocation.FullName, libraryVdfSubPath, libraryVdfName);
if (!_fileSystem.File.Exists(libraryVdf))
{
_logger?.LogTrace($"Steam library VDF file '{libraryVdf}' was not found. Library not created.");
_logger?.LogTrace("Steam library VDF file '{Library}' was not found. Library not created.", libraryVdf);
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public IGameProcess Debug(ArgumentCollection arguments, bool fallbackToPlay)
if (!fallbackToPlay)
throw new GameStartException(Game, "Debug version of the game could not be found.");
buildType = GameBuildType.Release;
Logger?.LogTrace($"Falling back to release configuration because debug executables of '{Game}' were not found.");
Logger?.LogTrace("Falling back to release configuration because debug executables of '{Game}' were not found.", Game);
}
return StartGame(arguments, buildType);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ public IGameProcess StartGameProcess(IFileInfo executable, GameProcessInfo proce
{
var arguments = ArgumentCommandLineBuilder.BuildCommandLine(processInfo.Arguments);

_logger?.LogDebug(
$"Starting game '{processInfo.Game}' with '{processInfo.BuildType}' configuration and with launch arguments '{arguments}'");
_logger?.LogDebug("Starting game '{Process}' with '{BuildType}' configuration and with launch arguments '{Args}'", processInfo.Game, processInfo.BuildType, arguments);

var processStartInfo = new ProcessStartInfo(executable.FullName)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<RootNamespace>PG.StarWarsGame.Infrastructure</RootNamespace>
Expand All @@ -22,10 +22,10 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AlamoEngineTools.Modinfo" Version="7.0.17" />
<PackageReference Include="AnakinRaW.CommonUtilities" Version="12.1.8" />
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.1.8" />
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.1.8" />
<PackageReference Include="AlamoEngineTools.Modinfo" Version="7.0.18" />
<PackageReference Include="AnakinRaW.CommonUtilities" Version="12.3.9" />
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.3.9" />
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.3.9" />
<PackageReference Include="IsExternalInit" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -35,9 +35,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="semver" Version="3.0.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.74" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
<PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageReference Include="QuikGraph" Version="2.5.0" PrivateAssets="compile" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public GameDetectionResult Detect(GameType gameType, params ICollection<GamePlat
GameDetectionResult? lastResult = null;
foreach (var detector in SortedDetectors)
{
_logger?.LogTrace($"Searching for game '{gameType}' with detector: '{detector}'");
_logger?.LogTrace("Searching for game '{GameType}' with detector: '{GameDetector}'", gameType, detector);
detector.InitializationRequested += PassThroughInitializationRequest;

try
Expand All @@ -70,7 +70,7 @@ public GameDetectionResult Detect(GameType gameType, params ICollection<GamePlat
}
catch (Exception e)
{
_logger?.LogDebug($"Failed detecting game using detector {detector}. {e}");
_logger?.LogDebug("Failed detecting game using detector {GameDetector}. {Exception}", detector, e);
errors.Add(e);

if (detector.Equals(SortedDetectors[^1]))
Expand Down
Loading
Loading