Skip to content

Commit bb6e248

Browse files
AnakinRaWAnakinRaW
authored
Merge pull request #230 from AlamoEngine-Tools/develop
Update dependencies
2 parents c617b2c + 5ffe2f8 commit bb6e248

30 files changed

Lines changed: 136 additions & 214 deletions

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
with:
1919
fetch-depth: 0
2020
- name: Setup .NET Core SDK
21-
uses: actions/setup-dotnet@v4
21+
uses: actions/setup-dotnet@v5
2222
with:
23-
dotnet-version: '9.0.x'
23+
dotnet-version: '10.0.x'
2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v3
25+
uses: github/codeql-action/init@v4
2626
with:
2727
languages: 'csharp'
2828
- name: Autobuild
29-
uses: github/codeql-action/autobuild@v3
29+
uses: github/codeql-action/autobuild@v4
3030
- name: Perform CodeQL Analysis
31-
uses: github/codeql-action/analyze@v3
31+
uses: github/codeql-action/analyze@v4

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout sources
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 0
2323
- name: Setup .NET
24-
uses: actions/setup-dotnet@v4
24+
uses: actions/setup-dotnet@v5
2525
with:
26-
dotnet-version: '9.0.x'
26+
dotnet-version: '10.0.x'
2727
- name: Create packages
2828
run: dotnet pack --configuration Release --output ./packages
2929
- name: Upload a Build Artifact
30-
uses: actions/upload-artifact@v4
30+
uses: actions/upload-artifact@v5
3131
with:
3232
name: NuGet packages
3333
path: packages/*.*
@@ -40,12 +40,12 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout sources
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v6
4444
with:
4545
fetch-depth: 0
4646
- name: Setup .NET
47-
uses: actions/setup-dotnet@v4
48-
- uses: actions/download-artifact@v4
47+
uses: actions/setup-dotnet@v5
48+
- uses: actions/download-artifact@v6
4949
with:
5050
name: NuGet packages
5151
path: packages

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
with:
2323
fetch-depth: 0
24-
- uses: actions/setup-dotnet@v4
24+
- uses: actions/setup-dotnet@v5
2525
with:
26-
dotnet-version: '9.0.x'
26+
dotnet-version: '10.0.x'
2727

2828
- name: Build & Test in Release Mode
2929
run: dotnet test --configuration Release --logger "GitHubActions"

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ItemGroup>
3030
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
3131
<PrivateAssets>all</PrivateAssets>
32-
<Version>3.7.115</Version>
32+
<Version>3.9.50</Version>
3333
</PackageReference>
3434
<PackageReference Include="SauceControl.InheritDoc" Version="2.0.2" PrivateAssets="all" />
3535
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">

‎PetroGlyphGameInfrastructure.sln‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎PetroGlyphGameInfrastructure.slnx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Solution>
2+
<Folder Name="/src/">
3+
<Project Path="src/AET.SteamAbstraction/AET.SteamAbstraction.csproj" />
4+
<Project Path="src/PG.StarWarsGame.Infrastructure.Clients.Steam/PG.StarWarsGame.Infrastructure.Clients.Steam.csproj" />
5+
<Project Path="src/PG.StarWarsGame.Infrastructure/PG.StarWarsGame.Infrastructure.csproj" />
6+
</Folder>
7+
<Folder Name="/test/">
8+
<Project Path="test/AET.SteamAbstraction.Test/AET.SteamAbstraction.Test.csproj" />
9+
<Project Path="test/AET.SteamAbstraction.Testing/AET.SteamAbstraction.Testing.csproj" />
10+
<Project Path="test/PG.StarWarsGame.Infrastructure.Clients.Steam.Test/PG.StarWarsGame.Infrastructure.Clients.Steam.Test.csproj" />
11+
<Project Path="test/PG.StarWarsGame.Infrastructure.Test/PG.StarWarsGame.Infrastructure.Test.csproj" />
12+
<Project Path="test/PG.StarWarsGame.Infrastructure.Testing/PG.StarWarsGame.Infrastructure.Testing.csproj" />
13+
<Project Path="test/PG.TestingUtilities/PG.TestingUtilities.csproj" />
14+
</Folder>
15+
<Project Path="sampleApp/SampleApplication.csproj" />
16+
</Solution>

‎sampleApp/SampleApplication.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0-windows</TargetFramework>
5+
<TargetFramework>net10.0-windows</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/AET.SteamAbstraction/AET.SteamAbstraction.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
<AssemblyName>AET.SteamAbstraction</AssemblyName>
@@ -21,16 +21,16 @@
2121
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2222
</PropertyGroup>
2323
<ItemGroup>
24-
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.1.8" />
24+
<PackageReference Include="AnakinRaW.CommonUtilities.Registry" Version="12.3.9" />
2525
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
26-
<PackageReference Include="AnakinRaW.CommonUtilities" Version="12.1.8" />
27-
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.1.8" />
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
29-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
26+
<PackageReference Include="AnakinRaW.CommonUtilities" Version="12.3.9" />
27+
<PackageReference Include="AnakinRaW.CommonUtilities.FileSystem" Version="12.3.9" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
3030
<PackageReference Include="Nullable" Version="1.3.1">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3333
</PackageReference>
34-
<PackageReference Include="System.Text.Json" Version="9.0.2" />
34+
<PackageReference Include="System.Text.Json" Version="10.0.0" />
3535
</ItemGroup>
3636
</Project>

‎src/AET.SteamAbstraction/Library/SteamLibrary.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public IEnumerable<SteamAppManifest> GetApps()
6666
}
6767
catch (SteamException e)
6868
{
69-
_logger?.LogWarning(e, $"Could not read game manifest file '{manifestFile}': {e.Message}");
69+
_logger?.LogWarning(e, "Could not read game manifest file '{ManifestFile}': {Message}", manifestFile, e.Message);
7070
}
7171
}
7272
return apps;

‎src/AET.SteamAbstraction/Library/SteamLibraryFinder.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ public IEnumerable<ISteamLibrary> FindLibraries(IDirectoryInfo steamInstallDir)
4545

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

5151
if (!libraryLocation.Exists)
5252
{
53-
_logger?.LogTrace($"Steam library location '{libraryLocation.FullName}' does not exist. Library not created.");
53+
_logger?.LogTrace("Steam library location '{Library}' does not exist. Library not created.", libraryLocation.FullName);
5454
return false;
5555
}
5656

@@ -59,7 +59,7 @@ private bool TryCreateLibraryFromLocation(IDirectoryInfo libraryLocation, bool i
5959
var steamDll = _fileSystem.Path.Combine(libraryLocation.FullName, SteamDllFileName);
6060
if (!_fileSystem.File.Exists(steamDll))
6161
{
62-
_logger?.LogTrace($"Steam library location '{libraryLocation.FullName}' does not contain 'steam.dll'. Library not created.");
62+
_logger?.LogTrace("Steam library location '{Library}' does not contain 'steam.dll'. Library not created.", libraryLocation.FullName);
6363
return false;
6464
}
6565
}
@@ -75,7 +75,7 @@ private bool TryCreateLibraryFromLocation(IDirectoryInfo libraryLocation, bool i
7575
var libraryVdf = _fileSystem.Path.Combine(libraryLocation.FullName, libraryVdfSubPath, libraryVdfName);
7676
if (!_fileSystem.File.Exists(libraryVdf))
7777
{
78-
_logger?.LogTrace($"Steam library VDF file '{libraryVdf}' was not found. Library not created.");
78+
_logger?.LogTrace("Steam library VDF file '{Library}' was not found. Library not created.", libraryVdf);
7979
return false;
8080
}
8181

0 commit comments

Comments
 (0)