From 5d17e92bca32e68a0503f7a6b3c66479731ab26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Tue, 5 Jul 2022 16:43:23 +0200
Subject: [PATCH] More 32-bit build system support.

Part of #5.
---
 Directory.Packages.props | 2 ++
 src/module/module.cproj  | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 28b511e..556bea4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -20,6 +20,8 @@
                         Version="2.9.7" />
         <PackageVersion Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost"
                         Version="7.0.0-preview.5.22301.12" />
+        <PackageVersion Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost"
+                        Version="7.0.0-preview.5.22301.12" />
         <PackageVersion Include="StyleCop.Analyzers"
                         Version="1.2.0-beta.406" />
     </ItemGroup>
diff --git a/src/module/module.cproj b/src/module/module.cproj
index 764aaa9..0d7ee4d 100644
--- a/src/module/module.cproj
+++ b/src/module/module.cproj
@@ -32,7 +32,9 @@
     TODO: Switch to this in .NET 7 Preview 7.
 
     <PropertyGroup>
-        <_AppHostPackageNative>$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetAppHost)/runtimes/$(RuntimeIdentifier)/native/</_AppHostPackageNative>
+        <_AppHostPackage Condition="'$(RuntimeIdentifier)' == 'win-x86'">$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetAppHost)/</_AppHostPackage>
+        <_AppHostPackage Condition="'$(RuntimeIdentifier)' == 'win-x64'">$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetAppHost)/</_AppHostPackage>
+        <_AppHostPackageNative>$(_AppHostPackage)runtimes/$(RuntimeIdentifier)/native/</_AppHostPackageNative>
     </PropertyGroup>
 
     <ItemGroup>
@@ -46,6 +48,8 @@
     <ItemGroup>
         <PackageReference Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost"
                           GeneratePathProperty="true" />
+        <PackageReference Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost"
+                          GeneratePathProperty="true" />
     </ItemGroup>
     -->
 </Project>