aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-04-07 20:49:42 -0400
committerBob Arnson <bob@firegiant.com>2021-04-07 20:51:56 -0400
commit56d24ed8b292c27288fbf00ff3dba3ff35f042a5 (patch)
tree53a33d71bcc3638570e1fef7516b56af3035f127
parent5baa00dc75b7bd160aa6b445f462793598d78681 (diff)
downloadwix-56d24ed8b292c27288fbf00ff3dba3ff35f042a5.tar.gz
wix-56d24ed8b292c27288fbf00ff3dba3ff35f042a5.tar.bz2
wix-56d24ed8b292c27288fbf00ff3dba3ff35f042a5.zip
Update dependencies.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/ca/netfxca.vcxproj2
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl4
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs8
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs4
-rw-r--r--src/wixlib/NetCore3.1.12_x64.wxs72
-rw-r--r--src/wixlib/NetCore3.1.12_x86.wxs72
-rw-r--r--src/wixlib/NetCore3.1_x64.wxs6
-rw-r--r--src/wixlib/NetCore3.1_x86.wxs6
-rw-r--r--src/wixlib/NetCore3_Platform.wxi28
-rw-r--r--src/wixlib/NetCoreShared.wxs15
-rw-r--r--src/wixlib/NetFx1.1.wxs3
-rw-r--r--src/wixlib/NetFx1.wxs3
-rw-r--r--src/wixlib/NetFx2.wxs3
-rw-r--r--src/wixlib/NetFx3.5.wxs11
-rw-r--r--src/wixlib/NetFx3.wxs3
-rw-r--r--src/wixlib/NetFx4.5.wxs14
-rw-r--r--src/wixlib/NetFx4.wxs22
-rw-r--r--src/wixlib/NetFx451.wxs6
-rw-r--r--src/wixlib/NetFx452.wxs49
-rw-r--r--src/wixlib/NetFx46.wxs49
-rw-r--r--src/wixlib/NetFx461.wxs49
-rw-r--r--src/wixlib/NetFx462.wxs49
-rw-r--r--src/wixlib/NetFx47.wxs6
-rw-r--r--src/wixlib/NetFx471.wxs6
-rw-r--r--src/wixlib/NetFx472.wxs49
-rw-r--r--src/wixlib/NetFx48.wxs49
-rw-r--r--src/wixlib/NetFxExtension.wxs3
-rw-r--r--src/wixlib/NetFxExtension_arm64.wxs3
-rw-r--r--src/wixlib/NetFxExtension_x64.wxs3
-rw-r--r--src/wixlib/NetFxExtension_x86.wxs3
31 files changed, 94 insertions, 508 deletions
diff --git a/global.json b/global.json
index 9181db6f..fc26eb6e 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0203" 3 "WixToolset.Sdk": "4.0.0-build-0206"
4 } 4 }
5} 5}
diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index f01417b6..4196aa80 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -63,7 +63,7 @@
63 </ItemGroup> 63 </ItemGroup>
64 64
65 <ItemGroup> 65 <ItemGroup>
66 <PackageReference Include="WixToolset.Dutil" Version="4.0.64" /> 66 <PackageReference Include="WixToolset.Dutil" Version="4.0.65" />
67 <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" /> 67 <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
68 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> 68 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
69 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> 69 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
@@ -1,6 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 1<!--
2
3<!--
4This file contains the declaration of all the localizable strings. 2This file contains the declaration of all the localizable strings.
5--> 3-->
6<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> 4<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
index 082ac4cc..ace73680 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
@@ -8,10 +8,8 @@
8 </Package> 8 </Package>
9 9
10 <Fragment> 10 <Fragment>
11 <Directory Id="TARGETDIR" Name="SourceDir"> 11 <StandardDirectory Id="ProgramFilesFolder">
12 <Directory Id="ProgramFilesFolder">
13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 12 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14 </Directory> 13 </StandardDirectory>
15 </Directory> 14 </Fragment>
16 </Fragment>
17</Wix> 15</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
index 21c92f26..a1c806d9 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
@@ -1,6 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
4 <Fragment> 2 <Fragment>
5 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> 3 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
6 <Component> 4 <Component>
diff --git a/src/wixlib/NetCore3.1.12_x64.wxs b/src/wixlib/NetCore3.1.12_x64.wxs
index e984468f..990dc0bf 100644
--- a/src/wixlib/NetCore3.1.12_x64.wxs
+++ b/src/wixlib/NetCore3.1.12_x64.wxs
@@ -1,8 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 4
7 <?define NetCorePlatform = x64?> 5 <?define NetCorePlatform = x64?>
8 <?define NetCoreIdVersion = 3112?> 6 <?define NetCoreIdVersion = 3112?>
@@ -22,26 +20,8 @@
22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> 20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
23 21
24 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 22 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage 23 <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)">
26 InstallArguments="$(var.AspNetCoreRedistInstallArguments)" 24 <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="5CE9839CAE90FB2936033431F2905E97C7DC080DC50108D58714939CCCC6A265694B8259A3BF742A68BF04D9CFFB0602B0306DD401C4CE644BDB96C7D1168E59" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
27 RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
28 UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
29 PerMachine="yes"
30 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
31 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
32 Id="$(var.AspNetCoreRedistId)"
33 Vital="yes"
34 Permanent="yes"
35 Protocol="burn"
36 LogPathVariable="$(var.AspNetCoreRedistLog)">
37 <ExePackagePayload
38 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
39 DownloadUrl="$(var.AspNetCoreRedistLink)"
40 Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
41 Hash="5CE9839CAE90FB2936033431F2905E97C7DC080DC50108D58714939CCCC6A265694B8259A3BF742A68BF04D9CFFB0602B0306DD401C4CE644BDB96C7D1168E59"
42 ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
43 Size="7841808"
44 Version="3.1.12.21070" />
45 </ExePackage> 25 </ExePackage>
46 </PackageGroup> 26 </PackageGroup>
47 </Fragment> 27 </Fragment>
@@ -55,26 +35,8 @@
55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> 35 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
56 36
57 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 37 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
58 <ExePackage 38 <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)">
59 InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" 39 <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Hash="CD69B8722B2FF175FADD6774AB6A97F89292FC57A15CEC95218E79FFF1E26F46A7EFFFB15CE0F6D22B83B991F7083BB5C04F5158F87D298EA0F204933F8ECD27" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Size="54284816" Version="3.1.12.29719" />
60 RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
61 UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
62 PerMachine="yes"
63 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
64 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
65 Id="$(var.DesktopNetCoreRedistId)"
66 Vital="yes"
67 Permanent="yes"
68 Protocol="burn"
69 LogPathVariable="$(var.DesktopNetCoreRedistLog)">
70 <ExePackagePayload
71 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
72 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
73 Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)"
74 Hash="CD69B8722B2FF175FADD6774AB6A97F89292FC57A15CEC95218E79FFF1E26F46A7EFFFB15CE0F6D22B83B991F7083BB5C04F5158F87D298EA0F204933F8ECD27"
75 ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)"
76 Size="54284816"
77 Version="3.1.12.29719" />
78 </ExePackage> 40 </ExePackage>
79 </PackageGroup> 41 </PackageGroup>
80 </Fragment> 42 </Fragment>
@@ -88,26 +50,8 @@
88 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> 50 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
89 51
90 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 52 <PackageGroup Id="$(var.DotNetCoreRedistId)">
91 <ExePackage 53 <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)">
92 InstallArguments="$(var.DotNetCoreRedistInstallArguments)" 54 <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x64)" Hash="9B3F882AE5DFDC8B50D3CEC4F3292292D658B2FECB84B3F73426FB3C16E6FC6B8E7118EF559CFAE25ED7A2C175FA4D89E18986CA3C05D15F706524FBB667F702" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)" Size="26090616" Version="3.1.12.29719" />
93 RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
94 UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
95 PerMachine="yes"
96 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
97 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
98 Id="$(var.DotNetCoreRedistId)"
99 Vital="yes"
100 Permanent="yes"
101 Protocol="burn"
102 LogPathVariable="$(var.DotNetCoreRedistLog)">
103 <ExePackagePayload
104 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105 DownloadUrl="$(var.DotNetCoreRedistLink)"
106 Description="Microsoft .NET Core Runtime - 3.1.12 (x64)"
107 Hash="9B3F882AE5DFDC8B50D3CEC4F3292292D658B2FECB84B3F73426FB3C16E6FC6B8E7118EF559CFAE25ED7A2C175FA4D89E18986CA3C05D15F706524FBB667F702"
108 ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)"
109 Size="26090616"
110 Version="3.1.12.29719" />
111 </ExePackage> 55 </ExePackage>
112 </PackageGroup> 56 </PackageGroup>
113 </Fragment> 57 </Fragment>
diff --git a/src/wixlib/NetCore3.1.12_x86.wxs b/src/wixlib/NetCore3.1.12_x86.wxs
index 727336fe..b6d5d371 100644
--- a/src/wixlib/NetCore3.1.12_x86.wxs
+++ b/src/wixlib/NetCore3.1.12_x86.wxs
@@ -1,8 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 4
7 <?define NetCorePlatform = x86?> 5 <?define NetCorePlatform = x86?>
8 <?define NetCoreIdVersion = 3112?> 6 <?define NetCoreIdVersion = 3112?>
@@ -22,26 +20,8 @@
22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> 20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
23 21
24 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 22 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage 23 <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)">
26 InstallArguments="$(var.AspNetCoreRedistInstallArguments)" 24 <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="03EE5F6D3B2AF8FFE2A5154BB05E50938E2D36E98D996D9E67A3C349DD0C8B3051D5A9628F48C51E006CEA0B1F4484B4BE51920FE5CA841060B0D2C6A12FD5D2" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
27 RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
28 UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
29 PerMachine="yes"
30 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
31 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
32 Id="$(var.AspNetCoreRedistId)"
33 Vital="yes"
34 Permanent="yes"
35 Protocol="burn"
36 LogPathVariable="$(var.AspNetCoreRedistLog)">
37 <ExePackagePayload
38 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
39 DownloadUrl="$(var.AspNetCoreRedistLink)"
40 Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
41 Hash="03EE5F6D3B2AF8FFE2A5154BB05E50938E2D36E98D996D9E67A3C349DD0C8B3051D5A9628F48C51E006CEA0B1F4484B4BE51920FE5CA841060B0D2C6A12FD5D2"
42 ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
43 Size="7841808"
44 Version="3.1.12.21070" />
45 </ExePackage> 25 </ExePackage>
46 </PackageGroup> 26 </PackageGroup>
47 </Fragment> 27 </Fragment>
@@ -55,26 +35,8 @@
55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> 35 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
56 36
57 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 37 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
58 <ExePackage 38 <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)">
59 InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" 39 <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Hash="C211A7F29D9B6FEEFCF0379B153FFBFB815157D3D494CFD7D0D84D619701EEA284BF12502094BCFF2BB2968213190454E7CE0E865FD623E78C2FCDAEBEF963DA" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Size="48590696" Version="3.1.12.29719" />
60 RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
61 UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
62 PerMachine="yes"
63 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
64 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
65 Id="$(var.DesktopNetCoreRedistId)"
66 Vital="yes"
67 Permanent="yes"
68 Protocol="burn"
69 LogPathVariable="$(var.DesktopNetCoreRedistLog)">
70 <ExePackagePayload
71 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
72 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
73 Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)"
74 Hash="C211A7F29D9B6FEEFCF0379B153FFBFB815157D3D494CFD7D0D84D619701EEA284BF12502094BCFF2BB2968213190454E7CE0E865FD623E78C2FCDAEBEF963DA"
75 ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)"
76 Size="48590696"
77 Version="3.1.12.29719" />
78 </ExePackage> 40 </ExePackage>
79 </PackageGroup> 41 </PackageGroup>
80 </Fragment> 42 </Fragment>
@@ -88,26 +50,8 @@
88 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> 50 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
89 51
90 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 52 <PackageGroup Id="$(var.DotNetCoreRedistId)">
91 <ExePackage 53 <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)">
92 InstallArguments="$(var.DotNetCoreRedistInstallArguments)" 54 <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x86)" Hash="BA18F9028B19630D91017BEACCD8D79388125C228A83B5A62306108F3BB283617A7ED9B98785BC73192EC00E5D186DA767E940DCAB388699FAF274E437D0C16F" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)" Size="23392184" Version="3.1.12.29719" />
93 RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
94 UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
95 PerMachine="yes"
96 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
97 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
98 Id="$(var.DotNetCoreRedistId)"
99 Vital="yes"
100 Permanent="yes"
101 Protocol="burn"
102 LogPathVariable="$(var.DotNetCoreRedistLog)">
103 <ExePackagePayload
104 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105 DownloadUrl="$(var.DotNetCoreRedistLink)"
106 Description="Microsoft .NET Core Runtime - 3.1.12 (x86)"
107 Hash="BA18F9028B19630D91017BEACCD8D79388125C228A83B5A62306108F3BB283617A7ED9B98785BC73192EC00E5D186DA767E940DCAB388699FAF274E437D0C16F"
108 ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)"
109 Size="23392184"
110 Version="3.1.12.29719" />
111 </ExePackage> 55 </ExePackage>
112 </PackageGroup> 56 </PackageGroup>
113 </Fragment> 57 </Fragment>
diff --git a/src/wixlib/NetCore3.1_x64.wxs b/src/wixlib/NetCore3.1_x64.wxs
index 7c283de1..60d7c27f 100644
--- a/src/wixlib/NetCore3.1_x64.wxs
+++ b/src/wixlib/NetCore3.1_x64.wxs
@@ -1,8 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 4
7 <Fragment> 5 <Fragment>
8 <PackageGroup Id="AspNetCoreRuntime31Redist_x64"> 6 <PackageGroup Id="AspNetCoreRuntime31Redist_x64">
diff --git a/src/wixlib/NetCore3.1_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs
index 751d364d..cfff07b3 100644
--- a/src/wixlib/NetCore3.1_x86.wxs
+++ b/src/wixlib/NetCore3.1_x86.wxs
@@ -1,8 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 4
7 <Fragment> 5 <Fragment>
8 <PackageGroup Id="AspNetCoreRuntime31Redist_x86"> 6 <PackageGroup Id="AspNetCoreRuntime31Redist_x86">
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>
diff --git a/src/wixlib/NetCoreShared.wxs b/src/wixlib/NetCoreShared.wxs
index 540eae6a..0332041a 100644
--- a/src/wixlib/NetCoreShared.wxs
+++ b/src/wixlib/NetCoreShared.wxs
@@ -1,20 +1,11 @@
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<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 <?foreach PLATFORM in x86;x64?> 6 <?foreach PLATFORM in x86;x64?>
9 <Fragment> 7 <Fragment>
10 <util:RegistrySearch 8 <util:RegistrySearch Id="DOTNETHOME_$(var.PLATFORM)" Variable="DOTNETHOME_$(var.PLATFORM)" Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)" Value="InstallLocation" Result="value" Bitness="always32" />
11 Id="DOTNETHOME_$(var.PLATFORM)"
12 Variable="DOTNETHOME_$(var.PLATFORM)"
13 Root="HKLM"
14 Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)"
15 Value="InstallLocation"
16 Result="value"
17 Bitness="always32" />
18 </Fragment> 9 </Fragment>
19 <?endforeach?> 10 <?endforeach?>
20</Wix> 11</Wix>
diff --git a/src/wixlib/NetFx1.1.wxs b/src/wixlib/NetFx1.1.wxs
index 406aef3f..12f0a4e3 100644
--- a/src/wixlib/NetFx1.1.wxs
+++ b/src/wixlib/NetFx1.1.wxs
@@ -1,5 +1,4 @@
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">
diff --git a/src/wixlib/NetFx1.wxs b/src/wixlib/NetFx1.wxs
index c1b266e8..68d6f13d 100644
--- a/src/wixlib/NetFx1.wxs
+++ b/src/wixlib/NetFx1.wxs
@@ -1,5 +1,4 @@
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">
diff --git a/src/wixlib/NetFx2.wxs b/src/wixlib/NetFx2.wxs
index 9ca358f1..e5eef54b 100644
--- a/src/wixlib/NetFx2.wxs
+++ b/src/wixlib/NetFx2.wxs
@@ -1,5 +1,4 @@
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">
diff --git a/src/wixlib/NetFx3.5.wxs b/src/wixlib/NetFx3.5.wxs
index 7544e433..c1a80f50 100644
--- a/src/wixlib/NetFx3.5.wxs
+++ b/src/wixlib/NetFx3.5.wxs
@@ -1,5 +1,4 @@
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" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
@@ -15,13 +14,7 @@
15 14
16 <!-- Indicates the service pack level for the .NET Framework 3.5 (for bundles). --> 15 <!-- Indicates the service pack level for the .NET Framework 3.5 (for bundles). -->
17 <Fragment> 16 <Fragment>
18 <util:RegistrySearch 17 <util:RegistrySearch Id="NETFRAMEWORK35_SP_LEVEL" Variable="NETFRAMEWORK35_SP_LEVEL" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5" Value="SP" Result="value" />
19 Id="NETFRAMEWORK35_SP_LEVEL"
20 Variable="NETFRAMEWORK35_SP_LEVEL"
21 Root="HKLM"
22 Key="Software\Microsoft\NET Framework Setup\NDP\v3.5"
23 Value="SP"
24 Result="value" />
25 </Fragment> 18 </Fragment>
26 19
27 <!-- set to #1 if the .NET Framework 3.5 is installed (not set otherwise) --> 20 <!-- set to #1 if the .NET Framework 3.5 is installed (not set otherwise) -->
diff --git a/src/wixlib/NetFx3.wxs b/src/wixlib/NetFx3.wxs
index ee5dbdb3..5fb279ea 100644
--- a/src/wixlib/NetFx3.wxs
+++ b/src/wixlib/NetFx3.wxs
@@ -1,5 +1,4 @@
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">
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs
index 9f09e663..443235d4 100644
--- a/src/wixlib/NetFx4.5.wxs
+++ b/src/wixlib/NetFx4.5.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
@@ -27,13 +25,7 @@
27 </Fragment> 25 </Fragment>
28 26
29 <Fragment> 27 <Fragment>
30 <util:RegistrySearch 28 <util:RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Result="value" />
31 Id="NETFRAMEWORK45"
32 Variable="NETFRAMEWORK45"
33 Root="HKLM"
34 Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
35 Value="Release"
36 Result="value" />
37 </Fragment> 29 </Fragment>
38 30
39 <!-- set to Release number of the .NET Framework 4.5 if installed (not set otherwise) --> 31 <!-- set to Release number of the .NET Framework 4.5 if installed (not set otherwise) -->
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) -->
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs
index 08a9b4f2..88363555 100644
--- a/src/wixlib/NetFx451.wxs
+++ b/src/wixlib/NetFx451.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">
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
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs
index 0e2ad0d6..33f79db4 100644
--- a/src/wixlib/NetFx452.wxs
+++ b/src/wixlib/NetFx452.wxs
@@ -1,9 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix 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">
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7 4
8 <!-- 5 <!--
9 .NET Framework installation state properties 6 .NET Framework installation state properties
@@ -34,25 +31,8 @@
34 <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" /> 31 <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
35 32
36 <PackageGroup Id="$(var.NetFx452WebId)"> 33 <PackageGroup Id="$(var.NetFx452WebId)">
37 <ExePackage 34 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog">
38 InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" 35 <ExePackagePayload Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" DownloadUrl="$(var.NetFx452WebLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" ProductName="Microsoft .NET Framework 4.5.2" Size="1118920" Version="4.5.51209.34209" />
39 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullWebLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx452WebDetectCondition)"
42 InstallCondition="!(wix.NetFx452WebInstallCondition)"
43 Id="$(var.NetFx452WebId)"
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 LogPathVariable="NetFx452FullWebLog">
48 <ExePackagePayload
49 Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe"
50 DownloadUrl="$(var.NetFx452WebLink)"
51 Description="Microsoft .NET Framework 4.5.2 Setup"
52 Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E"
53 ProductName="Microsoft .NET Framework 4.5.2"
54 Size="1118920"
55 Version="4.5.51209.34209" />
56 </ExePackage> 36 </ExePackage>
57 </PackageGroup> 37 </PackageGroup>
58 </Fragment> 38 </Fragment>
@@ -73,25 +53,8 @@
73 <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" /> 53 <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
74 54
75 <PackageGroup Id="$(var.NetFx452RedistId)"> 55 <PackageGroup Id="$(var.NetFx452RedistId)">
76 <ExePackage 56 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog">
77 InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" 57 <ExePackagePayload Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx452RedistLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" ProductName="Microsoft .NET Framework 4.5.2" Size="69999448" Version="4.5.51209.34209" />
78 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx452RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx452RedistInstallCondition)"
82 Id="$(var.NetFx452RedistId)"
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 LogPathVariable="NetFx452FullLog">
87 <ExePackagePayload
88 Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx452RedistLink)"
90 Description="Microsoft .NET Framework 4.5.2 Setup"
91 Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D"
92 ProductName="Microsoft .NET Framework 4.5.2"
93 Size="69999448"
94 Version="4.5.51209.34209" />
95 </ExePackage> 58 </ExePackage>
96 </PackageGroup> 59 </PackageGroup>
97 </Fragment> 60 </Fragment>
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs
index c33c1df4..cb53be2e 100644
--- a/src/wixlib/NetFx46.wxs
+++ b/src/wixlib/NetFx46.wxs
@@ -1,10 +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: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 <!-- 6 <!--
10 .NET Framework installation state properties 7 .NET Framework installation state properties
@@ -35,25 +32,8 @@
35 <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" /> 32 <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" />
36 33
37 <PackageGroup Id="$(var.NetFx46WebId)"> 34 <PackageGroup Id="$(var.NetFx46WebId)">
38 <ExePackage 35 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46WebDetectCondition)" InstallCondition="!(wix.NetFx46WebInstallCondition)" Id="$(var.NetFx46WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog">
39 InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" 36 <ExePackagePayload Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe" DownloadUrl="$(var.NetFx46WebLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205" ProductName="Microsoft .NET Framework 4.6" Size="1497400" Version="4.6.81.0" />
40 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;"
41 PerMachine="yes"
42 DetectCondition="!(wix.NetFx46WebDetectCondition)"
43 InstallCondition="!(wix.NetFx46WebInstallCondition)"
44 Id="$(var.NetFx46WebId)"
45 Vital="yes"
46 Permanent="yes"
47 Protocol="netfx4"
48 LogPathVariable="NetFx46FullLog">
49 <ExePackagePayload
50 Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe"
51 DownloadUrl="$(var.NetFx46WebLink)"
52 Description="Microsoft .NET Framework 4.6 Setup"
53 Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205"
54 ProductName="Microsoft .NET Framework 4.6"
55 Size="1497400"
56 Version="4.6.81.0" />
57 </ExePackage> 37 </ExePackage>
58 </PackageGroup> 38 </PackageGroup>
59 </Fragment> 39 </Fragment>
@@ -74,25 +54,8 @@
74 <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" /> 54 <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" />
75 55
76 <PackageGroup Id="$(var.NetFx46RedistId)"> 56 <PackageGroup Id="$(var.NetFx46RedistId)">
77 <ExePackage 57 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46RedistDetectCondition)" InstallCondition="!(wix.NetFx46RedistInstallCondition)" Id="$(var.NetFx46RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog">
78 InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" 58 <ExePackagePayload Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx46RedistLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E" ProductName="Microsoft .NET Framework 4.6" Size="65444688" Version="4.6.81.0" />
79 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;"
80 PerMachine="yes"
81 DetectCondition="!(wix.NetFx46RedistDetectCondition)"
82 InstallCondition="!(wix.NetFx46RedistInstallCondition)"
83 Id="$(var.NetFx46RedistId)"
84 Vital="yes"
85 Permanent="yes"
86 Protocol="netfx4"
87 LogPathVariable="NetFx46FullLog">
88 <ExePackagePayload
89 Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe"
90 DownloadUrl="$(var.NetFx46RedistLink)"
91 Description="Microsoft .NET Framework 4.6 Setup"
92 Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E"
93 ProductName="Microsoft .NET Framework 4.6"
94 Size="65444688"
95 Version="4.6.81.0" />
96 </ExePackage> 59 </ExePackage>
97 </PackageGroup> 60 </PackageGroup>
98 </Fragment> 61 </Fragment>
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs
index cf9d3d60..95cc2876 100644
--- a/src/wixlib/NetFx461.wxs
+++ b/src/wixlib/NetFx461.wxs
@@ -1,9 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix 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">
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7 4
8 <!-- 5 <!--
9 .NET Framework installation state properties 6 .NET Framework installation state properties
@@ -34,25 +31,8 @@
34 <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" /> 31 <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" />
35 32
36 <PackageGroup Id="$(var.NetFx461WebId)"> 33 <PackageGroup Id="$(var.NetFx461WebId)">
37 <ExePackage 34 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461WebDetectCondition)" InstallCondition="!(wix.NetFx461WebInstallCondition)" Id="$(var.NetFx461WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog">
38 InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" 35 <ExePackagePayload Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe" DownloadUrl="$(var.NetFx461WebLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E" ProductName="Microsoft .NET Framework 4.6.1" Size="1424328" Version="4.6.1055.0" />
39 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx461WebDetectCondition)"
42 InstallCondition="!(wix.NetFx461WebInstallCondition)"
43 Id="$(var.NetFx461WebId)"
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 LogPathVariable="NetFx461FullLog">
48 <ExePackagePayload
49 Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe"
50 DownloadUrl="$(var.NetFx461WebLink)"
51 Description="Microsoft .NET Framework 4.6.1 Setup"
52 Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E"
53 ProductName="Microsoft .NET Framework 4.6.1"
54 Size="1424328"
55 Version="4.6.1055.0" />
56 </ExePackage> 36 </ExePackage>
57 </PackageGroup> 37 </PackageGroup>
58 </Fragment> 38 </Fragment>
@@ -73,25 +53,8 @@
73 <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" /> 53 <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />
74 54
75 <PackageGroup Id="$(var.NetFx461RedistId)"> 55 <PackageGroup Id="$(var.NetFx461RedistId)">
76 <ExePackage 56 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461RedistDetectCondition)" InstallCondition="!(wix.NetFx461RedistInstallCondition)" Id="$(var.NetFx461RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog">
77 InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" 57 <ExePackagePayload Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx461RedistLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F" ProductName="Microsoft .NET Framework 4.6.1" Size="67681000" Version="4.6.1055.0" />
78 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx461RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx461RedistInstallCondition)"
82 Id="$(var.NetFx461RedistId)"
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 LogPathVariable="NetFx461FullLog">
87 <ExePackagePayload
88 Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx461RedistLink)"
90 Description="Microsoft .NET Framework 4.6.1 Setup"
91 Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F"
92 ProductName="Microsoft .NET Framework 4.6.1"
93 Size="67681000"
94 Version="4.6.1055.0" />
95 </ExePackage> 58 </ExePackage>
96 </PackageGroup> 59 </PackageGroup>
97 </Fragment> 60 </Fragment>
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs
index 22cb70c9..52cd5b14 100644
--- a/src/wixlib/NetFx462.wxs
+++ b/src/wixlib/NetFx462.wxs
@@ -1,9 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix 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">
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7 4
8 <!-- 5 <!--
9 .NET Framework installation state properties 6 .NET Framework installation state properties
@@ -34,25 +31,8 @@
34 <WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" /> 31 <WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" />
35 32
36 <PackageGroup Id="$(var.NetFx462WebId)"> 33 <PackageGroup Id="$(var.NetFx462WebId)">
37 <ExePackage 34 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462WebDetectCondition)" InstallCondition="!(wix.NetFx462WebInstallCondition)" Id="$(var.NetFx462WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
38 InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" 35 <ExePackagePayload Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe" DownloadUrl="$(var.NetFx462WebLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472" ProductName="Microsoft .NET Framework 4.6.2" Size="1429344" Version="4.6.1590.0" />
39 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx462WebDetectCondition)"
42 InstallCondition="!(wix.NetFx462WebInstallCondition)"
43 Id="$(var.NetFx462WebId)"
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 LogPathVariable="NetFx462FullLog">
48 <ExePackagePayload
49 Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe"
50 DownloadUrl="$(var.NetFx462WebLink)"
51 Description="Microsoft .NET Framework 4.6.2 Setup"
52 Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472"
53 ProductName="Microsoft .NET Framework 4.6.2"
54 Size="1429344"
55 Version="4.6.1590.0" />
56 </ExePackage> 36 </ExePackage>
57 </PackageGroup> 37 </PackageGroup>
58 </Fragment> 38 </Fragment>
@@ -73,25 +53,8 @@
73 <WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" /> 53 <WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" />
74 54
75 <PackageGroup Id="$(var.NetFx462RedistId)"> 55 <PackageGroup Id="$(var.NetFx462RedistId)">
76 <ExePackage 56 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462RedistDetectCondition)" InstallCondition="!(wix.NetFx462RedistInstallCondition)" Id="$(var.NetFx462RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
77 InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" 57 <ExePackagePayload Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx462RedistLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E" ProductName="Microsoft .NET Framework 4.6.2" Size="62008080" Version="4.6.1590.0" />
78 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx462RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx462RedistInstallCondition)"
82 Id="$(var.NetFx462RedistId)"
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 LogPathVariable="NetFx462FullLog">
87 <ExePackagePayload
88 Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx462RedistLink)"
90 Description="Microsoft .NET Framework 4.6.2 Setup"
91 Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E"
92 ProductName="Microsoft .NET Framework 4.6.2"
93 Size="62008080"
94 Version="4.6.1590.0" />
95 </ExePackage> 58 </ExePackage>
96 </PackageGroup> 59 </PackageGroup>
97 </Fragment> 60 </Fragment>
diff --git a/src/wixlib/NetFx47.wxs b/src/wixlib/NetFx47.wxs
index 277f466e..84f4a221 100644
--- a/src/wixlib/NetFx47.wxs
+++ b/src/wixlib/NetFx47.wxs
@@ -1,8 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 4
7 <!-- 5 <!--
8 .NET Framework installation state properties 6 .NET Framework installation state properties
diff --git a/src/wixlib/NetFx471.wxs b/src/wixlib/NetFx471.wxs
index c5399ce0..b5f825ab 100644
--- a/src/wixlib/NetFx471.wxs
+++ b/src/wixlib/NetFx471.wxs
@@ -1,8 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 4
7 <!-- 5 <!--
8 .NET Framework installation state properties 6 .NET Framework installation state properties
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs
index 35a3453a..1a47a3cc 100644
--- a/src/wixlib/NetFx472.wxs
+++ b/src/wixlib/NetFx472.wxs
@@ -1,9 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix 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">
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7 4
8 <!-- 5 <!--
9 .NET Framework installation state properties 6 .NET Framework installation state properties
@@ -32,25 +29,8 @@
32 <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" /> 29 <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
33 30
34 <PackageGroup Id="$(var.NetFx472WebId)"> 31 <PackageGroup Id="$(var.NetFx472WebId)">
35 <ExePackage 32 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472WebDetectCondition)" InstallCondition="!(wix.NetFx472WebInstallCondition)" Id="$(var.NetFx472WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472WebLog">
36 InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;" 33 <ExePackagePayload Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe" DownloadUrl="$(var.NetFx472WebLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="37006954E3AFE07FB02D24894CC34794618B78C27A1B514818985B6CC1FA3E896ED99BA2E4AAC3F6469D263819BD94EE70E7113946C51BA83C93B74826FC8FA8" ProductName="Microsoft .NET Framework 4.7.2" Size="1432848" Version="4.7.3081.0" />
37 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472WebLog].html&quot;"
38 PerMachine="yes"
39 DetectCondition="!(wix.NetFx472WebDetectCondition)"
40 InstallCondition="!(wix.NetFx472WebInstallCondition)"
41 Id="$(var.NetFx472WebId)"
42 Vital="yes"
43 Permanent="yes"
44 Protocol="netfx4"
45 LogPathVariable="NetFx472WebLog">
46 <ExePackagePayload
47 Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe"
48 DownloadUrl="$(var.NetFx472WebLink)"
49 Description="Microsoft .NET Framework 4.7.2 Setup"
50 Hash="37006954E3AFE07FB02D24894CC34794618B78C27A1B514818985B6CC1FA3E896ED99BA2E4AAC3F6469D263819BD94EE70E7113946C51BA83C93B74826FC8FA8"
51 ProductName="Microsoft .NET Framework 4.7.2"
52 Size="1432848"
53 Version="4.7.3081.0" />
54 </ExePackage> 34 </ExePackage>
55 </PackageGroup> 35 </PackageGroup>
56 </Fragment> 36 </Fragment>
@@ -71,25 +51,8 @@
71 <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" /> 51 <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
72 52
73 <PackageGroup Id="$(var.NetFx472RedistId)"> 53 <PackageGroup Id="$(var.NetFx472RedistId)">
74 <ExePackage 54 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472RedistDetectCondition)" InstallCondition="!(wix.NetFx472RedistInstallCondition)" Id="$(var.NetFx472RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472RedistLog">
75 InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;" 55 <ExePackagePayload Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx472RedistLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="36F295ED19A5BD5C5F05803BA26EFD17D419ABC7A791312AD011B63A4402492529AED0FB4D45FF1F74381079A310B33649C9C56C36E815B12E79ECD671897489" ProductName="Microsoft .NET Framework 4.7.2" Size="83943272" Version="4.7.3081.0" />
76 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472RedistLog].html&quot;"
77 PerMachine="yes"
78 DetectCondition="!(wix.NetFx472RedistDetectCondition)"
79 InstallCondition="!(wix.NetFx472RedistInstallCondition)"
80 Id="$(var.NetFx472RedistId)"
81 Vital="yes"
82 Permanent="yes"
83 Protocol="netfx4"
84 LogPathVariable="NetFx472RedistLog">
85 <ExePackagePayload
86 Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe"
87 DownloadUrl="$(var.NetFx472RedistLink)"
88 Description="Microsoft .NET Framework 4.7.2 Setup"
89 Hash="36F295ED19A5BD5C5F05803BA26EFD17D419ABC7A791312AD011B63A4402492529AED0FB4D45FF1F74381079A310B33649C9C56C36E815B12E79ECD671897489"
90 ProductName="Microsoft .NET Framework 4.7.2"
91 Size="83943272"
92 Version="4.7.3081.0" />
93 </ExePackage> 56 </ExePackage>
94 </PackageGroup> 57 </PackageGroup>
95 </Fragment> 58 </Fragment>
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index a48fe4cf..4958c647 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.wxs
@@ -1,9 +1,6 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix 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">
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7 4
8 <!-- 5 <!--
9 .NET Framework installation state properties 6 .NET Framework installation state properties
@@ -32,25 +29,8 @@
32 <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" /> 29 <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
33 30
34 <PackageGroup Id="$(var.NetFx48WebId)"> 31 <PackageGroup Id="$(var.NetFx48WebId)">
35 <ExePackage 32 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48WebDetectCondition)" InstallCondition="!(wix.NetFx48WebInstallCondition)" Id="$(var.NetFx48WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48WebLog">
36 InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" 33 <ExePackagePayload Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" DownloadUrl="$(var.NetFx48WebLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21" ProductName="Microsoft .NET Framework 4.8" Size="1479400" Version="4.8.3928.0" />
37 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48WebLog].html&quot;"
38 PerMachine="yes"
39 DetectCondition="!(wix.NetFx48WebDetectCondition)"
40 InstallCondition="!(wix.NetFx48WebInstallCondition)"
41 Id="$(var.NetFx48WebId)"
42 Vital="yes"
43 Permanent="yes"
44 Protocol="netfx4"
45 LogPathVariable="NetFx48WebLog">
46 <ExePackagePayload
47 Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"
48 DownloadUrl="$(var.NetFx48WebLink)"
49 Description="Microsoft .NET Framework 4.8 Setup"
50 Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21"
51 ProductName="Microsoft .NET Framework 4.8"
52 Size="1479400"
53 Version="4.8.3928.0" />
54 </ExePackage> 34 </ExePackage>
55 </PackageGroup> 35 </PackageGroup>
56 </Fragment> 36 </Fragment>
@@ -71,25 +51,8 @@
71 <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" /> 51 <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
72 52
73 <PackageGroup Id="$(var.NetFx48RedistId)"> 53 <PackageGroup Id="$(var.NetFx48RedistId)">
74 <ExePackage 54 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog">
75 InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;" 55 <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E" ProductName="Microsoft .NET Framework 4.8" Size="117380440" Version="4.8.3928.0" />
76 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48RedistLog].html&quot;"
77 PerMachine="yes"
78 DetectCondition="!(wix.NetFx48RedistDetectCondition)"
79 InstallCondition="!(wix.NetFx48RedistInstallCondition)"
80 Id="$(var.NetFx48RedistId)"
81 Vital="yes"
82 Permanent="yes"
83 Protocol="netfx4"
84 LogPathVariable="NetFx48RedistLog">
85 <ExePackagePayload
86 Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"
87 DownloadUrl="$(var.NetFx48RedistLink)"
88 Description="Microsoft .NET Framework 4.8 Setup"
89 Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E"
90 ProductName="Microsoft .NET Framework 4.8"
91 Size="117380440"
92 Version="4.8.3928.0" />
93 </ExePackage> 56 </ExePackage>
94 </PackageGroup> 57 </PackageGroup>
95 </Fragment> 58 </Fragment>
diff --git a/src/wixlib/NetFxExtension.wxs b/src/wixlib/NetFxExtension.wxs
index b64dc004..63c79235 100644
--- a/src/wixlib/NetFxExtension.wxs
+++ b/src/wixlib/NetFxExtension.wxs
@@ -1,5 +1,4 @@
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">
diff --git a/src/wixlib/NetFxExtension_arm64.wxs b/src/wixlib/NetFxExtension_arm64.wxs
index 8b1f9d36..a0492fde 100644
--- a/src/wixlib/NetFxExtension_arm64.wxs
+++ b/src/wixlib/NetFxExtension_arm64.wxs
@@ -1,5 +1,4 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/NetFxExtension_x64.wxs b/src/wixlib/NetFxExtension_x64.wxs
index cc079e5a..81c9d768 100644
--- a/src/wixlib/NetFxExtension_x64.wxs
+++ b/src/wixlib/NetFxExtension_x64.wxs
@@ -1,5 +1,4 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/NetFxExtension_x86.wxs b/src/wixlib/NetFxExtension_x86.wxs
index 7245a4dd..b8ad1927 100644
--- a/src/wixlib/NetFxExtension_x86.wxs
+++ b/src/wixlib/NetFxExtension_x86.wxs
@@ -1,5 +1,4 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-29 13:17:56 +0000