Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow the patcher project to open and build on Visual Studio 2022 #281

Merged
merged 11 commits into from
Nov 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@ env:
# don't clone the entire repository history, saves time
CIRRUS_CLONE_DEPTH: 1

Patcher_task:
# we don't need to tell GitHub if this isn't done
skip_notifications: "!changesInclude('.cirrus.yml', '**.{cs,resx,config,settings,ico,csproj,sln}')"
# skip if patcher remains unchanged
skip: "!changesInclude('.cirrus.yml', '**.{cs,resx,config,settings,ico,csproj,sln}')"
windows_container:
image: cirrusci/windowsservercore:visualstudio2019
Build_script:
- patcher/BuildCI.cmd
Patcher_Windows_artifacts:
path: patcher/bin/x64/Release/PeacockPatcher.exe
type: application/vnd.microsoft.portable-executable
Patcher_Linux_artifacts:
path: patcher/bin/x64/Linux.Release/PeacockPatcher.exe
type: application/vnd.microsoft.portable-executable

Build_task:
container:
image: node:18-slim
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/patcher.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Patcher

on:
push:
branches: [ "v*" ]
paths: [ "patcher/**/*" ]
pull_request:
branches: [ "v*" ]
paths: [ "patcher/**/*" ]

jobs:
build:
name: Build Patcher
runs-on: windows-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1

- name: Build Patcher
run: msbuild.exe patcher\HitmanPatcher.sln -t:Build -p:Configuration=Release -p:Platform=x64 -m

- name: Upload Patcher Artifacts
uses: actions/upload-artifact@v2
with:
name: patcher-windows
path: patcher/bin/x64/Release/PeacockPatcher.exe
4 changes: 2 additions & 2 deletions patcher/BuildCI.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" patcher\HitmanPatcher.sln -t:Build -p:Configuration=Release -m
"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" patcher\HitmanPatcher.sln -t:Build -p:Configuration=Linux.Release -m
msbuild.exe patcher\HitmanPatcher.sln -t:Build -p:Configuration=Release -m
msbuild.exe patcher\HitmanPatcher.sln -t:Build -p:Configuration=Linux.Release -m
rename patcher\bin\x64\Release\PeacockPatcher.exe PeacockPatcher.exe
2 changes: 1 addition & 1 deletion patcher/HitmanPatcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HitmanPatcher</RootNamespace>
<AssemblyName>PeacockPatcher</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<ShouldCreateLogs>True</ShouldCreateLogs>
Expand Down
Loading