Skip to content

Commit 72f5bf4

Browse files
authored
Backport #120 and readme updates to release-0.7 (#121)
* Updated README to 0.7.0 release * Use fixed runners OS version in CI
1 parent 4bf78cf commit 72f5bf4

File tree

2 files changed

+16
-48
lines changed

2 files changed

+16
-48
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127

128128
windows-build:
129129

130-
runs-on: windows-latest
130+
runs-on: windows-2019
131131

132132
steps:
133133
- name: Checkout
@@ -234,7 +234,7 @@ jobs:
234234

235235
mac-build:
236236

237-
runs-on: macos-latest
237+
runs-on: macos-10.15
238238

239239
steps:
240240

@@ -294,7 +294,7 @@ jobs:
294294

295295
trigger_autorebase:
296296

297-
runs-on: ubuntu-latest
297+
runs-on: ubuntu-20.04
298298

299299
needs: [linux-build, windows-build, mac-build]
300300

README.md

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
[![CI](https://github.com/GlebChili/GmodDotNet/workflows/CI/badge.svg?branch=master)](https://github.com/GlebChili/GmodDotNet/actions?query=workflow%3ACI)
33

44
# Gmod.NET
5-
[![Current Runtime](https://img.shields.io/badge/Current%20Runtime-0.6.0-2db94e)](https://github.com/GlebChili/GmodDotNet/wiki/GmodNET-Runtime-and-GmodNET.API-version-correspondence#gmodnet-and-gmodnetapi) [![Current API](https://img.shields.io/badge/Current%20API-0.6.0-2db94e)](https://github.com/GlebChili/GmodDotNet/wiki/GmodNET-Runtime-and-GmodNET.API-version-correspondence#gmodnet-and-gmodnetapi)
65

7-
Cross-platform .NET Module/Plugin platform for Garry's Mod powered by [__.NET Core__](https://dotnet.microsoft.com/).
6+
Cross-platform .NET Module/Plugin platform for Garry's Mod powered by [__.NET__](https://dotnet.microsoft.com/).
87

98
## About
109

@@ -13,17 +12,13 @@ and other .NET languages which runs across all platforms (Windows,
1312
Linux, Mac Os). Gmod.NET allows you to develop cross-platform Garry's Mod extensions without
1413
need to close or reload your game or server.
1514

16-
## Similar projects
17-
18-
Check out [gmod_csModuleLoader](https://github.com/dedady157/gmod_csModuleLoader) by [Bailey Drahoss](https://github.com/dedady157).
19-
20-
## Current features
21-
22-
GmodNET provides functionality to write Garry's Mod modules in C# or any other CIL-compiled language as [__.NET Core 3.1__](https://dotnet.microsoft.com/) class libraries. For more information on modules and API check out [project's wiki](https://github.com/GlebChili/GmodDotNet/wiki). Only `x86_64` version of Garry's Mod is currently supported.
15+
Gmod.NET allows you to write Garry's Mod modules in C# or any other CIL-compiled language as [__.NET 6.0__](https://dotnet.microsoft.com/) class libraries.
16+
For more information on modules and API check out [our documentation](https://docs.gmodnet.xyz/).
17+
Only `x86_64` version of Garry's Mod is currently supported.
2318

2419
## Need help?
2520

26-
Check out our [wiki](https://github.com/GlebChili/GmodDotNet/wiki) or join our [discord server](https://discord.gg/9bP8nMT).
21+
Check out [our docs](https://docs.gmodnet.xyz/) and join our [discord server](https://discord.gg/9bP8nMT).
2722

2823
## Building and contributing
2924

@@ -37,7 +32,7 @@ To build GmodDotNet you need to have following software installed and registered
3732

3833
3. Latest version of dotnet SDK
3934

40-
4. (On Windows) Latest version of Visual Studio 2019 with C++ package
35+
4. (On Windows) Latest version of Visual Studio 2019 with C++ workload
4136

4237
5. (On macOS) Latest version of Xcode
4338

@@ -49,7 +44,7 @@ Build steps:
4944

5045
2. In the root of the cloned repository run `dotnet build runtime.csproj -c Debug` or `dotnet build runtime.csproj -c Release` instruction in your command prompt.
5146

52-
__NOTE__: `runtime.csproj` is not a real C# project file but a kind of build script. To work with the managed part of GmodDotNet open `gm_dotnet_managed/gm_dotnet_managed.sln` solution file in your IDE instead.
47+
__NOTE__: `runtime.csproj` is not a real C# project file but a kind of build script. To work with the managed part of Gmod.NET open `gm_dotnet_managed/gm_dotnet_managed.sln` solution file in your IDE instead.
5348

5449
`runtime.csproj` build script will produce following folders in the root of repository:
5550

@@ -59,22 +54,9 @@ __NOTE__: `runtime.csproj` is not a real C# project file but a kind of build scr
5954

6055
3. `nupkgs` folder contains `GmodNET.API` NuGet package.
6156

62-
You may also want to copy the content of `lua` folder to the corresponding destinations in `garrysmod/lua`.
63-
64-
### Folder structure
65-
66-
Gmod.NET is subdivided into three subprojects.
67-
68-
Garry's Mod binary native module and helper libraries are
69-
contained in `gm_dotnet_native` folder and organized as CMake project.
70-
71-
Managed part is contained in `gm_dotnet_managed` folder and organized with .NET soultion file `gm_dotnet_managed.sln`.
72-
73-
Bootstrap Lua scripts are contained in `lua` folder.
74-
7557
### Nightly builds
7658

77-
You can find latest nightly builds GmodDotNet runtime at http://nightly.gmodnet.xyz/. To use nightly NuGet packages connect to [our nightly NuGet feed](https://dev.azure.com/GmodNET/gmodnet-artifacts/_packaging?_a=feed&feed=gmodnet-packages).
59+
You can find latest nightly builds of Gmod.NET runtime at http://nightly.gmodnet.xyz/. To use our nightly NuGet packages connect to [our nightly NuGet feed](https://dev.azure.com/GmodNET/gmodnet-artifacts/_packaging?_a=feed&feed=gmodnet-packages).
7860

7961
## Installation and usage
8062

@@ -84,32 +66,18 @@ You can find latest nightly builds GmodDotNet runtime at http://nightly.gmodnet.
8466

8567
3. Create a `Modules` folder inside `garrysmod/lua/bin/`.
8668

87-
4. Download and copy `gm_dotnet_server.lua` to `garrysmod/lua/autorun/server` folder.
88-
89-
5. Download and copy `gm_dotnet_client.lua` to `garrysmod/lua/autorun/client` folder.
69+
4. Place your .NET module, ...deps.json file, and all dependencies in `Modules/%exact_name_of_the_module_without_dll%/` folder.
9070

91-
6. Place your .NET module, ...deps.json file, and all dependencies in `Modules/%exact_name_of_the_module_without_dll/` folder.
71+
5. Load Gmod.NET runtime in game by executing Lua function `require("dotnet")`.
9272

93-
7. If you signed your module with [GmodNetModuleSigner](https://github.com/GlebChili/GmodNetModuleSigner), copy `[name_of_your_module].modulekey` and `[name_of_your_module].modulesign` to the same folder as above (`Modules/%exact_name_of_the_module_without_dll/`).
73+
6. Load your module by running Lua function `dotnet.load("%exact_name_of_the_module_without_dll%")`.
9474

95-
8. If you want your module to be serverside (clientside) only then add file `TYPE` to `Modules/%exact_name_of_the_module_without_dll/` with content `server` (`client`).
96-
97-
9. Use `gmod_net_load_all` (`gmod_net_load_all_cl` for client-side) console command to load all managed modules and `gmod_net_unload_all` (`gmod_net_unload_all_cl`) to unload them. Modules can be hot-reloaded, so one doesn't need to quit game to see changes.
75+
For more info check out [our quick start guide](https://docs.gmodnet.xyz/articles/tutorials/hello-world/index.html).
9876

9977
## License
10078

10179
Whole project is licensed under MIT License.
10280

10381
## Dependencies and code usage
10482

105-
Gmod.NET is making use of or borrows code from the following projects:
106-
107-
1. [CoreCLR](https://github.com/dotnet/coreclr), [CoreFX](https://github.com/dotnet/corefx), and [core-setup](https://github.com/dotnet/core-setup) by [.NET Foundation](https://github.com/dotnet) (MIT License)
108-
109-
2. [pure_lua_SHA](https://github.com/Egor-Skriptunoff/pure_lua_SHA) by [Egor Skriptunoff](https://github.com/Egor-Skriptunoff) (MIT License)
110-
111-
3. [NSec](https://nsec.rocks/) by [Klaus Hartke](https://github.com/ektrah) (MIT License)
112-
113-
4. [Libsodium](http://libsodium.org) by [Frank Denis](https://github.com/jedisct1) (ISC License)
114-
115-
See other copyright notices in the NOTICE file.
83+
See the NOTICE file.

0 commit comments

Comments
 (0)