Skip to content

Commit ee3747f

Browse files
nirbarnirbar
committed
Squashed commit of the following:
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
1 parent 2706043 commit ee3747f

File tree

68 files changed

+1830
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1830
-760
lines changed

‎.github/workflows/build.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
build:
2020
name: Build
2121
runs-on: windows-2022
22+
permissions:
23+
packages: write
24+
id-token: write
2225
steps:
2326
- name: Checkout code
2427
uses: actions/checkout@v3
@@ -29,6 +32,11 @@ jobs:
2932
# shell: cmd
3033
# run: ./src/vs_config.cmd
3134

35+
- name: Install sign tool
36+
if: (github.ref == 'refs/heads/master')
37+
shell: cmd
38+
run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.23356.1
39+
3240
- name: Configure automated logging and crash dumps
3341
shell: cmd
3442
run: |
@@ -41,6 +49,15 @@ jobs:
4149
reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f
4250
reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1
4351
52+
- name: 'Az CLI login'
53+
if: (github.ref == 'refs/heads/master')
54+
uses: azure/login@v1
55+
with:
56+
allow-no-subscriptions: true
57+
client-id: ${{ secrets.WIX_SIGNING_CLIENTID }}
58+
tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }}
59+
subscription-id: ${{ secrets.WIX_SIGNING_SUBSCRIPTIONID }}
60+
4461
- name: Decrypt snk
4562
run: gpg --quiet --batch --yes --decrypt --passphrase="${{ secrets.GPG_PASSPHRASE }}" --output "${{ github.workspace }}\src\psw-wix.snk" "${{ github.workspace }}\src\psw-wix.snk.gpg"
4663

@@ -49,8 +66,8 @@ jobs:
4966
run: ./src/build_official.cmd
5067
env:
5168
RuntimeTestsEnabled: true
52-
SigningUser: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_USER || '' }}
53-
SigningSecret: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_SECRET || '' }}
69+
SigningVaultUri: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_VAULTURI || '' }}
70+
SigningCertName: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_CERTNAME || '' }}
5471
BuildRunNumber: ${{ github.run_number }}
5572

5673
- name: Resolve build version

‎src/Directory.Build.targets

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<Project>
55
<PropertyGroup>
66
<SigningToolFolder>$(ToolsFolder)</SigningToolFolder>
7-
<SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe>
8-
<SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist>
9-
<SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration>
7+
<SigningToolExe>$(SigningToolFolder)\sign.exe</SigningToolExe>
8+
<SigningFilelist>$(MSBuildThisFileDirectory)signing-empty-file-list.txt</SigningFilelist>
9+
<SigningConfiguration>--description "WiX Toolset" --description-url "https://wixtoolset.org/" --timestamp-url "http://timestamp.digicert.com" --file-list "$(SigningFilelist)" --azure-key-vault-managed-identity true --azure-key-vault-url "$(SigningVaultUri)" --azure-key-vault-certificate "$(SigningCertName)"</SigningConfiguration>
1010
</PropertyGroup>
1111

1212
<PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
@@ -129,47 +129,39 @@
129129
</ItemGroup>
130130
</Target>
131131

132-
<Target Name="_GetSignClient"
133-
Condition=" !Exists('$(SigningToolExe)') ">
134-
135-
<WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' />
136-
137-
<Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' IgnoreExitCode='true' />
138-
</Target>
139-
140-
<Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild"
141-
Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and
132+
<Target Name="SignOutput" AfterTargets="AfterBuild"
133+
Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' and
142134
('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))">
143135

144-
<Message Importance="high" Text="Signing file: $(TargetPath) using configuration from: $(SigningConfiguration)" />
136+
<Message Importance="high" Text="Signing file: $(TargetPath)" />
145137

146-
<Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
138+
<Exec Command='"$(SigningToolExe)" code azure-key-vault $(TargetPath) $(SigningConfiguration)'
147139
WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
148140
</Target>
149141

150-
<Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative"
151-
Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' ">
142+
<Target Name="SignNupkg" AfterTargets="Pack;PackNative"
143+
Condition=" '$(SigningCertName)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' ">
152144
<ItemGroup>
153145
<SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " />
154146
</ItemGroup>
155147

156-
<Message Importance="high" Text="Signing nupkg: @(SigningNupkgs->&apos;%(Identity)&apos;) using configuration from: $(SigningConfiguration)" />
148+
<Message Importance="high" Text="Signing nupkg: @(SigningNupkgs->&apos;%(Identity)&apos;)" />
157149

158-
<Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->&apos;%(Identity)&apos;)" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
150+
<Exec Command='"$(SigningToolExe)" code azure-key-vault "@(SigningNupkgs->&apos;%(Identity)&apos;)" $(SigningConfiguration)'
159151
WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
160152
</Target>
161153

162-
<Target Name="SignBundleEngine" DependsOnTargets="_GetSignClient" Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' ">
163-
<Message Importance="high" Text="Signing bundle engine: @(SignBundleEngine->&apos;%(Identity)&apos;) using configuration from: $(SigningConfiguration)" />
154+
<Target Name="SignBundleEngine" Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' ">
155+
<Message Importance="high" Text="Signing bundle engine: @(SignBundleEngine->&apos;%(Identity)&apos;)" />
164156

165-
<Exec Command='"$(SigningToolExe)" sign -i "@(SignBundleEngine->&apos;%(Identity)&apos;)" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
157+
<Exec Command='"$(SigningToolExe)" code azure-key-vault "@(SignBundleEngine->&apos;%(Identity)&apos;)" $(SigningConfiguration)'
166158
WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
167159
</Target>
168160

169-
<Target Name="SignBundle" DependsOnTargets="_GetSignClient" Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' ">
170-
<Message Importance="high" Text="Signing bundle: @(SignBundle->&apos;%(Identity)&apos;) using configuration from: $(SigningConfiguration)" />
161+
<Target Name="SignBundle" Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' ">
162+
<Message Importance="high" Text="Signing bundle: @(SignBundle->&apos;%(Identity)&apos;)" />
171163

172-
<Exec Command='"$(SigningToolExe)" sign -i "@(SignBundle->&apos;%(Identity)&apos;)" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
164+
<Exec Command='"$(SigningToolExe)" code azure-key-vault "@(SignBundle->&apos;%(Identity)&apos;)" $(SigningConfiguration)'
173165
WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
174166
</Target>
175167

‎src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ public enum SymbolDefinitionType
207207

208208
public static partial class SymbolDefinitions
209209
{
210-
public static readonly Version Version = new Version("4.0.0");
211-
212210
public static IntermediateSymbolDefinition ByName(string name)
213211
{
214212
if (!Enum.TryParse(name, out SymbolDefinitionType type) || type == SymbolDefinitionType.MustBeFromAnExtension)

‎src/api/wix/WixToolset.Extensibility/BaseOptimizerExtension.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
3+
namespace WixToolset.Extensibility
4+
{
5+
using WixToolset.Extensibility.Data;
6+
7+
/// <summary>
8+
/// Base class for creating an optimizer extension.
9+
/// </summary>
10+
public abstract class BaseOptimizerExtension : IOptimizerExtension
11+
{
12+
/// <summary>
13+
/// Called after all files have been compiled, before built-in optimizations, and before all sections are linked into a single section.
14+
/// </summary>
15+
public virtual void PreOptimize(IOptimizeContext context)
16+
{
17+
}
18+
19+
/// <summary>
20+
/// Called after all files have been compiled, after built-in optimizations, and before all sections are linked into a single section.
21+
/// </summary>
22+
public virtual void PostOptimize(IOptimizeContext context)
23+
{
24+
}
25+
}
26+
}

‎src/api/wix/WixToolset.Extensibility/Data/IBindContext.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ public interface IBindContext
7272
/// </summary>
7373
string OutputPath { get; set; }
7474

75+
/// <summary>
76+
/// Output type to bind to.
77+
/// </summary>
78+
string OutputType { get; set; }
79+
7580
/// <summary>
7681
/// Type of PDB to create.
7782
/// </summary>

‎src/api/wix/WixToolset.Extensibility/Data/ICompileContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public interface ICompileContext
5555
XDocument Source { get; set; }
5656

5757
/// <summary>
58-
/// Cancellation token to abort cancellation.
58+
/// Cancellation token.
5959
/// </summary>
6060
CancellationToken CancellationToken { get; set; }
6161
}

‎src/api/wix/WixToolset.Extensibility/Data/IOptimizeContext.cs

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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+
3+
namespace WixToolset.Extensibility.Data
4+
{
5+
using System;
6+
using System.Collections.Generic;
7+
using System.Threading;
8+
using WixToolset.Data;
9+
10+
/// <summary>
11+
/// Context provided to the optimizer.
12+
/// </summary>
13+
public interface IOptimizeContext
14+
{
15+
/// <summary>
16+
/// Service provider made available to the optimizer and its extensions.
17+
/// </summary>
18+
IServiceProvider ServiceProvider { get; }
19+
20+
/// <summary>
21+
/// Set of extensions provided to the optimizer.
22+
/// </summary>
23+
IReadOnlyCollection<IOptimizerExtension> Extensions { get; set; }
24+
25+
/// <summary>
26+
/// Intermediate folder.
27+
/// </summary>
28+
string IntermediateFolder { get; set; }
29+
30+
/// <summary>
31+
/// Collection of bindpaths used to bind files.
32+
/// </summary>
33+
IReadOnlyCollection<IBindPath> BindPaths { get; set; }
34+
35+
/// <summary>
36+
/// Bind variables used during optimization.
37+
/// </summary>
38+
IDictionary<string, string> BindVariables { get; set; }
39+
40+
/// <summary>
41+
/// Gets or sets the platform which the optimizer will use when defaulting 64-bit symbol properties.
42+
/// </summary>
43+
/// <value>The platform which the optimizer will use when defaulting 64-bit symbol properties.</value>
44+
Platform Platform { get; set; }
45+
46+
/// <summary>
47+
/// Collection of intermediates to optimize.
48+
/// </summary>
49+
IReadOnlyCollection<Intermediate> Intermediates { get; set; }
50+
51+
/// <summary>
52+
/// Collection of localization files to use in the optimizer.
53+
/// </summary>
54+
IReadOnlyCollection<Localization> Localizations { get; set; }
55+
56+
/// <summary>
57+
/// Cancellation token.
58+
/// </summary>
59+
CancellationToken CancellationToken { get; set; }
60+
}
61+
}

‎src/api/wix/WixToolset.Extensibility/IOptimizerExtension.cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
3+
namespace WixToolset.Extensibility
4+
{
5+
using WixToolset.Extensibility.Data;
6+
7+
/// <summary>
8+
/// Interface that all optimizer extensions implement.
9+
/// </summary>
10+
public interface IOptimizerExtension
11+
{
12+
/// <summary>
13+
/// Called after all files have been compiled, before built-in optimizations, and before all sections are linked into a single section.
14+
/// </summary>
15+
void PreOptimize(IOptimizeContext context);
16+
17+
/// <summary>
18+
/// Called after all files have been compiled, after built-in optimizations, and before all sections are linked into a single section.
19+
/// </summary>
20+
void PostOptimize(IOptimizeContext context);
21+
}
22+
}

‎src/ext/ComPlus/wixext/Symbols/ComPlusSymbolDefinitions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public enum ComPlusSymbolDefinitionType
3636

3737
public static partial class ComPlusSymbolDefinitions
3838
{
39-
public static readonly Version Version = new Version("4.0.0");
40-
4139
public static IntermediateSymbolDefinition ByName(string name)
4240
{
4341
if (!Enum.TryParse(name, out ComPlusSymbolDefinitionType type))

‎src/ext/DifxApp/wixext/Symbols/DifxAppSymbolDefinitions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ public enum DifxAppSymbolDefinitionType
1212

1313
public static partial class DifxAppSymbolDefinitions
1414
{
15-
public static readonly Version Version = new Version("4.0.0");
16-
1715
public static IntermediateSymbolDefinition ByName(string name)
1816
{
1917
if (!Enum.TryParse(name, out DifxAppSymbolDefinitionType type))

0 commit comments

Comments
 (0)