.NET 4.5.1 check

raspi · Jul 24, 2017 · 5e2a793 · 5e2a793
1 parent d5815b2
commit 5e2a793
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/WinLLDPService/build/installer.wxs b/WinLLDPService/build/installer.wxs
@@ -14,7 +14,7 @@
 <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
 <?endif ?>
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 	<?include $(sys.CURRENTDIR)version.wxi ?>
 	<Product Name="$(var.ProductShortName) $(var.VersionNumber) ($(sys.BUILDARCH))" Manufacturer="$(var.Manufacturer)" Version="$(var.VersionNumber)" Language="1033" Codepage="1252" Id="408ea9f0-8118-4f0e-b618-62dd6b7dedb5" UpgradeCode="$(var.UpgradeCode)">
 

diff --git a/WinLLDPService/build/requirements.wxi b/WinLLDPService/build/requirements.wxi
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
 	<!-- Admin privileges required -->
 	<Condition Message="!(loc.Error1925)">
 		<![CDATA[Privileged]]>
 	</Condition>
 
-	<!-- Ensure .Net 4.0 is installed -->
-	<PropertyRef Id="NETFRAMEWORK40FULL" />
-	<Condition Message="This setup requires the .NET Framework 4.0 to be installed.">
-		<![CDATA[ Installed OR NETFRAMEWORK40FULL ]]>
+	<!-- Ensure .Net 4.5.1 is installed -->
+	<PropertyRef Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" />
+	<Condition Message="This setup requires the .NET Framework 4.5.1 to be installed.">
+		<![CDATA[ Installed OR WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED ]]>
 	</Condition>
 
 	<!-- Check WinPCap -->