From 7a188eec4f1e118c263f66e2c833e207714ac005 Mon Sep 17 00:00:00 2001
From: Anairkoen Schno <aaron.cirr.com@gmail.com>
Date: Wed, 17 Jul 2019 17:54:52 -0500
Subject: [PATCH] Fixed artifact paths and x86 builds

---
 BSIPA-Net4-Meta/BSIPA-Net4-Meta.csproj | 18 ++++++++-------
 BSIPA.sln                              | 32 +++++++++++++-------------
 appveyor.yml                           |  8 ++++---
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/BSIPA-Net4-Meta/BSIPA-Net4-Meta.csproj b/BSIPA-Net4-Meta/BSIPA-Net4-Meta.csproj
index 944b94c5..943ab8cf 100644
--- a/BSIPA-Net4-Meta/BSIPA-Net4-Meta.csproj
+++ b/BSIPA-Net4-Meta/BSIPA-Net4-Meta.csproj
@@ -12,7 +12,9 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net4|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' " />
+  <PropertyGroup Condition=" '$(Platform)' == 'x64' " />
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug_Net4' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -24,7 +26,7 @@
     <OtherConfig>Debug</OtherConfig>
     <ProxyConfig>Release</ProxyConfig>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Net4|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release_Net4' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -35,7 +37,7 @@
     <OtherConfig>Release</OtherConfig>
     <ProxyConfig>Release</ProxyConfig>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Verbose_Net4|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Verbose_Net4' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -47,7 +49,7 @@
     <OtherConfig>Verbose</OtherConfig>
     <ProxyConfig>Verbose_Release</ProxyConfig>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Verbose_Release_Net4|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Verbose_Release_Net4' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -72,8 +74,8 @@
   </Target>
   <ItemGroup>
     <InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(OtherConfig)\**\*" Exclude="$(SolutionDir)IPA.Injector\bin\$(OtherConfig)\Libraries\**\*" />
-    <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\x64\$(ProxyConfig)\**\*.dll" />
-    <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\x64\$(ProxyConfig)\**\*.pdb" />
+    <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(Platform)\$(ProxyConfig)\**\*.dll" />
+    <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(Platform)\$(ProxyConfig)\**\*.pdb" />
     <InputIPAFiles Include="$(SolutionDir)IPA\bin\$(OtherConfig)\**\*" />
   </ItemGroup>
   <Target Name="Assemble" Returns="$(OutputPath)">
@@ -85,8 +87,8 @@
     <Copy SourceFiles="@(InputIPAFiles)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
     <ItemGroup>
       <BadFiles Include="$(OutputPath)*.dll" />
-      <BadFiles Include="$(OutputPath)*.pdb" Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Verbose_Release'" />
-      <BadFiles Include="$(OutputPath)IPA\*.pdb" Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Verbose_Release'" />
+      <BadFiles Include="$(OutputPath)*.pdb" Condition="'$(Configuration)'=='Release_Net4' Or '$(Configuration)'=='Verbose_Release_Net4'" />
+      <BadFiles Include="$(OutputPath)IPA\*.pdb" Condition="'$(Configuration)'=='Release_Net4' Or '$(Configuration)'=='Verbose_Release_Net4'" />
     </ItemGroup>
     <Delete Files="@(BadFiles)" />
     <RemoveDir Directories="$(OutputPath)Libraries\" />
diff --git a/BSIPA.sln b/BSIPA.sln
index c0e59465..20890db7 100644
--- a/BSIPA.sln
+++ b/BSIPA.sln
@@ -165,22 +165,22 @@ Global
 		{23AB2621-A05C-4377-8418-85E6012C0BBE}.Verbose_Release_Net4|x64.ActiveCfg = Release|Any CPU
 		{23AB2621-A05C-4377-8418-85E6012C0BBE}.Verbose_Release_Net4|x64.Build.0 = Release|Any CPU
 		{23AB2621-A05C-4377-8418-85E6012C0BBE}.Verbose_Release_Net4|x86.ActiveCfg = Release|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x64.ActiveCfg = Debug_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x64.Build.0 = Debug_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x86.ActiveCfg = Debug_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x86.Build.0 = Debug_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x64.ActiveCfg = Release_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x64.Build.0 = Release_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x86.ActiveCfg = Release_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x86.Build.0 = Release_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x64.ActiveCfg = Verbose_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x64.Build.0 = Verbose_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x86.ActiveCfg = Verbose_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x86.Build.0 = Verbose_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x64.ActiveCfg = Verbose_Release_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x64.Build.0 = Verbose_Release_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x86.ActiveCfg = Verbose_Release_Net4|Any CPU
-		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x86.Build.0 = Verbose_Release_Net4|Any CPU
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x64.ActiveCfg = Debug_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x64.Build.0 = Debug_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x86.ActiveCfg = Debug_Net4|x86
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Debug_Net4|x86.Build.0 = Debug_Net4|x86
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x64.ActiveCfg = Release_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x64.Build.0 = Release_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x86.ActiveCfg = Release_Net4|x86
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Release_Net4|x86.Build.0 = Release_Net4|x86
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x64.ActiveCfg = Verbose_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x64.Build.0 = Verbose_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x86.ActiveCfg = Verbose_Net4|x86
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Net4|x86.Build.0 = Verbose_Net4|x86
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x64.ActiveCfg = Verbose_Release_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x64.Build.0 = Verbose_Release_Net4|x64
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x86.ActiveCfg = Verbose_Release_Net4|x86
+		{880A3560-82CD-4836-996B-11BEFE6B44DB}.Verbose_Release_Net4|x86.Build.0 = Verbose_Release_Net4|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
index 6fe5fd96..96dbfe85 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,8 +32,10 @@ platform:
   - x86
   
 artifacts: # When Net3 is added, this will need to be moved to the for block to only run for Net4 builds
-  - path: BSIPA-ModList/bin/$(configuration)
+  - path: BSIPA-ModList/bin/Release
     name: ModList
+  - path: BSIPA-Net4-Meta/bin/$(configuration) 
+    name: BSIPA-Net4-$(platform)
 
 matrix:
   exclude:
@@ -54,9 +56,9 @@ for:
     only:
     - configuration: Release_Net4
   
+  environment:
+    
   artifacts:
-    - path: BSIPA-Net4-Meta/bin/$(configuration) 
-      name: BSIPA-Net4-$(platform)
 - 
   matrix:
     except: