ckaczor/FeedCenter
1
0
Fork 0
mirror of https://github.com/ckaczor/FeedCenter.git synced 2026-01-13 17:22:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update installer to detect .NET runtime

Browse Source
This commit is contained in:
Chris Kaczor
2023-04-29 18:42:53 -04:00
parent c64ec21bd9
commit 1db13fbe2e
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Bootstrapper/Bootstrapper.wixproj
View File

@@ -37,6 +37,10 @@
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name> <Name>WixNetFxExtension</Name>
</WixExtension> </WixExtension>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Application\FeedCenter.csproj"> <ProjectReference Include="..\Application\FeedCenter.csproj">
@@ -66,12 +70,4 @@
<PropertyGroup> <PropertyGroup>
<PostBuildEvent /> <PostBuildEvent />
</PropertyGroup> </PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project> </Project>

17
Bootstrapper/Bundle.wxs
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?> <?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?> <?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
@@ -13,6 +14,18 @@
UpgradeCode="5e5c13a5-635e-4310-a653-0f9760f46935" UpgradeCode="5e5c13a5-635e-4310-a653-0f9760f46935"
Compressed="no"> Compressed="no">
<util:DirectorySearch Id="DotnetDesktopRuntimeSearch_x86"
Path="[ProgramFilesFolder]dotnet\shared\Microsoft.WindowsDesktop.App\7.0.5"
Result="exists"
Variable="DotnetDesktopRuntimeExists_x86"
Condition="NOT VersionNT64" />
<util:DirectorySearch Id="DotnetDesktopRuntimeSearch_x64"
Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\7.0.5"
Result="exists"
Variable="DotnetDesktopRuntimeExists_x64"
Condition="VersionNT64" />
<BootstrapperApplicationRef Id="WixExtendedBootstrapperApplication.HyperlinkLicense"> <BootstrapperApplicationRef Id="WixExtendedBootstrapperApplication.HyperlinkLicense">
<bal:WixExtendedBootstrapperApplication LicenseUrl="" <bal:WixExtendedBootstrapperApplication LicenseUrl=""
SuppressOptionsUI="yes" SuppressOptionsUI="yes"
@@ -31,6 +44,7 @@
Compressed="no" Compressed="no"
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/dffb1939-cef1-4db3-a579-5475a3061cdd/578b208733c914c7b7357f6baa4ecfd6/windowsdesktop-runtime-7.0.5-win-x64.exe" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/dffb1939-cef1-4db3-a579-5475a3061cdd/578b208733c914c7b7357f6baa4ecfd6/windowsdesktop-runtime-7.0.5-win-x64.exe"
Name="windowsdesktop-runtime-7.0.5-win-x64.exe" Name="windowsdesktop-runtime-7.0.5-win-x64.exe"
DetectCondition="DotnetDesktopRuntimeExists_x64 = 1"
InstallCondition='VersionNT64'> InstallCondition='VersionNT64'>
<RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x64)" <RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x64)"
Description="Microsoft Windows Desktop Runtime - 7.0.5 (x64)" Description="Microsoft Windows Desktop Runtime - 7.0.5 (x64)"
@@ -45,6 +59,7 @@
Compressed="no" Compressed="no"
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/eb64dcd1-d277-4798-ada1-600805c9e2dc/fc73c843d66f3996e7ef22468f4902e6/windowsdesktop-runtime-7.0.5-win-x86.exe" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/eb64dcd1-d277-4798-ada1-600805c9e2dc/fc73c843d66f3996e7ef22468f4902e6/windowsdesktop-runtime-7.0.5-win-x86.exe"
Name="windowsdesktop-runtime-7.0.5-win-x86.exe" Name="windowsdesktop-runtime-7.0.5-win-x86.exe"
DetectCondition="DotnetDesktopRuntimeExists_x86 = 1"
InstallCondition='NOT VersionNT64'> InstallCondition='NOT VersionNT64'>
<RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x86)" <RemotePayload ProductName="Microsoft Windows Desktop Runtime - 7.0.5 (x86)"
Description="Microsoft Windows Desktop Runtime - 7.0.5 (x86)" Description="Microsoft Windows Desktop Runtime - 7.0.5 (x86)"