diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-12-29 14:04:28 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-12-30 06:45:49 -0800 |
| commit | 6edc5d1e2a289eac50c6d59a29e195353bb023cb (patch) | |
| tree | c162d40ec9b8a972b8a89afa5a79017a3d3a1902 /src/setup | |
| parent | d9bb1133c2913d7129b3b103bd4a75f01d24625c (diff) | |
| download | wix-6edc5d1e2a289eac50c6d59a29e195353bb023cb.tar.gz wix-6edc5d1e2a289eac50c6d59a29e195353bb023cb.tar.bz2 wix-6edc5d1e2a289eac50c6d59a29e195353bb023cb.zip | |
Add Package/@Id and Bundle/@Id that can replace UpgradeCodes
Completes 8584
Diffstat (limited to 'src/setup')
| -rw-r--r-- | src/setup/ThmViewerPackage/ThmViewerPackage.wxs | 2 | ||||
| -rw-r--r-- | src/setup/WixAdditionalTools/WixAdditionalTools.wxs | 2 | ||||
| -rw-r--r-- | src/setup/wix-cli/Package.wxs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs index eb399686..df398d0f 100644 --- a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs +++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <!-- 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. --> | 1 | <!-- 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. --> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 3 | <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89"> | 3 | <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)"> |
| 4 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 4 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
| 5 | 5 | ||
| 6 | <Feature Id="Main"> | 6 | <Feature Id="Main"> |
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs index 6a9f945f..9369f32e 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 4 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 4 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 5 | <Bundle Name="!(loc.Name)" Manufacturer="WiX Toolset" Version="$(SetupVersion)" UpgradeCode="fc48131d-214a-439b-9a31-ef2ea5c69ea5" | 5 | <Bundle Id="WixToolset.WixAdditionalTools" Name="!(loc.Name)" Manufacturer="WiX Toolset" Version="$(SetupVersion)" |
| 6 | AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)"> | 6 | AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)"> |
| 7 | <BootstrapperApplication> | 7 | <BootstrapperApplication> |
| 8 | <bal:WixStandardBootstrapperApplication | 8 | <bal:WixStandardBootstrapperApplication |
diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs index 9c193130..c777f356 100644 --- a/src/setup/wix-cli/Package.wxs +++ b/src/setup/wix-cli/Package.wxs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <!-- 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. --> | 1 | <!-- 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. --> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 3 | <Package Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)" UpgradeCode="2e85dc76-769f-46d2-82a7-46cb3a0c9d50"> | 3 | <Package Id="WixToolset.CommandLineTools.Package" Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)"> |
| 4 | <MediaTemplate EmbedCab="yes" /> | 4 | <MediaTemplate EmbedCab="yes" /> |
| 5 | 5 | ||
| 6 | <ComponentGroupRef Id="BinaryFiles" /> | 6 | <ComponentGroupRef Id="BinaryFiles" /> |