diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-03-19 16:46:08 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-03-19 17:55:00 -0700 |
| commit | 45535e659ea8b58101fe9e8adfa6aa273d2bb544 (patch) | |
| tree | 5e183841bb3c25f3f9ddc130ded97efd3b204ff2 /src/setup | |
| parent | 4d3f7c8cf16db06932596beb27d8d025be501b95 (diff) | |
| download | wix-45535e659ea8b58101fe9e8adfa6aa273d2bb544.tar.gz wix-45535e659ea8b58101fe9e8adfa6aa273d2bb544.tar.bz2 wix-45535e659ea8b58101fe9e8adfa6aa273d2bb544.zip | |
Formalize official WiX build and update tags in nupkgs
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 66bbe766..0851450e 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 Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)"> | 3 | <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="$(Company)" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)"> |
| 4 | <Component> | 4 | <Component> |
| 5 | <File Id="ThmViewerFile" Source="thmviewer.exe" /> | 5 | <File Id="ThmViewerFile" Source="thmviewer.exe" /> |
| 6 | <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" /> | 6 | <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" /> |
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs index da8201ee..08dc90fe 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 Id="WixToolset.WixAdditionalTools" Name="!(loc.Name)" Manufacturer="WiX Toolset" Version="$(SetupVersion)" | 5 | <Bundle Id="WixToolset.WixAdditionalTools" Name="!(loc.Name)" Manufacturer="$(Company)" 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 c3a66973..897a1e5a 100644 --- a/src/setup/wix-cli/Package.wxs +++ b/src/setup/wix-cli/Package.wxs | |||
| @@ -1,7 +1,7 @@ | |||
| 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 | xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> | 3 | xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> |
| 4 | <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)"> | 4 | <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="$(Company)" Version="!(bind.fileVersion.WixExe)"> |
| 5 | <MediaTemplate EmbedCab="yes" /> | 5 | <MediaTemplate EmbedCab="yes" /> |
| 6 | 6 | ||
| 7 | <ComponentGroupRef Id="BinaryFiles" /> | 7 | <ComponentGroupRef Id="BinaryFiles" /> |