diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-07 17:43:36 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-08 15:18:03 -0600 |
| commit | 4c2e4c26cb3895f22fdafe9d897653f8fa258f9a (patch) | |
| tree | 76e02b23d249a14a033b19bd4bb60062fdc1100a /src | |
| parent | 8a67cff70cdfa014cc068dcc7756ed57b2ed1642 (diff) | |
| download | wix-4c2e4c26cb3895f22fdafe9d897653f8fa258f9a.tar.gz wix-4c2e4c26cb3895f22fdafe9d897653f8fa258f9a.tar.bz2 wix-4c2e4c26cb3895f22fdafe9d897653f8fa258f9a.zip | |
Remove dead code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/Compiler_Bundle.cs | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index 33467dda..976139ca 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs | |||
| @@ -1333,7 +1333,6 @@ namespace WixToolset.Core | |||
| 1333 | string name = null; | 1333 | string name = null; |
| 1334 | string sourceFile = null; | 1334 | string sourceFile = null; |
| 1335 | string downloadUrl = null; | 1335 | string downloadUrl = null; |
| 1336 | RemotePayload remotePayload = null; | ||
| 1337 | 1336 | ||
| 1338 | // This list lets us evaluate extension attributes *after* all core attributes | 1337 | // This list lets us evaluate extension attributes *after* all core attributes |
| 1339 | // have been parsed and dealt with, regardless of authoring order. | 1338 | // have been parsed and dealt with, regardless of authoring order. |
| @@ -1402,43 +1401,13 @@ namespace WixToolset.Core | |||
| 1402 | this.Core.ParseExtensionAttribute(node, extensionAttribute, context); | 1401 | this.Core.ParseExtensionAttribute(node, extensionAttribute, context); |
| 1403 | } | 1402 | } |
| 1404 | 1403 | ||
| 1405 | // We only handle the elements we care about. Let caller handle other children. | 1404 | // Let caller handle the 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 | } | ||
| 1423 | 1405 | ||
| 1424 | if (null != sourceFile && null != remotePayload) | 1406 | if (null == sourceFile) |
| 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) | ||
| 1433 | { | 1407 | { |
| 1434 | sourceFile = String.Empty; | 1408 | sourceFile = String.Empty; |
| 1435 | } | 1409 | } |
| 1436 | 1410 | ||
| 1437 | if (null == downloadUrl && null != remotePayload) | ||
| 1438 | { | ||
| 1439 | this.Core.Write(ErrorMessages.ExpectedAttributeWithElement(sourceLineNumbers, node.Name.LocalName, "DownloadUrl", "RemotePayload")); | ||
| 1440 | } | ||
| 1441 | |||
| 1442 | if (Compiler.BurnUXContainerId == parentId) | 1411 | if (Compiler.BurnUXContainerId == parentId) |
| 1443 | { | 1412 | { |
| 1444 | if (compressed == YesNoDefaultType.No) | 1413 | if (compressed == YesNoDefaultType.No) |
| @@ -1449,7 +1418,7 @@ namespace WixToolset.Core | |||
| 1449 | compressed = YesNoDefaultType.Yes; | 1418 | compressed = YesNoDefaultType.Yes; |
| 1450 | } | 1419 | } |
| 1451 | 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); |
| 1453 | 1422 | ||
| 1454 | return id; | 1423 | return id; |
| 1455 | } | 1424 | } |
