DESrv v2.0

.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

.github/workflows/codeql.yml

@@ -1,15 +1,4 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
+name: Perform CodeQL checks
 
 on:
  push:
@@ -20,6 +9,7 @@ on:
  - "**.sln"
  branches: 
  - "master"
+ - "desrv2.0"
  - "main"
  pull_request:
  paths:
@@ -80,4 +70,4 @@ jobs:
  - name: Perform CodeQL Analysis
  uses: github/codeql-action/analyze@v2
  with:
- category: "/language:${{matrix.language}}"
+ category: "/language:${{matrix.language}}"

.github/workflows/dotnet.yml → .github/workflows/per_commit.yml

@@ -9,8 +9,9 @@ on:
  - "**.cs"
  - "**.csproj"
  - "**.sln"
- # only when pushing to master/main branch 
- branches: 
+ # only when pushing to theese branches
+ branches:
+ - "desrv2.0"
  - "master"
  - "main"
 
@@ -27,24 +28,25 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
  # restore nuget
  - name: Restore dependencies
- run: dotnet restore --nologo
- working-directory: DES-Core/
+ run: dotnet restore DESrv.sln --nologo
+ # run tests
+ - name: Run tests
+ run: dotnet test DESrv.sln
  # do build!
  - name: Build
  run: dotnet build -c Debug -o outs-win --sc -v n --nologo
- working-directory: DES-Core/
+ working-directory: DESrv/
  # upload build
  - name: Upload a Build Artifact
  uses: actions/[email protected]
  with:
  # Artifact name
  name: DESrv-Windows-Debug
  # A file, directory or wildcard pattern that describes what to upload
- path: DES-Core/outs-win
-
+ path: DESrv/outs-win
 
  buildlinux:
  runs-on: ubuntu-latest
@@ -56,18 +58,20 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
  # restore nuget
  - name: Restore dependencies
- run: dotnet restore --nologo
- working-directory: DES-Core/
+ run: dotnet restore DESrv.sln --nologo
+ # run tests
+ - name: Run tests
+ run: dotnet test DESrv.sln
  # do build!
  - name: Build
  run: dotnet build -c Debug -o outs-linux --sc -v n --nologo
- working-directory: DES-Core/
+ working-directory: DESrv/
  # upload build
  - name: Upload a Build Artifact
  uses: actions/[email protected]
  with:
  name: DESrv-Linux-Debug
- path: DES-Core/outs-linux
+ path: DESrv/outs-linux

.github/workflows/release_build.yml

@@ -19,26 +19,26 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
  # restore nuget
  - name: Restore dependencies
  run: dotnet restore --nologo
- working-directory: DES-Core/
+ working-directory: DESrv/
  # do build!
  - name: Build
- run: dotnet build -c Release -o outs-win --sc -v n --nologo
- working-directory: DES-Core/
+ run: dotnet publish -c Release -o outs-win --sc -v n --nologo
+ working-directory: DESrv/
  # pack binaries into archive
  - name: Create archive
- run: tar -c -a -f DESrv_Windows.zip outs-win
- working-directory: DES-Core/
+ run: tar -c -a -f DESrv_win.zip outs-win
+ working-directory: DESrv/
  # upload build
  - name: Upload build to Release
  uses: irongut/[email protected]
  with:
  token: ${{ secrets.GITHUB_TOKEN }}
  id: ${{ github.event.release.id }}
- files: "./DES-Core/DESrv_Windows.zip"
+ files: "./DESrv/DESrv_win.zip"
 
 
  buildlinux:
@@ -51,23 +51,27 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
  # restore nuget
  - name: Restore dependencies
  run: dotnet restore --nologo
- working-directory: DES-Core/
+ working-directory: DESrv/
  # do build!
  - name: Build
- run: dotnet build -c Debug -o outs-linux --sc -v n --nologo
- working-directory: DES-Core/
+ run: dotnet publish -c Debug -o outs-linux --sc -v n --nologo
+ working-directory: DESrv/
  # pack binaries into archive
  - name: Create archive
- run: tar -czvf DESrv_Linux.tar.gz ./outs-linux
- working-directory: DES-Core/
+ run: tar -czvf DESrv_nix.tar.gz ./outs-linux
+ working-directory: DESrv/
  # upload build
  - name: Upload build to Release
  uses: irongut/[email protected]
  with:
  token: ${{ secrets.GITHUB_TOKEN }}
  id: ${{ github.event.release.id }}
- files: "./DES-Core/DESrv_Linux.tar.gz"
+ files: "./DESrv/DESrv_nix.tar.gz"
+
+ # TODO: mac actions
+ # buildmac:
+ # runs-on: macos-latest-xl

.gitignore

@@ -1,17 +1,7 @@
-/.vs/*
-/DES-Core/.vs/*
-/DES-Core/.vs/*
-*.exe
-*.dll
-*.pdb
-*.cache
-*.deps.json
-*.nuget.g.targets
-
-/obj/*
-/bin/*
-/.vs/*
-/Properties/*
+**/obj/**
+**/bin/**
+.vs/*
+Properties/*
 *.exe
 *.dll
 *.pdb
@@ -25,19 +15,8 @@
 *.FileListAbsolute.*
 *.Assembly*.cs
 *.g.*
-
-/PDK/PDK/obj/Release/net6.0
-/DES-Core/des-config/obj
-DESCEnd/
-/PDK/CppRand/x64/bin/Debug
-/PDK/CppRand/x64/object/Debug
-/DES-Core/DESrv.Core/bin/**
-/DES-Core/DESrv.Core/obj/**
-/DES-Core/DESrv.Core/Properties/**
-/DES-Core/DESrv.PDK/obj/**
-/DES-Core/DESrv.Config/obj/**
-/DES-Core/DESrv.PDK/obj/**
-/DES-Core/outs-win/**
-/DES-Core/outs-linux/**
-/DES-Core/DESrv.Config/obj/**
-/DES-Core/DESrv.PDK/obj/**
+*.suo
+*.v2
+*.lock
+*.vsidx
+/DESrv/logs

CONTRIBUTING.md

@@ -4,90 +4,103 @@
 
 ## Ways to contribute
 
-### Reports about bugs/vulnerabilies/strange things. Suggestions of new ideas/features
+This section contains some hints about what you can contribute.
 
-Don't be shy to report about bugs/vulnerabilies/strange things. [Issues](https://github.com/Blusutils/DESrv/issues) page always open to you!
+### Suggestions or bug reports
+
+Don't be shy to report about bugs/vulnerabilies/strange things on the [Issues](https://github.com/Blusutils/DESrv/issues) page.
 You also can suggest anything about DESrv in the same place.
 
 > **Note**: please use one of existing issue templates.
 
-### Localization
+### Localization files edits
 
-You can suggest translation to your language for Wiki, Documentation and Core on our [SimpleTranslate](https://simpletranslate.net/projects/blusutils-desrv) page (or by creating PR if website offline).
+You can suggest translation to your language for Documentation or Core by creating pull request.
 
-> **Note**: no need to translate into Russian or English. Only correction suggestions.
+> **Note**: please affect only one directory in "translation pull requests" - `translations`. PRs that points as "translation pull requests" but has requesting changes to files outside this directory will be rejected on review.
 
 ### Source code
 
 Feel free to create forks and pull requests with improvements. See guide below to learn how to.
 
 #### Prerequesties
 
-* Visual Studio 2022 (17)
-* .NET SDK 6.0 or above
+* Visual Studio 2022 (17) (highly recommended)
+* .NET SDK 7.0 or above
 * Git (any version)
 
-#### Fork, clone, modify, push, PR
-
 1. Create a new fork of this repository.
 2. Clone your fork:
 
- ```batch
+ ```bash
  git clone https://github.com/You/YourForkRepo.git
  ```
 
 3. Modify source code with any changes you want.
 4. Test your changes:
 
- ```batch
- :: or build solution directly from VS
- dotnet build
+ ```bash
+ # or perform tests directly from VS
+ dotnet test DESrv.sln
  ```
 
 6. Push to fork:
 
- ```batch
- git add .
- :: or any other message
- git commit -m "I've changed something"
+ ```bash
+ git add . # if files is untracked
+ git commit -m "Commit message" # it is highly recommended to separate your work to certain commits
  git push origin master
  ```
 
-7. Open PR in original repository.
+7. Open PR in original repository. Don't forget to describe your changes - it will speed up the PR review process.
 
 ## Contribution guidelines
 
 ### 1. Targets of contributions
 
-* We do not consider contributions related to extensions/addons or DESCEndLib, only Core and PDK (DESCEndLib has its [own repository](https://github.com/Blusutils/DESCEndLib)).
+* We do not consider contributions related to extensions/addons (except `DESrv.InternalPlugin`, which is bundled to this repo).
+* If contribution affects more than one project in DESrv repo, it is recommended to separate changes to several commits or pull requests.
 
-### 2. Bug reports.
+### 2. Bug reports
 
 * Please provide clear and concise (as you can) description of what the bug is, versions of Core and libraries you are using.
 
-* If bug is able to reproduce, please describe how it can be reproduce (code examples, video, etc.)
+* If bug is able to reproduce, please describe how it can be reproduce (code examples, videos, screenshots, etc.)
 
-* If it possible, please attach a relevant log output (`*desrv directory*/logs`) and/or screenshots. Additional context that can be useful also welcome.
+* If it possible, please attach a relevant log output (`*desrv directory*/logs`) and/or screenshots.
 
-> These items can help us understand the problem and fix it faster.
+* Additional context that can be useful also welcome.
 
 ### 3. Enhancements
 
-* Please describe your suggestion as clearly and completely as possible. If you are able, add code examples.
+* Please describe your suggestion as clearly and completely as possible.
+
+* If you are able, add code examples.
+ * The enhancements must not harm the DESrv code base.
+
+* Enhancement must ofcourse be implementable.
 
-* The enhancements must not harm the DESrv Core and PDK code base. They must also be implementable.
+### 4. Translations
 
-### 4. Changes in code
+* Consider changing only the `translations` directory and creating a ONE new JSON file with your strings.
+
+* If suggested strings is not valid or contains "bad" contents, pull request will be closed.
+
+* And if you are adding a new language...
+ * Please check that the language alphabet is printable by most common console hosts.
+ * If language is not exist, pull request will be closed.
+
+### 5. Changes in code
 
 * The pull requests must not harm the DESrv Core and PDK code base. They must also be applicable to current code base.
 
-* Please stick to DESrv code styling (our modified Java style instead of classic C# style):
-  * Brackets on the same line.
-  * Tab size - 4 spaces.
-  * Delegates must end with `Delegate`, events with `Event`.
-  * Interfaces must starts with `I`, abstract classes with `Abstract`.
-  * `camelCase` for field; `PascalCase` for anything else.
-  * Example:
+* Please stick to DESrv code styling (our modified Mono style):
+ * Brackets on the same line.
+ * Tab size - 4 spaces.
+ * Delegates must end with `Delegate`, events with `Event`.
+ * Interfaces must starts with `I`, abstract classes with `Abstract`.
+ * `camelCase` for field; `PascalCase` for anything else.
+ * Example:
 
  ```cs
  // that is recommended
@@ -116,6 +129,3 @@ Feel free to create forks and pull requests with improvements. See guide below t
  }
  }
  ```
-
-<!-- ### 5. Localization
-* coming soon because SimpleTranslate not done yet -->