Skip to content

Commit

Permalink
General Updates:
Browse files Browse the repository at this point in the history
- update deps
  • Loading branch information
Cryptoc1 committed Feb 26, 2025
1 parent b9d9e80 commit 838b9d1
Show file tree
Hide file tree
Showing 13 changed files with 973 additions and 898 deletions.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sdk": {
"allowPrerelease": false,
"rollForward": "latestMajor",
"version": "9.0.102"
"version": "9.0.200"
}
}
340 changes: 170 additions & 170 deletions sample/App/packages.lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sample/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Nullable>enable</Nullable>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<TargetFramework>net9.0</TargetFramework>
<AspNetCoreVersion>9.0.1</AspNetCoreVersion>
<AspNetCoreVersion>9.0.2</AspNetCoreVersion>
</PropertyGroup>

</Project>
419 changes: 222 additions & 197 deletions sample/Launcher/packages.lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/App/CS2Launcher.AspNetCore.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ESCd.Extensions.Http" Version="1.0.3" />
<PackageReference Include="ESCd.Extensions.Http" Version="1.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="$(AspNetCoreVersion)" />
</ItemGroup>
Expand All @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="System.Text.Json" Version="9.0.1" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/App/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/App/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@tailwindcss/forms": "0.5.10",
"cross-env": "7.0.3",
"cssnano": "7.0.6",
"postcss": "8.5.1",
"postcss": "8.5.3",
"postcss-cli": "11.0.0",
"postcss-preset-env": "10.1.3",
"tailwindcss": "3.4.17"
Expand Down
468 changes: 234 additions & 234 deletions src/App/packages.lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

<!-- net8.0 -->
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<AspNetCoreVersion>8.0.12</AspNetCoreVersion>
<AspNetCoreVersion Condition=" '$(TargetFramework)' == 'net9.0' ">9.0.1</AspNetCoreVersion>
<AspNetCoreVersion>8.0.13</AspNetCoreVersion>
<AspNetCoreVersion Condition=" '$(TargetFramework)' == 'net9.0' ">9.0.2</AspNetCoreVersion>
</PropertyGroup>

<!-- Git Versioning + Metadata -->
Expand Down
6 changes: 3 additions & 3 deletions src/Launcher/CS2Launcher.AspNetCore.Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.ApplicationStatus" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="9.2.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -35,8 +35,8 @@
<PackageReference Include="AspNet.Security.OpenId.Steam" Version="9.0.0" />

<!-- NOTE: force transitive deps of CoreRCON, since `PrivateAssets` is used to prevent generated a dependency key on nuget -->
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.1" />
<PackageReference Include="System.IO.Pipelines" Version="9.0.1" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
<PackageReference Include="System.IO.Pipelines" Version="9.0.2" />
</ItemGroup>

<Target DependsOnTargets="BuildOnlySettings;ResolveReferences" Name="CopyProjectReferencesToPackage">
Expand Down
9 changes: 4 additions & 5 deletions src/Launcher/CS2LauncherApplication.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using CS2Launcher.AspNetCore.App;
using CS2Launcher.AspNetCore.App.Abstractions.Api;
using CS2Launcher.AspNetCore.App.Hosting;
using CS2Launcher.AspNetCore.Launcher.Abstractions;
using CS2Launcher.AspNetCore.Launcher.Authorization;
using CS2Launcher.AspNetCore.Launcher.Configuration;
using CS2Launcher.AspNetCore.Launcher.Hosting;
using HealthChecks.ApplicationStatus.DependencyInjection;
using CS2Launcher.AspNetCore.Launcher.Hubs;
using CS2Launcher.AspNetCore.Launcher.Infrastructure;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
Expand All @@ -19,9 +21,6 @@
using Microsoft.Extensions.Diagnostics.Metrics;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using CS2Launcher.AspNetCore.Launcher.Infrastructure;
using CS2Launcher.AspNetCore.App.Abstractions.Api;
using CS2Launcher.AspNetCore.Launcher.Hubs;

namespace CS2Launcher.AspNetCore.Launcher;

Expand Down Expand Up @@ -61,7 +60,7 @@ public static CS2LauncherApplicationBuilder CreateBuilder( string[] args )
.AddRouting( options => options.LowercaseUrls = true );

builder.Services.AddHealthChecks()
.AddApplicationStatus()
.AddApplicationLifecycleHealthCheck()
.AddCheck<DedicatedServerHealthCheck>( nameof( DedicatedServer ) );

builder.Services.AddSingleton<DedicatedServer>()
Expand Down
Loading

0 comments on commit 838b9d1

Please sign in to comment.