Skip to content

Commit

Permalink
Release 0.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
thomotron committed Jan 28, 2023
2 parents 641c1e8 + 4083a95 commit 3889ffc
Show file tree
Hide file tree
Showing 10 changed files with 91 additions and 36 deletions.
89 changes: 70 additions & 19 deletions .github/workflows/mono.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,85 @@
name: Mono on Ubuntu Latest
name: Full project build

on: [push]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
version: [ 1.3, 1.4 ]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- name: Pull repo
uses: actions/checkout@master
with:
submodules: recursive

# Windows flavour
- name: Define variables (via PowerShell)
if: ${{ matrix.os == 'windows-latest' }}
id: variables-ps
run: |
echo "SHA8=$("${{ github.sha }}".Substring(0, 8))" >> $Env:GITHUB_ENV
# Linux flavour
- name: Define variables (via sh)
if: ${{ matrix.os == 'ubuntu-latest' }}
id: variables-sh
run: |
echo "SHA8=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
- name: Setup build environment
id: init
run: |
echo "##[set-output name=sha8;]$(echo ${GITHUB_SHA:0:8})"
echo "##[set-output name=pwd;]$(pwd)"
curl ${{ secrets.RIMWORLD_DLLS }} -o rimworld-dlls.zip
unzip rimworld-dlls.zip -d GameDlls
curl ${{ secrets.RIMWORLD_DLLS_PREFIX }}-${{ matrix.version }}.zip -o rimworld-dlls.zip
mkdir -p GameDLLs/${{ matrix.version }}
unzip rimworld-dlls.zip -d GameDlls/${{ matrix.version }}
curl https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -o nuget.exe
- name: Restore project via Nuget
# Windows flavour
- name: Remove Protobuf Source Link (via PowerShell)
if: ${{ matrix.os == 'windows-latest' }}
id: kill-sourcelink-ps
run: |
(Get-Content Dependencies\protobuf\csharp\src\Google.Protobuf\Google.Protobuf.csproj -Raw) -Replace '<PackageReference.+?Include="Microsoft.SourceLink.GitHub".+>', '' | Set-Content Dependencies\protobuf\csharp\src\Google.Protobuf\Google.Protobuf.csproj
# Linux flavour
- name: Remove Protobuf Source Link (via sed)
if: ${{ matrix.os == 'ubuntu-latest' }}
id: kill-sourcelink-sed
run: |
sed -i -Es "s/<PackageReference.+?Include=\"Microsoft.SourceLink.GitHub\".+>//g" Dependencies/protobuf/csharp/src/Google.Protobuf/Google.Protobuf.csproj
# Windows only
- name: Add msbuild to PATH
if: ${{ matrix.os == 'windows-latest' }}
uses: microsoft/setup-msbuild@v1.1

# Windows flavour
- name: Restore project via Nuget (native)
if: ${{ matrix.os == 'windows-latest' }}
run: nuget.exe restore ./Phinix.sln
# Linux flavour
- name: Restore project via Nuget (mono)
if: ${{ matrix.os == 'ubuntu-latest' }}
run: mono nuget.exe restore ./Phinix.sln

- name: Build Phinix
run: msbuild /property:Configuration=Release ./Phinix.sln

- name: Prepare artifacts
id: artifacts
run: "msbuild /restore /property:Configuration=\"Release ${{ matrix.version }}\" ./Phinix.sln"

# Windows flavour
- name: Prepare artifacts (via PowerShell)
if: ${{ matrix.os == 'windows-latest' }}
id: artifacts-ps
run: |
Remove-Item .\Server\bin\Release\*.pdb
Remove-Item -Recurse .\Client\Source\
Move-Item -Path .\Client\ -Destination .\PhinixClient\
Move-Item -Path .\Server\bin\Release\ .\PhinixServer\
# Linux flavour
- name: Prepare artifacts (via sh)
if: ${{ matrix.os == 'ubuntu-latest' }}
id: artifacts-sh
run: |
rm ./Server/bin/Release/*.pdb
rm -rf ./Client/Source/
Expand All @@ -38,11 +89,11 @@ jobs:
- name: Upload client artifact
uses: actions/upload-artifact@v1
with:
name: PhinixClient-${{ steps.init.outputs.sha8 }}
path: ${{ format('{0}/{1}', steps.init.outputs.pwd, 'PhinixClient') }}
name: PhinixClient-${{ env.SHA8 }}-${{ matrix.version }}-${{ matrix.os }}
path: './PhinixClient'

- name: Upload server artifact
uses: actions/upload-artifact@v1
with:
name: PhinixServer-${{ steps.init.outputs.sha8 }}
path: ${{ format('{0}/{1}', steps.init.outputs.pwd, 'PhinixServer') }}
name: PhinixServer-${{ env.SHA8 }}-${{ matrix.version }}-${{ matrix.os }}
path: './PhinixServer'
6 changes: 5 additions & 1 deletion Client/Source/GUI/Compound Widgets/ChatMessageList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,11 @@ public void ReplaceWithBuffer()
Clear();

// Append the buffered messages to the list, filtering out any blocked users and trimming it to the limit
messages.AddRange(Client.Instance.GetChatMessages().Where(m => !Client.Instance.BlockedUsers.Contains(m.SenderUuid)).TakeLast(Client.Instance.ChatMessageLimit));
messages.AddRange(
Client.Instance.GetChatMessages()
.Where(m => !Client.Instance.BlockedUsers.Contains(m.SenderUuid))
.Skip(Math.Max(0, messages.Count() - Client.Instance.ChatMessageLimit))
);
messagesChanged = true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions Client/Source/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]
4 changes: 2 additions & 2 deletions Common/Authentication/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]
4 changes: 2 additions & 2 deletions Common/Chat/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]
4 changes: 2 additions & 2 deletions Common/Connections/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]
4 changes: 2 additions & 2 deletions Common/Trading/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]
4 changes: 2 additions & 2 deletions Common/UserManagement/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]
4 changes: 2 additions & 2 deletions Common/Utils/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]
4 changes: 2 additions & 2 deletions Server/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
[assembly: AssemblyVersion("0.9.1.0")]
[assembly: AssemblyFileVersion("0.9.1.0")]

0 comments on commit 3889ffc

Please sign in to comment.