aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Parsons <japarson@microsoft.com>2020-10-01 23:05:25 -0700
committerJames Parsons <japarson@microsoft.com>2020-10-01 23:05:25 -0700
commitaf731a9631a7f7f6d7c3b2ef84f38a07bb4db211 (patch)
tree6423ab630edd94df8beb35308bd5a47bcad771aa
parent9ed6f291d49599bb12a1baa3a0e000f1e0e254cf (diff)
downloadwix-af731a9631a7f7f6d7c3b2ef84f38a07bb4db211.tar.gz
wix-af731a9631a7f7f6d7c3b2ef84f38a07bb4db211.tar.bz2
wix-af731a9631a7f7f6d7c3b2ef84f38a07bb4db211.zip
Split up latest package and individual packages. Make corresponding changes to tests.
Diffstat
-rw-r--r--src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs50
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs6
-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/TestData/UsingDotNetCorePackages/Bundle_x64.wxs6
-rw-r--r--src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj2
-rw-r--r--src/wixlib/NetCore3.1.8_x64.wxs123
-rw-r--r--src/wixlib/NetCore3.1.8_x86.wxs123
-rw-r--r--src/wixlib/NetCore3.1_x64.wxs116
-rw-r--r--src/wixlib/NetCore3.1_x86.wxs116
10 files changed, 344 insertions, 226 deletions
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 845e1373..c9391074 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -12,6 +12,56 @@ namespace WixToolsetTest.Netfx
12 public class NetfxExtensionFixture 12 public class NetfxExtensionFixture
13 { 13 {
14 [Fact] 14 [Fact]
15 public void CanBuildUsingLatestDotNetCorePackages()
16 {
17 using (var fs = new DisposableFileSystem())
18 {
19 var baseFolder = fs.GetFolder();
20 var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
21 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
22 var intermediateFolder = Path.Combine(baseFolder, "obj");
23
24 var compileResult = WixRunner.Execute(new[]
25 {
26 "build",
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"),
53 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
54 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
55 "-intermediateFolder", intermediateFolder,
56 "-o", bundleFile,
57 });
58 compileResult.AssertSuccess();
59
60 Assert.True(File.Exists(bundleFile));
61 }
62 }
63
64 [Fact]
15 public void CanBuildUsingDotNetCorePackages() 65 public void CanBuildUsingDotNetCorePackages()
16 { 66 {
17 using (var fs = new DisposableFileSystem()) 67 using (var fs = new DisposableFileSystem())
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
index 49e8c022..d746226e 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,9 +6,9 @@
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> 6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
7 </BootstrapperApplicationRef> 7 </BootstrapperApplicationRef>
8 <Chain> 8 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" /> 9 <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" /> 10 <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
11 <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" /> 11 <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
12 </Chain> 12 </Chain>
13 </Bundle> 13 </Bundle>
14</Wix> 14</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/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
index 09c7bcdd..4d1ba73e 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -6,9 +6,9 @@
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> 6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
7 </BootstrapperApplicationRef> 7 </BootstrapperApplicationRef>
8 <Chain> 8 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" /> 9 <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" /> 10 <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
11 <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" /> 11 <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
12 </Chain> 12 </Chain>
13 </Bundle> 13 </Bundle>
14</Wix> 14</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index 1df84972..a9e5cd2b 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -14,6 +14,8 @@
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> 15 <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" /> 16 <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" /> 19 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> 20 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
19 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> 21 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs
new file mode 100644
index 00000000..56f498de
--- /dev/null
+++ b/src/wixlib/NetCore3.1.8_x64.wxs
@@ -0,0 +1,123 @@
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 = 318?>
9 <?define NetCoreVersion = 3.1.8?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
13 <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
14 <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
18
19 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.AspNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.AspNetCoreRedistLink)"
38 LogPathVariable="$(var.AspNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
43 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
44 Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
45 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
46 Size="7841880"
47 Version="3.1.8.20421" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
54
55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
56 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.DesktopNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
74 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
80 Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
81 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
82 Size="26089480"
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>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs
new file mode 100644
index 00000000..87d780c3
--- /dev/null
+++ b/src/wixlib/NetCore3.1.8_x86.wxs
@@ -0,0 +1,123 @@
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 = 318?>
9 <?define NetCoreVersion = 3.1.8?>
10 <?include NetCore3_Platform.wxi?>
11
12 <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
13 <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
14 <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
18
19 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23
24 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
28 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
29 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
30 PerMachine="yes"
31 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
33 Id="$(var.AspNetCoreRedistId)"
34 Vital="yes"
35 Permanent="yes"
36 Protocol="burn"
37 DownloadUrl="$(var.AspNetCoreRedistLink)"
38 LogPathVariable="$(var.AspNetCoreRedistLog)"
39 Compressed="no">
40 <RemotePayload
41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
43 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
44 Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
45 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
46 Size="7160128"
47 Version="3.1.8.20421" />
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
51
52 <Fragment>
53 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
54
55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
56 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
60 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
64 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
65 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
66 PerMachine="yes"
67 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
69 Id="$(var.DesktopNetCoreRedistId)"
70 Vital="yes"
71 Permanent="yes"
72 Protocol="burn"
73 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
74 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
80 Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
81 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
82 Size="23183576"
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>
121 </PackageGroup>
122 </Fragment>
123</Wix>
diff --git a/src/wixlib/NetCore3.1_x64.wxs b/src/wixlib/NetCore3.1_x64.wxs
index d43ba1ce..b6fd944d 100644
--- a/src/wixlib/NetCore3.1_x64.wxs
+++ b/src/wixlib/NetCore3.1_x64.wxs
@@ -4,125 +4,21 @@
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
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?>
8 <?define NetCoreIdVersionBase = 31?>
9 <?define NetCoreIdVersion = 318?>
10 <?define NetCoreVersion = 3.1.8?>
11 <?include NetCore3_Platform.wxi?>
12
13 <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
14 <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
15 <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
16
17 <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
18 <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
19 <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
20
21 <Fragment> 7 <Fragment>
22 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> 8 <PackageGroup Id="AspNetCoreRuntime31Redist_x64">
23 9 <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
24 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
25 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
26 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
27 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
28
29 <PackageGroup Id="$(var.AspNetCoreRedistId)">
30 <ExePackage
31 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
32 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
33 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
34 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
35 PerMachine="yes"
36 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
37 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
38 Id="$(var.AspNetCoreRedistId)"
39 Vital="yes"
40 Permanent="yes"
41 Protocol="burn"
42 DownloadUrl="$(var.AspNetCoreRedistLink)"
43 LogPathVariable="$(var.AspNetCoreRedistLog)"
44 Compressed="no">
45 <RemotePayload
46 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
47 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
48 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
49 Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
50 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
51 Size="7841880"
52 Version="3.1.8.20421" />
53 </ExePackage>
54 </PackageGroup> 10 </PackageGroup>
55 </Fragment> 11 </Fragment>
56 12
57 <Fragment> 13 <Fragment>
58 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" /> 14 <PackageGroup Id="DesktopNetCoreRuntime31Redist_x64">
59 15 <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
60 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
61 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
62 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
63 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
64
65 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
66 <ExePackage
67 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
68 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
69 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
70 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
71 PerMachine="yes"
72 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
73 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
74 Id="$(var.DesktopNetCoreRedistId)"
75 Vital="yes"
76 Permanent="yes"
77 Protocol="burn"
78 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
79 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
80 Compressed="no">
81 <RemotePayload
82 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
83 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
84 Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
85 Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
86 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
87 Size="26089480"
88 Version="3.1.8.29220" />
89 </ExePackage>
90 </PackageGroup> 16 </PackageGroup>
91 </Fragment> 17 </Fragment>
92 18
93 <Fragment> 19 <Fragment>
94 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 20 <PackageGroup Id="DotNetCoreRuntime31Redist_x64">
95 21 <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
96 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
97 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
101 <PackageGroup Id="$(var.DotNetCoreRedistId)">
102 <ExePackage
103 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
104 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
105 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
106 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
107 PerMachine="yes"
108 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
109 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
110 Id="$(var.DotNetCoreRedistId)"
111 Vital="yes"
112 Permanent="yes"
113 Protocol="burn"
114 DownloadUrl="$(var.DotNetCoreRedistLink)"
115 LogPathVariable="$(var.DotNetCoreRedistLog)"
116 Compressed="no">
117 <RemotePayload
118 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
119 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
120 Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
121 Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
122 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
123 Size="26089480"
124 Version="3.1.8.29220" />
125 </ExePackage>
126 </PackageGroup> 22 </PackageGroup>
127 </Fragment> 23 </Fragment>
128</Wix> 24</Wix>
diff --git a/src/wixlib/NetCore3.1_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs
index 7cb1b26b..fd4470c0 100644
--- a/src/wixlib/NetCore3.1_x86.wxs
+++ b/src/wixlib/NetCore3.1_x86.wxs
@@ -4,125 +4,21 @@
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
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?>
8 <?define NetCoreIdVersionBase = 31?>
9 <?define NetCoreIdVersion = 318?>
10 <?define NetCoreVersion = 3.1.8?>
11 <?include NetCore3_Platform.wxi?>
12
13 <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
14 <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
15 <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
16
17 <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
18 <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
19 <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
20
21 <Fragment> 7 <Fragment>
22 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> 8 <PackageGroup Id="AspNetCoreRuntime31Redist_x86">
23 9 <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
24 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
25 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
26 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
27 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
28
29 <PackageGroup Id="$(var.AspNetCoreRedistId)">
30 <ExePackage
31 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
32 InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
33 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
34 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
35 PerMachine="yes"
36 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
37 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
38 Id="$(var.AspNetCoreRedistId)"
39 Vital="yes"
40 Permanent="yes"
41 Protocol="burn"
42 DownloadUrl="$(var.AspNetCoreRedistLink)"
43 LogPathVariable="$(var.AspNetCoreRedistLog)"
44 Compressed="no">
45 <RemotePayload
46 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
47 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
48 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
49 Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
50 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
51 Size="7160128"
52 Version="3.1.8.20421" />
53 </ExePackage>
54 </PackageGroup> 10 </PackageGroup>
55 </Fragment> 11 </Fragment>
56 12
57 <Fragment> 13 <Fragment>
58 <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" /> 14 <PackageGroup Id="DesktopNetCoreRuntime31Redist_x86">
59 15 <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
60 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
61 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
62 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
63 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
64
65 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
66 <ExePackage
67 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
68 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
69 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
70 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
71 PerMachine="yes"
72 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
73 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
74 Id="$(var.DesktopNetCoreRedistId)"
75 Vital="yes"
76 Permanent="yes"
77 Protocol="burn"
78 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
79 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
80 Compressed="no">
81 <RemotePayload
82 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
83 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
84 Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
85 Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
86 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
87 Size="23183576"
88 Version="3.1.8.29220" />
89 </ExePackage>
90 </PackageGroup> 16 </PackageGroup>
91 </Fragment> 17 </Fragment>
92 18
93 <Fragment> 19 <Fragment>
94 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 20 <PackageGroup Id="DotNetCoreRuntime31Redist_x86">
95 21 <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
96 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
97 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
101 <PackageGroup Id="$(var.DotNetCoreRedistId)">
102 <ExePackage
103 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
104 InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
105 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
106 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
107 PerMachine="yes"
108 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
109 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
110 Id="$(var.DotNetCoreRedistId)"
111 Vital="yes"
112 Permanent="yes"
113 Protocol="burn"
114 DownloadUrl="$(var.DotNetCoreRedistLink)"
115 LogPathVariable="$(var.DotNetCoreRedistLog)"
116 Compressed="no">
117 <RemotePayload
118 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
119 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
120 Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
121 Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
122 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
123 Size="23183576"
124 Version="3.1.8.29220" />
125 </ExePackage>
126 </PackageGroup> 22 </PackageGroup>
127 </Fragment> 23 </Fragment>
128</Wix> 24</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-29 13:17:57 +0000