From e0a88194af923cb523384352165bca91780c4289 Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Wed, 23 Sep 2020 14:06:22 -0700
Subject: Add package definitions for the latest version of .NET Core 3.1
---
.../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 25 ++++
.../TestData/UsingDotNetCorePackages/Bundle.wxs | 32 ++++--
.../UsingDotNetCorePackages/Bundle_x64.wxs | 34 ++++++
.../WixToolsetTest.Netfx.csproj | 1 +
src/wixlib/NetCore3.1.Latest_x64.wxs | 128 +++++++++++++++++++++
src/wixlib/NetCore3.1.Latest_x86.wxs | 128 +++++++++++++++++++++
6 files changed, 339 insertions(+), 9 deletions(-)
create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
create mode 100644 src/wixlib/NetCore3.1.Latest_x64.wxs
create mode 100644 src/wixlib/NetCore3.1.Latest_x86.wxs
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8bcac8df..845e1373 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -36,6 +36,31 @@ namespace WixToolsetTest.Netfx
}
}
+ [Fact]
+ public void CanBuildUsingDotNetCorePackages_X64()
+ {
+ using (var fs = new DisposableFileSystem())
+ {
+ var baseFolder = fs.GetFolder();
+ var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
+ var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
+ var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+ var compileResult = WixRunner.Execute(new[]
+ {
+ "build",
+ Path.Combine(bundleSourceFolder, "Bundle_x64.wxs"),
+ "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+ "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
+ "-intermediateFolder", intermediateFolder,
+ "-o", bundleFile,
+ });
+ compileResult.AssertSuccess();
+
+ Assert.True(File.Exists(bundleFile));
+ }
+ }
+
[Fact]
public void CanBuildUsingNativeImage()
{
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
index 7c008171..a31848a7 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,15 +6,29 @@
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
</BootstrapperApplicationRef>
<Chain>
- <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" />
- <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
- <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
- <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
+ <PackageGroupRef Id="AspNetCoreRuntime310Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime310Redist_x86" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime311Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime311Redist_x86" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime312Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime312Redist_x86" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime313Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime313Redist_x86" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime314Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime314Redist_x86" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x86" />
</Chain>
</Bundle>
</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
new file mode 100644
index 00000000..a5e91532
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+ <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+ <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
+ <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
+ </BootstrapperApplicationRef>
+ <Chain>
+ <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime310Redist_x64" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime311Redist_x64" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime312Redist_x64" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime314Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime314Redist_x64" />
+
+ <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x64" />
+ </Chain>
+ </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index cf7afa8b..1df84972 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -13,6 +13,7 @@
<ItemGroup>
<Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
+ <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wixlib/NetCore3.1.Latest_x64.wxs b/src/wixlib/NetCore3.1.Latest_x64.wxs
new file mode 100644
index 00000000..f8f2bfbc
--- /dev/null
+++ b/src/wixlib/NetCore3.1.Latest_x64.wxs
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+ <?define NetCorePlatform = x64?>
+ <?define NetCoreIdVersionBase = 31?>
+ <?define NetCoreIdVersion = 318?>
+ <?define NetCoreVersion = 3.1.8?>
+ <?include NetCore3_Platform.wxi?>
+
+ <?define AspNetCoreLatestRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
+ <?define DesktopNetCoreLatestRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
+ <?define DotNetCoreLatestRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
+
+ <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
+ <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
+ <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.AspNetCoreLatestRedistId)">
+ <ExePackage
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.AspNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
+ ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Size="7841880"
+ Version="3.1.8.20421" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DesktopNetCoreLatestRedistId)">
+ <ExePackage
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DesktopNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Size="26089480"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DotNetCoreLatestRedistId)">
+ <ExePackage
+ Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DotNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DotNetCoreRedistLink)"
+ LogPathVariable="$(var.DotNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Size="26089480"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.Latest_x86.wxs b/src/wixlib/NetCore3.1.Latest_x86.wxs
new file mode 100644
index 00000000..c36523dc
--- /dev/null
+++ b/src/wixlib/NetCore3.1.Latest_x86.wxs
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+ <?define NetCorePlatform = x86?>
+ <?define NetCoreIdVersionBase = 31?>
+ <?define NetCoreIdVersion = 318?>
+ <?define NetCoreVersion = 3.1.8?>
+ <?include NetCore3_Platform.wxi?>
+
+ <?define AspNetCoreLatestRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
+ <?define DesktopNetCoreLatestRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
+ <?define DotNetCoreLatestRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
+
+ <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
+ <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
+ <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.AspNetCoreLatestRedistId)">
+ <ExePackage
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.AspNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
+ ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Size="7160128"
+ Version="3.1.8.20421" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DesktopNetCoreLatestRedistId)">
+ <ExePackage
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DesktopNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Size="23183576"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DotNetCoreLatestRedistId)">
+ <ExePackage
+ Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DotNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DotNetCoreRedistLink)"
+ LogPathVariable="$(var.DotNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Size="23183576"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+</Wix>
--
cgit v1.2.3-55-g6feb
From 9ed6f291d49599bb12a1baa3a0e000f1e0e254cf Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Tue, 29 Sep 2020 00:10:57 -0700
Subject: Remove unsupported .NET Core 3.1 package definitions
---
.../TestData/UsingDotNetCorePackages/Bundle.wxs | 26 +----
.../UsingDotNetCorePackages/Bundle_x64.wxs | 26 +----
src/wixlib/NetCore3.1.0_x64.wxs | 123 --------------------
src/wixlib/NetCore3.1.0_x86.wxs | 123 --------------------
src/wixlib/NetCore3.1.1_x64.wxs | 123 --------------------
src/wixlib/NetCore3.1.1_x86.wxs | 123 --------------------
src/wixlib/NetCore3.1.2_x64.wxs | 123 --------------------
src/wixlib/NetCore3.1.2_x86.wxs | 123 --------------------
src/wixlib/NetCore3.1.3_x64.wxs | 123 --------------------
src/wixlib/NetCore3.1.3_x86.wxs | 123 --------------------
src/wixlib/NetCore3.1.4_x64.wxs | 123 --------------------
src/wixlib/NetCore3.1.4_x86.wxs | 123 --------------------
src/wixlib/NetCore3.1.Latest_x64.wxs | 128 ---------------------
src/wixlib/NetCore3.1.Latest_x86.wxs | 128 ---------------------
src/wixlib/NetCore3.1_x64.wxs | 128 +++++++++++++++++++++
src/wixlib/NetCore3.1_x86.wxs | 128 +++++++++++++++++++++
16 files changed, 262 insertions(+), 1532 deletions(-)
delete mode 100644 src/wixlib/NetCore3.1.0_x64.wxs
delete mode 100644 src/wixlib/NetCore3.1.0_x86.wxs
delete mode 100644 src/wixlib/NetCore3.1.1_x64.wxs
delete mode 100644 src/wixlib/NetCore3.1.1_x86.wxs
delete mode 100644 src/wixlib/NetCore3.1.2_x64.wxs
delete mode 100644 src/wixlib/NetCore3.1.2_x86.wxs
delete mode 100644 src/wixlib/NetCore3.1.3_x64.wxs
delete mode 100644 src/wixlib/NetCore3.1.3_x86.wxs
delete mode 100644 src/wixlib/NetCore3.1.4_x64.wxs
delete mode 100644 src/wixlib/NetCore3.1.4_x86.wxs
delete mode 100644 src/wixlib/NetCore3.1.Latest_x64.wxs
delete mode 100644 src/wixlib/NetCore3.1.Latest_x86.wxs
create mode 100644 src/wixlib/NetCore3.1_x64.wxs
create mode 100644 src/wixlib/NetCore3.1_x86.wxs
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
index a31848a7..49e8c022 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,29 +6,9 @@
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
</BootstrapperApplicationRef>
<Chain>
- <PackageGroupRef Id="AspNetCoreRuntime310Redist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime310Redist_x86" />
-
- <PackageGroupRef Id="AspNetCoreRuntime311Redist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime311Redist_x86" />
-
- <PackageGroupRef Id="AspNetCoreRuntime312Redist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime312Redist_x86" />
-
- <PackageGroupRef Id="AspNetCoreRuntime313Redist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime313Redist_x86" />
-
- <PackageGroupRef Id="AspNetCoreRuntime314Redist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime314Redist_x86" />
-
- <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x86" />
+ <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
</Chain>
</Bundle>
</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
index a5e91532..09c7bcdd 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -6,29 +6,9 @@
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
</BootstrapperApplicationRef>
<Chain>
- <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime310Redist_x64" />
-
- <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime311Redist_x64" />
-
- <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime312Redist_x64" />
-
- <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
-
- <PackageGroupRef Id="AspNetCoreRuntime314Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime314Redist_x64" />
-
- <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x64" />
+ <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
</Chain>
</Bundle>
</Wix>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x64?>
- <?define NetCoreIdVersion = 310?>
- <?define NetCoreVersion = 3.1.0?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9f010da2-d510-4271-8dcc-ad92b8b9b767/d2dd394046c20e0563ce5c45c356653f/dotnet-runtime-3.1.0-win-x64.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
- CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
- Description="Microsoft .NET Core Runtime - 3.1.0 (x64)"
- Hash="DDA7CD0E851E742ACA43EFBD1361CDB382771E21"
- ProductName="Microsoft .NET Core Runtime - 3.1.0 (x64)"
- Size="26061496"
- Version="3.1.0.28315" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
- CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
- Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
- Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
- ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
- Size="7811768"
- Version="3.1.0.19566" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
- CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
- Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
- Hash="C16F271754879BA78868947486F37871C9F0E40F"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
- Size="54443856"
- Version="3.1.0.28315" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x86?>
- <?define NetCoreIdVersion = 310?>
- <?define NetCoreVersion = 3.1.0?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/74ed410a-d452-4057-bb89-befeccf34b2b/e11a376951914e197c50528e5b20e2ef/aspnetcore-runtime-3.1.0-win-x86.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/e93147bb-7654-46d6-954a-bbd54da63b9b/cbdba4605fd04dc3886ca772d3953c53/windowsdesktop-runtime-3.1.0-win-x86.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/04356520-4cf7-4e98-b4a8-b3043e2eeca3/cdf6d3d104334dfe8f471fe135f16b07/dotnet-runtime-3.1.0-win-x86.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
- CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
- Description="Microsoft .NET Core Runtime - 3.1.0 (x86)"
- Hash="CAF456ED2F229E5CE36CEAE5C752D7C69BB4CABD"
- ProductName="Microsoft .NET Core Runtime - 3.1.0 (x86)"
- Size="23318984"
- Version="3.1.0.28315" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
- CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
- Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
- Hash="7616CD3453F253032DB7A56455A8429FAEC934C4"
- ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
- Size="7146408"
- Version="3.1.0.19566" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
- CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
- Description="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
- Hash="96FF19C3F740EA1D49376462EE336F5E5CA0ED79"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
- Size="48703304"
- Version="3.1.0.28315" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x64?>
- <?define NetCoreIdVersion = 311?>
- <?define NetCoreVersion = 3.1.1?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fda71c5b-ee58-4919-95dc-4f32dbebd2cd/97ffe3880a25f5f7cae1a7e40cd3509e/dotnet-runtime-3.1.1-win-x64.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft .NET Core Runtime - 3.1.1 (x64)"
- Hash="B9E2166EDDEFAA4D7543F24A2E7CD76C35D4E617"
- ProductName="Microsoft .NET Core Runtime - 3.1.1 (x64)"
- Size="26055096"
- Version="3.1.1.28408" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
- Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
- ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
- Size="7867488"
- Version="3.1.1.19615"/>
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
- Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
- Size="54211664"
- Version="3.1.1.28408"/>
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x86?>
- <?define NetCoreIdVersion = 311?>
- <?define NetCoreVersion = 3.1.1?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/b1298310-3170-4553-ba50-153e1def5747/00ba44679959c19a67bd36b8c1eb5220/aspnetcore-runtime-3.1.1-win-x86.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/662153d9-58c5-4630-a326-ed9e4e342787/1deb6ba6a2a5f5f694b784a6859b446e/windowsdesktop-runtime-3.1.1-win-x86.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3a21bd9a-8040-4277-99d4-9de7fcda6d7c/c669f1662f140cbb41fdf0c9cba221a8/dotnet-runtime-3.1.1-win-x86.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft .NET Core Runtime - 3.1.1 (x86)"
- Hash="4790D3117F4D4F7AF63113BBECD3BF0E8C940C2A"
- ProductName="Microsoft .NET Core Runtime - 3.1.1 (x86)"
- Size="23327424"
- Version="3.1.1.28408" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
- Hash="65B4D07B6BA51BC7D0D1B82EC904893B8ACF639D"
- ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
- Size="7193600"
- Version="3.1.1.19615" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
- Hash="A368E17FFEE5CEBFDFE981BC329CEFFACF4674CC"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
- Size="48513144"
- Version="3.1.1.28408" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x64?>
- <?define NetCoreIdVersion = 312?>
- <?define NetCoreVersion = 3.1.2?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-win-x64.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/cfe420d5-084c-4590-b387-f89f3387d4c9/db4c577b995c54dee0530d8230e87145/dotnet-runtime-3.1.2-win-x64.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft .NET Core Runtime - 3.1.2 (x64)"
- Hash="6955F4851B42A533683824C65D7423AF22BC6710"
- ProductName="Microsoft .NET Core Runtime - 3.1.2 (x64)"
- Size="26066088"
- Version="3.1.2.28517" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
- Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
- ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
- Size="7812680"
- Version="3.1.2.20068"/>
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
- Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
- Size="54323576"
- Version="3.1.2.28517"/>
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x86?>
- <?define NetCoreIdVersion = 312?>
- <?define NetCoreVersion = 3.1.2?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2c8e520e-d705-4b11-8854-518546133e27/13354ed8b42d8c2c52f75d7acffd0be4/aspnetcore-runtime-3.1.2-win-x86.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/b824906f-bd6e-4067-86a6-95c61620674d/cfcdab84a01cee94fdaa31271c3d4d47/windowsdesktop-runtime-3.1.2-win-x86.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/dfedf8a5-c3cd-4b69-a5eb-8f9994e810f7/feeead4b3ae3b9e003917797c8356675/dotnet-runtime-3.1.2-win-x86.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
- Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
- ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
- Size="23298048"
- Version="3.1.2.28517" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
- Hash="302D15317C3D2D0B707EAC92D943A624BBDA14D9"
- ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
- Size="7128912"
- Version="3.1.2.20068" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
- Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
- Size="48525928"
- Version="3.1.2.28517" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x64?>
- <?define NetCoreIdVersion = 313?>
- <?define NetCoreVersion = 3.1.3?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
- Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56"
- ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)"
- Size="26117496"
- Version="3.1.3.28628"/>
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
- Hash="E6B175E66DE4662CEF161FF3263A97410E993D18"
- ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
- Size="7868592"
- Version="3.1.3.20163"/>
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
- Hash="9A965A63214627F2C9B3A38E402B561BFD275422"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
- Size="54449000"
- Version="3.1.3.28628"/>
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x86?>
- <?define NetCoreIdVersion = 313?>
- <?define NetCoreVersion = 3.1.3?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/afec5ced-6298-4e54-add1-1d2e02d950f9/3a8064ac78eaf651c0030e8a96d4bd83/aspnetcore-runtime-3.1.3-win-x86.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/7cd5c874-5d11-4e72-81f0-4a005d956708/0eb310169770c893407169fc3abaac4f/windowsdesktop-runtime-3.1.3-win-x86.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9afebfd7-7719-4612-b15b-79b67b725b42/b93c5514f58eed2e66fc30d0e88aafcb/dotnet-runtime-3.1.3-win-x86.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
- Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
- ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
- Size="23298048"
- Version="3.1.2.28517" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
- Hash="42F8DF6AAC1299E05A04B4D2DB3E10D0D1A8E942"
- ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
- Size="7157720"
- Version="3.1.3.20163" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
- Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
- Size="48525928"
- Version="3.1.2.28517" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1.4_x64.wxs b/src/wixlib/NetCore3.1.4_x64.wxs
deleted file mode 100644
index 06a42c37..00000000
--- a/src/wixlib/NetCore3.1.4_x64.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x64?>
- <?define NetCoreIdVersion = 314?>
- <?define NetCoreVersion = 3.1.4?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/f9598bd0-060a-46c1-b5ce-65f1663f6204/afb4dd9e1377f63a5c124d60fb119764/aspnetcore-runtime-3.1.4-win-x64.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/d8cf1fe3-21c2-4baf-988f-f0152996135e/0c00b94713ee93e7ad5b4f82e2b86607/windowsdesktop-runtime-3.1.4-win-x64.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/93d4ac87-6db0-4ddd-9bef-8050067b5e5d/605b178040bdd75b63d021d9387219ea/dotnet-runtime-3.1.4-win-x64.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.4 (x64)"
- Hash="F60C08D1FB8B6D5A8AC5D008928B673AAC5D0278"
- ProductName="Microsoft .NET Core Runtime - 3.1.4 (x64)"
- Size="26159064"
- Version="3.1.4.28821" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
- Hash="5CF68BFFE3377DCBE03986380098D93AB876FF13"
- ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
- Size="7829704"
- Version="3.1.4.20222" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.4 (x64)"
- Hash="78BA9B86F57379D8FE20C7C06038B79C0B7051F6"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x64)"
- Size="54480864"
- Version="3.1.4.28821" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1.4_x86.wxs b/src/wixlib/NetCore3.1.4_x86.wxs
deleted file mode 100644
index ea643a04..00000000
--- a/src/wixlib/NetCore3.1.4_x86.wxs
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x86?>
- <?define NetCoreIdVersion = 314?>
- <?define NetCoreVersion = 3.1.4?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/adef45e2-4f8f-4880-b1f7-08c63edd640f/cf3e68f27ae8cb1e820af6ecafc24eee/aspnetcore-runtime-3.1.4-win-x86.exe?>
- <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2d4b7600-5f32-4a1f-abd5-47cdb2d1362b/7b8b7635e3bb63f6b2cc9a1c624b5325/windowsdesktop-runtime-3.1.4-win-x86.exe?>
- <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/03b8b6cb-c80c-43ea-9136-1156e839bb52/31c13e5a5b028a3c721a50df8f02caf0/dotnet-runtime-3.1.4-win-x86.exe?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft .NET Core Runtime - 3.1.4 (x86)"
- Hash="4FA35E3F31BCFCC6B65D0CB13E21EE0FC56D1C6B"
- ProductName="Microsoft .NET Core Runtime - 3.1.4 (x86)"
- Size="23345544"
- Version="3.1.4.28821" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
- Hash="2272BF19490DA6519FC2735A2C8815F8944D3388"
- ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
- Size="7171864"
- Version="3.1.4.20222" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
- CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
- Description="Microsoft Windows Desktop Runtime - 3.1.4 (x86)"
- Hash="331BF47FD6E95174D17B63938C022A48E02CB8BF"
- ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x86)"
- Size="48703936"
- Version="3.1.4.28821" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1.Latest_x64.wxs b/src/wixlib/NetCore3.1.Latest_x64.wxs
deleted file mode 100644
index f8f2bfbc..00000000
--- a/src/wixlib/NetCore3.1.Latest_x64.wxs
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x64?>
- <?define NetCoreIdVersionBase = 31?>
- <?define NetCoreIdVersion = 318?>
- <?define NetCoreVersion = 3.1.8?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreLatestRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
- <?define DesktopNetCoreLatestRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
- <?define DotNetCoreLatestRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
-
- <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
- <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
- <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreLatestRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
- ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Size="7841880"
- Version="3.1.8.20421" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreLatestRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Size="26089480"
- Version="3.1.8.29220" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreLatestRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Size="26089480"
- Version="3.1.8.29220" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1.Latest_x86.wxs b/src/wixlib/NetCore3.1.Latest_x86.wxs
deleted file mode 100644
index c36523dc..00000000
--- a/src/wixlib/NetCore3.1.Latest_x86.wxs
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-
- <?define NetCorePlatform = x86?>
- <?define NetCoreIdVersionBase = 31?>
- <?define NetCoreIdVersion = 318?>
- <?define NetCoreVersion = 3.1.8?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreLatestRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
- <?define DesktopNetCoreLatestRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
- <?define DotNetCoreLatestRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?>
-
- <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
- <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
- <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreLatestRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
- ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Size="7160128"
- Version="3.1.8.20421" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreLatestRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Size="23183576"
- Version="3.1.8.29220" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-
- <Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreLatestRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Size="23183576"
- Version="3.1.8.29220" />
- </ExePackage>
- </PackageGroup>
- </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1_x64.wxs b/src/wixlib/NetCore3.1_x64.wxs
new file mode 100644
index 00000000..d43ba1ce
--- /dev/null
+++ b/src/wixlib/NetCore3.1_x64.wxs
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+ <?define NetCorePlatform = x64?>
+ <?define NetCoreIdVersionBase = 31?>
+ <?define NetCoreIdVersion = 318?>
+ <?define NetCoreVersion = 3.1.8?>
+ <?include NetCore3_Platform.wxi?>
+
+ <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
+ <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
+ <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
+
+ <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
+ <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
+ <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.AspNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
+ ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Size="7841880"
+ Version="3.1.8.20421" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DesktopNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Size="26089480"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DotNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DotNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DotNetCoreRedistLink)"
+ LogPathVariable="$(var.DotNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Size="26089480"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs
new file mode 100644
index 00000000..7cb1b26b
--- /dev/null
+++ b/src/wixlib/NetCore3.1_x86.wxs
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+ <?define NetCorePlatform = x86?>
+ <?define NetCoreIdVersionBase = 31?>
+ <?define NetCoreIdVersion = 318?>
+ <?define NetCoreVersion = 3.1.8?>
+ <?include NetCore3_Platform.wxi?>
+
+ <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
+ <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
+ <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
+
+ <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
+ <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
+ <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.AspNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
+ ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Size="7160128"
+ Version="3.1.8.20421" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DesktopNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Size="23183576"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DotNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DotNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DotNetCoreRedistLink)"
+ LogPathVariable="$(var.DotNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Size="23183576"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+</Wix>
--
cgit v1.2.3-55-g6feb
From af731a9631a7f7f6d7c3b2ef84f38a07bb4db211 Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Thu, 1 Oct 2020 23:05:25 -0700
Subject: Split up latest package and individual packages. Make corresponding
changes to tests.
---
.../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 50 +++++++++
.../TestData/UsingDotNetCorePackages/Bundle.wxs | 6 +-
.../UsingDotNetCorePackages/BundleLatest.wxs | 14 +++
.../UsingDotNetCorePackages/BundleLatest_x64.wxs | 14 +++
.../UsingDotNetCorePackages/Bundle_x64.wxs | 6 +-
.../WixToolsetTest.Netfx.csproj | 2 +
src/wixlib/NetCore3.1.8_x64.wxs | 123 +++++++++++++++++++++
src/wixlib/NetCore3.1.8_x86.wxs | 123 +++++++++++++++++++++
src/wixlib/NetCore3.1_x64.wxs | 116 +------------------
src/wixlib/NetCore3.1_x86.wxs | 116 +------------------
10 files changed, 344 insertions(+), 226 deletions(-)
create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
create mode 100644 src/wixlib/NetCore3.1.8_x64.wxs
create mode 100644 src/wixlib/NetCore3.1.8_x86.wxs
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
@@ -11,6 +11,56 @@ namespace WixToolsetTest.Netfx
public class NetfxExtensionFixture
{
+ [Fact]
+ public void CanBuildUsingLatestDotNetCorePackages()
+ {
+ using (var fs = new DisposableFileSystem())
+ {
+ var baseFolder = fs.GetFolder();
+ var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
+ var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
+ var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+ var compileResult = WixRunner.Execute(new[]
+ {
+ "build",
+ Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
+ "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+ "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
+ "-intermediateFolder", intermediateFolder,
+ "-o", bundleFile,
+ });
+ compileResult.AssertSuccess();
+
+ Assert.True(File.Exists(bundleFile));
+ }
+ }
+
+ [Fact]
+ public void CanBuildUsingLatestDotNetCorePackages_X64()
+ {
+ using (var fs = new DisposableFileSystem())
+ {
+ var baseFolder = fs.GetFolder();
+ var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
+ var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
+ var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+ var compileResult = WixRunner.Execute(new[]
+ {
+ "build",
+ Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
+ "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+ "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
+ "-intermediateFolder", intermediateFolder,
+ "-o", bundleFile,
+ });
+ compileResult.AssertSuccess();
+
+ Assert.True(File.Exists(bundleFile));
+ }
+ }
+
[Fact]
public void CanBuildUsingDotNetCorePackages()
{
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 @@
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
</BootstrapperApplicationRef>
<Chain>
- <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
+ <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
</Chain>
</Bundle>
</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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+ <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+ <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
+ <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
+ </BootstrapperApplicationRef>
+ <Chain>
+ <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
+ <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
+ </Chain>
+ </Bundle>
+</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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+ <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+ <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
+ <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
+ </BootstrapperApplicationRef>
+ <Chain>
+ <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
+ </Chain>
+ </Bundle>
+</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 @@
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
</BootstrapperApplicationRef>
<Chain>
- <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
+ <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
+ <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
+ <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
</Chain>
</Bundle>
</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 @@
<ItemGroup>
<Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
+ <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
+ <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
<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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+ <?define NetCorePlatform = x64?>
+ <?define NetCoreIdVersion = 318?>
+ <?define NetCoreVersion = 3.1.8?>
+ <?include NetCore3_Platform.wxi?>
+
+ <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
+ <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
+ <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.AspNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
+ ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Size="7841880"
+ Version="3.1.8.20421" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DesktopNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Size="26089480"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DotNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DotNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DotNetCoreRedistLink)"
+ LogPathVariable="$(var.DotNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+ Size="26089480"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+</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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+ <?define NetCorePlatform = x86?>
+ <?define NetCoreIdVersion = 318?>
+ <?define NetCoreVersion = 3.1.8?>
+ <?include NetCore3_Platform.wxi?>
+
+ <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
+ <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
+ <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.AspNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
+ ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
+ Size="7160128"
+ Version="3.1.8.20421" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DesktopNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Size="23183576"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+
+ <Fragment>
+ <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+ <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+
+ <PackageGroup Id="$(var.DotNetCoreRedistId)">
+ <ExePackage
+ Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+ InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+ RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+ UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+ PerMachine="yes"
+ DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+ InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+ Id="$(var.DotNetCoreRedistId)"
+ Vital="yes"
+ Permanent="yes"
+ Protocol="burn"
+ DownloadUrl="$(var.DotNetCoreRedistLink)"
+ LogPathVariable="$(var.DotNetCoreRedistLog)"
+ Compressed="no">
+ <RemotePayload
+ CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
+ CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
+ Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
+ ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+ Size="23183576"
+ Version="3.1.8.29220" />
+ </ExePackage>
+ </PackageGroup>
+ </Fragment>
+</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 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
- <?define NetCorePlatform = x64?>
- <?define NetCoreIdVersionBase = 31?>
- <?define NetCoreIdVersion = 318?>
- <?define NetCoreVersion = 3.1.8?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
- <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
- <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
-
- <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
- <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
- <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
-
<Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
- ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Size="7841880"
- Version="3.1.8.20421" />
- </ExePackage>
+ <PackageGroup Id="AspNetCoreRuntime31Redist_x64">
+ <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
</PackageGroup>
</Fragment>
<Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Size="26089480"
- Version="3.1.8.29220" />
- </ExePackage>
+ <PackageGroup Id="DesktopNetCoreRuntime31Redist_x64">
+ <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
</PackageGroup>
</Fragment>
<Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Size="26089480"
- Version="3.1.8.29220" />
- </ExePackage>
+ <PackageGroup Id="DotNetCoreRuntime31Redist_x64">
+ <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
</PackageGroup>
</Fragment>
</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 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
- <?define NetCorePlatform = x86?>
- <?define NetCoreIdVersionBase = 31?>
- <?define NetCoreIdVersion = 318?>
- <?define NetCoreVersion = 3.1.8?>
- <?include NetCore3_Platform.wxi?>
-
- <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
- <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
- <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?>
-
- <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
- <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
- <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
-
<Fragment>
- <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.AspNetCoreRedistId)">
- <ExePackage
- Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.AspNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.AspNetCoreRedistLink)"
- LogPathVariable="$(var.AspNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
- ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
- Size="7160128"
- Version="3.1.8.20421" />
- </ExePackage>
+ <PackageGroup Id="AspNetCoreRuntime31Redist_x86">
+ <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
</PackageGroup>
</Fragment>
<Fragment>
- <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DesktopNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DesktopNetCoreRedistLink)"
- LogPathVariable="$(var.DesktopNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Size="23183576"
- Version="3.1.8.29220" />
- </ExePackage>
+ <PackageGroup Id="DesktopNetCoreRuntime31Redist_x86">
+ <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
</PackageGroup>
</Fragment>
<Fragment>
- <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
- <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-
- <PackageGroup Id="$(var.DotNetCoreRedistId)">
- <ExePackage
- Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
- InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
- RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
- UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
- PerMachine="yes"
- DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
- InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
- Id="$(var.DotNetCoreRedistId)"
- Vital="yes"
- Permanent="yes"
- Protocol="burn"
- DownloadUrl="$(var.DotNetCoreRedistLink)"
- LogPathVariable="$(var.DotNetCoreRedistLog)"
- Compressed="no">
- <RemotePayload
- CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
- CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Size="23183576"
- Version="3.1.8.29220" />
- </ExePackage>
+ <PackageGroup Id="DotNetCoreRuntime31Redist_x86">
+ <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
</PackageGroup>
</Fragment>
</Wix>
--
cgit v1.2.3-55-g6feb
From 9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7 Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Thu, 15 Oct 2020 15:23:07 -0700
Subject: Fix 3.1.8 desktop runtime payloads and remove version specific tests
---
.../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 50 ----------------------
.../TestData/UsingDotNetCorePackages/Bundle.wxs | 14 ------
.../UsingDotNetCorePackages/Bundle_x64.wxs | 14 ------
.../WixToolsetTest.Netfx.csproj | 2 -
src/wixlib/NetCore3.1.8_x64.wxs | 8 ++--
src/wixlib/NetCore3.1.8_x86.wxs | 8 ++--
6 files changed, 8 insertions(+), 88 deletions(-)
delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index c9391074..72d4a682 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -61,56 +61,6 @@ namespace WixToolsetTest.Netfx
}
}
- [Fact]
- public void CanBuildUsingDotNetCorePackages()
- {
- using (var fs = new DisposableFileSystem())
- {
- var baseFolder = fs.GetFolder();
- var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
- var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
- var intermediateFolder = Path.Combine(baseFolder, "obj");
-
- var compileResult = WixRunner.Execute(new[]
- {
- "build",
- Path.Combine(bundleSourceFolder, "Bundle.wxs"),
- "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
- "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
- "-intermediateFolder", intermediateFolder,
- "-o", bundleFile,
- });
- compileResult.AssertSuccess();
-
- Assert.True(File.Exists(bundleFile));
- }
- }
-
- [Fact]
- public void CanBuildUsingDotNetCorePackages_X64()
- {
- using (var fs = new DisposableFileSystem())
- {
- var baseFolder = fs.GetFolder();
- var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
- var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
- var intermediateFolder = Path.Combine(baseFolder, "obj");
-
- var compileResult = WixRunner.Execute(new[]
- {
- "build",
- Path.Combine(bundleSourceFolder, "Bundle_x64.wxs"),
- "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
- "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
- "-intermediateFolder", intermediateFolder,
- "-o", bundleFile,
- });
- compileResult.AssertSuccess();
-
- Assert.True(File.Exists(bundleFile));
- }
- }
-
[Fact]
public void CanBuildUsingNativeImage()
{
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 d746226e..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
- <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
- <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
- <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
- </BootstrapperApplicationRef>
- <Chain>
- <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
- <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
- <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
- </Chain>
- </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
deleted file mode 100644
index 4d1ba73e..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
- xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
- <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
- <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
- <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
- </BootstrapperApplicationRef>
- <Chain>
- <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
- <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
- <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
- </Chain>
- </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index a9e5cd2b..4dea73da 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,8 +12,6 @@
</PropertyGroup>
<ItemGroup>
- <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
- <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
<Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs
index 56f498de..d6877e56 100644
--- a/src/wixlib/NetCore3.1.8_x64.wxs
+++ b/src/wixlib/NetCore3.1.8_x64.wxs
@@ -76,10 +76,10 @@
<RemotePayload
CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
- Size="26089480"
+ Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
+ Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
+ ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
+ Size="54253328"
Version="3.1.8.29220" />
</ExePackage>
</PackageGroup>
diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs
index 87d780c3..bf639c22 100644
--- a/src/wixlib/NetCore3.1.8_x86.wxs
+++ b/src/wixlib/NetCore3.1.8_x86.wxs
@@ -76,10 +76,10 @@
<RemotePayload
CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
- Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
- Size="23183576"
+ Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
+ Hash="6105823D7417C265929DF2978A7214E7394E404F"
+ ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
+ Size="48377976"
Version="3.1.8.29220" />
</ExePackage>
</PackageGroup>
--
cgit v1.2.3-55-g6feb