Implement Windows x64 build and packaging

djp952 · Dec 24, 2021 · 14eb80b · 14eb80b
1 parent f3a85c9
commit 14eb80b
Show file tree

Hide file tree

Showing 11 changed files with 361 additions and 45 deletions.
diff --git a/hdhomeruntray.sln b/hdhomeruntray.sln
@@ -42,32 +42,58 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup.findvcmsms", "src\set
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x64.ActiveCfg = Debug|Win32
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x64.Build.0 = Debug|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x86.ActiveCfg = Debug|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x86.Build.0 = Debug|Win32
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x64.ActiveCfg = Release|Win32
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x64.Build.0 = Release|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x86.ActiveCfg = Release|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x86.Build.0 = Release|Win32
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x64.ActiveCfg = Debug|x64
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x64.Build.0 = Debug|x64
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x86.ActiveCfg = Debug|Win32
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x86.Build.0 = Debug|Win32
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x64.ActiveCfg = Release|x64
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x64.Build.0 = Release|x64
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x86.ActiveCfg = Release|Win32
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x86.Build.0 = Release|Win32
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x64.ActiveCfg = Debug|x64
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x64.Build.0 = Debug|x64
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x86.ActiveCfg = Debug|x86
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x86.Build.0 = Debug|x86
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x64.ActiveCfg = Release|x64
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x64.Build.0 = Release|x64
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x86.ActiveCfg = Release|x86
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x86.Build.0 = Release|x86
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x64.ActiveCfg = Debug|x64
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x64.Build.0 = Debug|x64
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x86.ActiveCfg = Debug|x86
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x86.Build.0 = Debug|x86
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x64.ActiveCfg = Release|x64
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x64.Build.0 = Release|x64
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x86.ActiveCfg = Release|x86
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x86.Build.0 = Release|x86
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x64.ActiveCfg = Debug|x64
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x64.Build.0 = Debug|x64
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x86.ActiveCfg = Debug|x86
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x86.Build.0 = Debug|x86
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x64.ActiveCfg = Release|x64
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x64.Build.0 = Release|x64
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x86.ActiveCfg = Release|x86
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x86.Build.0 = Release|x86
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x64.ActiveCfg = Debug|x64
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x64.Build.0 = Debug|x64
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x86.ActiveCfg = Debug|Win32
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x86.Build.0 = Debug|Win32
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x64.ActiveCfg = Release|x64
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x64.Build.0 = Release|x64
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x86.ActiveCfg = Release|Win32
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection

diff --git a/msbuild.proj b/msbuild.proj
@@ -20,7 +20,7 @@
  SOFTWARE.
 -->
 
-<Project DefaultTargets="windows" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="all" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
     <PackageVersion></PackageVersion>         <!-- Set by PackageVersion Target; may override on the command line -->
@@ -39,8 +39,8 @@
 
   </Target>
 
-  <!-- BUILD: WINDOWS -->
-  <Target Name="windows" DependsOnTargets="PackageVersion">
+  <!-- BUILD: WINDOWS-X86 -->
+  <Target Name="windows-x86" DependsOnTargets="PackageVersion">
 
     <MakeDir Directories="out" ContinueOnError="false"/>
 
@@ -52,19 +52,49 @@
     <MSBuild Projects="src\setup\setup.wixproj" Properties="Configuration=$(Configuration);Platform=x86" Targets="Build" ContinueOnError="false"/>
 
     <ItemGroup>
-      <Packages Include="bin\Release\hdhomeruntray.msi"/>
+      <PackagesX86 Include="bin\Release\x86\hdhomeruntray.msi"/>
     </ItemGroup>
 
-    <Move SourceFiles="@(Packages)" DestinationFiles="@(Packages->Replace('.msi', '-$(PackageVersion).msi'))">
-      <Output TaskParameter="MovedFiles" ItemName="Packages1"/>
+    <Move SourceFiles="@(PackagesX86)" DestinationFiles="@(PackagesX86->Replace('.msi', '-$(PackageVersion)-x86.msi'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX86_1"/>
     </Move>
 
-    <Move SourceFiles="@(Packages1)" DestinationFiles="@(Packages1->Replace('hdhomeruntray', 'hdhomerunstatusmonitor'))">
-      <Output TaskParameter="MovedFiles" ItemName="Packages2"/>
+    <Move SourceFiles="@(PackagesX86_1)" DestinationFiles="@(PackagesX86_1->Replace('hdhomeruntray', 'hdhomerunstatusmonitor'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX86_2"/>
     </Move>
 
-    <Copy SourceFiles="@(Packages2)" DestinationFolder="out"/>
+    <Copy SourceFiles="@(PackagesX86_2)" DestinationFolder="out"/>
 
   </Target>
 
+  <!-- BUILD: WINDOWS-X64 -->
+  <Target Name="windows-x64" DependsOnTargets="PackageVersion">
+
+    <MakeDir Directories="out" ContinueOnError="false"/>
+
+    <MSBuild Targets="Restore" Projects="src\hdhomeruntray\hdhomeruntray.csproj" Properties="SolutionDir=$(MSBuildThisFileDirectory);RestorePackagesConfig=true"/>
+    <MSBuild Projects="src\findvcmsms\findvcmsms.csproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\hdhomeruntray.discovery\hdhomeruntray.discovery.vcxproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\hdhomeruntray\hdhomeruntray.csproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\setup.findvcmsms\setup.findvcmsms.vcxproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\setup\setup.wixproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+
+    <ItemGroup>
+      <PackagesX64 Include="bin\Release\x64\hdhomeruntray.msi"/>
+    </ItemGroup>
+
+    <Move SourceFiles="@(PackagesX64)" DestinationFiles="@(PackagesX64->Replace('.msi', '-$(PackageVersion)-x64.msi'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX64_1"/>
+    </Move>
+
+    <Move SourceFiles="@(PackagesX64_1)" DestinationFiles="@(PackagesX64_1->Replace('hdhomeruntray', 'hdhomerunstatusmonitor'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX64_2"/>
+    </Move>
+
+    <Copy SourceFiles="@(PackagesX64_2)" DestinationFolder="out"/>
+
+  </Target>
+
+  <Target Name="all" DependsOnTargets="windows-x86;windows-x64"/>
+
 </Project>
diff --git a/src/findvcmsms/findvcmsms.csproj b/src/findvcmsms/findvcmsms.csproj
@@ -19,22 +19,44 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\x86\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\x86\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\bin\Debug\x64\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\..\bin\Release\x64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />