From 133763c43c8221b1fab21e69c172117fb0e1e69d Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Mon, 7 Aug 2017 00:31:11 +0200
Subject: [PATCH] Revisit content assembly copying, now much neater.

---
 Content.Client/Content.Client.csproj | 30 ++++++++--------------
 Content.Server/Content.Server.csproj | 37 +++++++---------------------
 SS14.Content.targets                 |  6 +++++
 3 files changed, 25 insertions(+), 48 deletions(-)
 create mode 100644 SS14.Content.targets

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index ae8c4a6e09..9a9c395319 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>Content.Client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <ContentAssemblyTarget>..\bin\Client\Assemblies\</ContentAssemblyTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -74,24 +75,13 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">
-      <PropertyGroup>
-        <PostBuildEvent>
-        if not exist "..\Client\Assemblies" (
-          mkdir ..\Client\Assemblies\
-        )
-        copy Content.* ..\Client\Assemblies\ > NUL
-        </PostBuildEvent>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-          <PostBuildEvent>
-           mkdir -p ../Client/Assemblies/
-           cp Content.* ../Client/Assemblies/
-         </PostBuildEvent>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <Import Project="..\SS14.Content.targets" />
+  <Target Name="AfterBuild" DependsOnTargets="CopyContentAssemblies" />
+  <ItemGroup>
+    <!-- Files to be copied into Client/Assemblies -->
+    <ContentAssemblies Include="$(OutputPath)Content.Client.dll" />
+    <ContentAssemblies Include="$(OutputPath)Content.Shared.dll" />
+    <ContentAssemblies Include="$(OutputPath)Content.Client.pdb" Condition="'$(Configuration)' == 'Debug'" />
+    <ContentAssemblies Include="$(OutputPath)Content.Shared.pdb" Condition="'$(Configuration)' == 'Debug'" />
+  </ItemGroup>
 </Project>
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 42c2eee4ed..41521ca899 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -11,13 +11,10 @@
     <AssemblyName>Content.Server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <ContentAssemblyTarget>..\bin\Server\Assemblies\</ContentAssemblyTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <!--
-    This copies all dependencies,
-    but on the plus side it's automatically located in the right place.
-    -->
     <OutputPath>..\bin\Content.Server\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -26,10 +23,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <!--
-    This copies all dependencies,
-    but on the plus side it's automatically located in the right place.
-    -->
     <OutputPath>..\bin\Content.Server\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -70,24 +63,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">
-      <PropertyGroup>
-        <PostBuildEvent>
-        if not exist "..\Server\Assemblies" (
-          mkdir ..\Server\Assemblies\
-        )
-        copy Content.* ..\Server\Assemblies\ > NUL
-        </PostBuildEvent>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-          <PostBuildEvent>
-           mkdir -p ../Server/Assemblies/
-           cp Content.* ../Server/Assemblies/
-         </PostBuildEvent>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <Import Project="..\SS14.Content.targets" />
+  <Target Name="AfterBuild" DependsOnTargets="CopyContentAssemblies" />
+  <ItemGroup>
+    <ContentAssemblies Include="$(OutputPath)Content.Server.dll" />
+    <ContentAssemblies Include="$(OutputPath)Content.Shared.dll" />
+    <ContentAssemblies Include="$(OutputPath)Content.Server.pdb" Condition="'$(Configuration)' == 'Debug'" />
+    <ContentAssemblies Include="$(OutputPath)Content.Shared.pdb" Condition="'$(Configuration)' == 'Debug'" />
+  </ItemGroup>
 </Project>
diff --git a/SS14.Content.targets b/SS14.Content.targets
new file mode 100644
index 0000000000..cbf0d4356a
--- /dev/null
+++ b/SS14.Content.targets
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Common target to copy content assemblies to the parent projects. -->
+  <Target Name="CopyContentAssemblies">
+    <Copy SourceFiles="@(ContentAssemblies)" DestinationFolder="$(ContentAssemblyTarget)" />
+  </Target>
+</Project>