From e54dee518261020f522d68dead1ca0dcc344f3f1 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sat, 4 Jun 2022 18:06:10 -0400
Subject: [PATCH] Fix Windows building

---
 .github/workflows/build.yml                        |  7 +------
 .idea/.idea.UnionPatcher/.idea/git_toolbox_prj.xml | 11 +++++++++++
 UnionPatcher/UnionPatcher.csproj                   |  9 +--------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ea3127..f42b6c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,11 +18,6 @@ jobs:
           - { prettyName: Linux, platform: ubuntu-latest, configurationName: Linux, extraArgs: "", buildPath: "Release/net6.0/publish"}
 #          - { prettyName: MacOS, platform: ubuntu-latest, configurationName: Release, platform: osx-x64 }
     steps:
-      - name: Cancel previous runs of this workflow
-        uses: styfle/cancel-workflow-action@0.6.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout
         uses: actions/checkout@v2
 
@@ -37,4 +32,4 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: UnionPatcher-${{ matrix.os.prettyName }}
-          path: ${{ github.workspace }}/UnionPatcher.UI.${{ matrix.os.prettyName }}/bin/${{ matrix.os.buildPath }}
+          path: ${{ github.workspace }}/UnionPatcher.Gui.${{ matrix.os.prettyName }}/bin/${{ matrix.os.buildPath }}
diff --git a/.idea/.idea.UnionPatcher/.idea/git_toolbox_prj.xml b/.idea/.idea.UnionPatcher/.idea/git_toolbox_prj.xml
index b382006..0b5461a 100644
--- a/.idea/.idea.UnionPatcher/.idea/git_toolbox_prj.xml
+++ b/.idea/.idea.UnionPatcher/.idea/git_toolbox_prj.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="GitToolBoxProjectSettings">
+    <option name="autoFetchIntervalMinutesOverride">
+      <IntValueOverride>
+        <option name="enabled" value="true" />
+        <option name="value" value="15" />
+      </IntValueOverride>
+    </option>
     <option name="commitMessageIssueKeyValidationOverride">
       <BoolValueOverride>
         <option name="enabled" value="true" />
@@ -11,5 +17,10 @@
         <option name="enabled" value="true" />
       </CommitMessageValidationOverride>
     </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/UnionPatcher/UnionPatcher.csproj b/UnionPatcher/UnionPatcher.csproj
index 41f5b48..9d730fd 100644
--- a/UnionPatcher/UnionPatcher.csproj
+++ b/UnionPatcher/UnionPatcher.csproj
@@ -3,18 +3,11 @@
         <AssemblyName>LBPUnion.UnionPatcher</AssemblyName>
         <RootNamespace>LBPUnion.UnionPatcher</RootNamespace>
         <Configurations>Debug;Release;Windows</Configurations>
-        <Platforms>AnyCPU</Platforms>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
         <TargetFramework>net6.0</TargetFramework>
+        <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0-windows</TargetFramework>
-        <AssemblyName>LBPUnion.UnionPatcher</AssemblyName>
-        <RootNamespace>LBPUnion.UnionPatcher</RootNamespace>
         <SelfContained>true</SelfContained>
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     </PropertyGroup>