Update .NET Core packages so they don't conflict. Make it easier to add new ones. Add AsPrereq package group for DotNetCoreRuntime packages.
Update .NET Core packages so they don't conflict. Make it easier to add new ones. Add AsPrereq package group for DotNetCoreRuntime packages.
Sean Hall committed
May 20, 2020 at 22:33 UTC
4029dacd2053cc35bdbce158fb9b2c4c832ebb78
10 files changed
+367
-162
src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+26
@@ -2,6 +2,7 @@
2
3
namespace WixToolsetTest.Netfx
4
{
5
+ using System.IO;
6
using System.Linq;
7
using WixBuildTools.TestSupport;
8
using WixToolset.Core.TestPackage;
@@ -10,6 +11,31 @@ namespace WixToolsetTest.Netfx
11
12
public class NetfxExtensionFixture
13
{
14
+ [Fact]
15
+ public void CanBuildUsingDotNetCorePackages()
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, "Bundle.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 CanBuildUsingNativeImage()
41
{
src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
new
+20
@@ -0,0 +1,20 @@
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>
src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+6
@@ -12,17 +12,23 @@
12
</PropertyGroup>
13
14
<ItemGroup>
15
+ <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
16
<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.wxs" CopyToOutputDirectory="PreserveNewest" />
19
<Content Include="TestData\UsingNativeImage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
20
</ItemGroup>
21
22
+ <Target Name="CopyExtensions" AfterTargets="Build">
23
+ <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
24
+ </Target>
25
+
26
<ItemGroup>
27
<ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" />
28
</ItemGroup>
29
30
<ItemGroup>
31
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" />
32
<PackageReference Include="WixToolset.Core" Version="4.0.*" />
33
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
34
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
src/wixlib/NetCore3.1.1.wxs
+51
-39
@@ -1,30 +1,41 @@
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" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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
+
15
<Fragment>
6
- <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.1"/>
7
- <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/>
16
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
17
9
- <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/>
10
- <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/>
18
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
19
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
20
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
21
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
22
12
- <PackageGroup Id="AspNetCoreRuntime31Web">
23
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
24
<ExePackage
14
- Name="aspnetcore-runtime-3.1.1-win-x64.exe"
15
- InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]""
16
- RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]""
17
- UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]""
18
- PerMachine="yes"
19
- DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)"
20
- InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)"
21
- Vital="yes"
22
- Permanent="yes"
23
- Protocol="burn"
24
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe"
25
- LogPathVariable="AspNetCoreRuntime31Log"
26
- Compressed="no">
27
- <!-- "%WIX%\bin\heat.exe" payload "aspnetcore-runtime-3.1.1-win-x64.exe" -o "aspnetcore-runtime.wxs" -->
25
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
26
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
27
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
28
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
29
+ PerMachine="yes"
30
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
31
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
32
+ Id="$(var.AspNetCoreRedistId)"
33
+ Vital="yes"
34
+ Permanent="yes"
35
+ Protocol="burn"
36
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
37
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
38
+ Compressed="no">
39
<RemotePayload
40
CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
41
CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
@@ -38,28 +49,29 @@
49
</Fragment>
50
51
<Fragment>
41
- <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.1"/>
42
- <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/>
52
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
53
44
- <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/>
45
- <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/>
54
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
55
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
56
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
57
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
58
47
- <PackageGroup Id="WindowsDesktopRuntime31Web">
59
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
60
<ExePackage
49
- Name="windowsdesktop-runtime-3.1.1-win-x64.exe"
50
- InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
51
- RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
52
- UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
53
- PerMachine="yes"
54
- DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)"
55
- InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)"
56
- Vital="yes"
57
- Permanent="yes"
58
- Protocol="burn"
59
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe"
60
- LogPathVariable="WindowsDesktopRuntime31Log"
61
- Compressed="no">
62
- <!-- "%WIX%\bin\heat.exe" payload "windowsdesktop-runtime-3.1.1-win-x64.exe" -o "windowsdesktop-runtime.wxs" -->
61
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
62
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
63
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
64
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
65
+ PerMachine="yes"
66
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
67
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
68
+ Id="$(var.DesktopNetCoreRedistId)"
69
+ Vital="yes"
70
+ Permanent="yes"
71
+ Protocol="burn"
72
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
73
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
74
+ Compressed="no">
75
<RemotePayload
76
CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
77
CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
src/wixlib/NetCore3.1.2.wxs
+51
-39
@@ -1,30 +1,41 @@
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" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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
+
15
<Fragment>
6
- <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.2"/>
7
- <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/>
16
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
17
9
- <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/>
10
- <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/>
18
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
19
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
20
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
21
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
22
12
- <PackageGroup Id="AspNetCoreRuntime31Web">
23
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
24
<ExePackage
14
- Name="aspnetcore-runtime-3.1.2-win-x64.exe"
15
- InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]""
16
- RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]""
17
- UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]""
18
- PerMachine="yes"
19
- DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)"
20
- InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)"
21
- Vital="yes"
22
- Permanent="yes"
23
- Protocol="burn"
24
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe"
25
- LogPathVariable="AspNetCoreRuntime31Log"
26
- Compressed="no">
27
- <!-- "%WIX%\bin\heat.exe" payload "aspnetcore-runtime-3.1.2-win-x64.exe" -o "aspnetcore-runtime.wxs" -->
25
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
26
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
27
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
28
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
29
+ PerMachine="yes"
30
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
31
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
32
+ Id="$(var.AspNetCoreRedistId)"
33
+ Vital="yes"
34
+ Permanent="yes"
35
+ Protocol="burn"
36
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
37
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
38
+ Compressed="no">
39
<RemotePayload
40
CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
41
CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
@@ -38,28 +49,29 @@
49
</Fragment>
50
51
<Fragment>
41
- <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.2"/>
42
- <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/>
52
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
53
44
- <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/>
45
- <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/>
54
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
55
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
56
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
57
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
58
47
- <PackageGroup Id="WindowsDesktopRuntime31Web">
59
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
60
<ExePackage
49
- Name="windowsdesktop-runtime-3.1.2-win-x64.exe"
50
- InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
51
- RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
52
- UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
53
- PerMachine="yes"
54
- DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)"
55
- InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)"
56
- Vital="yes"
57
- Permanent="yes"
58
- Protocol="burn"
59
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-win-x64.exe"
60
- LogPathVariable="WindowsDesktopRuntime31Log"
61
- Compressed="no">
62
- <!-- "%WIX%\bin\heat.exe" payload "windowsdesktop-runtime-3.1.2-win-x64.exe" -o "windowsdesktop-runtime.wxs" -->
61
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
62
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
63
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
64
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
65
+ PerMachine="yes"
66
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
67
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
68
+ Id="$(var.DesktopNetCoreRedistId)"
69
+ Vital="yes"
70
+ Permanent="yes"
71
+ Protocol="burn"
72
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
73
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
74
+ Compressed="no">
75
<RemotePayload
76
CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
77
CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
src/wixlib/NetCore3.1.3.wxs
+72
-55
@@ -1,29 +1,42 @@
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" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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>
6
- <Variable Name="DotNetRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.NETCore.App\3.1.3"/>
7
- <util:DirectorySearch Id="DotNetRuntime31Installed" Path="[DotNetRuntime31InstallDir]" Variable="DotNetRuntime31Installed" Result="exists"/>
17
+ <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
18
9
- <WixVariable Id="DotNetRuntime31WebDetectCondition" Value="DotNetRuntime31Installed" Overridable="yes"/>
10
- <WixVariable Id="DotNetRuntime31WebInstallCondition" Value="" Overridable="yes"/>
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
12
- <PackageGroup Id="DotNetRuntime31Web">
24
+ <PackageGroup Id="$(var.DotNetCoreRedistId)">
25
<ExePackage
14
- Name="dotnet-runtime-3.1.3-win-x64.exe"
15
- InstallCommand="/install /quiet /norestart /log "[DotNetRuntime31Log]""
16
- RepairCommand="/repair /quiet /norestart /log "[DotNetRuntime31Log]""
17
- UninstallCommand="/uninstall /quiet /norestart /log "[DotNetRuntime31Log]""
18
- PerMachine="yes"
19
- DetectCondition="!(wix.DotNetRuntime31WebDetectCondition)"
20
- InstallCondition="!(wix.DotNetRuntime31WebInstallCondition)"
21
- Vital="yes"
22
- Permanent="yes"
23
- Protocol="burn"
24
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe"
25
- LogPathVariable="DotNetRuntime31Log"
26
- Compressed="no">
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 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
41
CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
42
Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
@@ -36,27 +49,29 @@
49
</Fragment>
50
51
<Fragment>
39
- <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.3"/>
40
- <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/>
52
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
53
42
- <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/>
43
- <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/>
54
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
55
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
56
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
57
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
58
45
- <PackageGroup Id="AspNetCoreRuntime31Web">
59
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
60
<ExePackage
47
- Name="aspnetcore-runtime-3.1.3-win-x64.exe"
48
- InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]""
49
- RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]""
50
- UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]""
51
- PerMachine="yes"
52
- DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)"
53
- InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)"
54
- Vital="yes"
55
- Permanent="yes"
56
- Protocol="burn"
57
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe"
58
- LogPathVariable="AspNetCoreRuntime31Log"
59
- Compressed="no">
61
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
62
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
63
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
64
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
65
+ PerMachine="yes"
66
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
67
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
68
+ Id="$(var.AspNetCoreRedistId)"
69
+ Vital="yes"
70
+ Permanent="yes"
71
+ Protocol="burn"
72
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
73
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
74
+ Compressed="no">
75
<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
76
CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
77
Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
@@ -69,27 +84,29 @@
84
</Fragment>
85
86
<Fragment>
72
- <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.3"/>
73
- <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/>
87
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
88
75
- <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/>
76
- <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/>
89
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
90
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
91
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
92
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
93
78
- <PackageGroup Id="WindowsDesktopRuntime31Web">
94
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
95
<ExePackage
80
- Name="windowsdesktop-runtime-3.1.3-win-x64.exe"
81
- InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
82
- RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
83
- UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
84
- PerMachine="yes"
85
- DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)"
86
- InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)"
87
- Vital="yes"
88
- Permanent="yes"
89
- Protocol="burn"
90
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe"
91
- LogPathVariable="WindowsDesktopRuntime31Log"
92
- Compressed="no">
96
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
97
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
98
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
99
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
100
+ PerMachine="yes"
101
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
102
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
103
+ Id="$(var.DesktopNetCoreRedistId)"
104
+ Vital="yes"
105
+ Permanent="yes"
106
+ Protocol="burn"
107
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
108
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
109
+ Compressed="no">
110
<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
111
CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
112
Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
src/wixlib/NetCore3.1.wxs
+41
-29
@@ -1,30 +1,41 @@
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" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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
+
15
<Fragment>
6
- <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.0" />
7
- <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists" />
16
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
17
9
- <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes" />
10
- <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes" />
18
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
19
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
20
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
21
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
22
12
- <PackageGroup Id="AspNetCoreRuntime31Web">
23
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
24
<ExePackage
14
- Name="aspnetcore-runtime-3.1.0-win-x64.exe"
15
- InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]""
16
- RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]""
17
- UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]""
25
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
26
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
27
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
28
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
29
PerMachine="yes"
19
- DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)"
20
- InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)"
30
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
31
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
32
+ Id="$(var.AspNetCoreRedistId)"
33
Vital="yes"
34
Permanent="yes"
35
Protocol="burn"
24
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe"
25
- LogPathVariable="AspNetCoreRuntime31Log"
36
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
37
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
38
Compressed="no">
27
- <!-- heat.exe payload "aspnetcore-runtime-3.1.0-win-x64.exe" -o "aspnetcore-runtime.wxs" -->
39
<RemotePayload
40
CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
41
CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
@@ -38,28 +49,29 @@
49
</Fragment>
50
51
<Fragment>
41
- <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.0" />
42
- <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists" />
52
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
53
44
- <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes" />
45
- <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes" />
54
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
55
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
56
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
57
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
58
47
- <PackageGroup Id="WindowsDesktopRuntime31Web">
59
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
60
<ExePackage
49
- Name="windowsdesktop-runtime-3.1.0-win-x64.exe"
50
- InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
51
- RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
52
- UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]""
61
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
62
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
63
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
64
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
65
PerMachine="yes"
54
- DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)"
55
- InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)"
66
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
67
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
68
+ Id="$(var.DesktopNetCoreRedistId)"
69
Vital="yes"
70
Permanent="yes"
71
Protocol="burn"
59
- DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe"
60
- LogPathVariable="WindowsDesktopRuntime31Log"
72
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
73
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
74
Compressed="no">
62
- <!-- heat.exe payload "windowsdesktop-runtime-3.1.0-win-x64.exe" -o "windowsdesktop-runtime.wxs" -->
75
<RemotePayload
76
CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
77
CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
src/wixlib/NetCore3_Platform.wxi
new
+79
@@ -0,0 +1,79 @@
1
+<?xml version="1.0"?>
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
+
5
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"
6
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
7
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
8
+
9
+ <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
10
+ <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
11
+ <?define AspNetCoreRedistLog = AspNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
12
+ <?define AspNetCoreRedistInstallCommand = /install /quiet /norestart /log "[$(var.AspNetCoreRedistLog)]"?>
13
+ <?define AspNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log "[$(var.AspNetCoreRedistLog)]"?>
14
+
15
+ <?define DesktopNetCoreId = DESKTOPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
16
+ <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
17
+ <?define DesktopNetCoreRedistLog = DesktopNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
18
+ <?define DesktopNetCoreRedistInstallCommand = /install /quiet /norestart /log "[$(var.DesktopNetCoreRedistLog)]"?>
19
+ <?define DesktopNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log "[$(var.DesktopNetCoreRedistLog)]"?>
20
+
21
+ <?define DotNetCoreId = DOTNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
22
+ <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
23
+ <?define DotNetCoreRedistLog = DotNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
24
+ <?define DotNetCoreRedistInstallCommand = /install /quiet /norestart /log "[$(var.DotNetCoreRedistLog)]"?>
25
+ <?define DotNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log "[$(var.DotNetCoreRedistLog)]"?>
26
+
27
+ <?define DotNetHomeId = DOTNETHOME_$(var.NetCorePlatform)?>
28
+ <?define NetCoreEulaLink = https://go.microsoft.com/fwlink/?LinkId=329770?>
29
+
30
+ <Fragment>
31
+ <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
32
+ <util:DirectorySearch
33
+ Id="$(var.AspNetCoreId)"
34
+ Variable="$(var.AspNetCoreId)"
35
+ Path="[$(var.DotNetHomeId)]\shared\Microsoft.AspNetCore.App\$(var.NetCoreVersion)"
36
+ Result="exists"
37
+ After="$(var.DotNetHomeId)" />
38
+ </Fragment>
39
+
40
+ <Fragment>
41
+ <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
42
+ <util:DirectorySearch
43
+ Id="$(var.DesktopNetCoreId)"
44
+ Variable="$(var.DesktopNetCoreId)"
45
+ Path="[$(var.DotNetHomeId)]\shared\Microsoft.WindowsDesktop.App\$(var.NetCoreVersion)"
46
+ Result="exists"
47
+ After="$(var.DotNetHomeId)" />
48
+ </Fragment>
49
+
50
+ <Fragment>
51
+ <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
52
+ <util:DirectorySearch
53
+ Id="$(var.DotNetCoreId)"
54
+ Variable="$(var.DotNetCoreId)"
55
+ Path="[$(var.DotNetHomeId)]\shared\Microsoft.NETCore.App\$(var.NetCoreVersion)"
56
+ Result="exists"
57
+ After="$(var.DotNetHomeId)" />
58
+ </Fragment>
59
+
60
+ <!--
61
+ <Fragment>
62
+ <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq" />
63
+
64
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" />
65
+ </Fragment>
66
+
67
+ <Fragment>
68
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq" />
69
+
70
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" />
71
+ </Fragment>
72
+ -->
73
+
74
+ <Fragment>
75
+ <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq" />
76
+
77
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
78
+ </Fragment>
79
+</Include>
src/wixlib/NetCoreShared.wxs
new
+20
@@ -0,0 +1,20 @@
1
+<?xml version="1.0"?>
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
+
5
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
+
8
+ <?foreach PLATFORM in x86;x64?>
9
+ <Fragment>
10
+ <util:RegistrySearch
11
+ Id="DOTNETHOME_$(var.PLATFORM)"
12
+ Variable="DOTNETHOME_$(var.PLATFORM)"
13
+ Root="HKLM"
14
+ Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)"
15
+ Value="InstallLocation"
16
+ Result="value"
17
+ Win64="no" />
18
+ </Fragment>
19
+ <?endforeach?>
20
+</Wix>
src/wixlib/netfx.wixproj
+1
@@ -31,6 +31,7 @@
31
<Compile Include="NetCore3.1.1.wxs" />
32
<Compile Include="NetCore3.1.2.wxs" />
33
<Compile Include="NetCore3.1.3.wxs" />
34
+ <Compile Include="NetCoreShared.wxs" />
35
</ItemGroup>
36
<ItemGroup>
37
<None Include="packages.config" />