Merge upstream

.clang-format

@@ -1,14 +1,39 @@
 Language: Cpp
-Standard: Auto
+Standard: Cpp11
 IndentWidth: 4
 TabWidth: 4
 UseCRLF: false
+AccessModifierOffset: -4
+AlignTrailingComments: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: false
+BinPackParameters: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+ObjCBinPackProtocolList: Auto
 SpacesInSquareBrackets: false
 SpacesInParentheses: false
+SpaceAfterCStyleCast: false
+SpaceInEmptyParentheses: false
+SpaceAfterLogicalNot: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
 UseTab: Always
 ColumnLimit: 140
 BreakBeforeBraces: Allman
 AlignAfterOpenBracket: AlwaysBreak
 IndentExternBlock: Indent
 PointerAlignment: Left
-SortIncludes: false
+SortIncludes: false
+NamespaceIndentation: All
+PackConstructorInitializers: Never
+BreakConstructorInitializers: BeforeComma

.cmake-format.json

@@ -0,0 +1,26 @@
+{
+	"format": {
+		"line_width": 120,
+		"tab_size": 4,
+		"use_tabchars": false,
+		"fractional_tab_policy": "use-space",
+		"max_subgroups_hwrap": 2,
+		"max_pargs_hwrap": 2,
+		"max_rows_cmdline": 2,
+		"separate_ctrl_name_with_space": false,
+		"separate_fn_name_with_space": false,
+		"dangle_parens": true,
+		"dangle_align": "child",
+		"min_prefix_chars": 4,
+		"max_prefix_chars": 10,
+		"max_lines_hwrap": 2,
+		"line_ending": "unix",
+		"command_case": "canonical",
+		"keyword_case": "unchanged",
+		"always_wrap": [],
+		"enable_sort": true,
+		"autosort": false,
+		"require_valid_layout": false,
+		"layout_passes": {}
+	}
+}

.editorconfig

@@ -0,0 +1,12 @@
+# For more info on `.editorconfig` file see https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Newline ending every file
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = tab
+indent_size = 4

.git-blame-ignore-revs

@@ -2,3 +2,12 @@
 
 # Format commit
 75bf194b2fca06de805a7bc025c6dd8379250fa5
+
+# Folder rename
+f9bc3c9d1834cb8bd5f872b749b057c33e8b0102
+
+# Clang format change: one-line inline functions
+5b2c608b22ba272e4ab1a45adc1f43b60b1aea79
+
+# Clang format change: see PR #775
+6e9792f3651d1e0c7045c5d67312c10f91ce6962

.gitattributes

@@ -1 +1 @@
-**/include/** linguist-vendored
+**/thirdparty/** linguist-vendored

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Configures dependabot
+
+version: 2
+updates:
+  # GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/labeler.yml

@@ -0,0 +1,9 @@
+# Add 'needs code review' label to any changes within the entire repository
+needs code review:
+- changed-files:
+  - any-glob-to-any-file: '**'
+
+# Add 'needs testing' label to any changes within the entire repository
+needs testing:
+- changed-files:
+  - any-glob-to-any-file: '**'

.github/pull_request_template.md

@@ -0,0 +1,26 @@
+<!-- 
+WHEN OPENING A PULL REQUEST KEEP IN MIND:
+-> If the changes you made can be summarised in a screenshot, add one (e.g. you changed the layout of an in-game menu)
+-> If the changes you made can be summarised in a screenrecording, add one (e.g. proof that you fixed a certain bug)
+
+-> For fixes, description on how to reproduce the bug are appreciated and help your PR get merged faster
+-> For features, description on how to use the feature is appreciated and will help your PR get merged faster
+
+-> Please use a sensible title for your pull request
+
+-> Please describe the changes you made. The easier it is to understand what you changed, the higher the chances of your PR being merged (in a timely manner).
+
+-> If you made multiple independent changes, please make a new PR for each one. This prevents your PR being blocked from merging by one of the changes you made.
+
+Note that commit messages in PRs will generally be squashed to keep commit history clean.
+-->
+
+Replace this line with a description of your change (and screenshots/screenrecordings if applicable).
+
+### Code review:
+
+Replace this line with anything specific to look out for during code reviews.
+
+### Testing:
+
+Replace this line with instructions on how to test your pull request. The more detailed, the easier it is for reviewers to test, the faster your PR gets merged.

.github/workflows/add-to-project.yml

@@ -0,0 +1,20 @@
+name: add-to-project
+
+on:
+  issues:
+    types:
+      - opened
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          project-url: "https://github.com/orgs/R2Northstar/projects/3"
+          github-token: "${{ secrets.PROJECT_BOARD_TOKEN }}"
+

.github/workflows/auto-label-pr.yml

@@ -0,0 +1,14 @@
+name: Auto-Labeler
+on:
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5

.github/workflows/ci.yml

@@ -3,39 +3,66 @@ on: [push, pull_request]
 
 env:
   BUILD_PROFILE: Release
+  NORTHSTAR_VERSION: 0.0.0.${{github.run_number}}
 
 jobs:
   build:
     runs-on: windows-2022
+    strategy:
+      matrix:
+        config:
+          - { name: "MSVC", cc: cl }
+          - { name: "LLVM", cc: clang-cl  }
+    env:
+      CC: ${{ matrix.config.cc }}
+      CXX: ${{ matrix.config.cc }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup MSBuild
-        uses: microsoft/[email protected]
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+      - name: Setup msvc
+        uses: ilammy/msvc-dev-cmd@v1
+      - name: Configure cmake
+        run: cmake -G "Ninja" -B build -DCMAKE_BUILD_TYPE:STRING="${{ env.BUILD_PROFILE }}"
+      - name: Setup resource file version
+        shell: bash
+        run: |
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc
+          FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h
       - name: Build
-        run: msbuild /p:Configuration=${{ env.BUILD_PROFILE }}
+        run: cmake --build build/
       - name: Extract Short Commit Hash
         id: extract
         shell: bash
-        run: echo ::set-output name=commit::`git rev-parse --short HEAD`
+        run: echo commit=$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
       - name: Upload Build Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: NorthstarLauncher-${{ steps.extract.outputs.commit }}
+          name: NorthstarLauncher-${{ matrix.config.name }}-${{ steps.extract.outputs.commit }}
           path: |
-            x64/${{ env.BUILD_PROFILE }}/*.dll
-            x64/${{ env.BUILD_PROFILE }}/*.exe
-            x64/${{ env.BUILD_PROFILE }}/*.pdb
-            x64/${{ env.BUILD_PROFILE }}/*.txt
+            build/game/
 
   format-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: DoozyX/clang-format-lint-action@v0.13
+    - uses: actions/checkout@v4
+    - uses: DoozyX/clang-format-lint-action@v0.18.2
       with:
-        source: 'NorthstarDedicatedTest LauncherInjector'
-        exclude: 'NorthstarDedicatedTest/include loader_launcher_proxy loader_wsock32_proxy'
+        source: 'primedev'
+        exclude: 'primedev/include primedev/thirdparty primedev/wsockproxy'
         extensions: 'h,cpp'
-        clangFormatVersion: 13
+        clangFormatVersion: 16
         style: file
+
+  format-check-cmake-files:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: puneetmatharu/[email protected]
+      with:
+        args: "--in-place"
+    - run: |
+        git diff --exit-code

.github/workflows/merge-conflict-auto-label.yml

@@ -0,0 +1,19 @@
+name: Merge Conflict Auto Label
+on:
+  workflow_dispatch: # Manual run
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "10 21 * * *" # Runs at 21:10; time was chosen based on contributor activity and low GitHub Actions cron load.
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "merge conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000

.github/workflows/release.yml

@@ -0,0 +1,80 @@
+name: Build
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write # Needed to write to GitHub draft release
+
+env:
+  NORTHSTAR_VERSION: ${{ github.ref_name }}
+
+jobs:
+  build-launcher:
+    runs-on: windows-2022
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+      - name: Setup msvc
+        uses: ilammy/msvc-dev-cmd@v1
+      - name: Configure cmake
+        run: cmake -G "Ninja" -B build -DCMAKE_BUILD_TYPE:STRING="Release"
+      - name: Setup resource file version
+        shell: bash
+        run: |
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc
+          FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h
+      - name: Build
+        run: cmake --build build/
+      - name: Upload launcher build as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: northstar-launcher
+          path: |
+            build/game/*.exe
+            build/game/*.dll
+            build/game/bin/x64_retail/*.dll
+      - name: Upload debug build artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: launcher-debug-files
+          path: |
+            build/game/*.pdb
+            build/game/bin/x64_retail/*.pdb
+
+  upload-launcher-to-release:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: build-launcher
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Download compiled launcher
+        uses: actions/download-artifact@v3
+        with:
+          name: northstar-launcher
+          path: northstar-launcher
+      - name: Download compiled launcher
+        uses: actions/download-artifact@v3
+        with:
+          name: launcher-debug-files
+          path: launcher-debug-files
+      - name: Create zip with binaries
+        run: |
+          cd northstar-launcher
+          zip --recurse-paths --quiet ../northstar-launcher.zip *
+      - name: Create zip with debug symbols
+        run: |
+          cd launcher-debug-files
+          zip --recurse-paths --quiet ../launcher-debug-files.zip *
+      - name: Upload files to release
+        uses: softprops/action-gh-release@v1
+        with:
+          body: ":warning: These are development files! If you want to download Northstar, [go here instead](https://github.com/R2Northstar/Northstar/releases) :warning:"
+          draft: false
+          files: |
+            northstar-launcher.zip
+            launcher-debug-files.zip

.gitignore

@@ -16,6 +16,31 @@
 # Mono auto generated files
 mono_crash.*
 
+# CMake output
+out/
+build/game/
+build/
+CMakeFiles/
+cmake_install.cmake
+CMakeCache.txt
+CopyOfCMakeCache.txt
+
+# Ninja build files
+.ninja_deps
+.ninja_log
+build.ninja
+
+# Visual studio build files
+*.vcxproj
+*.vcxproj.filters
+*.sln
+
+# Build results
+# These ignore *.lib and *.exp in the specified
+loader_wsock32_proxy/wsock32.*
+NorthstarDLL/Northstar.*
+NorthstarLauncher/NorthstarLauncher.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/