Fixed release

degoedel · Jun 24, 2015 · b52ac0f · b52ac0f
1 parent 1dbf1ad
commit b52ac0f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/CatchupCast.sln b/CatchupCast.sln
@@ -14,30 +14,39 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{37678DA3-F66D-4A00-816D-6203A4D74052}.Debug|x64.ActiveCfg = Debug|x64
+		{37678DA3-F66D-4A00-816D-6203A4D74052}.Debug|x64.Build.0 = Debug|x64
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Release|Any CPU.Build.0 = Release|Any CPU
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{37678DA3-F66D-4A00-816D-6203A4D74052}.Release|x64.ActiveCfg = Release|x64
+		{37678DA3-F66D-4A00-816D-6203A4D74052}.Release|x64.Build.0 = Release|x64
 		{37678DA3-F66D-4A00-816D-6203A4D74052}.Release|x86.ActiveCfg = Release|Any CPU
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Debug|x64.ActiveCfg = Debug|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Debug|x86.ActiveCfg = Debug|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Debug|x86.Build.0 = Debug|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Release|Any CPU.ActiveCfg = Release|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Release|Mixed Platforms.Build.0 = Release|x86
+		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Release|x64.ActiveCfg = Release|x86
+		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Release|x64.Build.0 = Release|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Release|x86.ActiveCfg = Release|x86
 		{FD089F3A-57C6-48E9-A9A1-A4F3C40170F4}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

diff --git a/PodCatchup.csproj b/PodCatchup.csproj
@@ -36,6 +36,26 @@
   <PropertyGroup>
     <ApplicationIcon>icons\Main.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CSCore">
       <HintPath>packages\CSCore.1.0.0.0\lib\net35-client\CSCore.dll</HintPath>

diff --git a/PodCatchupSetup/PodCatchup V1.0.0.msi b/PodCatchupSetup/PodCatchup V1.0.0.msi
diff --git a/PodCatchupSetup/Product.wxs b/PodCatchupSetup/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="!(wix.Product) !(wix.Target) v!(wix.Version)" Language="1033" Version="!(wix.Version)" Manufacturer="!(wix.Manufacturer)" UpgradeCode="e75aa8e8-0012-4624-b82c-f6cf4e5986b1">
+	<Product Id="*" Name="!(wix.Product) v!(wix.Version)" Language="1033" Version="!(wix.Version)" Manufacturer="!(wix.Manufacturer)" UpgradeCode="e75aa8e8-0012-4624-b82c-f6cf4e5986b1">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Property Id="ApplicationFolderName" Value="My Program" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
@@ -43,7 +43,7 @@
 		<ComponentGroup Id="ProductDependencies" Directory="APPLICATIONFOLDER">
 			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
 			<Component Id="CSCoreComponent">
-        <File Id="CsCore" Name="CSCore.dll" Source="$(var.PodCatchup.TargetPath)" DiskId="1" KeyPath="yes" />
+        <File Id="CsCore" Name="CSCore.dll" Source="$(var.PodCatchup.TargetDir)CSCore.dll" DiskId="1" KeyPath="yes" />
 			</Component>
 			<Component Id="LiteDBComponent">
         <File Id="LiteDB" Name="LiteDB.dll" Source="$(var.PodCatchup.TargetDir)LiteDB.dll" DiskId="1" KeyPath="yes" />