aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetCore3_Platform.wxi
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetCore3_Platform.wxi')
-rw-r--r--src/wixlib/NetCore3_Platform.wxi28
1 files changed, 5 insertions, 23 deletions
diff --git a/src/wixlib/NetCore3_Platform.wxi b/src/wixlib/NetCore3_Platform.wxi
index bb7e59a7..c7aaca50 100644
--- a/src/wixlib/NetCore3_Platform.wxi
+++ b/src/wixlib/NetCore3_Platform.wxi
@@ -1,10 +1,7 @@
1<?xml version="1.0"?> 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<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
7 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
8 5
9 <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?> 6 <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
10 <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?> 7 <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
@@ -29,32 +26,17 @@
29 26
30 <Fragment> 27 <Fragment>
31 <util:RegistrySearchRef Id="$(var.DotNetHomeId)" /> 28 <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
32 <util:DirectorySearch 29 <util:DirectorySearch Id="$(var.AspNetCoreId)" Variable="$(var.AspNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.AspNetCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
33 Id="$(var.AspNetCoreId)"
34 Variable="$(var.AspNetCoreId)"
35 Path="[$(var.DotNetHomeId)]\shared\Microsoft.AspNetCore.App\$(var.NetCoreVersion)"
36 Result="exists"
37 After="$(var.DotNetHomeId)" />
38 </Fragment> 30 </Fragment>
39 31
40 <Fragment> 32 <Fragment>
41 <util:RegistrySearchRef Id="$(var.DotNetHomeId)" /> 33 <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
42 <util:DirectorySearch 34 <util:DirectorySearch Id="$(var.DesktopNetCoreId)" Variable="$(var.DesktopNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.WindowsDesktop.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
43 Id="$(var.DesktopNetCoreId)"
44 Variable="$(var.DesktopNetCoreId)"
45 Path="[$(var.DotNetHomeId)]\shared\Microsoft.WindowsDesktop.App\$(var.NetCoreVersion)"
46 Result="exists"
47 After="$(var.DotNetHomeId)" />
48 </Fragment> 35 </Fragment>
49 36
50 <Fragment> 37 <Fragment>
51 <util:RegistrySearchRef Id="$(var.DotNetHomeId)" /> 38 <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
52 <util:DirectorySearch 39 <util:DirectorySearch Id="$(var.DotNetCoreId)" Variable="$(var.DotNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.NETCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
53 Id="$(var.DotNetCoreId)"
54 Variable="$(var.DotNetCoreId)"
55 Path="[$(var.DotNetHomeId)]\shared\Microsoft.NETCore.App\$(var.NetCoreVersion)"
56 Result="exists"
57 After="$(var.DotNetHomeId)" />
58 </Fragment> 40 </Fragment>
59 41
60 <Fragment> 42 <Fragment>