Add package definitions for the latest version of .NET Core 3.1
This commit is contained in:
James Parsons
Родитель
2586d9355a
Коммит
e0a88194af
|
|
@ -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()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
Загрузка…
Ссылка в новой задаче