Skip to content

Commit

Permalink
Revert "Change build path of executables to output/dll but gooder"
Browse files Browse the repository at this point in the history
This reverts commit bb0e92a.

I can't build again. e.g:
Unable to move file "..\..\output\BizHawk.WinForms.Controls.dll" to "../../output\dll/BizHawk.WinForms.Controls.dll". Cannot create a file when that file already exists.

We've failed twice now. Please give a rationale for why we have to move these files around.
  • Loading branch information
zeromus committed Sep 27, 2020
1 parent 96f4f24 commit f078709
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion src/MainSlnCommon.props
Expand Up @@ -6,7 +6,7 @@
<DocumentationFile>$(ProjectDir)bin/doc_comments.xml</DocumentationFile>
<MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
<NoWarn>CS1573;CS1591;NU1701</NoWarn>
<OutputPath>$(ProjectDir)../../output/dll</OutputPath>
<OutputPath>$(ProjectDir)../../output</OutputPath>
</PropertyGroup>
<ItemGroup>
<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
Expand Down
10 changes: 0 additions & 10 deletions src/MainSlnExecutable.props
@@ -1,7 +1,6 @@
<Project>
<Import Project="MainSlnCommon.props" />
<PropertyGroup>
<OutputPath>$(ProjectDir)../../output</OutputPath>
<TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand All @@ -10,13 +9,4 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputType>WinExe</OutputType>
</PropertyGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<ItemGroup>
<NotExecFilesFromExecProj Include="$(OutputPath)*.deps.json" />
<NotExecFilesFromExecProj Include="$(OutputPath)*.dll" />
<NotExecFilesFromExecProj Include="$(OutputPath)*.pdb" />
<NotExecFilesFromExecProj Include="$(OutputPath)*.xml" />
</ItemGroup>
<Move Condition=" $(IsTargetingNetFramework) " SourceFiles="@(NotExecFilesFromExecProj)" DestinationFolder="$(OutputPath)dll/" />
</Target>
</Project>

0 comments on commit f078709

Please sign in to comment.