@joebigelow / wix-1 / commits / 4c2e4c26

Remove dead code.

Sean Hall committed Dec 7, 2020 at 17:43 UTC 4c2e4c26cb3895f22fdafe9d897653f8fa258f9a
1 file changed +3 -34
src/WixToolset.Core/Compiler_Bundle.cs
+3 -34
@@ -1333,7 +1333,6 @@ namespace WixToolset.Core
1333 string name = null;
1334 string sourceFile = null;
1335 string downloadUrl = null;
1336 - RemotePayload remotePayload = null;
1336
1337 // This list lets us evaluate extension attributes *after* all core attributes
1338 // have been parsed and dealt with, regardless of authoring order.
@@ -1402,43 +1401,13 @@ namespace WixToolset.Core
1401 this.Core.ParseExtensionAttribute(node, extensionAttribute, context);
1402 }
1403
1405 - // We only handle the elements we care about. Let caller handle other children.
1406 - foreach (var child in node.Elements(CompilerCore.WixNamespace + "RemotePayload"))
1407 - {
1408 - var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
1409 -
1410 - if (CompilerCore.WixNamespace == node.Name.Namespace && node.Name.LocalName != "ExePackage")
1411 - {
1412 - this.Core.Write(ErrorMessages.RemotePayloadUnsupported(childSourceLineNumbers));
1413 - continue;
1414 - }
1415 -
1416 - if (null != remotePayload)
1417 - {
1418 - this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
1419 - }
1420 -
1421 - remotePayload = this.ParseRemotePayloadElement(child);
1422 - }
1404 + // Let caller handle the children.
1405
1424 - if (null != sourceFile && null != remotePayload)
1425 - {
1426 - this.Core.Write(ErrorMessages.UnexpectedElementWithAttribute(sourceLineNumbers, node.Name.LocalName, "RemotePayload", "SourceFile"));
1427 - }
1428 - else if (null == sourceFile && null == remotePayload)
1429 - {
1430 - this.Core.Write(ErrorMessages.ExpectedAttributeOrElement(sourceLineNumbers, node.Name.LocalName, "SourceFile", "RemotePayload"));
1431 - }
1432 - else if (null == sourceFile)
1406 + if (null == sourceFile)
1407 {
1408 sourceFile = String.Empty;
1409 }
1410
1437 - if (null == downloadUrl && null != remotePayload)
1438 - {
1439 - this.Core.Write(ErrorMessages.ExpectedAttributeWithElement(sourceLineNumbers, node.Name.LocalName, "DownloadUrl", "RemotePayload"));
1440 - }
1441 -
1411 if (Compiler.BurnUXContainerId == parentId)
1412 {
1413 if (compressed == YesNoDefaultType.No)
@@ -1449,7 +1418,7 @@ namespace WixToolset.Core
1418 compressed = YesNoDefaultType.Yes;
1419 }
1420
1452 - this.CreatePayloadRow(sourceLineNumbers, id, name, sourceFile, downloadUrl, parentType, parentId, previousType, previousId, compressed, enableSignatureVerification, null, null, remotePayload);
1421 + this.CreatePayloadRow(sourceLineNumbers, id, name, sourceFile, downloadUrl, parentType, parentId, previousType, previousId, compressed, enableSignatureVerification, null, null, null);
1422
1423 return id;
1424 }