Skip to content

Commit 6f7af2d

Browse files
committed
Replace Nerdbank.GitVersioning with MinVer, as it better fits the workflow
update dependencies
1 parent 4500fbb commit 6f7af2d

File tree

3 files changed

+43
-7
lines changed

3 files changed

+43
-7
lines changed

AssettoServer/AssettoServer.csproj

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Autofac" Version="8.2.1" />
31+
<PackageReference Include="Autofac" Version="8.3.0" />
3232
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
3333
<PackageReference Include="CommandLineParser" Version="2.9.1" />
3434
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
@@ -45,7 +45,7 @@
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4747
</PackageReference>
48-
<PackageReference Include="FluentValidation" Version="11.11.0" />
48+
<PackageReference Include="FluentValidation" Version="12.0.0" />
4949
<PackageReference Include="Humanizer.Core" Version="3.0.0-beta.54" />
5050
<PackageReference Include="ini-parser" Version="2.5.2">
5151
<NoWarn>NU1701</NoWarn>
@@ -54,7 +54,7 @@
5454
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
5555
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
5656
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
57-
<PackageReference Include="NJsonSchema" Version="11.2.0" />
57+
<PackageReference Include="NJsonSchema" Version="11.3.2" />
5858
<PackageReference Include="NodaTime" Version="3.2.2" />
5959
<PackageReference Include="Open.NAT" Version="2.1.0">
6060
<NoWarn>NU1701</NoWarn>
@@ -72,17 +72,25 @@
7272
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
7373
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
7474
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
75-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
75+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
7676
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
7777
<PackageReference Include="SerilogTimings" Version="3.1.0" />
7878
<PackageReference Include="compujuckel.Supercluster.KDTree" Version="1.0.8" />
7979
<PackageReference Include="Sigil" Version="5.0.0" />
8080
<PackageReference Include="SunCalcNet" Version="1.2.2" />
81-
<PackageReference Include="System.IO.Hashing" Version="9.0.4" />
81+
<PackageReference Include="System.IO.Hashing" Version="9.0.5" />
8282
<PackageReference Include="YamlDotNet" Version="16.3.0" />
83-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="all" Condition="!Exists('packages.config')" />
83+
<PackageReference Include="MinVer" Version="6.0.0">
84+
<PrivateAssets>all</PrivateAssets>
85+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
86+
</PackageReference>
8487
</ItemGroup>
8588

89+
<PropertyGroup>
90+
<MinVerTagPrefix>v</MinVerTagPrefix>
91+
<MinVerIgnoreHeight>true</MinVerIgnoreHeight>
92+
</PropertyGroup>
93+
8694
<ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
8795
<ContentWithTargetPath Include="Redist/libsteam_api.so">
8896
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

AssettoServer/ThisAssembly.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Reflection;
3+
4+
namespace AssettoServer;
5+
6+
internal static class ThisAssembly
7+
{
8+
internal static string AssemblyInformationalVersion { get; }
9+
internal static string? GitCommitHash { get; }
10+
11+
static ThisAssembly()
12+
{
13+
var informationalVersion = GetAssemblyAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
14+
var plusIndex = informationalVersion.IndexOf('+');
15+
if (plusIndex > 0)
16+
{
17+
AssemblyInformationalVersion = informationalVersion[..plusIndex];
18+
GitCommitHash = informationalVersion[(plusIndex + 1)..];
19+
}
20+
else
21+
{
22+
AssemblyInformationalVersion = informationalVersion;
23+
}
24+
}
25+
26+
private static T GetAssemblyAttribute<T>() where T : Attribute =>
27+
(T)Attribute.GetCustomAttribute(typeof(ThisAssembly).Assembly, typeof(T), false)!;
28+
}

GeoIPPlugin/GeoIPPlugin.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
27+
<PackageReference Include="MaxMind.GeoIP2" Version="5.3.0" />
2828
</ItemGroup>
2929

3030
</Project>

0 commit comments

Comments
 (0)