Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-15-intel, macos-latest]
configuration: [Debug, Release]
configuration: [Debug, Release, "Debug (Dedicated)", "Release (Dedicated)"]
include:
- os: ubuntu-latest
configuration: Release
Expand All @@ -22,19 +22,19 @@ jobs:
with:
submodules: recursive

- uses: actions/setup-dotnet@v5
- uses: actions/setup-dotnet@v5.4.0
with:
dotnet-version: 10.0.x
dotnet-version: 11.0.x

- name: Build
run: dotnet build Source.NET.slnx -c ${{ matrix.configuration }}
run: dotnet build Source.NET.slnx -c "${{ matrix.configuration }}"

- name: Test
run: dotnet test --project Source.Common.Tests/Source.Common.Tests.csproj -c ${{ matrix.configuration }} --no-build ${{ matrix.coverage && '--coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml --coverage-settings Source.Common.Tests/coverage.settings.xml --results-directory TestResults' || '' }}
run: dotnet test --project Source.Common.Tests/Source.Common.Tests.csproj -c "${{ matrix.configuration }}" --no-build ${{ matrix.coverage && '--coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml --coverage-settings Source.Common.Tests/coverage.settings.xml --results-directory TestResults' || '' }}

- name: Coverage report
if: matrix.coverage
uses: danielpalme/ReportGenerator-GitHub-Action@5
uses: danielpalme/ReportGenerator-GitHub-Action@v5
with:
reports: TestResults/coverage.cobertura.xml
targetdir: CoverageReport
Expand Down
3 changes: 1 addition & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"--no-restore",
"${workspaceFolder}/Source.Dedicated/Source.Dedicated.csproj",
"-p:WarningLevel=0",
"-c",
"Debug (Dedicated)"
"-p:Configuration=Debug%20(Dedicated)"
],
"problemMatcher": "$msCompile"
}
Expand Down
2 changes: 1 addition & 1 deletion Dependencies/OpenGL/OpenGL46.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0</TargetFrameworks>
<TargetFrameworks>net11.0</TargetFrameworks>
<EnableDefaultItems>false</EnableDefaultItems>
<AssemblyName>OpenGL46</AssemblyName>
<RootNamespace>OpenGL46</RootNamespace>
Expand Down
17 changes: 16 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<Project>
<PropertyGroup>
<IsDependency Condition="$(MSBuildProjectDirectory.StartsWith('$(MSBuildThisFileDirectory)Dependencies'))">true</IsDependency>
<IsAnalyzer Condition="$(MSBuildProjectName.StartsWith('Source.CodeAnalysis'))">true</IsAnalyzer>
</PropertyGroup>

<PropertyGroup Condition="'$(IsDependency)' != 'true' And '$(IsAnalyzer)' != 'true'">
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition="'$(IsDependency)' != 'true'">
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
</PropertyGroup>
Expand Down Expand Up @@ -56,7 +71,7 @@
<PlatformTarget Condition="'$(PlatformTarget)' == ''">x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="$(MSBuildProjectName.StartsWith('Source.CodeAnalysis'))">
<PropertyGroup Condition="'$(IsAnalyzer)' == 'true'">
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>

Expand Down
58 changes: 58 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Aspose.Drawing" Version="26.10.0" />
<PackageVersion Include="Box3D.Sharp" Version="0.1.2" />
<PackageVersion Include="cef.runtime.linux-x64" Version="154.0.34" />
<PackageVersion Include="cef.runtime.win-x64" Version="154.0.34" />
<PackageVersion Include="CefGlue.Next.Core" Version="154.8037.98" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.4.2" />
<PackageVersion Include="DStruct.NET" Version="1.2.0" />
<PackageVersion Include="FreeImage-dotnet-core" Version="4.3.6" />
<PackageVersion Include="FreeTypeSharp" Version="3.1.0" />
<PackageVersion Include="K4os.Hash.xxHash" Version="1.0.8" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0" />
<PackageVersion Include="NLayer" Version="1.16.0" />
<PackageVersion Include="Pastel" Version="6.0.1" />
<PackageVersion Include="PInvoke.Gdi32" Version="0.7.124" />
<PackageVersion Include="PInvoke.User32" Version="0.7.124" />
<PackageVersion Include="ppy.SDL3-CS" Version="2026.1002.1" />
<PackageVersion Include="SevenZip" Version="19.0.0" />
<PackageVersion Include="SharpCompress" Version="0.50.8" />
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="Snappier" Version="1.3.1" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis" Version="3.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.3.1" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest" Version="1.1.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest" Version="1.1.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest" Version="1.1.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest" Version="1.1.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.12.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="1.3.2" />
<PackageVersion Include="MSTest.TestFramework" Version="1.3.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="NuGet.Common" Version="5.11.7" />
<PackageVersion Include="NuGet.Packaging" Version="5.11.7" />
<PackageVersion Include="NuGet.Protocol" Version="5.11.7" />
<PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="xunit.v3" Version="4.0.3" />
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions Game.Assets/Game.Assets.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Usings\GlobalUsings.cs" Link="Usings/GlobalUsings.cs" />
</ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions Game.Client/Game.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Project Settings -->
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<!-- Project References -->
Expand Down Expand Up @@ -41,6 +36,6 @@
<ProjectReference Include="../Source.CodeAnalysis.EntityFactories/Source.CodeAnalysis.EntityFactories.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions Game.Lua/Game.Lua.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions Game.MenuSystem/Game.MenuSystem.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<ItemGroup>
Expand All @@ -31,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" />
</ItemGroup>

</Project>
8 changes: 2 additions & 6 deletions Game.Server.Tests/Game.Server.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>

Expand All @@ -20,8 +16,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.12.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
<PackageReference Include="xunit.v3" />
</ItemGroup>

</Project>
6 changes: 1 addition & 5 deletions Game.Server/Game.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Usings\GlobalUsings.cs" Link="Usings/GlobalUsings.cs" />
Expand All @@ -28,7 +24,7 @@
<Compile Condition="$(DefineConstants.Contains(&quot;GMOD_DLL&quot;))" Include="..\Game.Shared\GarrysMod\*.cs" Link="Shared\GarrysMod\%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" />
</ItemGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);GAME_DLL</DefineConstants>
Expand Down
7 changes: 0 additions & 7 deletions Game.ServerBrowser/Game.ServerBrowser.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Usings\GlobalUsings.cs" Link="Usings/GlobalUsings.cs" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions Game.Shared/Game.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
<RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
<EnableNETAnalyzers>False</EnableNETAnalyzers>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<IsPublishable>False</IsPublishable>
Expand Down
7 changes: 0 additions & 7 deletions Game.UI/Game.UI.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Usings\GlobalUsings.cs" Link="Usings/GlobalUsings.cs" />
</ItemGroup>
Expand Down
6 changes: 1 addition & 5 deletions HTML.CEF.Process/HTML.CEF.Process.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CefGlue.Next.Core" Version="154.8037.98" />
<PackageReference Include="CefGlue.Next.Core" />
</ItemGroup>

</Project>
7 changes: 1 addition & 6 deletions HTML.CEF/HTML.CEF.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CefGlue.Next.Core" Version="154.8037.98" />
<PackageReference Include="CefGlue.Next.Core" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions HTML.Stub/HTML.Stub.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Source.Common\Source.Common.csproj" />
</ItemGroup>
Expand Down
10 changes: 3 additions & 7 deletions Source.AudioSystem/Source.AudioSystem.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Usings\GlobalUsings.cs" Link="Usings/GlobalUsings.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NLayer" Version="1.16.0" />
<PackageReference Include="ppy.SDL3-CS" Version="2025.703.0" />
<PackageReference Include="NLayer" />
<PackageReference Include="ppy.SDL3-CS" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions Source.Bitmap/Source.Bitmap.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Usings\GlobalUsings.cs" Link="Usings/GlobalUsings.cs" />
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions Source.CodeAnalysis.BitVec/Source.CodeAnalysis.BitVec.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<IncludeBuildOutput>false</IncludeBuildOutput>
<Configurations>Debug;Release;Debug (Dedicated);Release (Dedicated)</Configurations>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
</ItemGroup>

</Project>
Loading
Loading