From f402c864e07ff331e0c79f86a583bcb4b9a859d5 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Mon, 16 Oct 2017 13:33:47 -0400
Subject: [PATCH] Server releases are now packaged as a single exe

---
 TGInstallerWrapper/FodyWeavers.xml           |  4 ++++
 TGInstallerWrapper/TGInstallerWrapper.csproj | 17 +++++++++++++++++
 TGInstallerWrapper/packages.config           |  5 +++++
 TGS3Release.ps1                              | 11 ++---------
 appveyor.yml                                 |  2 +-
 5 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 TGInstallerWrapper/FodyWeavers.xml
 create mode 100644 TGInstallerWrapper/packages.config

diff --git a/TGInstallerWrapper/FodyWeavers.xml b/TGInstallerWrapper/FodyWeavers.xml
new file mode 100644
index 0000000000..c6e1b7c8af
--- /dev/null
+++ b/TGInstallerWrapper/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <Costura />
+</Weavers>
\ No newline at end of file
diff --git a/TGInstallerWrapper/TGInstallerWrapper.csproj b/TGInstallerWrapper/TGInstallerWrapper.csproj
index e94ed50a6c..9685dbe6d6 100644
--- a/TGInstallerWrapper/TGInstallerWrapper.csproj
+++ b/TGInstallerWrapper/TGInstallerWrapper.csproj
@@ -11,6 +11,8 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,6 +40,10 @@
     <ApplicationIcon>tgs.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Microsoft.Deployment.WindowsInstaller, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -70,6 +76,7 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="app.manifest" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TGServiceInterface\TGServiceInterface.csproj">
@@ -78,7 +85,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="FodyWeavers.xml" />
     <Content Include="tgs.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.0\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
+  </Target>
+  <Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
 </Project>
\ No newline at end of file
diff --git a/TGInstallerWrapper/packages.config b/TGInstallerWrapper/packages.config
new file mode 100644
index 0000000000..b4d46b584a
--- /dev/null
+++ b/TGInstallerWrapper/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Costura.Fody" version="1.6.2" targetFramework="net452" developmentDependency="true" />
+  <package id="Fody" version="2.0.0" targetFramework="net452" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/TGS3Release.ps1 b/TGS3Release.ps1
index 0749e410db..ea5884c247 100644
--- a/TGS3Release.ps1
+++ b/TGS3Release.ps1
@@ -2,19 +2,12 @@ $bf = $Env:APPVEYOR_BUILD_FOLDER
 $src = "$bf\TGInstallerWrapper\bin\Release"
 $version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$src\TG Station Server Installer.exe").FileVersion
 
-Remove-Item "$src\Microsoft.Deployment.WindowsInstaller.xml"
-Remove-Item "$src\TG Station Server Installer.exe.config"
-Remove-Item "$src\TG Station Server Installer.pdb"
-Rename-Item -Path "$src\TG Station Server Installer.exe" -NewName "$src\TG Station Server Installer v$version.exe"
+$destination = "$bf\TGS3-Server-v$version.exe"
 
-$destination = "$bf\TGS3-Server-v$version.zip"
-
-If(Test-path $destination) {Remove-item $destination}
+Move-Item -Path "$src\TG Station Server Installer.exe" -Destination "$destination"
 
 Add-Type -assembly "system.io.compression.filesystem"
 
-[io.compression.zipfile]::CreateFromDirectory($src, $destination) 
-
 $destination_md5sha = $Env:APPVEYOR_BUILD_FOLDER + "\MD5-SHA1-Server-v$version.txt"
 
 $src2 = $Env:APPVEYOR_BUILD_FOLDER + "\ClientApps"
diff --git a/appveyor.yml b/appveyor.yml
index cd29c86075..0bbbd54080 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ image: Visual Studio 2017
 configuration: Release
 shallow_clone: true
 artifacts:
-- path: TGS3-Server-v*.zip
+- path: TGS3-Server-v*.exe
   name: TGS3Server
 - path: MD5-SHA1-Server-v*.txt
   name: MD5SHA1Server