A bit of cleanup on now-defunct Product element references.
Bob Arnson committed
Oct 28, 2020 at 17:10 UTC
f28de8b2b38a09af130bc128b6226a2010ab535d
3 files changed
+7
-6
src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs
+1
@@ -23,6 +23,7 @@ namespace WixToolset.Core.WindowsInstaller
23
return true;
24
25
case "msipackage":
26
+ case "package":
27
case "product":
28
case ".msi":
29
backend = new MsiBackend();
src/WixToolset.Core/Compiler.cs
+2
-2
@@ -6962,13 +6962,13 @@ namespace WixToolset.Core
6962
var upgradeCode = contextValues["UpgradeCode"];
6963
if (String.IsNullOrEmpty(upgradeCode))
6964
{
6965
- this.Core.Write(ErrorMessages.ParentElementAttributeRequired(sourceLineNumbers, "Product", "UpgradeCode", node.Name.LocalName));
6965
+ this.Core.Write(ErrorMessages.ParentElementAttributeRequired(sourceLineNumbers, "Package", "UpgradeCode", node.Name.LocalName));
6966
}
6967
6968
var productVersion = contextValues["ProductVersion"];
6969
if (String.IsNullOrEmpty(productVersion))
6970
{
6971
- this.Core.Write(ErrorMessages.ParentElementAttributeRequired(sourceLineNumbers, "Product", "Version", node.Name.LocalName));
6971
+ this.Core.Write(ErrorMessages.ParentElementAttributeRequired(sourceLineNumbers, "Package", "Version", node.Name.LocalName));
6972
}
6973
6974
var productLanguage = contextValues["ProductLanguage"];
src/WixToolset.Core/Linker.cs
+4
-4
@@ -793,7 +793,7 @@ namespace WixToolset.Core
793
{
794
if (connection.IsExplicitPrimaryFeature)
795
{
796
- this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), connection.PrimaryFeature ?? resolvedSection.Id));
796
+ this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
797
continue;
798
}
799
else
@@ -825,7 +825,7 @@ namespace WixToolset.Core
825
connection = featuresToFeatures[wixComplexReferenceRow.Child];
826
if (null != connection)
827
{
828
- this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
828
+ this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
829
continue;
830
}
831
@@ -842,7 +842,7 @@ namespace WixToolset.Core
842
{
843
if (connection.IsExplicitPrimaryFeature)
844
{
845
- this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
845
+ this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
846
continue;
847
}
848
else
@@ -915,7 +915,7 @@ namespace WixToolset.Core
915
connection = featuresToFeatures[wixComplexReferenceRow.Child];
916
if (null != connection)
917
{
918
- this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
918
+ this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
919
continue;
920
}
921