Skip to content

Commit

Permalink
Merge pull request #467 from OpenPerpetuum/bugfix/UnexpectedCharacters
Browse files Browse the repository at this point in the history
Bugfix/UnexpectedCharacters
  • Loading branch information
Sellafield committed Dec 8, 2023
2 parents bdb863b + 6f0e4f4 commit f96cdf1
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 20 deletions.
37 changes: 19 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: .NET Core Desktop
name: OpenPerpetuum Server Compile

on:
push:
Expand All @@ -12,47 +12,48 @@ on:
description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
required: false
default: false

jobs:

build:

strategy:
matrix:
# configuration: [Debug, Release]
configuration: [Debug]
configuration: [Debug, Release]

runs-on: windows-2019 # For a list of available runner types, refer to
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on

env:
Solution_Name: Perpetuum.sln # Replace with your solution name, i.e. MyWpfApp.sln.
Configuration: ${{ matrix.configuration }}
Workspace: ${{ github.workspace }}

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.0.2

uses: microsoft/setup-msbuild@v1.1

# Restore the application to populate the obj folder with RuntimeIdentifiers
- name: Restore the application
- name: Restore&Build the application for (${{ matrix.configuration }})
run: |
nuget restore
msbuild $env:Solution_Name -p:Configuration=$env:Configuration
env:
Configuration: ${{ matrix.configuration }}
msbuild ${{ env.Solution_Name }} -p:Configuration=${{ env.Configuration }}
# Enable tmate debugging of manually-triggered workflows if the input option was provided
# this allows us to debug the file paths
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
# if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled && always()}}
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled && always()}}

- name: Upload a Build Artifact for (${{ matrix.configuration }})
uses: actions/upload-artifact@v3
with:
name: Perpetuum-Server-${{ github.sha }}.${{ matrix.configuration }}
path: ${{ env.Workspace }}/bin/x64/${{ env.Configuration }}/Perpetuum.Server
if: ${{ github.event_name == 'push'}}
Binary file modified src/Perpetuum/Collections/LazyDictionary.cs
Binary file not shown.
Binary file modified src/Perpetuum/Converters/IConverter.cs
Binary file not shown.
Binary file modified src/Perpetuum/Converters/IConvertible.cs
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,6 @@ public void DeliverMissionByRequest(Character character, int locationId = 0)
{
Logger.Info("++ Deliver targets begins. characterId:" + character.Id);

var deliveryState = DeliverResult.nothingHappened;

//get the affected characters from the gang
var charactersToProcess = GetGangMembersCached(character);

Expand Down
Binary file modified src/Perpetuum/Services/TechTree/Kernel.cs
Binary file not shown.
Binary file modified src/Perpetuum/Wallets/IWallet.cs
Binary file not shown.

0 comments on commit f96cdf1

Please sign in to comment.