convenience changes

pifopi · Jul 21, 2024 · d557990 · d557990
1 parent 89e8dbd
commit d557990
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 6 deletions.
diff --git a/.github/workflows/csharp-ci-pkhex.yml b/.github/workflows/csharp-ci-pkhex.yml
@@ -0,0 +1,43 @@
+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: 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\x64\${{ matrix.configuration }}\net8.0-windows\win-x64\plugins\ AutoModPlugins.dll LibUsbDotNet.LibUsbDotNet.dll NtrSharp.dll PKHeX.Core.AutoMod.dll PKHeX.Core.Enhancements.dll PKHeX.Core.Injection.dll
+        write-host "Robocopy exited with exit code:" $lastexitcode
+        if ($lastexitcode -eq 1)
+        {
+          exit 0
+        }
+        else
+        {
+          exit 1
+        }
+    - uses: actions/upload-artifact@v4
+      with:
+        name: PKHeX for windows (${{ matrix.configuration }})
+        path: PKHeX/PKHeX.WinForms/bin/x64/${{ matrix.configuration }}/net8.0-windows/win-x64
diff --git a/AutoLegalityMod/AutoModPlugins.csproj b/AutoLegalityMod/AutoModPlugins.csproj
@@ -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.7.3" 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" />

diff --git a/AutoModTests/AutoModTests.csproj b/AutoModTests/AutoModTests.csproj
@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.11.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="PKHeX.Core" Version="24.7.3" />
+    <ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
     <PackageReference Include="xunit" Version="2.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>

diff --git a/PKHeX-Plugins.sln b/PKHeX-Plugins.sln
@@ -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
@@ -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

diff --git a/PKHeX.Core.AutoMod/AutoMod/Util/LivingDexUtils.cs b/PKHeX.Core.AutoMod/AutoMod/Util/LivingDexUtils.cs
@@ -2,7 +2,7 @@
 {
     public class 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; }

diff --git a/PKHeX.Core.AutoMod/PKHeX.Core.AutoMod.csproj b/PKHeX.Core.AutoMod/PKHeX.Core.AutoMod.csproj
@@ -3,6 +3,6 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="24.7.3" />
+    <ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/PKHeX.Core.Enhancements/PKHeX.Core.Enhancements.csproj b/PKHeX.Core.Enhancements/PKHeX.Core.Enhancements.csproj
@@ -3,6 +3,6 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="24.7.3" />
+    <ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/PKHeX.Core.Injection/PKHeX.Core.Injection.csproj b/PKHeX.Core.Injection/PKHeX.Core.Injection.csproj
@@ -4,6 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="LibUsbDotNet" Version="2.2.29" />
-    <PackageReference Include="PKHeX.Core" Version="24.7.3" />
+    <ProjectReference Include="..\..\PKHeX\PKHeX.Core\PKHeX.Core.csproj" />
   </ItemGroup>
 </Project>