diff options
| author | James Parsons <japarson@microsoft.com> | 2020-09-29 00:10:57 -0700 |
|---|---|---|
| committer | James Parsons <japarson@microsoft.com> | 2020-09-29 00:10:57 -0700 |
| commit | 9ed6f291d49599bb12a1baa3a0e000f1e0e254cf (patch) | |
| tree | b6fac9928a616a85066c1dd3b0bc100bfa87f97c /src/wixlib/NetCore3.1_x86.wxs | |
| parent | e0a88194af923cb523384352165bca91780c4289 (diff) | |
| download | wix-9ed6f291d49599bb12a1baa3a0e000f1e0e254cf.tar.gz wix-9ed6f291d49599bb12a1baa3a0e000f1e0e254cf.tar.bz2 wix-9ed6f291d49599bb12a1baa3a0e000f1e0e254cf.zip | |
Remove unsupported .NET Core 3.1 package definitions
Diffstat (limited to '')
| -rw-r--r-- | src/wixlib/NetCore3.1_x86.wxs (renamed from src/wixlib/NetCore3.1.Latest_x86.wxs) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wixlib/NetCore3.1.Latest_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs index c36523dc..7cb1b26b 100644 --- a/src/wixlib/NetCore3.1.Latest_x86.wxs +++ b/src/wixlib/NetCore3.1_x86.wxs | |||
| @@ -10,9 +10,9 @@ | |||
| 10 | <?define NetCoreVersion = 3.1.8?> | 10 | <?define NetCoreVersion = 3.1.8?> |
| 11 | <?include NetCore3_Platform.wxi?> | 11 | <?include NetCore3_Platform.wxi?> |
| 12 | 12 | ||
| 13 | <?define AspNetCoreLatestRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | 13 | <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?> |
| 14 | <?define DesktopNetCoreLatestRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | 14 | <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?> |
| 15 | <?define DotNetCoreLatestRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)LatestRedist_$(var.NetCorePlatform)?> | 15 | <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersionBase)Redist_$(var.NetCorePlatform)?> |
| 16 | 16 | ||
| 17 | <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?> | 17 | <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?> |
| 18 | <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?> | 18 | <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?> |
| @@ -26,7 +26,7 @@ | |||
| 26 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> | 27 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> |
| 28 | 28 | ||
| 29 | <PackageGroup Id="$(var.AspNetCoreLatestRedistId)"> | 29 | <PackageGroup Id="$(var.AspNetCoreRedistId)"> |
| 30 | <ExePackage | 30 | <ExePackage |
| 31 | Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | 31 | Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" |
| 32 | InstallCommand="$(var.AspNetCoreRedistInstallCommand)" | 32 | InstallCommand="$(var.AspNetCoreRedistInstallCommand)" |
| @@ -62,7 +62,7 @@ | |||
| 62 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> | 63 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> |
| 64 | 64 | ||
| 65 | <PackageGroup Id="$(var.DesktopNetCoreLatestRedistId)"> | 65 | <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> |
| 66 | <ExePackage | 66 | <ExePackage |
| 67 | Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | 67 | Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" |
| 68 | InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)" | 68 | InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)" |
| @@ -98,7 +98,7 @@ | |||
| 98 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> | 99 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> |
| 100 | 100 | ||
| 101 | <PackageGroup Id="$(var.DotNetCoreLatestRedistId)"> | 101 | <PackageGroup Id="$(var.DotNetCoreRedistId)"> |
| 102 | <ExePackage | 102 | <ExePackage |
| 103 | Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | 103 | Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" |
| 104 | InstallCommand="$(var.DotNetCoreRedistInstallCommand)" | 104 | InstallCommand="$(var.DotNetCoreRedistInstallCommand)" |