Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions src/api/wix/WixToolset.Data/ErrorMessages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -563,11 +563,6 @@ public static Message ExpectedPatchIdInWixMsp()
return Message(null, Ids.ExpectedPatchIdInWixMsp, "The WixMsp is missing the patch ID.");
}

public static Message ExpectedRowInPatchCreationPackage(string tableName)
{
return Message(null, Ids.ExpectedRowInPatchCreationPackage, "Could not find a row in the '{0}' table for this patch creation package. Patch creation packages must contain at least one row in the '{0}' table.", tableName);
}

public static Message ExpectedSignedCabinetName(SourceLineNumber sourceLineNumbers)
{
return Message(sourceLineNumbers, Ids.ExpectedSignedCabinetName, "The Media/@Cabinet attribute was not found; it is required when this element contains a DigitalSignature child element. This is because Windows Installer can only verify the digital signatures of external cabinets. Please either remove the DigitalSignature element or specify a valid external cabinet name via the Cabinet attribute.");
Expand Down Expand Up @@ -1413,7 +1408,7 @@ public static Message MissingDependencyVersion(string packageId)

public static Message MissingEntrySection()
{
return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, PatchCreation, Module.");
return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, Module.");
}

public static Message MissingEntrySection(string sectionType)
Expand Down Expand Up @@ -2056,11 +2051,6 @@ public static Message UnexpectedTableInPatch(SourceLineNumber sourceLineNumbers,
return Message(sourceLineNumbers, Ids.UnexpectedTableInPatch, "An unexpected row in the '{0}' table was found in this patch. Patches cannot contain the '{0}' table.", tableName);
}

public static Message UnexpectedTableInPatchCreationPackage(SourceLineNumber sourceLineNumbers, string tableName)
{
return Message(sourceLineNumbers, Ids.UnexpectedTableInPatchCreationPackage, "An unexpected row in the '{0}' table was found in this patch creation package. Patch creation packages cannot contain the '{0}' table.", tableName);
}

public static Message UnhandledExtensionAttribute(SourceLineNumber sourceLineNumbers, string elementName, string extensionAttributeName, string extensionNamespace)
{
return Message(sourceLineNumbers, Ids.UnhandledExtensionAttribute, "The {0} element contains an unhandled extension attribute '{1}'. Please ensure that the extension for attributes in the '{2}' namespace has been provided.", elementName, extensionAttributeName, extensionNamespace);
Expand Down Expand Up @@ -2435,9 +2425,7 @@ public enum Ids
NoUniqueActionSequenceNumber2 = 180,
ActionScheduledRelativeToItself = 181,
MissingTableDefinition = 182,
ExpectedRowInPatchCreationPackage = 183,
UnexpectedTableInMergeModule = 184,
UnexpectedTableInPatchCreationPackage = 185,
MergeExcludedModule = 186,
MergeFeatureRequired = 187,
MergeLanguageFailed = 188,
Expand Down
1 change: 1 addition & 0 deletions src/api/wix/WixToolset.Data/OutputType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public enum OutputType
Patch,

/// <summary>Patch Creation output type.</summary>
[Obsolete]
PatchCreation,

/// <summary>Package output type.</summary>
Expand Down
1 change: 1 addition & 0 deletions src/api/wix/WixToolset.Data/SectionType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public enum SectionType
Product = Package,

/// <summary>Patch creation section type.</summary>
[Obsolete]
PatchCreation,

/// <summary>Patch section type.</summary>
Expand Down
8 changes: 7 additions & 1 deletion src/api/wix/WixToolset.Data/Symbols/ExternalFilesSymbol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

namespace WixToolset.Data
{
using System;
using WixToolset.Data.Symbols;

public static partial class SymbolDefinitions
{
[Obsolete]
public static readonly IntermediateSymbolDefinition ExternalFiles = new IntermediateSymbolDefinition(
SymbolDefinitionType.ExternalFiles,
new[]
Expand All @@ -25,6 +27,9 @@ public static partial class SymbolDefinitions

namespace WixToolset.Data.Symbols
{
using System;

[Obsolete]
public enum ExternalFilesSymbolFields
{
Family,
Expand All @@ -37,6 +42,7 @@ public enum ExternalFilesSymbolFields
Order,
}

[Obsolete]
public class ExternalFilesSymbol : IntermediateSymbol
{
public ExternalFilesSymbol() : base(SymbolDefinitions.ExternalFiles, null, null)
Expand Down Expand Up @@ -97,4 +103,4 @@ public int Order
set => this.Set((int)ExternalFilesSymbolFields.Order, value);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

namespace WixToolset.Data
{
using System;
using WixToolset.Data.Symbols;

public static partial class SymbolDefinitions
{
[Obsolete]
public static readonly IntermediateSymbolDefinition FamilyFileRanges = new IntermediateSymbolDefinition(
SymbolDefinitionType.FamilyFileRanges,
new[]
Expand All @@ -21,6 +23,9 @@ public static partial class SymbolDefinitions

namespace WixToolset.Data.Symbols
{
using System;

[Obsolete]
public enum FamilyFileRangesSymbolFields
{
Family,
Expand All @@ -29,6 +34,7 @@ public enum FamilyFileRangesSymbolFields
RetainLengths,
}

[Obsolete]
public class FamilyFileRangesSymbol : IntermediateSymbol
{
public FamilyFileRangesSymbol() : base(SymbolDefinitions.FamilyFileRanges, null, null)
Expand Down Expand Up @@ -65,4 +71,4 @@ public string RetainLengths
set => this.Set((int)FamilyFileRangesSymbolFields.RetainLengths, value);
}
}
}
}
8 changes: 7 additions & 1 deletion src/api/wix/WixToolset.Data/Symbols/ImageFamiliesSymbol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

namespace WixToolset.Data
{
using System;
using WixToolset.Data.Symbols;

public static partial class SymbolDefinitions
{
[Obsolete]
public static readonly IntermediateSymbolDefinition ImageFamilies = new IntermediateSymbolDefinition(
SymbolDefinitionType.ImageFamilies,
new[]
Expand All @@ -23,6 +25,9 @@ public static partial class SymbolDefinitions

namespace WixToolset.Data.Symbols
{
using System;

[Obsolete]
public enum ImageFamiliesSymbolFields
{
Family,
Expand All @@ -33,6 +38,7 @@ public enum ImageFamiliesSymbolFields
VolumeLabel,
}

[Obsolete]
public class ImageFamiliesSymbol : IntermediateSymbol
{
public ImageFamiliesSymbol() : base(SymbolDefinitions.ImageFamilies, null, null)
Expand Down Expand Up @@ -81,4 +87,4 @@ public string VolumeLabel
set => this.Set((int)ImageFamiliesSymbolFields.VolumeLabel, value);
}
}
}
}
31 changes: 30 additions & 1 deletion src/api/wix/WixToolset.Data/Symbols/MsiPatchMetadataSymbol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,42 @@ public static partial class SymbolDefinitions

namespace WixToolset.Data.Symbols
{
using System;

public enum MsiPatchMetadataSymbolFields
{
Company,
Property,
Value,
}

/// <summary>
/// Values for the OptimizeCA MsiPatchMetdata property, which indicates whether custom actions can be skipped when applying the patch.
/// </summary>
[Flags]
public enum OptimizeCAFlags
{
/// <summary>
/// No custom actions are skipped.
/// </summary>
None = 0,

/// <summary>
/// Skip property (type 51) and directory (type 35) assignment custom actions.
/// </summary>
SkipAssignment = 1,

/// <summary>
/// Skip immediate custom actions that are not property or directory assignment custom actions.
/// </summary>
SkipImmediate = 2,

/// <summary>
/// Skip custom actions that run within the script.
/// </summary>
SkipDeferred = 4
}

public class MsiPatchMetadataSymbol : IntermediateSymbol
{
public MsiPatchMetadataSymbol() : base(SymbolDefinitions.MsiPatchMetadata, null, null)
Expand Down Expand Up @@ -57,4 +86,4 @@ public string Value
set => this.Set((int)MsiPatchMetadataSymbolFields.Value, value);
}
}
}
}
31 changes: 4 additions & 27 deletions src/api/wix/WixToolset.Data/Symbols/PatchMetadataSymbol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

namespace WixToolset.Data
{
using System;
using WixToolset.Data.Symbols;

public static partial class SymbolDefinitions
{
[Obsolete]
public static readonly IntermediateSymbolDefinition PatchMetadata = new IntermediateSymbolDefinition(
SymbolDefinitionType.PatchMetadata,
new[]
Expand All @@ -22,40 +24,15 @@ namespace WixToolset.Data.Symbols
{
using System;

[Obsolete]
public enum PatchMetadataSymbolFields
{
Company,
Property,
Value,
}

/// <summary>
/// Values for the OptimizeCA MsiPatchMetdata property, which indicates whether custom actions can be skipped when applying the patch.
/// </summary>
[Flags]
public enum OptimizeCAFlags
{
/// <summary>
/// No custom actions are skipped.
/// </summary>
None = 0,

/// <summary>
/// Skip property (type 51) and directory (type 35) assignment custom actions.
/// </summary>
SkipAssignment = 1,

/// <summary>
/// Skip immediate custom actions that are not property or directory assignment custom actions.
/// </summary>
SkipImmediate = 2,

/// <summary>
/// Skip custom actions that run within the script.
/// </summary>
SkipDeferred = 4
}

[Obsolete]
public class PatchMetadataSymbol : IntermediateSymbol
{
public PatchMetadataSymbol() : base(SymbolDefinitions.PatchMetadata, null, null)
Expand Down
2 changes: 1 addition & 1 deletion src/api/wix/WixToolset.Data/Symbols/PatchPackageSymbol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ public int MediaDiskIdRef
set => this.Set((int)PatchPackageSymbolFields.MediaDiskIdRef, value);
}
}
}
}
8 changes: 7 additions & 1 deletion src/api/wix/WixToolset.Data/Symbols/PatchSequenceSymbol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

namespace WixToolset.Data
{
using System;
using WixToolset.Data.Symbols;

public static partial class SymbolDefinitions
{
[Obsolete]
public static readonly IntermediateSymbolDefinition PatchSequence = new IntermediateSymbolDefinition(
SymbolDefinitionType.PatchSequence,
new[]
Expand All @@ -21,6 +23,9 @@ public static partial class SymbolDefinitions

namespace WixToolset.Data.Symbols
{
using System;

[Obsolete]
public enum PatchSequenceSymbolFields
{
PatchFamily,
Expand All @@ -29,6 +34,7 @@ public enum PatchSequenceSymbolFields
Supersede,
}

[Obsolete]
public class PatchSequenceSymbol : IntermediateSymbol
{
public PatchSequenceSymbol() : base(SymbolDefinitions.PatchSequence, null, null)
Expand Down Expand Up @@ -65,4 +71,4 @@ public int? Supersede
set => this.Set((int)PatchSequenceSymbolFields.Supersede, value);
}
}
}
}
10 changes: 10 additions & 0 deletions src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ namespace WixToolset.Data
{
using System;

#pragma warning disable CS0612 // includes some obsolete symbol definitions
public enum SymbolDefinitionType
{
SummaryInformation,
Expand Down Expand Up @@ -34,7 +35,9 @@ public enum SymbolDefinitionType
Error,
EventMapping,
Extension,
[Obsolete]
ExternalFiles,
[Obsolete]
FamilyFileRanges,
Feature,
FeatureComponents,
Expand Down Expand Up @@ -86,8 +89,10 @@ public enum SymbolDefinitionType
ODBCSourceAttribute,
ODBCTranslator,
Patch,
[Obsolete]
PatchMetadata,
PatchPackage,
[Obsolete]
PatchSequence,
ProgId,
Properties,
Expand All @@ -106,14 +111,19 @@ public enum SymbolDefinitionType
Shortcut,
Signature,
SoftwareIdentificationTag,
[Obsolete]
TargetFilesOptionalData,
[Obsolete]
TargetImages,
TextStyle,
TypeLib,
UIText,
Upgrade,
[Obsolete]
UpgradedFilesOptionalData,
[Obsolete]
UpgradedFilesToIgnore,
[Obsolete]
UpgradedImages,
Verb,
WixAction,
Expand Down
Loading