Browse Source

Fixed artifact paths and x86 builds

pull/32/head
Anairkoen Schno 5 years ago
parent
commit
63c796e632
3 changed files with 31 additions and 27 deletions
  1. +10
    -8
      BSIPA-Net4-Meta/BSIPA-Net4-Meta.csproj
  2. +16
    -16
      BSIPA.sln
  3. +5
    -3
      appveyor.yml

+ 10
- 8
BSIPA-Net4-Meta/BSIPA-Net4-Meta.csproj View File

@ -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\" />


+ 16
- 16
BSIPA.sln View File

@ -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


+ 5
- 3
appveyor.yml View File

@ -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:


Loading…
Cancel
Save