Merge branch 'main' into cpp_shared_library_loader

Author: Stat1cV01D

.github/workflows/ci.yml

@@ -1,6 +1,10 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push: {}
+  release:
+    types: [published]
 
 env:
   GMODNET_VERSION: '0.6.0'
@@ -13,7 +17,7 @@ jobs:
 
    steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.3.4
       with:
         submodules: 'true'
 
@@ -82,19 +86,19 @@ jobs:
 # Finilize nightly build for push event
 
     - name: Download GMS
-      if: github.event_name == 'push'
+      if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
       run: |
            wget https://github.com/GlebChili/GmodNetModuleSigner/releases/download/1.0.0/gms
            chmod +x gms
 
     - name: Download signature key
-      if: github.event_name == 'push'
+      if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
       env:
         GITHUB_TOKEN: ${{ secrets.GMOD_NET_PRIVATE_KEY_REPO_TOKEN }}
       run: git clone https://GlebChili:[email protected]/GlebChili/GmodDotNetPrivateKey.git
 
     - name: Sign assemblies
-      if: github.event_name == 'push'
+      if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
       run: |
            cd build
            ./../gms --sign=gmcl_dotnet_linux64.dll --key=../GmodDotNetPrivateKey/gmodnet-private.modulekey --version=$GMODNET_VERSION
@@ -108,19 +112,19 @@ jobs:
            mv gmodnet-public.modulekey GmodNET.modulekey
 
     - name: Pack build
-      if: github.event_name == 'push'
+      if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
       env:
         TRAVIS_COMMIT: ${{ github.sha }}
       run: |
            cd build
            tar czfv ../linux-$TRAVIS_COMMIT.tar.gz .
 
     - name: Pack with MSBuild
-      if: github.event_name == 'push'
+      if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
       run: dotnet build runtime.csproj -target:PackRuntimeBuild
 
     - name: Upload versioned build as artifact
-      if: github.event_name == 'push'
+      if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
       uses: actions/[email protected]
       with:
         name: linux-versioned-build
@@ -132,7 +136,7 @@ jobs:
 
    steps:
      - name: Checkout
-       uses: actions/checkout@v2
+       uses: actions/checkout@v2.3.4
        with:
          submodules: 'true'
 
@@ -165,12 +169,20 @@ jobs:
             cp lua/Tests/run_tests.lua gmod/garrysmod/lua/autorun
 
      - name: Run Garry's Mod
-       shell: bash
+       shell: pwsh
        run: |
-            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'
+            ./gmod/srcds_win64.exe -console -systemtest -condebug -game "garrysmod" +exec "server.cfg" +gamemode sandbox +map gm_construct +maxplayers 16 +sv_hibernate_think 1
+            Wait-Process -Name srcds_win64
        timeout-minutes: 5
        continue-on-error: true
+       env:
+         COREHOST_TRACE: 1
+         COREHOST_TRACE_VERBOSITY: 4
+         COREHOST_TRACEFILE: corehost_trace.txt
+
+     - name: Print Corehost trace
+       working-directory: ./gmod/
+       run: cat corehost_trace.txt
 
      - name: Print console log
        run: cat gmod/garrysmod/console.log
@@ -192,19 +204,19 @@ jobs:
     # Finilize full signed build on push
 
      - name: Download GMS
-       if: github.event_name == 'push'
+       if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
        shell: bash
        run: curl -O -L https://github.com/GlebChili/GmodNetModuleSigner/releases/download/1.0.0/gms.exe
 
      - name: Download signature key
-       if: github.event_name == 'push'
+       if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
        shell: bash
        env:
          GITHUB_TOKEN: ${{ secrets.GMOD_NET_PRIVATE_KEY_REPO_TOKEN }}
        run: git clone https://GlebChili:[email protected]/GlebChili/GmodDotNetPrivateKey.git
 
      - name: Sign assemblies
-       if: github.event_name == 'push'
+       if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
        shell: bash
        run: |
             cd build
@@ -219,11 +231,11 @@ jobs:
             mv gmodnet-public.modulekey GmodNET.modulekey
 
      - name: Pack with MSBuild
-       if: github.event_name == 'push'
+       if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
        run: dotnet build runtime.csproj -target:PackRuntimeBuild
 
      - name: Upload versioned build as artifact
-       if: github.event_name == 'push'
+       if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
        uses: actions/[email protected]
        with:
          name: windows-versioned-build
@@ -236,7 +248,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
         with:
           submodules: 'true'
 
@@ -257,19 +269,19 @@ jobs:
 # Finilize full signed build on push
 
       - name: Download GMS
-        if: github.event_name == 'push'
+        if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
         run: |
              curl -O -L https://github.com/GlebChili/GmodNetModuleSigner/releases/download/1.0.0/gms-osx
              chmod +x gms-osx
 
       - name: Download signature key
-        if: github.event_name == 'push'
+        if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GMOD_NET_PRIVATE_KEY_REPO_TOKEN }}
         run: git clone https://GlebChili:[email protected]/GlebChili/GmodDotNetPrivateKey.git
 
       - name: Sign assemblies
-        if: github.event_name == 'push'
+        if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
         run: |
              cd build
              ./../gms-osx --sign=gmcl_dotnet_osx64.dll --key=../GmodDotNetPrivateKey/gmodnet-private.modulekey --version=$GMODNET_VERSION
@@ -283,11 +295,11 @@ jobs:
              mv gmodnet-public.modulekey GmodNET.modulekey
 
       - name: Pack with MSBuild
-        if: github.event_name == 'push'
+        if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
         run: dotnet build runtime.csproj -target:PackRuntimeBuild
 
       - name: Upload versioned build as artifact
-        if: github.event_name == 'push'
+        if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
         uses: actions/[email protected]
         with:
           name: osx-versioned-build
@@ -299,12 +311,12 @@ jobs:
 
     needs: [linux-build, windows-build, mac-build]
 
-    if: github.event_name == 'push'
+    if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'GmodNET' }}
 
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
         with:
           submodules: 'true'
 
@@ -359,11 +371,25 @@ jobs:
           SOURCE_DIR: 'versioned-publish'
           DEST_DIR: 'GmodNETStorage/storage'
 
-      - name: Upload API nuget package
+      - name: Upload API nuget package to Azure DevOps
         run: |
-             dotnet nuget update source gmodnet-packages --username CI --password ${{ secrets.DEVOPS_PASSWORD }} --store-password-in-clear-text
+             dotnet nuget update source gmodnet-packages --username CI --password ${{ secrets.AZURE_DEVOPS_ARTIFACTS_PAT }} --store-password-in-clear-text
              dotnet nuget push nuget-publish/**.nupkg --source gmodnet-packages --api-key az --skip-duplicate
 
+      - name: Upload NuGet package to NuGet.org
+        if: ${{ github.event_name == 'release' }}
+        run: dotnet nuget push nuget-publish/**.nupkg --source nuget --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate
+        
+      - name: Upload build to GitHub release
+        if: ${{ github.event_name == 'release' }}
+        uses: svenstaro/[email protected]
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: versioned-publish/*
+          overwrite: true
+          tag: ${{ github.ref }}
+          file_glob: true
+
       - name: Restore local dotnet tools
         run: |
              cd csx

gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj

@@ -9,21 +9,20 @@
     <RepositoryType>Git</RepositoryType>
     <PackageTags>garrysmod; GmodNET</PackageTags>
     <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>
-	  <Product>$(Description)</Product>
-    
+    <PackageIcon>gmodnetlogo.png</PackageIcon>
+    <Company>GmodNET</Company>
+    <Copyright>Copyright (c) 2018 - 2021 Gleb Krasilich, GmodNET</Copyright>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>Portable</DebugType>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\GmodNET.API.xml</DocumentationFile>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
 	<ItemGroup>
@@ -36,6 +35,7 @@
 
   <ItemGroup>
     <VersionFile Include="../../version.json" />
+    <Content Include="../../MetaInfo/Logo/gmodnetlogo.png" PackagePath="/" />
   </ItemGroup>
 
 </Project>

gm_dotnet_managed/GmodNET/GmodNET.csproj

@@ -10,17 +10,16 @@
     <RepositoryType>Git</RepositoryType>
 	  <Company>GmodNET</Company>
 	  <Product>$(Description)</Product>
-	  <Copyright>Copyright (c) 2018 - 2020 Gleb Krasilich, GmodNET</Copyright>
-
+	  <Copyright>Copyright (c) 2018 - 2021 Gleb Krasilich, GmodNET</Copyright>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>Portable</DebugType>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <ItemGroup>