Added EPPlus source for .Net. Changed all libs targets so they're com…

…piled with .NET 4.0. Added post-build script for ILMerge. Changed attachments' model name to match attachment slot

ArgbColorDialog/ArgbColorDialog.csproj

@@ -8,7 +8,8 @@
     <RootNamespace>CutoutPro.Winforms</RootNamespace>
     <AssemblyName>ArgbColorDialog</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>

DissDlcToolkit.sln

@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgbColorDialog", "ArgbColo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FolderSelect", "FolderSelectDialog\FolderSelect.csproj", "{F4A7CCFF-3855-4F01-A146-4BE677B5FC4A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus", "EPPlus\EPPlus.csproj", "{7B288026-5502-4A39-BF41-77E086F3E4A3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,16 @@ Global
 		{F4A7CCFF-3855-4F01-A146-4BE677B5FC4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F4A7CCFF-3855-4F01-A146-4BE677B5FC4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F4A7CCFF-3855-4F01-A146-4BE677B5FC4A}.Release|x86.ActiveCfg = Release|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DissDlcToolkit/DissDlcToolkit.csproj

@@ -36,10 +36,6 @@
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EPPlus">
-      <HintPath>..\packages\EPPlus.4.0.1.1\lib\net20\EPPlus.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -298,6 +294,10 @@
       <Name>ArgbColorDialog</Name>
       <Private>True</Private>
     </ProjectReference>
+    <ProjectReference Include="..\EPPlus\EPPlus.csproj">
+      <Project>{7b288026-5502-4a39-bf41-77e086f3e4a3}</Project>
+      <Name>EPPlus</Name>
+    </ProjectReference>
     <ProjectReference Include="..\FolderSelectDialog\FolderSelect.csproj">
       <Project>{f4a7ccff-3855-4f01-a146-4be677b5fc4a}</Project>
       <Name>FolderSelect</Name>
@@ -308,6 +308,9 @@
     <None Include="Resources\icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>"C:\Program Files (x86)\Microsoft\ILMerge\ILMerge.exe" /target:winexe /targetplatform:"v4,C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0" /out:$(TargetDir)DissDlcToolkit-merged.exe $(TargetDir)DissDlcToolkit.exe $(TargetDir)ArgbColorDialog.dll $(TargetDir)EPPlus.dll $(TargetDir)FolderSelect.dll</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

DissDlcToolkit/Forms/MainFormAttachmentsUserControl.cs

@@ -124,7 +124,7 @@ private void attachmentCreationGenerateButton_Click(object sender, EventArgs e)
 
                     attachmentObjectEntry.id = attachmentDlcSlotId;
                     attachmentObjectEntry.objectEntrySlot = Convert.ToByte(attachmentDlcSlotNumber);
-                    attachmentObjectEntry.modelName = "G_" + Hasher.hash(DateTime.Now.ToString("yyyyMMddHHmmss")).ToUpper(); // Ensure unique file name: use hash of current date
+                    attachmentObjectEntry.modelName = ("G_" + "att_" + attachmentDlcSlotNumber.ToString("d3")).ToUpper(); // Ensure unique file name
                     attachmentObjectEntry.objxName = attachmentObjectEntry.modelName.ToLower(); // Ensure unique file name: use hash of current date
 
                     // Get hashed filenames, so the game can read them

DissDlcToolkit/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EPPlus" version="4.0.1.1" targetFramework="net45" />
+  <package id="EPPlus" version="4.0.1.1" targetFramework="net40" />
 </packages>