Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit e0a9ec5
Author: Bob Arnson <bob@firegiant.com>
Date:   Sun Nov 19 21:11:51 2023 -0500

    Remove the deprecated DifxApp WiX extension.

    Per
    https://wixtoolset.org/docs/releasenotes/#deprecations-and-deletions.

commit e5ed750
Author: Bob Arnson <bob@firegiant.com>
Date:   Sun Nov 19 20:55:45 2023 -0500

    Clean up.

commit dfb7512
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Thu Sep 21 16:03:28 2023 +1000

    add firewall extension decompiler, make msi modifications work, add all attributes

commit 80e6047
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Sat Aug 26 18:51:38 2023 +1000

    change firewall extension table name to Wix5FirewallException

commit 6e97449
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Nov 13 12:56:15 2023 -0800

    Return intermediate even if compiler encounters error

    Fixes 7854

commit a532341
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Nov 6 21:46:30 2023 -0800

    Include duplicated inline directory symbols referenced in subsequent sections

    Due to the handling of redundant symbols, which are only used by inline directory
    syntax, the symbols were only defined in the first section encountered by the linker.
    Fix that so at most one duplicated inline directory symbol is included when
    referenced.

    Fixes 7840

commit 4b9bbae
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Nov 6 22:45:46 2023 -0800

    Fix duplication of AdditionalOptions being added to command-line

    Fixes 7837

commit a886df0
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Nov 6 22:36:57 2023 -0800

    Correctly handle top-level AppId element

    Fixes 7738

commit 96e9c0f
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Nov 6 23:08:10 2023 -0800

    Avoid use of Encoding.WindowsCodePage

    Fixes 7612

commit b842027
Author: Bob Arnson <bob@firegiant.com>
Date:   Mon Oct 23 00:17:18 2023 -0400

    Introduce a new phase in the build pipeline.

    A useful point in the build pipeline is after all the files in the
    project have been compiled but before they've been linked.
    The WiX core and extensions can operate on symbols across
    the project but without operating at the source-code level.

    This phase is currently named "optimize," after a moderately-similar
    phase in other compiler architectures. The name is, for now, a stake in
    the ground and a better alternate is welcome.

commit bb691bd
Author: Bob Arnson <bob@firegiant.com>
Date:   Fri Oct 13 20:22:34 2023 -0400

    Random typo fix.

commit f5e164d
Author: Bob Arnson <bob@firegiant.com>
Date:   Fri Oct 13 20:22:21 2023 -0400

    Add cert and x64 tests.

commit 0014af6
Author: apacker1 <apacker1@users.noreply.github.com>
Date:   Fri Sep 22 14:41:57 2023 -0700

    DotNetCompatibilityCheck: If running NetCoreCheck.exe fails with error code ERROR_EXE_MACHINE_TYPE_MISMATCH or ERROR_BAD_EXE_FORMAT then don't abort the installation, just set the property to 13.  Fixes issue #7737

commit e570ce5
Author: Rob Mensching <rob@firegiant.com>
Date:   Tue Sep 12 14:08:34 2023 -0700

    Update to latest signing infrastructure

    Fixes 7546

commit 409d3b6
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Sat Aug 26 17:31:08 2023 +1000

    add FIREWALL_EXCEPTION_ATTRIBUTES struct

commit e7656ce
Author: Bob Arnson <bob@firegiant.com>
Date:   Sun Sep 10 22:52:33 2023 -0400

    Remove unused symbol `Version`.

commit f18d7e6
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Sep 4 23:40:46 2023 -0700

    Correctly process build -outputType switch

    Also add a few additional output types to built-in backends.

    Fixes 7708

commit e29b4aa
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Mon Aug 21 11:34:51 2023 +1000

    remove windows xp specific code from firewall extension

commit b3deb46
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Sat Aug 26 08:31:28 2023 +1000

    add firewall extension decompiler

commit 537e79d
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Sun Aug 20 19:49:21 2023 +1000

    use WcaGetRecordFormattedString to get firewall rule description

commit febb9c9
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Sun Aug 13 11:34:57 2023 +1000

    add integration tests for the firewall extenstion

commit 6f520b9
Author: Bob Arnson <bob@firegiant.com>
Date:   Tue Aug 15 18:05:47 2023 -0400

    Properly fragment NetFx custom actions.

    FIxes wixtoolset/issues#7677.

commit 59f37d2
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Aug 7 15:43:10 2023 -0700

    Fix the use of ModuleSubstitution table

    Addresses two issues in the creation of configurable merge modules. First, the
    ModuleConfiguration table Id should not be modularized. Second, the
    ModuleSubstitution table was never created. Fixing both of those allows
    configurable merge modules to work again.

    Fixes 7559

commit 2b429e9
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Aug 7 12:31:20 2023 -0700

    Remove Esproj test

    The npm packages in esproj regularly encounter security issues that are not
    relevant to WiX. The test provides less value than the churn required to keep
    all the test project up to date, so deleting it.

commit 9607c3a
Author: Rob Mensching <rob@firegiant.com>
Date:   Mon Aug 7 12:07:39 2023 -0700

    Ensure the Font actions are scheduled for TrueType fonts

    TrueType fonts are denoted by the empty string in the FontTitle field of the
    FileSymbol. That means a non-null FontTitle field value means a font is being
    installed.

    Fixes 7593

commit 6d5c4be
Author: Bob Arnson <bob@firegiant.com>
Date:   Sat Jul 29 20:57:14 2023 -0400

    Remove legacy permissions support.

    In the long ago, a share could have one user/permissions pair. That's
    really limited, of course, so support for _n_ user/permissions pairs
    was added. In the move to WiX v4, support for that single, legacy user
    was removed from the extension side but not the custom action side.
    Remove that support.

    Fixes wixtoolset/issues#7632.

commit d8832db
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Wed Aug 2 19:39:25 2023 +1000

    fix stack corruption around cbdata when adding a machine certificate

commit 5e9901d
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Sat Jul 22 09:01:55 2023 +1000

    Multiple extension support in unit tests

commit 1c50eb8
Author: Bob Arnson <bob@firegiant.com>
Date:   Fri Jul 21 19:56:59 2023 -0400

    Fix mentions of dark.exe.

commit e0641f1
Author: Marco Stadler <marco.stadler@bruker.com>
Date:   Mon Apr 24 11:49:53 2023 +0200

    Allow custom package comments

    Fixes #7369

commit 42118ef
Author: Rob Mensching <rob@firegiant.com>
Date:   Wed Jul 19 10:20:19 2023 -0700

    Fix out of date references to Product in warnings

    Fixes 7631

commit 7a603e4
Author: Rob Mensching <rob@firegiant.com>
Date:   Wed Jul 19 10:19:35 2023 -0700

    Remove invalid references to ToolsVersion in ext wixlib projects

commit d20b6d4
Author: chris_bednarski <Chris.Bednarski@minfos.com.au>
Date:   Wed Jul 19 10:11:18 2023 +1000

    feat(build): update xunit to version 2.5.0, fix occasional test timeout

commit cef14c6
Author: Bob Arnson <bob@firegiant.com>
Date:   Thu Jun 15 15:40:37 2023 -0400

    Ensure extensions get the same decompiler helper.

    Fixes wixtoolset/issues#7548.

    THIS IS A BREAKING INTERFACE/EXTENSIBILITY CHANGE.

commit 164c29a
Author: Bob Arnson <bob@firegiant.com>
Date:   Tue Jul 11 21:19:08 2023 -0400

    Partial fix for the weirdly broken...

    IWindowsInstallerDecompileContext.TreatProductAsModule.

    wixtoolset/issues#7607

commit 713f286
Author: Rob Mensching <rob@firegiant.com>
Date:   Sat Jul 8 09:10:50 2023 -0700

    Fix typo where Level was used instead of Value in Level element error message

    Fixes 7603

commit e53c658
Author: Bob Arnson <bob@firegiant.com>
Date:   Thu Jun 29 21:16:35 2023 -0400

    Extract object fields with modularization GUIDs.

commit ddae99c
Author: Bob Arnson <bob@firegiant.com>
Date:   Tue Jun 20 20:09:19 2023 -0400

    Handle MergeModule.CABinet for extraction.

    Fixes wixtoolset/issues#7568,

commit 9a550ac
Author: Michael Stoll <michael.stoll@stolltec.com>
Date:   Wed May 3 18:04:48 2023 +0200

    Add more _NODOMAIN properties to WixQueryOsWellKnownSID

commit 35d30e0
Author: Bob Arnson <bob@firegiant.com>
Date:   Thu May 18 20:47:27 2023 -0400

    Improve logging to remove `(null)`.

    Add detached container runtime test.

    Inspired by wixtoolset/issues#7490.

commit f474066
Author: Jesper Hansen <jesper@staunhansen.dk>
Date:   Mon Jun 12 14:39:32 2023 +0200

    Update WindowsInstallerStandard.cs ordered sequence

    Ordered standard actions by sequence and group for more human readability

commit 2daf189
Author: Nir Bar <nir.bar@panel-sw.co.il>
Date:   Thu Apr 20 08:44:54 2023 +0300

    Allow customized AdditionalOptions for all HarvestX MSBuild ItemGroups

commit 783b829
Author: Rob Mensching <rob@firegiant.com>
Date:   Fri Jun 2 11:45:10 2023 -0700

    ProjectReferences to wixlibs should participate in DefineConstants creation

    Also fix documentation in ResolveWixLibraryReferences target.

    Fixes 7512

commit ed0a765
Author: Bob Arnson <bob@firegiant.com>
Date:   Wed May 31 16:04:27 2023 -0400

    Downgrade bad ProductVersion error to warning.

    Fixes wixtoolset/issues#7522.

commit bc9343a
Author: Rob Mensching <rob@firegiant.com>
Date:   Tue May 30 08:28:14 2023 -0700

    Obsolete removed PackageState.Cached value

    A package's cached status is no longer set via the PackageState. The value was
    removed in native code but the managed code was missed throwing off the enum
    mapping.

    Fixes 7399
  • Loading branch information
nirbar committed Nov 21, 2023
1 parent 72f97c8 commit 0610efe
Show file tree
Hide file tree
Showing 90 changed files with 4,107 additions and 1,155 deletions.
3 changes: 0 additions & 3 deletions src/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# 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.
#
# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig
# then update all of the repos.

root = true

Expand Down
5 changes: 1 addition & 4 deletions src/Directory.csproj.targets
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<!-- 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. -->
<!--
Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
then update all of the repos.
-->

<Project>
<PropertyGroup>
<CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
Expand Down
8 changes: 4 additions & 4 deletions src/api/wix/WixToolset.Data/ErrorMessages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static Message AdvertiseStateMustMatch(SourceLineNumber sourceLineNumbers

public static Message AppIdIncompatibleAdvertiseState(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string parentValue)
{
return Message(sourceLineNumbers, Ids.AppIdIncompatibleAdvertiseState, "The {0}/@(1) attribute's value, '{2}' does not match the advertise state on its parent element: '{3}'. (Note: AppIds nested under Fragment, Module, or Product elements must be advertised.)", elementName, attributeName, value, parentValue);
return Message(sourceLineNumbers, Ids.AppIdIncompatibleAdvertiseState, "The {0}/@(1) attribute's value, '{2}' does not match the advertise state on its parent element: '{3}'. (Note: AppIds nested under Fragment, Module, or Package elements must be advertised.)", elementName, attributeName, value, parentValue);
}

public static Message BaselineRequired()
Expand Down Expand Up @@ -867,12 +867,12 @@ public static Message IllegalCharactersInPath(string pathName)

public static Message IllegalCodepage(int codepage)
{
return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
}

public static Message IllegalCodepage(SourceLineNumber sourceLineNumbers, int codepage)
{
return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
}

public static Message IllegalCodepageAttribute(SourceLineNumber sourceLineNumbers, string codepage, string elementName, string attributeName)
Expand Down Expand Up @@ -1318,7 +1318,7 @@ public static Message InvalidSequenceTable(string sequenceTableName)

public static Message InvalidStringForCodepage(SourceLineNumber sourceLineNumbers, string codepage)
{
return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
}

public static Message InvalidStubExe(string filename)
Expand Down
63 changes: 0 additions & 63 deletions src/ext/DifxApp/DifxApp.wixext.sln

This file was deleted.

2 changes: 0 additions & 2 deletions src/ext/DifxApp/README.md

This file was deleted.

21 changes: 0 additions & 21 deletions src/ext/DifxApp/difxapp.cmd

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

155 changes: 0 additions & 155 deletions src/ext/DifxApp/wixext/DifxAppCompiler.cs

This file was deleted.

Loading

0 comments on commit 0610efe

Please sign in to comment.