diff options
| author | James Parsons <japarson@microsoft.com> | 2020-09-23 14:06:22 -0700 |
|---|---|---|
| committer | James Parsons <japarson@microsoft.com> | 2020-09-23 14:06:22 -0700 |
| commit | e0a88194af923cb523384352165bca91780c4289 (patch) | |
| tree | 60ca39881c97502f46ce3fb8a85a5c0975bbc33e /src | |
| parent | 2586d9355abacc7294499dd81217012385d3d8a8 (diff) | |
| download | wix-e0a88194af923cb523384352165bca91780c4289.tar.gz wix-e0a88194af923cb523384352165bca91780c4289.tar.bz2 wix-e0a88194af923cb523384352165bca91780c4289.zip | |
Add package definitions for the latest version of .NET Core 3.1
Diffstat (limited to 'src')
6 files changed, 339 insertions, 9 deletions
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 | |||
| @@ -37,6 +37,31 @@ namespace WixToolsetTest.Netfx | |||
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | [Fact] | 39 | [Fact] |
| 40 | public void CanBuildUsingDotNetCorePackages_X64() | ||
| 41 | { | ||
| 42 | using (var fs = new DisposableFileSystem()) | ||
| 43 | { | ||
| 44 | var baseFolder = fs.GetFolder(); | ||
| 45 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | ||
| 46 | var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); | ||
| 47 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | ||
| 48 | |||
| 49 | var compileResult = WixRunner.Execute(new[] | ||
| 50 | { | ||
| 51 | "build", | ||
| 52 | Path.Combine(bundleSourceFolder, "Bundle_x64.wxs"), | ||
| 53 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | ||
| 54 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | ||
| 55 | "-intermediateFolder", intermediateFolder, | ||
| 56 | "-o", bundleFile, | ||
| 57 | }); | ||
| 58 | compileResult.AssertSuccess(); | ||
| 59 | |||
| 60 | Assert.True(File.Exists(bundleFile)); | ||
| 61 | } | ||
| 62 | } | ||
| 63 | |||
| 64 | [Fact] | ||
| 40 | public void CanBuildUsingNativeImage() | 65 | public void CanBuildUsingNativeImage() |
| 41 | { | 66 | { |
| 42 | var folder = TestData.Get(@"TestData\UsingNativeImage"); | 67 | var folder = TestData.Get(@"TestData\UsingNativeImage"); |
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 @@ | |||
| 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> | 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> |
| 7 | </BootstrapperApplicationRef> | 7 | </BootstrapperApplicationRef> |
| 8 | <Chain> | 8 | <Chain> |
| 9 | <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" /> | 9 | <PackageGroupRef Id="AspNetCoreRuntime310Redist_x86" /> |
| 10 | <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" /> | 10 | <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x86" /> |
| 11 | <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" /> | 11 | <PackageGroupRef Id="DotNetCoreRuntime310Redist_x86" /> |
| 12 | <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" /> | 12 | |
| 13 | <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" /> | 13 | <PackageGroupRef Id="AspNetCoreRuntime311Redist_x86" /> |
| 14 | <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" /> | 14 | <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x86" /> |
| 15 | <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" /> | 15 | <PackageGroupRef Id="DotNetCoreRuntime311Redist_x86" /> |
| 16 | <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" /> | 16 | |
| 17 | <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" /> | 17 | <PackageGroupRef Id="AspNetCoreRuntime312Redist_x86" /> |
| 18 | <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x86" /> | ||
| 19 | <PackageGroupRef Id="DotNetCoreRuntime312Redist_x86" /> | ||
| 20 | |||
| 21 | <PackageGroupRef Id="AspNetCoreRuntime313Redist_x86" /> | ||
| 22 | <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x86" /> | ||
| 23 | <PackageGroupRef Id="DotNetCoreRuntime313Redist_x86" /> | ||
| 24 | |||
| 25 | <PackageGroupRef Id="AspNetCoreRuntime314Redist_x86" /> | ||
| 26 | <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x86" /> | ||
| 27 | <PackageGroupRef Id="DotNetCoreRuntime314Redist_x86" /> | ||
| 28 | |||
| 29 | <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x86" /> | ||
| 30 | <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x86" /> | ||
| 31 | <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x86" /> | ||
| 18 | </Chain> | 32 | </Chain> |
| 19 | </Bundle> | 33 | </Bundle> |
| 20 | </Wix> | 34 | </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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
| 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | ||
| 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | ||
| 5 | <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense"> | ||
| 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> | ||
| 7 | </BootstrapperApplicationRef> | ||
| 8 | <Chain> | ||
| 9 | <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" /> | ||
| 10 | <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" /> | ||
| 11 | <PackageGroupRef Id="DotNetCoreRuntime310Redist_x64" /> | ||
| 12 | |||
| 13 | <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" /> | ||
| 14 | <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" /> | ||
| 15 | <PackageGroupRef Id="DotNetCoreRuntime311Redist_x64" /> | ||
| 16 | |||
| 17 | <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" /> | ||
| 18 | <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" /> | ||
| 19 | <PackageGroupRef Id="DotNetCoreRuntime312Redist_x64" /> | ||
| 20 | |||
| 21 | <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" /> | ||
| 22 | <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" /> | ||
| 23 | <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" /> | ||
| 24 | |||
| 25 | <PackageGroupRef Id="AspNetCoreRuntime314Redist_x64" /> | ||
| 26 | <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x64" /> | ||
| 27 | <PackageGroupRef Id="DotNetCoreRuntime314Redist_x64" /> | ||
| 28 | |||
| 29 | <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x64" /> | ||
| 30 | <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x64" /> | ||
| 31 | <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x64" /> | ||
| 32 | </Chain> | ||
| 33 | </Bundle> | ||
| 34 | </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 @@ | |||
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> | 15 | <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 16 | <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" /> | 17 | <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" /> |
| 17 | <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | 18 | <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> |
| 18 | <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | 19 | <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> |
diff --git a/src/wixlib/NetCore3.1.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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 3 | |||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
| 5 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
| 6 | |||
| 7 | <?define NetCorePlatform = x64?> | ||
| 8 | <?define NetCoreIdVersionBase = 31?> | ||
| 9 | <?define NetCoreIdVersion = 318?> | ||
| 10 | <?define NetCoreVersion = 3.1.8?> | ||
| 11 | <?include NetCore3_Platform.wxi?> | ||
| 12 | |||
| 13 | <?define AspNetCoreLatestRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | ||
| 14 | <?define DesktopNetCoreLatestRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | ||
| 15 | <?define DotNetCoreLatestRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | ||
| 16 | |||
| 17 | <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?> | ||
| 18 | <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?> | ||
| 19 | <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?> | ||
| 20 | |||
| 21 | <Fragment> | ||
| 22 | <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> | ||
| 23 | |||
| 24 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" /> | ||
| 25 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
| 26 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
| 27 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
| 28 | |||
| 29 | <PackageGroup Id="$(var.AspNetCoreLatestRedistId)"> | ||
| 30 | <ExePackage | ||
| 31 | Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | ||
| 32 | InstallCommand="$(var.AspNetCoreRedistInstallCommand)" | ||
| 33 | RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" | ||
| 34 | UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)" | ||
| 35 | PerMachine="yes" | ||
| 36 | DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" | ||
| 37 | InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" | ||
| 38 | Id="$(var.AspNetCoreRedistId)" | ||
| 39 | Vital="yes" | ||
| 40 | Permanent="yes" | ||
| 41 | Protocol="burn" | ||
| 42 | DownloadUrl="$(var.AspNetCoreRedistLink)" | ||
| 43 | LogPathVariable="$(var.AspNetCoreRedistLog)" | ||
| 44 | Compressed="no"> | ||
| 45 | <RemotePayload | ||
| 46 | CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" | ||
| 47 | CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" | ||
| 48 | Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework" | ||
| 49 | Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA" | ||
| 50 | ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework" | ||
| 51 | Size="7841880" | ||
| 52 | Version="3.1.8.20421" /> | ||
| 53 | </ExePackage> | ||
| 54 | </PackageGroup> | ||
| 55 | </Fragment> | ||
| 56 | |||
| 57 | <Fragment> | ||
| 58 | <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" /> | ||
| 59 | |||
| 60 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" /> | ||
| 61 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
| 62 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
| 63 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
| 64 | |||
| 65 | <PackageGroup Id="$(var.DesktopNetCoreLatestRedistId)"> | ||
| 66 | <ExePackage | ||
| 67 | Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | ||
| 68 | InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)" | ||
| 69 | RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" | ||
| 70 | UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)" | ||
| 71 | PerMachine="yes" | ||
| 72 | DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" | ||
| 73 | InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" | ||
| 74 | Id="$(var.DesktopNetCoreRedistId)" | ||
| 75 | Vital="yes" | ||
| 76 | Permanent="yes" | ||
| 77 | Protocol="burn" | ||
| 78 | DownloadUrl="$(var.DesktopNetCoreRedistLink)" | ||
| 79 | LogPathVariable="$(var.DesktopNetCoreRedistLog)" | ||
| 80 | Compressed="no"> | ||
| 81 | <RemotePayload | ||
| 82 | CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" | ||
| 83 | CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" | ||
| 84 | Description="Microsoft .NET Core Runtime - 3.1.8 (x64)" | ||
| 85 | Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449" | ||
| 86 | ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)" | ||
| 87 | Size="26089480" | ||
| 88 | Version="3.1.8.29220" /> | ||
| 89 | </ExePackage> | ||
| 90 | </PackageGroup> | ||
| 91 | </Fragment> | ||
| 92 | |||
| 93 | <Fragment> | ||
| 94 | <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> | ||
| 95 | |||
| 96 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" /> | ||
| 97 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
| 98 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
| 99 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
| 100 | |||
| 101 | <PackageGroup Id="$(var.DotNetCoreLatestRedistId)"> | ||
| 102 | <ExePackage | ||
| 103 | Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | ||
| 104 | InstallCommand="$(var.DotNetCoreRedistInstallCommand)" | ||
| 105 | RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" | ||
| 106 | UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)" | ||
| 107 | PerMachine="yes" | ||
| 108 | DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" | ||
| 109 | InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" | ||
| 110 | Id="$(var.DotNetCoreRedistId)" | ||
| 111 | Vital="yes" | ||
| 112 | Permanent="yes" | ||
| 113 | Protocol="burn" | ||
| 114 | DownloadUrl="$(var.DotNetCoreRedistLink)" | ||
| 115 | LogPathVariable="$(var.DotNetCoreRedistLog)" | ||
| 116 | Compressed="no"> | ||
| 117 | <RemotePayload | ||
| 118 | CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" | ||
| 119 | CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" | ||
| 120 | Description="Microsoft .NET Core Runtime - 3.1.8 (x64)" | ||
| 121 | Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449" | ||
| 122 | ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)" | ||
| 123 | Size="26089480" | ||
| 124 | Version="3.1.8.29220" /> | ||
| 125 | </ExePackage> | ||
| 126 | </PackageGroup> | ||
| 127 | </Fragment> | ||
| 128 | </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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 3 | |||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
| 5 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
| 6 | |||
| 7 | <?define NetCorePlatform = x86?> | ||
| 8 | <?define NetCoreIdVersionBase = 31?> | ||
| 9 | <?define NetCoreIdVersion = 318?> | ||
| 10 | <?define NetCoreVersion = 3.1.8?> | ||
| 11 | <?include NetCore3_Platform.wxi?> | ||
| 12 | |||
| 13 | <?define AspNetCoreLatestRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | ||
| 14 | <?define DesktopNetCoreLatestRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | ||
| 15 | <?define DotNetCoreLatestRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | ||
| 16 | |||
| 17 | <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?> | ||
| 18 | <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?> | ||
| 19 | <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?> | ||
| 20 | |||
| 21 | <Fragment> | ||
| 22 | <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> | ||
| 23 | |||
| 24 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" /> | ||
| 25 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
| 26 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
| 27 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
| 28 | |||
| 29 | <PackageGroup Id="$(var.AspNetCoreLatestRedistId)"> | ||
| 30 | <ExePackage | ||
| 31 | Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | ||
| 32 | InstallCommand="$(var.AspNetCoreRedistInstallCommand)" | ||
| 33 | RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" | ||
| 34 | UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)" | ||
| 35 | PerMachine="yes" | ||
| 36 | DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" | ||
| 37 | InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" | ||
| 38 | Id="$(var.AspNetCoreRedistId)" | ||
| 39 | Vital="yes" | ||
| 40 | Permanent="yes" | ||
| 41 | Protocol="burn" | ||
| 42 | DownloadUrl="$(var.AspNetCoreRedistLink)" | ||
| 43 | LogPathVariable="$(var.AspNetCoreRedistLog)" | ||
| 44 | Compressed="no"> | ||
| 45 | <RemotePayload | ||
| 46 | CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" | ||
| 47 | CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" | ||
| 48 | Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework" | ||
| 49 | Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D" | ||
| 50 | ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework" | ||
| 51 | Size="7160128" | ||
| 52 | Version="3.1.8.20421" /> | ||
| 53 | </ExePackage> | ||
| 54 | </PackageGroup> | ||
| 55 | </Fragment> | ||
| 56 | |||
| 57 | <Fragment> | ||
| 58 | <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" /> | ||
| 59 | |||
| 60 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" /> | ||
| 61 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
| 62 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
| 63 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
| 64 | |||
| 65 | <PackageGroup Id="$(var.DesktopNetCoreLatestRedistId)"> | ||
| 66 | <ExePackage | ||
| 67 | Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | ||
| 68 | InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)" | ||
| 69 | RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" | ||
| 70 | UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)" | ||
| 71 | PerMachine="yes" | ||
| 72 | DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" | ||
| 73 | InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" | ||
| 74 | Id="$(var.DesktopNetCoreRedistId)" | ||
| 75 | Vital="yes" | ||
| 76 | Permanent="yes" | ||
| 77 | Protocol="burn" | ||
| 78 | DownloadUrl="$(var.DesktopNetCoreRedistLink)" | ||
| 79 | LogPathVariable="$(var.DesktopNetCoreRedistLog)" | ||
| 80 | Compressed="no"> | ||
| 81 | <RemotePayload | ||
| 82 | CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" | ||
| 83 | CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" | ||
| 84 | Description="Microsoft .NET Core Runtime - 3.1.8 (x86)" | ||
| 85 | Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91" | ||
| 86 | ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)" | ||
| 87 | Size="23183576" | ||
| 88 | Version="3.1.8.29220" /> | ||
| 89 | </ExePackage> | ||
| 90 | </PackageGroup> | ||
| 91 | </Fragment> | ||
| 92 | |||
| 93 | <Fragment> | ||
| 94 | <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> | ||
| 95 | |||
| 96 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" /> | ||
| 97 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
| 98 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
| 99 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
| 100 | |||
| 101 | <PackageGroup Id="$(var.DotNetCoreLatestRedistId)"> | ||
| 102 | <ExePackage | ||
| 103 | Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | ||
| 104 | InstallCommand="$(var.DotNetCoreRedistInstallCommand)" | ||
| 105 | RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" | ||
| 106 | UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)" | ||
| 107 | PerMachine="yes" | ||
| 108 | DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" | ||
| 109 | InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" | ||
| 110 | Id="$(var.DotNetCoreRedistId)" | ||
| 111 | Vital="yes" | ||
| 112 | Permanent="yes" | ||
| 113 | Protocol="burn" | ||
| 114 | DownloadUrl="$(var.DotNetCoreRedistLink)" | ||
| 115 | LogPathVariable="$(var.DotNetCoreRedistLog)" | ||
| 116 | Compressed="no"> | ||
| 117 | <RemotePayload | ||
| 118 | CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" | ||
| 119 | CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" | ||
| 120 | Description="Microsoft .NET Core Runtime - 3.1.8 (x86)" | ||
| 121 | Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91" | ||
| 122 | ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)" | ||
| 123 | Size="23183576" | ||
| 124 | Version="3.1.8.29220" /> | ||
| 125 | </ExePackage> | ||
| 126 | </PackageGroup> | ||
| 127 | </Fragment> | ||
| 128 | </Wix> | ||
