Skip to content

Commit

Permalink
convenience changes
Browse files Browse the repository at this point in the history
  • Loading branch information
pifopi committed Dec 1, 2024
1 parent a7e05cd commit 1333804
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 6 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/csharp-ci-pkhex.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: C# CI PKHex

on: [push, pull_request, workflow_dispatch]

jobs:
build:
runs-on: windows-2022
strategy:
matrix:
configuration: [Debug, Release]

steps:
- uses: actions/checkout@v4
with:
repository: 'pifopi/PKHeX'
path: PKHex
- uses: actions/checkout@v4
with:
repository: 'pifopi/PKHeX-Plugins'
path: PKHeX-Plugins
- uses: actions/checkout@v4
with:
repository: 'pifopi/HOME-Live-Plugin'
path: HOME-Live-Plugin
- uses: microsoft/setup-msbuild@v1
- name: Generate binaries
run: |
cd PKHeX
dotnet restore /p:Configuration=${{ matrix.configuration }} /p:Platform="Any CPU"
MSBuild.exe PKHeX.WinForms/PKHeX.WinForms.csproj /p:Configuration=${{ matrix.configuration }}
cd ../PKHeX-Plugins
dotnet restore /p:Configuration=${{ matrix.configuration }} /p:Platform="Any CPU"
MSBuild.exe AutoLegalityMod/AutoModPlugins.csproj /p:Configuration=${{ matrix.configuration }}
robocopy AutoLegalityMod\bin\${{ matrix.configuration }}\net8.0-windows ..\PKHeX\PKHeX.WinForms\bin\${{ matrix.configuration }}\net8.0-windows\win-x64\plugins\ AutoModPlugins.dll
$PKHeXPlugins = $lastexitcode
write-host "Robocopy PKHeX-Plugins exited with exit code:" $PKHeXPlugins
cd ../HOME-Live-Plugin
dotnet restore /p:Configuration=${{ matrix.configuration }} /p:Platform="Any CPU"
MSBuild.exe HomeLive.Plugins/HomeLive.Plugins.csproj /p:Configuration=${{ matrix.configuration }}
robocopy HomeLive.Plugins\bin\${{ matrix.configuration }}\net8.0-windows7.0 ..\PKHeX\PKHeX.WinForms\bin\${{ matrix.configuration }}\net8.0-windows\win-x64\plugins\ HomeLive.Plugins.dll
$HOMELivePlugin = $lastexitcode
write-host "Robocopy HOME-Live-Plugin exited with exit code:" $HOMELivePlugin
if ($PKHeXPlugins -ne 1 -or $HOMELivePlugin -ne 1)
{
exit 1
}
else
{
exit 0
}
- uses: actions/upload-artifact@v4
with:
name: PKHeX for windows (${{ matrix.configuration }})
path: PKHeX/PKHeX.WinForms/bin/${{ matrix.configuration }}/net8.0-windows/win-x64
2 changes: 1 addition & 1 deletion AutoLegalityMod/AutoModPlugins.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
<PackageReference Include="PKHeX.Core" Version="24.11.12" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<ProjectReference Include="..\PKHeX.Core.AutoMod\PKHeX.Core.AutoMod.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion AutoModTests/AutoModTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="PKHeX.Core" Version="24.11.12" />
<ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 6 additions & 0 deletions PKHeX-Plugins.sln
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKHeX.Core.Injection", "PKH
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKHeX.Core.Enhancements", "PKHeX.Core.Enhancements\PKHeX.Core.Enhancements.csproj", "{165D144A-DBB4-4F3B-BF39-E783B41008C3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKHeX.Core", "..\PKHeX\PKHeX.Core\PKHeX.Core.csproj", "{85483679-4605-4558-B7CB-4B818BB5D2C3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -41,6 +43,10 @@ Global
{165D144A-DBB4-4F3B-BF39-E783B41008C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{165D144A-DBB4-4F3B-BF39-E783B41008C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{165D144A-DBB4-4F3B-BF39-E783B41008C3}.Release|Any CPU.Build.0 = Release|Any CPU
{85483679-4605-4558-B7CB-4B818BB5D2C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85483679-4605-4558-B7CB-4B818BB5D2C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85483679-4605-4558-B7CB-4B818BB5D2C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85483679-4605-4558-B7CB-4B818BB5D2C3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion PKHeX.Core.AutoMod/AutoMod/Util/LivingDexUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public readonly record struct LivingDexConfig
{
public bool IncludeForms { get; init; }
public bool IncludeForms { get; init; } = true;
public bool SetShiny { get; init; }
public bool SetAlpha { get; init; }
public bool NativeOnly { get; init; }
Expand Down
2 changes: 1 addition & 1 deletion PKHeX.Core.AutoMod/PKHeX.Core.AutoMod.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="PKHeX.Core" Version="24.11.12" />
<ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion PKHeX.Core.Enhancements/PKHeX.Core.Enhancements.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="PKHeX.Core" Version="24.11.12" />
<ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion PKHeX.Core.Injection/PKHeX.Core.Injection.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="LibUsbDotNet" Version="2.2.29" />
<PackageReference Include="PKHeX.Core" Version="24.11.12" />
<ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
</ItemGroup>
</Project>

0 comments on commit 1333804

Please sign in to comment.