Skip to content

Commit

Permalink
Add checks for existence of .NET Core runtime 3.0 or higher (#308)
Browse files Browse the repository at this point in the history
  • Loading branch information
DaveTryon authored Feb 12, 2020
1 parent 598308a commit 978c2cd
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions src/CLI_Installer/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ Licensed under the MIT license. See LICENSE file in the project root for full li

<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>

<Property Id="NETCORERUNTIMEFOUNDX86">
<DirectorySearch Id="NetCoreDirectoryFoundx86" Path="[ProgramFilesFolder]dotnet" >
<FileSearch Name="dotnet.exe" MinVersion="3.0"/>
</DirectorySearch>
</Property>

<Property Id="NETCORERUNTIMEFOUNDX64">
<DirectorySearch Id="NetCoreDirectoryFoundx64" Path="[ProgramFiles64Folder]dotnet" >
<FileSearch Name="dotnet.exe" MinVersion="3.0"/>
</DirectorySearch>
</Property>

<MediaTemplate EmbedCab="yes" />

<Feature Id="ProductFeature" Title="Axe.Windows CLI" Level="1">
Expand All @@ -28,6 +40,10 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
<ComponentGroupRef Id="NetStandard20Components" />
</Feature>

<Condition Message="[ProductName] requires .NET Core Runtime 3.0 or newer. Please visit https://dotnet.microsoft.com/download/dotnet-core">
<![CDATA[Installed OR NETCORERUNTIMEFOUNDX64 OR NETCORERUNTIMEFOUNDX86]]>
</Condition>

<Directory Id="TARGETDIR" Name="SourceDir" >
<Directory Id="ProgramFilesFolder" >
<Directory Id="AxeWindowsCLIFolder" Name ="AxeWindowsCLI" >
Expand Down Expand Up @@ -101,4 +117,5 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
</ComponentGroup>

</Product>

</Wix>

0 comments on commit 978c2cd

Please sign in to comment.