aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-10-17 16:56:52 -0500
committerGitHub <noreply@github.com>2020-10-17 16:56:52 -0500
commit3a7ce8761489aca2f5a93c0c80ace7ef8ba3397f (patch)
treea343c2d6e93b9e80521e3bf3ff37027caa47a527 /src
parent22825f603eabf92103852de2b9a55431883ffbaf (diff)
parent9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7 (diff)
downloadwix-3a7ce8761489aca2f5a93c0c80ace7ef8ba3397f.tar.gz
wix-3a7ce8761489aca2f5a93c0c80ace7ef8ba3397f.tar.bz2
wix-3a7ce8761489aca2f5a93c0c80ace7ef8ba3397f.zip
Merge pull request #21 from japarson/dev/japarson/current_pack_def
Add package definitions for the latest version of .NET Core 3.1
Diffstat (limited to 'src')
-rw-r--r--src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs29
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs20
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs14
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs14
-rw-r--r--src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj3
-rw-r--r--src/wixlib/NetCore3.1.0_x64.wxs123
-rw-r--r--src/wixlib/NetCore3.1.0_x86.wxs123
-rw-r--r--src/wixlib/NetCore3.1.1_x64.wxs123
-rw-r--r--src/wixlib/NetCore3.1.1_x86.wxs123
-rw-r--r--src/wixlib/NetCore3.1.2_x64.wxs123
-rw-r--r--src/wixlib/NetCore3.1.2_x86.wxs123
-rw-r--r--src/wixlib/NetCore3.1.3_x64.wxs123
-rw-r--r--src/wixlib/NetCore3.1.3_x86.wxs123
-rw-r--r--src/wixlib/NetCore3.1.8_x64.wxs (renamed from src/wixlib/NetCore3.1.4_x64.wxs)106
-rw-r--r--src/wixlib/NetCore3.1.8_x86.wxs (renamed from src/wixlib/NetCore3.1.4_x86.wxs)106
-rw-r--r--src/wixlib/NetCore3.1_x64.wxs24
-rw-r--r--src/wixlib/NetCore3.1_x86.wxs24
17 files changed, 211 insertions, 1113 deletions
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8bcac8df..72d4a682 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -12,7 +12,7 @@ namespace WixToolsetTest.Netfx
12 public class NetfxExtensionFixture 12 public class NetfxExtensionFixture
13 { 13 {
14 [Fact] 14 [Fact]
15 public void CanBuildUsingDotNetCorePackages() 15 public void CanBuildUsingLatestDotNetCorePackages()
16 { 16 {
17 using (var fs = new DisposableFileSystem()) 17 using (var fs = new DisposableFileSystem())
18 { 18 {
@@ -24,7 +24,32 @@ namespace WixToolsetTest.Netfx
24 var compileResult = WixRunner.Execute(new[] 24 var compileResult = WixRunner.Execute(new[]
25 { 25 {
26 "build", 26 "build",
27 Path.Combine(bundleSourceFolder, "Bundle.wxs"), 27 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
28 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
29 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
30 "-intermediateFolder", intermediateFolder,
31 "-o", bundleFile,
32 });
33 compileResult.AssertSuccess();
34
35 Assert.True(File.Exists(bundleFile));
36 }
37 }
38
39 [Fact]
40 public void CanBuildUsingLatestDotNetCorePackages_X64()
41 {
42 using (var fs = new DisposableFileSystem())
43 {
44 var baseFolder = fs.GetFolder();
45 var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
46 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
47 var intermediateFolder = Path.Combine(baseFolder, "obj");
48
49 var compileResult = WixRunner.Execute(new[]
50 {
51 "build",
52 Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
28 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), 53 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
29 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), 54 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
30 "-intermediateFolder", intermediateFolder, 55 "-intermediateFolder", intermediateFolder,
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
deleted file mode 100644
index 7c008171..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4 <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
5 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
7 </BootstrapperApplicationRef>
8 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" />
11 <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
12 <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
13 <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
14 <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
15 <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
16 <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
17 <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
18 </Chain>
19 </Bundle>
20</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
new file mode 100644
index 00000000..49e8c022
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4 <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
5 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
7 </BootstrapperApplicationRef>
8 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
11 <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
12 </Chain>
13 </Bundle>
14</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
new file mode 100644
index 00000000..09c7bcdd
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4 <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
5 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
7 </BootstrapperApplicationRef>
8 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
11 <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
12 </Chain>
13 </Bundle>
14</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index cf7afa8b..4dea73da 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,7 +12,8 @@
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> 15 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" /> 17 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> 18 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> 19 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wixlib/NetCore3.1.0_x64.wxs b/src/wixlib/NetCore3.1.0_x64.wxs
deleted file mode 100644
index cda6aedf..00000000
--- a/src/wixlib/NetCore3.1.0_x64.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x64?>
8 <?define NetCoreIdVersion = 310?>
9 <?define NetCoreVersion = 3.1.0?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9f010da2-d510-4271-8dcc-ad92b8b9b767/d2dd394046c20e0563ce5c45c356653f/dotnet-runtime-3.1.0-win-x64.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
42 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
43 Description="Microsoft .NET Core Runtime - 3.1.0 (x64)"
44 Hash="DDA7CD0E851E742ACA43EFBD1361CDB382771E21"
45 ProductName="Microsoft .NET Core Runtime - 3.1.0 (x64)"
46 Size="26061496"
47 Version="3.1.0.28315" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
78 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
79 Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
80 Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
81 ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
82 Size="7811768"
83 Version="3.1.0.19566" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
114 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
115 Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
116 Hash="C16F271754879BA78868947486F37871C9F0E40F"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
118 Size="54443856"
119 Version="3.1.0.28315" />
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.0_x86.wxs b/src/wixlib/NetCore3.1.0_x86.wxs
deleted file mode 100644
index 92da9266..00000000
--- a/src/wixlib/NetCore3.1.0_x86.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x86?>
8 <?define NetCoreIdVersion = 310?>
9 <?define NetCoreVersion = 3.1.0?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/74ed410a-d452-4057-bb89-befeccf34b2b/e11a376951914e197c50528e5b20e2ef/aspnetcore-runtime-3.1.0-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/e93147bb-7654-46d6-954a-bbd54da63b9b/cbdba4605fd04dc3886ca772d3953c53/windowsdesktop-runtime-3.1.0-win-x86.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/04356520-4cf7-4e98-b4a8-b3043e2eeca3/cdf6d3d104334dfe8f471fe135f16b07/dotnet-runtime-3.1.0-win-x86.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
42 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
43 Description="Microsoft .NET Core Runtime - 3.1.0 (x86)"
44 Hash="CAF456ED2F229E5CE36CEAE5C752D7C69BB4CABD"
45 ProductName="Microsoft .NET Core Runtime - 3.1.0 (x86)"
46 Size="23318984"
47 Version="3.1.0.28315" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
78 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
79 Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
80 Hash="7616CD3453F253032DB7A56455A8429FAEC934C4"
81 ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
82 Size="7146408"
83 Version="3.1.0.19566" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
114 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
115 Description="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
116 Hash="96FF19C3F740EA1D49376462EE336F5E5CA0ED79"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
118 Size="48703304"
119 Version="3.1.0.28315" />
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.1_x64.wxs b/src/wixlib/NetCore3.1.1_x64.wxs
deleted file mode 100644
index 14adbea3..00000000
--- a/src/wixlib/NetCore3.1.1_x64.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x64?>
8 <?define NetCoreIdVersion = 311?>
9 <?define NetCoreVersion = 3.1.1?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fda71c5b-ee58-4919-95dc-4f32dbebd2cd/97ffe3880a25f5f7cae1a7e40cd3509e/dotnet-runtime-3.1.1-win-x64.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Description="Microsoft .NET Core Runtime - 3.1.1 (x64)"
44 Hash="B9E2166EDDEFAA4D7543F24A2E7CD76C35D4E617"
45 ProductName="Microsoft .NET Core Runtime - 3.1.1 (x64)"
46 Size="26055096"
47 Version="3.1.1.28408" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
80 Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
81 ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
82 Size="7867488"
83 Version="3.1.1.19615"/>
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
116 Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
118 Size="54211664"
119 Version="3.1.1.28408"/>
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.1_x86.wxs b/src/wixlib/NetCore3.1.1_x86.wxs
deleted file mode 100644
index 132f4349..00000000
--- a/src/wixlib/NetCore3.1.1_x86.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x86?>
8 <?define NetCoreIdVersion = 311?>
9 <?define NetCoreVersion = 3.1.1?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/b1298310-3170-4553-ba50-153e1def5747/00ba44679959c19a67bd36b8c1eb5220/aspnetcore-runtime-3.1.1-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/662153d9-58c5-4630-a326-ed9e4e342787/1deb6ba6a2a5f5f694b784a6859b446e/windowsdesktop-runtime-3.1.1-win-x86.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3a21bd9a-8040-4277-99d4-9de7fcda6d7c/c669f1662f140cbb41fdf0c9cba221a8/dotnet-runtime-3.1.1-win-x86.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Description="Microsoft .NET Core Runtime - 3.1.1 (x86)"
44 Hash="4790D3117F4D4F7AF63113BBECD3BF0E8C940C2A"
45 ProductName="Microsoft .NET Core Runtime - 3.1.1 (x86)"
46 Size="23327424"
47 Version="3.1.1.28408" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
80 Hash="65B4D07B6BA51BC7D0D1B82EC904893B8ACF639D"
81 ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
82 Size="7193600"
83 Version="3.1.1.19615" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 Description="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
116 Hash="A368E17FFEE5CEBFDFE981BC329CEFFACF4674CC"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
118 Size="48513144"
119 Version="3.1.1.28408" />
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.2_x64.wxs b/src/wixlib/NetCore3.1.2_x64.wxs
deleted file mode 100644
index e63f8117..00000000
--- a/src/wixlib/NetCore3.1.2_x64.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x64?>
8 <?define NetCoreIdVersion = 312?>
9 <?define NetCoreVersion = 3.1.2?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-win-x64.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/cfe420d5-084c-4590-b387-f89f3387d4c9/db4c577b995c54dee0530d8230e87145/dotnet-runtime-3.1.2-win-x64.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Description="Microsoft .NET Core Runtime - 3.1.2 (x64)"
44 Hash="6955F4851B42A533683824C65D7423AF22BC6710"
45 ProductName="Microsoft .NET Core Runtime - 3.1.2 (x64)"
46 Size="26066088"
47 Version="3.1.2.28517" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
80 Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
81 ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
82 Size="7812680"
83 Version="3.1.2.20068"/>
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
116 Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
118 Size="54323576"
119 Version="3.1.2.28517"/>
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.2_x86.wxs b/src/wixlib/NetCore3.1.2_x86.wxs
deleted file mode 100644
index 8f3c26d7..00000000
--- a/src/wixlib/NetCore3.1.2_x86.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x86?>
8 <?define NetCoreIdVersion = 312?>
9 <?define NetCoreVersion = 3.1.2?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2c8e520e-d705-4b11-8854-518546133e27/13354ed8b42d8c2c52f75d7acffd0be4/aspnetcore-runtime-3.1.2-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/b824906f-bd6e-4067-86a6-95c61620674d/cfcdab84a01cee94fdaa31271c3d4d47/windowsdesktop-runtime-3.1.2-win-x86.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/dfedf8a5-c3cd-4b69-a5eb-8f9994e810f7/feeead4b3ae3b9e003917797c8356675/dotnet-runtime-3.1.2-win-x86.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
44 Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
45 ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
46 Size="23298048"
47 Version="3.1.2.28517" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
80 Hash="302D15317C3D2D0B707EAC92D943A624BBDA14D9"
81 ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
82 Size="7128912"
83 Version="3.1.2.20068" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
116 Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
118 Size="48525928"
119 Version="3.1.2.28517" />
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.3_x64.wxs b/src/wixlib/NetCore3.1.3_x64.wxs
deleted file mode 100644
index 85887c84..00000000
--- a/src/wixlib/NetCore3.1.3_x64.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x64?>
8 <?define NetCoreIdVersion = 313?>
9 <?define NetCoreVersion = 3.1.3?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
44 Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56"
45 ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)"
46 Size="26117496"
47 Version="3.1.3.28628"/>
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
80 Hash="E6B175E66DE4662CEF161FF3263A97410E993D18"
81 ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
82 Size="7868592"
83 Version="3.1.3.20163"/>
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
116 Hash="9A965A63214627F2C9B3A38E402B561BFD275422"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
118 Size="54449000"
119 Version="3.1.3.28628"/>
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.3_x86.wxs b/src/wixlib/NetCore3.1.3_x86.wxs
deleted file mode 100644
index 9a038650..00000000
--- a/src/wixlib/NetCore3.1.3_x86.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x86?>
8 <?define NetCoreIdVersion = 313?>
9 <?define NetCoreVersion = 3.1.3?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/afec5ced-6298-4e54-add1-1d2e02d950f9/3a8064ac78eaf651c0030e8a96d4bd83/aspnetcore-runtime-3.1.3-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/7cd5c874-5d11-4e72-81f0-4a005d956708/0eb310169770c893407169fc3abaac4f/windowsdesktop-runtime-3.1.3-win-x86.exe?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9afebfd7-7719-4612-b15b-79b67b725b42/b93c5514f58eed2e66fc30d0e88aafcb/dotnet-runtime-3.1.3-win-x86.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
44 Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
45 ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
46 Size="23298048"
47 Version="3.1.2.28517" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
54
55 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
56 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.AspNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
80 Hash="42F8DF6AAC1299E05A04B4D2DB3E10D0D1A8E942"
81 ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
82 Size="7157720"
83 Version="3.1.3.20163" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
90
91 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DesktopNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
116 Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
118 Size="48525928"
119 Version="3.1.2.28517" />
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.4_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs
index 06a42c37..d6877e56 100644
--- a/src/wixlib/NetCore3.1.4_x64.wxs
+++ b/src/wixlib/NetCore3.1.8_x64.wxs
@@ -5,49 +5,13 @@
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 6
7 <?define NetCorePlatform = x64?> 7 <?define NetCorePlatform = x64?>
8 <?define NetCoreIdVersion = 314?> 8 <?define NetCoreIdVersion = 318?>
9 <?define NetCoreVersion = 3.1.4?> 9 <?define NetCoreVersion = 3.1.8?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/f9598bd0-060a-46c1-b5ce-65f1663f6204/afb4dd9e1377f63a5c124d60fb119764/aspnetcore-runtime-3.1.4-win-x64.exe?> 12 <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/d8cf1fe3-21c2-4baf-988f-f0152996135e/0c00b94713ee93e7ad5b4f82e2b86607/windowsdesktop-runtime-3.1.4-win-x64.exe?> 13 <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/93d4ac87-6db0-4ddd-9bef-8050067b5e5d/605b178040bdd75b63d021d9387219ea/dotnet-runtime-3.1.4-win-x64.exe?> 14 <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
43 Description="Microsoft .NET Core Runtime - 3.1.4 (x64)"
44 Hash="F60C08D1FB8B6D5A8AC5D008928B673AAC5D0278"
45 ProductName="Microsoft .NET Core Runtime - 3.1.4 (x64)"
46 Size="26159064"
47 Version="3.1.4.28821" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51 15
52 <Fragment> 16 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
@@ -76,11 +40,11 @@
76 <RemotePayload 40 <RemotePayload
77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" 41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" 42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework" 43 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
80 Hash="5CF68BFFE3377DCBE03986380098D93AB876FF13" 44 Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
81 ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework" 45 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
82 Size="7829704" 46 Size="7841880"
83 Version="3.1.4.20222" /> 47 Version="3.1.8.20421" />
84 </ExePackage> 48 </ExePackage>
85 </PackageGroup> 49 </PackageGroup>
86 </Fragment> 50 </Fragment>
@@ -110,13 +74,49 @@
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 74 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no"> 75 Compressed="no">
112 <RemotePayload 76 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
115 Description="Microsoft Windows Desktop Runtime - 3.1.4 (x64)" 79 Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
116 Hash="78BA9B86F57379D8FE20C7C06038B79C0B7051F6" 80 Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x64)" 81 ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
118 Size="54480864" 82 Size="54253328"
119 Version="3.1.4.28821" /> 83 Version="3.1.8.29220" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
90
91 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DotNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DotNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DotNetCoreRedistLink)"
110 LogPathVariable="$(var.DotNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
114 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
115 Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
116 Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
117 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
118 Size="26089480"
119 Version="3.1.8.29220" />
120 </ExePackage> 120 </ExePackage>
121 </PackageGroup> 121 </PackageGroup>
122 </Fragment> 122 </Fragment>
diff --git a/src/wixlib/NetCore3.1.4_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs
index ea643a04..bf639c22 100644
--- a/src/wixlib/NetCore3.1.4_x86.wxs
+++ b/src/wixlib/NetCore3.1.8_x86.wxs
@@ -5,49 +5,13 @@
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6 6
7 <?define NetCorePlatform = x86?> 7 <?define NetCorePlatform = x86?>
8 <?define NetCoreIdVersion = 314?> 8 <?define NetCoreIdVersion = 318?>
9 <?define NetCoreVersion = 3.1.4?> 9 <?define NetCoreVersion = 3.1.8?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/adef45e2-4f8f-4880-b1f7-08c63edd640f/cf3e68f27ae8cb1e820af6ecafc24eee/aspnetcore-runtime-3.1.4-win-x86.exe?> 12 <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2d4b7600-5f32-4a1f-abd5-47cdb2d1362b/7b8b7635e3bb63f6b2cc9a1c624b5325/windowsdesktop-runtime-3.1.4-win-x86.exe?> 13 <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/03b8b6cb-c80c-43ea-9136-1156e839bb52/31c13e5a5b028a3c721a50df8f02caf0/dotnet-runtime-3.1.4-win-x86.exe?> 14 <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
19 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
20 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.DotNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Description="Microsoft .NET Core Runtime - 3.1.4 (x86)"
44 Hash="4FA35E3F31BCFCC6B65D0CB13E21EE0FC56D1C6B"
45 ProductName="Microsoft .NET Core Runtime - 3.1.4 (x86)"
46 Size="23345544"
47 Version="3.1.4.28821" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51 15
52 <Fragment> 16 <Fragment>
53 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
@@ -76,11 +40,11 @@
76 <RemotePayload 40 <RemotePayload
77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" 41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" 42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework" 43 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
80 Hash="2272BF19490DA6519FC2735A2C8815F8944D3388" 44 Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
81 ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework" 45 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
82 Size="7171864" 46 Size="7160128"
83 Version="3.1.4.20222" /> 47 Version="3.1.8.20421" />
84 </ExePackage> 48 </ExePackage>
85 </PackageGroup> 49 </PackageGroup>
86 </Fragment> 50 </Fragment>
@@ -110,13 +74,49 @@
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 74 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no"> 75 Compressed="no">
112 <RemotePayload 76 <RemotePayload
113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
115 Description="Microsoft Windows Desktop Runtime - 3.1.4 (x86)" 79 Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
116 Hash="331BF47FD6E95174D17B63938C022A48E02CB8BF" 80 Hash="6105823D7417C265929DF2978A7214E7394E404F"
117 ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x86)" 81 ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
118 Size="48703936" 82 Size="48377976"
119 Version="3.1.4.28821" /> 83 Version="3.1.8.29220" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
87
88 <Fragment>
89 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
90
91 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
96 <PackageGroup Id="$(var.DotNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
100 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
101 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
102 PerMachine="yes"
103 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
105 Id="$(var.DotNetCoreRedistId)"
106 Vital="yes"
107 Permanent="yes"
108 Protocol="burn"
109 DownloadUrl="$(var.DotNetCoreRedistLink)"
110 LogPathVariable="$(var.DotNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
113 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
114 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
115 Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
116 Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
117 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
118 Size="23183576"
119 Version="3.1.8.29220" />
120 </ExePackage> 120 </ExePackage>
121 </PackageGroup> 121 </PackageGroup>
122 </Fragment> 122 </Fragment>
diff --git a/src/wixlib/NetCore3.1_x64.wxs b/src/wixlib/NetCore3.1_x64.wxs
new file mode 100644
index 00000000..b6fd944d
--- /dev/null
+++ b/src/wixlib/NetCore3.1_x64.wxs
@@ -0,0 +1,24 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <Fragment>
8 <PackageGroup Id="AspNetCoreRuntime31Redist_x64">
9 <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
10 </PackageGroup>
11 </Fragment>
12
13 <Fragment>
14 <PackageGroup Id="DesktopNetCoreRuntime31Redist_x64">
15 <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
16 </PackageGroup>
17 </Fragment>
18
19 <Fragment>
20 <PackageGroup Id="DotNetCoreRuntime31Redist_x64">
21 <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
22 </PackageGroup>
23 </Fragment>
24</Wix>
diff --git a/src/wixlib/NetCore3.1_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs
new file mode 100644
index 00000000..fd4470c0
--- /dev/null
+++ b/src/wixlib/NetCore3.1_x86.wxs
@@ -0,0 +1,24 @@
1<?xml version="1.0" encoding="utf-8"?>
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
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <Fragment>
8 <PackageGroup Id="AspNetCoreRuntime31Redist_x86">
9 <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
10 </PackageGroup>
11 </Fragment>
12
13 <Fragment>
14 <PackageGroup Id="DesktopNetCoreRuntime31Redist_x86">
15 <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
16 </PackageGroup>
17 </Fragment>
18
19 <Fragment>
20 <PackageGroup Id="DotNetCoreRuntime31Redist_x86">
21 <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
22 </PackageGroup>
23 </Fragment>
24</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-28 17:52:52 +0000