Merge branch 'main' into doc-tutorials

Author: luttje

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   GMODNET_VERSION: '0.6.0'
-  DOTNET_SDK_VERSION: '5.0.300'
+  DOTNET_SDK_VERSION: '5.0.301'
 
 jobs:
  linux-build:
@@ -49,7 +49,7 @@ jobs:
            cp lua/Tests/run_tests.lua gmod/garrysmod/lua/autorun
 
     - name: Run Garry's Mod
-      run: ./srcds_run_x64 -game garrysmod -systemtest +sv_hibernate_think 1 || true
+      run: ./srcds_run_x64 -game garrysmod -systemtest -condebug +sv_hibernate_think 1 || true
       working-directory: ./gmod/
       timeout-minutes: 1
       continue-on-error: true
@@ -61,7 +61,9 @@ jobs:
     - name: Print Corehost trace
       working-directory: ./gmod/
       run: cat corehost_trace.txt
-      continue-on-error: true
+
+    - name: Print console log
+      run: cat gmod/garrysmod/console.log
 
     - name: Print test log
       run: cat gmod/tests-log.txt
@@ -161,8 +163,13 @@ jobs:
      - name: Run Garry's Mod
        shell: bash
        run: |
-            powershell -Command './gmod/srcds_win64.exe -console -systemtest -game "garrysmod" +exec "server.cfg" +gamemode sandbox +map gm_construct +maxplayers 16 +sv_hibernate_think 1'
-            sleep 15
+            powershell -Command './gmod/srcds_win64.exe -console -systemtest -condebug -game "garrysmod" +exec "server.cfg" +gamemode sandbox +map gm_construct +maxplayers 16 +sv_hibernate_think 1'
+            powershell -Command 'Wait-Process -Name srcds_win64'
+       timeout-minutes: 5
+       continue-on-error: true
+
+     - name: Print console log
+       run: cat gmod/garrysmod/console.log
 
      - name: Print test log
        shell: bash

docfx_project/README.md

@@ -1,3 +1,15 @@
 # How to build docs
 
-Due to the lack of complete .NET 5 and C# 9.0 support (https://github.com/dotnet/docfx/issues/6790), custom fork of DocFX must be used: https://github.com/GlebChili/docfx/tree/charp-9-workaround-by-tanner-gooding. It contains workaround by [Tanner Gooding](https://github.com/tannergooding).
+Docs must be build with [DocFX Version 2.58](https://github.com/dotnet/docfx) or greater. DocFX version 3.x is not (yet) supported.
+
+Build instructions (given that DocFX is in your `PATH`):
+
+To build docs (compiled docs artifacts will be in the `_site` folder)
+```
+[Path to GmodDotNet repo]\docfx_project> docfx .\docfx.json
+```
+
+To host a local http server and preview docs locally:
+```
+[Path to GmodDotNet repo]\docfx_project> docfx .\docfx.json --serve
+```

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.300",
+    "version": "5.0.301",
     "allowPrerelease": false
   }
 }

gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj

@@ -8,7 +8,7 @@
     <RepositoryUrl>https://github.com/GmodNET/GmodDotNet</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>garrysmod; GmodNET</PackageTags>
-    <PackageProjectUrl>https://github.com/GlebChili/GmodDotNet</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/GmodNET/GmodDotNet</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/GlebChili/GmodDotNet/devel_netcore_2/MetaInfo/Logo/gmodnetlogo.png</PackageIconUrl>
 	  <Company>GmodNET</Company>
 	  <Copyright>Copyright (c) 2018 - 2020 Gleb Krasilich, GmodNET</Copyright>

gm_dotnet_managed/GmodNET.API/ILua.cs

@@ -73,6 +73,7 @@ public interface ILua
         /// <param name="iStackPos">Position of the table on the stack.</param>
         /// <param name="key">Key in the table to set value for.</param>
         /// <remarks>
+        /// Pops the value from the top of the stack.
         /// This method can be used to fill Lua tables with values or update them. 
         /// In the example below we will add a Lua funtion <c>SayHello</c> to the Lua global table <see cref="SPECIAL_TABLES.SPECIAL_GLOB"/>.
         /// This function then can be called from any Lua script as <c>SayHello()</c>.

runtime.csproj

@@ -4,18 +4,18 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
 
-    <BundledNETCoreVersion>5.0.6</BundledNETCoreVersion>
+    <BundledNETCoreVersion>5.0.7</BundledNETCoreVersion>
 
     <NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'win-x64'">
-      https://download.visualstudio.microsoft.com/download/pr/ee27c1fe-bdca-4fb8-a303-125081a3e43d/14bb0ed982304f24a6429a5d63e9bff7/aspnetcore-runtime-5.0.6-win-x64.zip
+      https://download.visualstudio.microsoft.com/download/pr/ec3e6a91-56df-4f3e-bf8a-676c35363c12/f6d290090fa8c6c3174d708034ef3401/aspnetcore-runtime-5.0.7-win-x64.zip
     </NETCoreDownloadUrl>
 
     <NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'linux-x64'">
-      https://download.visualstudio.microsoft.com/download/pr/4a7f1f6c-6777-42c4-9793-581bba4b632e/e03e6237a8f49f60014d459f0f758923/aspnetcore-runtime-5.0.6-linux-x64.tar.gz
+      https://download.visualstudio.microsoft.com/download/pr/d6be94b3-458f-43c4-8bb5-9ba261de8c9c/bbe13b54208d088b5fdf428759b5bc0a/aspnetcore-runtime-5.0.7-linux-x64.tar.gz
     </NETCoreDownloadUrl>
 
     <NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'osx-x64'">
-      https://download.visualstudio.microsoft.com/download/pr/fdff418d-5cac-416e-b6d3-7ec2f1c68a34/8f1a06d97eab8244451e9f4a78aa4b4c/aspnetcore-runtime-5.0.6-osx-x64.tar.gz
+      https://download.visualstudio.microsoft.com/download/pr/8c4b18f1-cc83-4a85-b711-f7820e92bc35/5648074f913c376b06a64f8655ef202d/aspnetcore-runtime-5.0.7-osx-x64.tar.gz
     </NETCoreDownloadUrl>
   </PropertyGroup>