merge

Author: SupinePandora43

.github/workflows/ci.yml

@@ -154,8 +154,13 @@ jobs:
      - name: Run Garry's Mod
        shell: bash
        run: |
+<<<<<<< HEAD
             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'
             sleep 15
+=======
+            powershell -Command './gmod/srcds_win64.exe -console -systemtest -game "garrysmod" +exec "server.cfg" +gamemode sandbox +map gm_construct +maxplayers 16 +sv_hibernate_think 1'
+            powershell -Command 'Wait-Process -Name srcds_win64'
+>>>>>>> sup43_ci_windows_powershell_wait
 
      - name: Print test log
        shell: bash

gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj

@@ -2,30 +2,36 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-	<VersionFilePath>../../version.json</VersionFilePath>
+	  <VersionFilePath>../../version.json</VersionFilePath>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Product>GmodNET API</Product>
     <Description>GmodNET API library contains all necessary interfaces to write a GmodNET module.</Description>
-    <RepositoryUrl>https://github.com/GlebChili/GmodDotNet</RepositoryUrl>
+    <RepositoryUrl>https://github.com/GmodNET/GmodDotNet</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>garrysmod; GmodNET</PackageTags>
     <PackageProjectUrl>https://github.com/GlebChili/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>
-	<Product>$(Description)</Product>
+	  <Company>GmodNET</Company>
+	  <Copyright>Copyright (c) 2018 - 2020 Gleb Krasilich, GmodNET</Copyright>
+	  <Product>$(Description)</Product>
+    
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType></DebugType>
+    <DebugType>Portable</DebugType>
     <DocumentationFile>bin\Release\netcoreapp3.1\GmodNET.API.xml</DocumentationFile>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
   </PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="GmodNET.VersionTool.Target" Version="0.2.0-alpha.1.22426226.dev">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <InternalsVisibleTo Include="GmodNET" />
 	</ItemGroup>
 

gm_dotnet_managed/GmodNET/GmodNET.csproj

@@ -3,25 +3,32 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-	<VersionFilePath>../../version.json</VersionFilePath>
+	  <VersionFilePath>../../version.json</VersionFilePath>
     <StartupObject>GmodNET.BuidReq</StartupObject>
     <Description>GmodNET managed module loader.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/GlebChili/GmodDotNet</RepositoryUrl>
+    <RepositoryUrl>https://github.com/GmodNET/GmodDotNet</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-	<Company>GmodNET</Company>
-	<Product>$(Description)</Product>
-	<Copyright>Copyright (c) 2018 - 2020 Gleb Krasilich, GmodNET</Copyright>
+	  <Company>GmodNET</Company>
+	  <Product>$(Description)</Product>
+	  <Copyright>Copyright (c) 2018 - 2020 Gleb Krasilich, GmodNET</Copyright>
+
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>Portable</DebugType>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
   </PropertyGroup>
 
   <ItemGroup>
 	  <PackageReference Include="GmodNET.VersionTool.Target" Version="0.2.0-alpha.1.22426226.dev">
 		  <PrivateAssets>all</PrivateAssets>
 	  </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
   <ItemGroup>

gm_dotnet_managed/GmodNET/Startup.cs

@@ -36,7 +36,8 @@ internal static unsafe IntPtr Main(IntPtr lua_base, IntPtr native_version_string
 
                 if (native_version != full_assembly_version)
                 {
-                    throw new Exception("GmodNET version does not match with the version of dotnet_loader.");
+                    throw new Exception($"GmodNET version does not match with the version of dotnet_loader. Managed version: {full_assembly_version}; " +
+                        $"Native version: {native_version}");
                 }
 
                 if (FirstRun)
@@ -166,6 +167,18 @@ internal static unsafe IntPtr Main(IntPtr lua_base, IntPtr native_version_string
 
                 ILua lua = new Lua(lua_base);
 
+                lua.PushSpecial(SPECIAL_TABLES.SPECIAL_GLOB);
+                lua.GetField(-1, "print");
+                lua.PushString(
+                    "   _____       _   _   ______   _______ \n"+
+                    "  / ____|     | \\ | | |  ____| |__   __|\n"+
+                    " | |  __      |  \\| | | |__       | |   \n"+
+                    " | | |_ |     | . ` | |  __|      | |   \n"+
+                    " | |__| |  _  | |\\  | | |____     | |   \n"+
+                    "  \\_____| (_) |_| \\_| |______|    |_|   \n");
+                lua.MCall(1, 0);
+                lua.Pop(1);
+
                 lua.PushSpecial(SPECIAL_TABLES.SPECIAL_GLOB);
                 lua.GetField(-1, "print");
                 lua.PushString("GmodNET by Gleb Krasilich and GmodNET team. Version " + friendly_version + " codename " + version_codename);