From 7e1b1023fa17f00a0acb3b01b05e93bbf25715bf Mon Sep 17 00:00:00 2001 From: callumok2004 Date: Wed, 11 Nov 2026 16:46:10 +0000 Subject: [PATCH 1/6] Centralize build/package props --- Directory.Build.props | 17 +++++- Directory.Packages.props | 58 +++++++++++++++++++ Game.Assets/Game.Assets.csproj | 7 --- Game.Client/Game.Client.csproj | 7 +-- Game.Lua/Game.Lua.csproj | 4 -- Game.MenuSystem/Game.MenuSystem.csproj | 7 +-- Game.Server.Tests/Game.Server.Tests.csproj | 8 +-- Game.Server/Game.Server.csproj | 6 +- Game.ServerBrowser/Game.ServerBrowser.csproj | 7 --- Game.Shared/Game.Shared.csproj | 4 -- Game.UI/Game.UI.csproj | 7 --- HTML.CEF.Process/HTML.CEF.Process.csproj | 6 +- HTML.CEF/HTML.CEF.csproj | 7 +-- HTML.Stub/HTML.Stub.csproj | 7 --- Source.AudioSystem/Source.AudioSystem.csproj | 10 +--- Source.Bitmap/Source.Bitmap.csproj | 7 --- .../Source.CodeAnalysis.BitVec.csproj | 5 +- .../Source.CodeAnalysis.ConVars.csproj | 5 +- ...Source.CodeAnalysis.EntityFactories.csproj | 5 +- .../Source.CodeAnalysis.Lua.csproj | 5 +- .../Source.CodeAnalysis.NetworkVars.csproj | 5 +- .../Source.CodeAnalysis.VGUI.csproj | 5 +- .../Source.CodeAnalysis.CodeFixes.csproj | 3 +- .../Source.CodeAnalysis.Test.csproj | 37 ++++++------ .../Source.CodeAnalysis.csproj | 5 +- .../Source.Common.Tests.csproj | 8 +-- Source.Common/Source.Common.csproj | 22 +++---- Source.DataCache/Source.DataCache.csproj | 6 -- Source.Dedicated/Source.Dedicated.csproj | 4 -- Source.Engine/Source.Engine.csproj | 10 +--- Source.Filesystem/Source.Filesystem.csproj | 11 +--- .../Source.GUI.Controls.csproj | 7 --- Source.GUI/Source.GUI.csproj | 5 -- Source.Launcher/Source.Launcher.csproj | 8 +-- .../Source.MaterialSystem.csproj | 6 +- Source.Physics/Source.Physics.csproj | 13 ++--- .../Source.SDLInputSystem.csproj | 13 ++--- Source.SDLManager/Source.SDLManager.csproj | 12 ++-- Source.SDLSystem/Source.SDLSystem.csproj | 6 +- .../Source.ShaderAPI.Gl46.csproj | 4 -- .../Source.SoundEmitterSystem.csproj | 7 --- .../Source.StdShader.Gl46.csproj | 7 --- .../Source.StudioRender.csproj | 5 -- Source.VPK/Source.VPK.csproj | 8 --- Source.VTF/Source.VTF.csproj | 11 +--- 45 files changed, 153 insertions(+), 264 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props index 4ec807c32..c03e0a671 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,19 @@ + + true + true + + + + net10.0 + enable + enable + + + + Debug;Release;Debug (Dedicated);Release (Dedicated) + + Debug @@ -56,7 +71,7 @@ x64 - + AnyCPU diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..383d3f275 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,58 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Game.Assets/Game.Assets.csproj b/Game.Assets/Game.Assets.csproj index 1a55104af..272f72a91 100644 --- a/Game.Assets/Game.Assets.csproj +++ b/Game.Assets/Game.Assets.csproj @@ -1,12 +1,5 @@ - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - - diff --git a/Game.Client/Game.Client.csproj b/Game.Client/Game.Client.csproj index 7f2eb8ea1..c618aea07 100644 --- a/Game.Client/Game.Client.csproj +++ b/Game.Client/Game.Client.csproj @@ -1,11 +1,6 @@ - - net10.0 - enable - enable True - Debug;Release;Debug (Dedicated);Release (Dedicated) @@ -41,6 +36,6 @@ - + \ No newline at end of file diff --git a/Game.Lua/Game.Lua.csproj b/Game.Lua/Game.Lua.csproj index b5bb3e6fe..9fc8c3deb 100644 --- a/Game.Lua/Game.Lua.csproj +++ b/Game.Lua/Game.Lua.csproj @@ -1,10 +1,6 @@  true - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) diff --git a/Game.MenuSystem/Game.MenuSystem.csproj b/Game.MenuSystem/Game.MenuSystem.csproj index 48df5d37f..30a786122 100644 --- a/Game.MenuSystem/Game.MenuSystem.csproj +++ b/Game.MenuSystem/Game.MenuSystem.csproj @@ -1,11 +1,6 @@ - - net10.0 - enable - enable True - Debug;Release;Debug (Dedicated);Release (Dedicated) @@ -31,7 +26,7 @@ - + diff --git a/Game.Server.Tests/Game.Server.Tests.csproj b/Game.Server.Tests/Game.Server.Tests.csproj index ed477fe58..821234aaa 100644 --- a/Game.Server.Tests/Game.Server.Tests.csproj +++ b/Game.Server.Tests/Game.Server.Tests.csproj @@ -1,13 +1,9 @@ - net10.0 Exe - enable - enable false true - Debug;Release;Debug (Dedicated);Release (Dedicated) bin\$(Configuration)\ @@ -20,8 +16,8 @@ - - + + diff --git a/Game.Server/Game.Server.csproj b/Game.Server/Game.Server.csproj index 19e23fc2e..42019900f 100644 --- a/Game.Server/Game.Server.csproj +++ b/Game.Server/Game.Server.csproj @@ -1,10 +1,6 @@ - net10.0 - enable - enable True - Debug;Release;Debug (Dedicated);Release (Dedicated) @@ -28,7 +24,7 @@ - + $(DefineConstants);GAME_DLL diff --git a/Game.ServerBrowser/Game.ServerBrowser.csproj b/Game.ServerBrowser/Game.ServerBrowser.csproj index d433e0686..3ec4d2c67 100644 --- a/Game.ServerBrowser/Game.ServerBrowser.csproj +++ b/Game.ServerBrowser/Game.ServerBrowser.csproj @@ -1,11 +1,4 @@  - - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - diff --git a/Game.Shared/Game.Shared.csproj b/Game.Shared/Game.Shared.csproj index b4bfd36ae..527eb547e 100644 --- a/Game.Shared/Game.Shared.csproj +++ b/Game.Shared/Game.Shared.csproj @@ -1,14 +1,10 @@  - net10.0 - enable - enable true False False False False - Debug;Release;Debug (Dedicated);Release (Dedicated) False diff --git a/Game.UI/Game.UI.csproj b/Game.UI/Game.UI.csproj index 7ed35e77c..752882fcb 100644 --- a/Game.UI/Game.UI.csproj +++ b/Game.UI/Game.UI.csproj @@ -1,11 +1,4 @@  - - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - diff --git a/HTML.CEF.Process/HTML.CEF.Process.csproj b/HTML.CEF.Process/HTML.CEF.Process.csproj index 5f26724b8..016bc4cf7 100644 --- a/HTML.CEF.Process/HTML.CEF.Process.csproj +++ b/HTML.CEF.Process/HTML.CEF.Process.csproj @@ -2,15 +2,11 @@ WinExe - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) true - + diff --git a/HTML.CEF/HTML.CEF.csproj b/HTML.CEF/HTML.CEF.csproj index e8c887cbd..d0d5c2a39 100644 --- a/HTML.CEF/HTML.CEF.csproj +++ b/HTML.CEF/HTML.CEF.csproj @@ -1,15 +1,10 @@ - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) true - + diff --git a/HTML.Stub/HTML.Stub.csproj b/HTML.Stub/HTML.Stub.csproj index 2c791ac69..6e84cdcff 100644 --- a/HTML.Stub/HTML.Stub.csproj +++ b/HTML.Stub/HTML.Stub.csproj @@ -1,12 +1,5 @@ - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - - diff --git a/Source.AudioSystem/Source.AudioSystem.csproj b/Source.AudioSystem/Source.AudioSystem.csproj index 16871fe95..5638ab9bb 100644 --- a/Source.AudioSystem/Source.AudioSystem.csproj +++ b/Source.AudioSystem/Source.AudioSystem.csproj @@ -1,18 +1,14 @@  - - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) + - - + + diff --git a/Source.Bitmap/Source.Bitmap.csproj b/Source.Bitmap/Source.Bitmap.csproj index b024eee66..c3476c68e 100644 --- a/Source.Bitmap/Source.Bitmap.csproj +++ b/Source.Bitmap/Source.Bitmap.csproj @@ -1,11 +1,4 @@  - - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - diff --git a/Source.CodeAnalysis.BitVec/Source.CodeAnalysis.BitVec.csproj b/Source.CodeAnalysis.BitVec/Source.CodeAnalysis.BitVec.csproj index 5fe2175b2..272f10ce9 100644 --- a/Source.CodeAnalysis.BitVec/Source.CodeAnalysis.BitVec.csproj +++ b/Source.CodeAnalysis.BitVec/Source.CodeAnalysis.BitVec.csproj @@ -8,12 +8,11 @@ latest enable false - Debug;Release;Debug (Dedicated);Release (Dedicated) - - + + diff --git a/Source.CodeAnalysis.ConVars/Source.CodeAnalysis.ConVars.csproj b/Source.CodeAnalysis.ConVars/Source.CodeAnalysis.ConVars.csproj index 5fe2175b2..272f10ce9 100644 --- a/Source.CodeAnalysis.ConVars/Source.CodeAnalysis.ConVars.csproj +++ b/Source.CodeAnalysis.ConVars/Source.CodeAnalysis.ConVars.csproj @@ -8,12 +8,11 @@ latest enable false - Debug;Release;Debug (Dedicated);Release (Dedicated) - - + + diff --git a/Source.CodeAnalysis.EntityFactories/Source.CodeAnalysis.EntityFactories.csproj b/Source.CodeAnalysis.EntityFactories/Source.CodeAnalysis.EntityFactories.csproj index 5fe2175b2..272f10ce9 100644 --- a/Source.CodeAnalysis.EntityFactories/Source.CodeAnalysis.EntityFactories.csproj +++ b/Source.CodeAnalysis.EntityFactories/Source.CodeAnalysis.EntityFactories.csproj @@ -8,12 +8,11 @@ latest enable false - Debug;Release;Debug (Dedicated);Release (Dedicated) - - + + diff --git a/Source.CodeAnalysis.Lua/Source.CodeAnalysis.Lua.csproj b/Source.CodeAnalysis.Lua/Source.CodeAnalysis.Lua.csproj index 5fe2175b2..272f10ce9 100644 --- a/Source.CodeAnalysis.Lua/Source.CodeAnalysis.Lua.csproj +++ b/Source.CodeAnalysis.Lua/Source.CodeAnalysis.Lua.csproj @@ -8,12 +8,11 @@ latest enable false - Debug;Release;Debug (Dedicated);Release (Dedicated) - - + + diff --git a/Source.CodeAnalysis.NetworkVars/Source.CodeAnalysis.NetworkVars.csproj b/Source.CodeAnalysis.NetworkVars/Source.CodeAnalysis.NetworkVars.csproj index 5fe2175b2..272f10ce9 100644 --- a/Source.CodeAnalysis.NetworkVars/Source.CodeAnalysis.NetworkVars.csproj +++ b/Source.CodeAnalysis.NetworkVars/Source.CodeAnalysis.NetworkVars.csproj @@ -8,12 +8,11 @@ latest enable false - Debug;Release;Debug (Dedicated);Release (Dedicated) - - + + diff --git a/Source.CodeAnalysis.VGUI/Source.CodeAnalysis.VGUI.csproj b/Source.CodeAnalysis.VGUI/Source.CodeAnalysis.VGUI.csproj index 5fe2175b2..272f10ce9 100644 --- a/Source.CodeAnalysis.VGUI/Source.CodeAnalysis.VGUI.csproj +++ b/Source.CodeAnalysis.VGUI/Source.CodeAnalysis.VGUI.csproj @@ -8,12 +8,11 @@ latest enable false - Debug;Release;Debug (Dedicated);Release (Dedicated) - - + + diff --git a/Source.CodeAnalysis/Source.CodeAnalysis.CodeFixes/Source.CodeAnalysis.CodeFixes.csproj b/Source.CodeAnalysis/Source.CodeAnalysis.CodeFixes/Source.CodeAnalysis.CodeFixes.csproj index 824a7e6a1..c2e5c564b 100644 --- a/Source.CodeAnalysis/Source.CodeAnalysis.CodeFixes/Source.CodeAnalysis.CodeFixes.csproj +++ b/Source.CodeAnalysis/Source.CodeAnalysis.CodeFixes/Source.CodeAnalysis.CodeFixes.csproj @@ -4,11 +4,10 @@ netstandard2.0 false Source.CodeAnalysis - Debug;Release;Debug (Dedicated);Release (Dedicated) - + diff --git a/Source.CodeAnalysis/Source.CodeAnalysis.Test/Source.CodeAnalysis.Test.csproj b/Source.CodeAnalysis/Source.CodeAnalysis.Test/Source.CodeAnalysis.Test.csproj index 02b50b34f..6c1c890f2 100644 --- a/Source.CodeAnalysis/Source.CodeAnalysis.Test/Source.CodeAnalysis.Test.csproj +++ b/Source.CodeAnalysis/Source.CodeAnalysis.Test/Source.CodeAnalysis.Test.csproj @@ -5,28 +5,27 @@ true true - Debug;Release;Debug (Dedicated);Release (Dedicated) - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/Source.CodeAnalysis/Source.CodeAnalysis/Source.CodeAnalysis.csproj b/Source.CodeAnalysis/Source.CodeAnalysis/Source.CodeAnalysis.csproj index 4745363ca..b21c9cbb3 100644 --- a/Source.CodeAnalysis/Source.CodeAnalysis/Source.CodeAnalysis.csproj +++ b/Source.CodeAnalysis/Source.CodeAnalysis/Source.CodeAnalysis.csproj @@ -6,12 +6,11 @@ *$(MSBuildProjectFile)* - Debug;Release;Debug (Dedicated);Release (Dedicated) - - + + diff --git a/Source.Common.Tests/Source.Common.Tests.csproj b/Source.Common.Tests/Source.Common.Tests.csproj index 12fa1e4b2..58ee299dd 100644 --- a/Source.Common.Tests/Source.Common.Tests.csproj +++ b/Source.Common.Tests/Source.Common.Tests.csproj @@ -1,13 +1,9 @@ - net10.0 Exe - enable - enable false true - Debug;Release;Debug (Dedicated);Release (Dedicated) bin\$(Configuration)\ @@ -22,8 +18,8 @@ - - + + diff --git a/Source.Common/Source.Common.csproj b/Source.Common/Source.Common.csproj index 333ff1651..74cea09cc 100644 --- a/Source.Common/Source.Common.csproj +++ b/Source.Common/Source.Common.csproj @@ -1,10 +1,6 @@  - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) @@ -23,15 +19,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/Source.DataCache/Source.DataCache.csproj b/Source.DataCache/Source.DataCache.csproj index 0db83d231..0a81ec373 100644 --- a/Source.DataCache/Source.DataCache.csproj +++ b/Source.DataCache/Source.DataCache.csproj @@ -1,10 +1,4 @@  - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - diff --git a/Source.Dedicated/Source.Dedicated.csproj b/Source.Dedicated/Source.Dedicated.csproj index ee0c3ed91..dba724568 100644 --- a/Source.Dedicated/Source.Dedicated.csproj +++ b/Source.Dedicated/Source.Dedicated.csproj @@ -1,10 +1,6 @@  Exe - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) SourceDotNET.ico diff --git a/Source.Engine/Source.Engine.csproj b/Source.Engine/Source.Engine.csproj index 86a6fba4f..46c818649 100644 --- a/Source.Engine/Source.Engine.csproj +++ b/Source.Engine/Source.Engine.csproj @@ -1,10 +1,6 @@  - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) @@ -17,11 +13,11 @@ - - + + - + diff --git a/Source.Filesystem/Source.Filesystem.csproj b/Source.Filesystem/Source.Filesystem.csproj index 75ccd7a5b..d2cbe54a7 100644 --- a/Source.Filesystem/Source.Filesystem.csproj +++ b/Source.Filesystem/Source.Filesystem.csproj @@ -1,12 +1,7 @@  - - - net10.0 - enable - enable - true - Debug;Release;Debug (Dedicated);Release (Dedicated) - + + true + diff --git a/Source.GUI.Controls/Source.GUI.Controls.csproj b/Source.GUI.Controls/Source.GUI.Controls.csproj index 4d801d847..335fceff0 100644 --- a/Source.GUI.Controls/Source.GUI.Controls.csproj +++ b/Source.GUI.Controls/Source.GUI.Controls.csproj @@ -1,11 +1,4 @@  - - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - diff --git a/Source.GUI/Source.GUI.csproj b/Source.GUI/Source.GUI.csproj index 14ee176a9..40b123007 100644 --- a/Source.GUI/Source.GUI.csproj +++ b/Source.GUI/Source.GUI.csproj @@ -1,11 +1,6 @@  - - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) diff --git a/Source.Launcher/Source.Launcher.csproj b/Source.Launcher/Source.Launcher.csproj index 23ec14762..300f20504 100644 --- a/Source.Launcher/Source.Launcher.csproj +++ b/Source.Launcher/Source.Launcher.csproj @@ -1,10 +1,6 @@  Exe - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) SourceDotNET.ico @@ -48,8 +44,8 @@ - - + + diff --git a/Source.MaterialSystem/Source.MaterialSystem.csproj b/Source.MaterialSystem/Source.MaterialSystem.csproj index a7f0c4e7e..ac031a8e7 100644 --- a/Source.MaterialSystem/Source.MaterialSystem.csproj +++ b/Source.MaterialSystem/Source.MaterialSystem.csproj @@ -1,10 +1,6 @@  - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) $(DefineConstants);DBGFLAG_ASSERT @@ -18,7 +14,7 @@ - + diff --git a/Source.Physics/Source.Physics.csproj b/Source.Physics/Source.Physics.csproj index fbce2515d..75b1052d3 100644 --- a/Source.Physics/Source.Physics.csproj +++ b/Source.Physics/Source.Physics.csproj @@ -1,17 +1,12 @@  - - - net10.0 - enable - enable - true - Debug;Release;Debug (Dedicated);Release (Dedicated) - + + true + - + diff --git a/Source.SDLInputSystem/Source.SDLInputSystem.csproj b/Source.SDLInputSystem/Source.SDLInputSystem.csproj index a134ecc3c..95b6a0b67 100644 --- a/Source.SDLInputSystem/Source.SDLInputSystem.csproj +++ b/Source.SDLInputSystem/Source.SDLInputSystem.csproj @@ -1,17 +1,12 @@  - - - net10.0 - enable - enable - true - Debug;Release;Debug (Dedicated);Release (Dedicated) - + + true + - + diff --git a/Source.SDLManager/Source.SDLManager.csproj b/Source.SDLManager/Source.SDLManager.csproj index 617265e12..afe5f7be5 100644 --- a/Source.SDLManager/Source.SDLManager.csproj +++ b/Source.SDLManager/Source.SDLManager.csproj @@ -1,20 +1,16 @@  - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) - + - - - + + + diff --git a/Source.SDLSystem/Source.SDLSystem.csproj b/Source.SDLSystem/Source.SDLSystem.csproj index 2b6cfddc9..371cc8a8b 100644 --- a/Source.SDLSystem/Source.SDLSystem.csproj +++ b/Source.SDLSystem/Source.SDLSystem.csproj @@ -1,10 +1,6 @@  - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) @@ -12,7 +8,7 @@ - + diff --git a/Source.ShaderAPI.Gl46/Source.ShaderAPI.Gl46.csproj b/Source.ShaderAPI.Gl46/Source.ShaderAPI.Gl46.csproj index 595aae3ec..7fceb9da4 100644 --- a/Source.ShaderAPI.Gl46/Source.ShaderAPI.Gl46.csproj +++ b/Source.ShaderAPI.Gl46/Source.ShaderAPI.Gl46.csproj @@ -1,10 +1,6 @@ - net10.0 - enable - enable true - Debug;Release;Debug (Dedicated);Release (Dedicated) diff --git a/Source.SoundEmitterSystem/Source.SoundEmitterSystem.csproj b/Source.SoundEmitterSystem/Source.SoundEmitterSystem.csproj index 4d801d847..335fceff0 100644 --- a/Source.SoundEmitterSystem/Source.SoundEmitterSystem.csproj +++ b/Source.SoundEmitterSystem/Source.SoundEmitterSystem.csproj @@ -1,11 +1,4 @@  - - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - diff --git a/Source.StdShader.Gl46/Source.StdShader.Gl46.csproj b/Source.StdShader.Gl46/Source.StdShader.Gl46.csproj index d173ba33f..bb095b335 100644 --- a/Source.StdShader.Gl46/Source.StdShader.Gl46.csproj +++ b/Source.StdShader.Gl46/Source.StdShader.Gl46.csproj @@ -1,11 +1,4 @@  - - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - diff --git a/Source.StudioRender/Source.StudioRender.csproj b/Source.StudioRender/Source.StudioRender.csproj index 78be85ce4..07f3bb985 100644 --- a/Source.StudioRender/Source.StudioRender.csproj +++ b/Source.StudioRender/Source.StudioRender.csproj @@ -1,11 +1,6 @@  - - net10.0 - enable true - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) diff --git a/Source.VPK/Source.VPK.csproj b/Source.VPK/Source.VPK.csproj index dedbdb0dd..bef03830d 100644 --- a/Source.VPK/Source.VPK.csproj +++ b/Source.VPK/Source.VPK.csproj @@ -1,10 +1,2 @@  - - - net10.0 - enable - enable - Debug;Release;Debug (Dedicated);Release (Dedicated) - - diff --git a/Source.VTF/Source.VTF.csproj b/Source.VTF/Source.VTF.csproj index bbb5ba3ed..700648b71 100644 --- a/Source.VTF/Source.VTF.csproj +++ b/Source.VTF/Source.VTF.csproj @@ -1,12 +1,7 @@  - - - net10.0 - enable - enable - true - Debug;Release;Debug (Dedicated);Release (Dedicated) - + + true + From df993cee1ee6bc7eaf60966e9a8d9f0abdd7d3da Mon Sep 17 00:00:00 2001 From: callumok2004 Date: Wed, 11 Nov 2026 16:48:54 +0000 Subject: [PATCH 2/6] Bump to dotnet11 --- .github/workflows/build.yml | 2 +- Dependencies/OpenGL/OpenGL46.csproj | 2 +- Directory.Build.props | 2 +- Directory.Packages.props | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5629187f6..c7f05a1da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-dotnet@v5 with: - dotnet-version: 10.0.x + dotnet-version: 11.0.x - name: Build run: dotnet build Source.NET.slnx -c ${{ matrix.configuration }} diff --git a/Dependencies/OpenGL/OpenGL46.csproj b/Dependencies/OpenGL/OpenGL46.csproj index 06e04d532..cdd835cd4 100644 --- a/Dependencies/OpenGL/OpenGL46.csproj +++ b/Dependencies/OpenGL/OpenGL46.csproj @@ -1,6 +1,6 @@  - net10.0 + net11.0 false OpenGL46 OpenGL46 diff --git a/Directory.Build.props b/Directory.Build.props index c03e0a671..a19062318 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,7 @@ - net10.0 + net11.0 enable enable diff --git a/Directory.Packages.props b/Directory.Packages.props index 383d3f275..0fa7f6c1b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -14,7 +14,7 @@ - + From 1bb184ca684f51e2e2076af1c8eeb35c47f5acdc Mon Sep 17 00:00:00 2001 From: callumok2004 Date: Wed, 11 Nov 2026 16:51:11 +0000 Subject: [PATCH 3/6] Fix ensuing errors --- Source.Common/Mathematics/MathLib.cs | 2 +- Source.Engine/ConSys.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source.Common/Mathematics/MathLib.cs b/Source.Common/Mathematics/MathLib.cs index a75b6fb58..f13f71f37 100644 --- a/Source.Common/Mathematics/MathLib.cs +++ b/Source.Common/Mathematics/MathLib.cs @@ -2929,7 +2929,7 @@ public static void StoreFloat3(ref Vector3 v, fltx4 x4) { static void SetupMatrixAnglesInternal(ref this Matrix4x4 m, in QAngle angles) { fltx4 sine, cosine; - fltx4 radians = Vector128.Multiply(LoadFloat3(MemoryMarshal.Cast(new(in angles))), Vector128.Create(MathF.PI / 180f)); + fltx4 radians = Vector128.Multiply(LoadFloat3(MemoryMarshal.Cast(new ReadOnlySpan(in angles))), Vector128.Create(MathF.PI / 180f)); (sine, cosine) = Vector128.SinCos(radians); float sp = sine[0], sy = sine[1], sr = sine[2]; diff --git a/Source.Engine/ConSys.cs b/Source.Engine/ConSys.cs index c40a4fd26..841699062 100644 --- a/Source.Engine/ConSys.cs +++ b/Source.Engine/ConSys.cs @@ -381,7 +381,7 @@ public void Con_NXPrintf(in Con_NPrint_s info, ReadOnlySpan msg) { else da_notify[info.Index].Expire = Host.RealTime + info.TimeToLive; - MemoryMarshal.Cast(new(in info.Color)).CopyTo(da_notify[info.Index].Color); + MemoryMarshal.Cast(new ReadOnlySpan(in info.Color)).CopyTo(da_notify[info.Index].Color); da_notify[info.Index].FixedWidthFont = info.FixedWidthFont; drawDebugAreas = true; } From 2fbdbc59456a0a804a35ed3bca0f708f76374fa4 Mon Sep 17 00:00:00 2001 From: callumok2004 Date: Wed, 11 Nov 2026 16:54:50 +0000 Subject: [PATCH 4/6] Pin actions --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7f05a1da..8c39c5976 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,11 +18,11 @@ jobs: coverage: true runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: submodules: recursive - - uses: actions/setup-dotnet@v5 + - uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0 with: dotnet-version: 11.0.x @@ -34,7 +34,7 @@ jobs: - name: Coverage report if: matrix.coverage - uses: danielpalme/ReportGenerator-GitHub-Action@5 + uses: danielpalme/ReportGenerator-GitHub-Action@5f3701a41d14548c9b8e575a5c235230e515cbc0 # v5.6.0 with: reports: TestResults/coverage.cobertura.xml targetdir: CoverageReport From 24ba6698afbd2365893747f22b0bc9a6e71f6d8b Mon Sep 17 00:00:00 2001 From: callumok2004 Date: Wed, 11 Nov 2026 16:57:27 +0000 Subject: [PATCH 5/6] bump some packages --- Directory.Packages.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0fa7f6c1b..b12b66f3d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,24 +4,24 @@ - + - + - + - + - + @@ -53,6 +53,6 @@ - + From f3faa2311ebcc862198722cb0c79a72fd5773118 Mon Sep 17 00:00:00 2001 From: callumok2004 Date: Wed, 11 Nov 2026 17:17:58 +0000 Subject: [PATCH 6/6] update build workflow --- .github/workflows/build.yml | 12 ++++++------ .vscode/tasks.json | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c39c5976..368e18d47 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,30 +11,30 @@ 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 coverage: true runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@v5 with: submodules: recursive - - uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0 + - uses: actions/setup-dotnet@v5.4.0 with: 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@5f3701a41d14548c9b8e575a5c235230e515cbc0 # v5.6.0 + uses: danielpalme/ReportGenerator-GitHub-Action@v5 with: reports: TestResults/coverage.cobertura.xml targetdir: CoverageReport diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 16ff963ee..005f45147 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -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" }