Skip to content

Commit

Permalink
Merge branch 'dev' for version 1.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
Noxalus committed Feb 10, 2022
2 parents da8e503 + a61bd40 commit 2da4a95
Show file tree
Hide file tree
Showing 2,513 changed files with 7,627 additions and 231 deletions.
62 changes: 35 additions & 27 deletions .github/workflows/dotnet-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,61 @@
name: Win32Sample GitHub Release
name: GitHub Release
on:
push:
branches: [ ci ]
tags:
- 'v*'
- 'v*.*'
jobs:
create_release:
name: Create GitHub Release
runs-on: windows-2019
runs-on: windows-2022
steps:
- name: Install 7Zip PowerShell Module
shell: powershell
run: Install-Module 7Zip4PowerShell -Force -Verbose
- uses: actions/checkout@v2


- name: Checkout repository
uses: actions/checkout@v2
with:
lfs: 'true'

- name: Get the version
uses: kzrnm/get-net-sdk-project-versions-action@v1
id: get-version
with:
proj-path: KHFM-VF-Patch/KHFM-VF-Patch.csproj

- name: Build Binary
shell: cmd
run: call .\Build.cmd
- name: Build Artifact
run: call .\CI\Build.cmd

- name: Create Artifact
shell: cmd
run: call .\ArtifactBuild.cmd
run: call .\CI\CreateArtifact.cmd

- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: KHFM-VF-Patch
path: .\KHFM-VF-Patch\bin\x86\Release\net5.0-windows

- name: Create Release
id: create_release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: |
Automated Release by GitHub Action CI
draft: false
tag_name: ${{ steps.get-version.outputs.version }}
release_name: v${{ steps.get-version.outputs.version }}
draft: true
prerelease: true
- name: Upload Release Asset (x64)
id: upload-release-asset-x64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./SampleX64.ZIP
asset_name: SampleX64.ZIP
asset_content_type: application/zip
- name: Upload Release Asset (x86)
id: upload-release-asset-x86

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./SampleX86.ZIP
asset_name: SampleX86.ZIP
asset_path: ./KHFM-VF-Patch/KHFM-VF-Patch.zip
asset_name: KHFM-VF-Patch-${{ steps.get-version.outputs.version }}.zip
asset_content_type: application/zip
13 changes: 13 additions & 0 deletions CI/Build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@echo off

pushd "%~dp0"
cd ..\KHFM-VF-Patch

"%programfiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe" KHFM-VF-Patch.sln /t:Restore /p:Configuration=Release /p:Platform=x86
"%programfiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe" KHFM-VF-Patch.sln /t:Build /p:Configuration=Release /p:Platform=x86
"%programfiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe" KHFM-VF-Patch.sln /t:Rebuild /p:Configuration=Release /p:Platform=x86

:exit
popd

@echo on
23 changes: 23 additions & 0 deletions CI/CreateArtifact.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@echo off

pushd "%~dp0"
cd ..\KHFM-VF-Patch

@REM Create Patches directory
powershell New-Item -Path "bin\x86\Release\net5.0-windows\Resources\Patches" -ItemType Directory

@REM Zip all sub-patches in the proper directory with the proper extension
powershell Compress-7Zip "Resources\Patches\KH1FM-Magic-EN" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Magic-EN.patch" -Format Zip
powershell Compress-7Zip "Resources\Patches\KH1FM-Magic-FR" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Magic-FR.patch" -Format Zip
powershell Compress-7Zip "Resources\Patches\KH1FM-Stranger" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Stranger.patch" -Format Zip
powershell Compress-7Zip "Resources\Patches\KH1FM-Textures" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Textures.patch" -Format Zip
powershell Compress-7Zip "Resources\Patches\KH1FM-Voices" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Voices.patch" -Format Zip
powershell Compress-7Zip "Resources\Patches\KH1FM-Videos" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Videos.patch" -Format Zip

@REM Zip all patch files to upload them for release
powershell Compress-7Zip "bin\x86\Release\net5.0-windows" -ArchiveFileName "KHFM-VF-Patch.zip" -Format Zip

:exit
popd

@echo on
64 changes: 0 additions & 64 deletions KHFM-VF-Patch/KHFM-VF-Patch - Backup.csproj

This file was deleted.

4 changes: 2 additions & 2 deletions KHFM-VF-Patch/KHFM-VF-Patch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.0</FileVersion>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.1</Version>
<Version>1.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -76,7 +76,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Patches\KH1FM-Videos.patch">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Patches\KH1FM-Voices.patch">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
12 changes: 12 additions & 0 deletions KHFM-VF-Patch/KHFM-VF-Patch.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Debug|x64.ActiveCfg = Debug|x64
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Debug|x64.Build.0 = Debug|x64
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Debug|x86.ActiveCfg = Debug|x86
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Debug|x86.Build.0 = Debug|x86
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Release|Any CPU.Build.0 = Release|Any CPU
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Release|x64.ActiveCfg = Release|x64
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Release|x64.Build.0 = Release|x64
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Release|x86.ActiveCfg = Release|x86
{62B27280-24A0-4FF7-AA3B-DD7EDC5F2966}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading

0 comments on commit 2da4a95

Please sign in to comment.