diff options
Diffstat (limited to 'src/wixlib/NetFx4.wxs')
| -rw-r--r-- | src/wixlib/NetFx4.wxs | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs index 979c1da4..295d8078 100644 --- a/src/wixlib/NetFx4.wxs +++ b/src/wixlib/NetFx4.wxs | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 3 | 2 | ||
| 4 | 3 | ||
| 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
| 6 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
| 7 | 5 | ||
| 8 | <!-- | 6 | <!-- |
| 9 | .NET Framework installation state properties | 7 | .NET Framework installation state properties |
| @@ -30,23 +28,11 @@ | |||
| 30 | </Fragment> | 28 | </Fragment> |
| 31 | 29 | ||
| 32 | <Fragment> | 30 | <Fragment> |
| 33 | <util:RegistrySearch | 31 | <util:RegistrySearch Id="NETFRAMEWORK40" Variable="NETFRAMEWORK40" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Install" Result="value" /> |
| 34 | Id="NETFRAMEWORK40" | ||
| 35 | Variable="NETFRAMEWORK40" | ||
| 36 | Root="HKLM" | ||
| 37 | Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" | ||
| 38 | Value="Install" | ||
| 39 | Result="value" /> | ||
| 40 | </Fragment> | 32 | </Fragment> |
| 41 | 33 | ||
| 42 | <Fragment> | 34 | <Fragment> |
| 43 | <util:RegistrySearch | 35 | <util:RegistrySearch Id="NETFRAMEWORK40CLIENT" Variable="NETFRAMEWORK40CLIENT" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" Value="Install" Result="value" /> |
| 44 | Id="NETFRAMEWORK40CLIENT" | ||
| 45 | Variable="NETFRAMEWORK40CLIENT" | ||
| 46 | Root="HKLM" | ||
| 47 | Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" | ||
| 48 | Value="Install" | ||
| 49 | Result="value" /> | ||
| 50 | </Fragment> | 36 | </Fragment> |
| 51 | 37 | ||
| 52 | <!-- set to #1 if the .NET Framework 4.0 client is installed (not set otherwise) --> | 38 | <!-- set to #1 if the .NET Framework 4.0 client is installed (not set otherwise) --> |