Updated build settings

ParkitectNexus · Apr 26, 2016 · dcf5874 · dcf5874
1 parent c3d24ca
commit dcf5874
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 28 deletions.
diff --git a/ParkitectNexusClient.sln b/ParkitectNexusClient.sln
@@ -28,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packaging", "Packaging", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Setup", "src\Setup\Setup.csproj", "{C9A243E5-6443-4A00-ACAC-C20A61286264}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AE019B1D-D225-4256-9389-9753AE32DC95} = {AE019B1D-D225-4256-9389-9753AE32DC95}
 		{0CB13383-05D3-40F5-B0E1-3907A42872DC} = {0CB13383-05D3-40F5-B0E1-3907A42872DC}
 		{3451EBAF-3D69-4019-92BE-10E331F32A6F} = {3451EBAF-3D69-4019-92BE-10E331F32A6F}
 	EndProjectSection

diff --git a/src/ParkitectNexus.Client.Base/ParkitectNexus.Client.Base.csproj b/src/ParkitectNexus.Client.Base/ParkitectNexus.Client.Base.csproj
@@ -16,15 +16,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -103,10 +103,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Properties\" />
-    <Folder Include="Migrations\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

diff --git a/src/ParkitectNexus.Client.Linux/ParkitectNexus.Client.Linux.csproj b/src/ParkitectNexus.Client.Linux/ParkitectNexus.Client.Linux.csproj
@@ -13,7 +13,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -22,7 +22,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

diff --git a/src/ParkitectNexus.Client.Win32/ParkitectNexus.Client.Win32.csproj b/src/ParkitectNexus.Client.Win32/ParkitectNexus.Client.Win32.csproj
@@ -16,15 +16,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -83,7 +83,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
diff --git a/src/ParkitectNexus.Data.Test/ParkitectNexus.Data.Test.csproj b/src/ParkitectNexus.Data.Test/ParkitectNexus.Data.Test.csproj
@@ -22,15 +22,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/src/Setup/Program.cs b/src/Setup/Program.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using WixSharp;
 using Assembly = System.Reflection.Assembly;
@@ -20,7 +21,7 @@ internal class Program
 
         private const string AppIcon = @"..\..\images\nexus.ico";
         private const string AppName = @"ParkitectNexus Client";
-        private const string AppExecutable = @"ParkitectNexusClient.exe";
+        private const string AppExecutable = @"ParkitectNexus.Client.Win32.exe";
         private const string AppBinariesPath = @"..\..\bin\" + Configuration + @"\";
 
         private static void Main()
@@ -36,16 +37,16 @@ private static void Main()
                 new Dir(new Id("INSTALL_DIR"), @"%ProgramFiles%\" + AppName,
                     new File(AppExecutable),
                     new File(@"CommandLine.dll"),
-                    new File(@"MetroFramework.Design.dll"),
-                    new File(@"MetroFramework.dll"),
-                    new File(@"MetroFramework.Fonts.dll"),
                     new File(@"Newtonsoft.Json.dll"),
                     new File(@"Octokit.dll"),
                     new File(@"ParkitectNexus.AssetMagic.dll"),
+                    new File(@"ParkitectNexus.Client.Base.dll"),
                     new File(@"ParkitectNexus.Data.dll"),
                     new File(@"ParkitectNexus.Mod.ModLoader.dll"),
                     new File(@"StructureMap.dll"),
-                    new File(@"StructureMap.Net4.dll")
+                    new File(@"StructureMap.Net4.dll"),
+                    new File(@"Xwt.dll"),
+                    new File(@"Xwt.WPF.dll")
                     ),
                 new Dir(@"%ProgramMenu%\" + AppName,
                     new ExeFileShortcut(AppName, $"[INSTALL_DIR]{AppExecutable}", ""),

diff --git a/src/Setup/Setup.csproj b/src/Setup/Setup.csproj
@@ -11,8 +11,7 @@
     <AssemblyName>WixSharpSetup</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -101,17 +100,18 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="packages.config" />
     <None Include="wix\%24%28ProjectName%29.g.wxs" />
+    <None Include="wix\$(ProjectName).g.wxs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- 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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
   <Import Project="..\..\packages\WixSharp.1.0.27.0\build\WixSharp.targets" Condition="Exists('..\..\packages\WixSharp.1.0.27.0\build\WixSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">