diff options
Diffstat (limited to 'src/test')
14 files changed, 42 insertions, 42 deletions
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs index fff23274..cb97984f 100644 --- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs +++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs | |||
@@ -37,7 +37,7 @@ namespace ForTestingUseOnly | |||
37 | } | 37 | } |
38 | 38 | ||
39 | var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single(); | 39 | var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single(); |
40 | bundleSymbol.ProviderKey = bundleSymbol.BundleId = forTestingUseOnlyBundleSymbol.BundleId; | 40 | bundleSymbol.ProviderKey = bundleSymbol.BundleCode = forTestingUseOnlyBundleSymbol.BundleCode; |
41 | } | 41 | } |
42 | } | 42 | } |
43 | } | 43 | } |
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs index 4963c941..f6ff7f87 100644 --- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs +++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs | |||
@@ -32,7 +32,7 @@ namespace ForTestingUseOnly | |||
32 | private void ParseForTestingUseOnlyBundleElement(Intermediate intermediate, IntermediateSection section, XElement element) | 32 | private void ParseForTestingUseOnlyBundleElement(Intermediate intermediate, IntermediateSection section, XElement element) |
33 | { | 33 | { |
34 | var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); | 34 | var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); |
35 | string bundleId = null; | 35 | string bundleCode = null; |
36 | 36 | ||
37 | foreach (var attrib in element.Attributes()) | 37 | foreach (var attrib in element.Attributes()) |
38 | { | 38 | { |
@@ -41,7 +41,7 @@ namespace ForTestingUseOnly | |||
41 | switch (attrib.Name.LocalName) | 41 | switch (attrib.Name.LocalName) |
42 | { | 42 | { |
43 | case "Id": | 43 | case "Id": |
44 | bundleId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); | 44 | bundleCode = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); |
45 | break; | 45 | break; |
46 | default: | 46 | default: |
47 | this.ParseHelper.UnexpectedAttribute(element, attrib); | 47 | this.ParseHelper.UnexpectedAttribute(element, attrib); |
@@ -54,13 +54,13 @@ namespace ForTestingUseOnly | |||
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
57 | if (null == bundleId) | 57 | if (null == bundleCode) |
58 | { | 58 | { |
59 | this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); | 59 | this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); |
60 | } | 60 | } |
61 | else | 61 | else |
62 | { | 62 | { |
63 | bundleId = Guid.Parse(bundleId).ToString("B").ToUpperInvariant(); | 63 | bundleCode = Guid.Parse(bundleCode).ToString("B").ToUpperInvariant(); |
64 | } | 64 | } |
65 | 65 | ||
66 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); | 66 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); |
@@ -69,7 +69,7 @@ namespace ForTestingUseOnly | |||
69 | { | 69 | { |
70 | section.AddSymbol(new ForTestingUseOnlyBundleSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "ForTestingUseOnlyBundle")) | 70 | section.AddSymbol(new ForTestingUseOnlyBundleSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "ForTestingUseOnlyBundle")) |
71 | { | 71 | { |
72 | BundleId = bundleId, | 72 | BundleCode = bundleCode, |
73 | }); | 73 | }); |
74 | } | 74 | } |
75 | } | 75 | } |
diff --git a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs index a17dfe31..6cf9dabb 100644 --- a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs +++ b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs | |||
@@ -11,7 +11,7 @@ namespace ForTestingUseOnly | |||
11 | ForTestingUseOnlySymbolDefinitionType.ForTestingUseOnlyBundle.ToString(), | 11 | ForTestingUseOnlySymbolDefinitionType.ForTestingUseOnlyBundle.ToString(), |
12 | new[] | 12 | new[] |
13 | { | 13 | { |
14 | new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleId), IntermediateFieldType.String), | 14 | new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleCode), IntermediateFieldType.String), |
15 | }, | 15 | }, |
16 | typeof(ForTestingUseOnlyBundleSymbol)); | 16 | typeof(ForTestingUseOnlyBundleSymbol)); |
17 | } | 17 | } |
@@ -23,7 +23,7 @@ namespace ForTestingUseOnly.Symbols | |||
23 | 23 | ||
24 | public enum ForTestingUseOnlyBundleSymbolFields | 24 | public enum ForTestingUseOnlyBundleSymbolFields |
25 | { | 25 | { |
26 | BundleId, | 26 | BundleCode, |
27 | } | 27 | } |
28 | 28 | ||
29 | public class ForTestingUseOnlyBundleSymbol : IntermediateSymbol | 29 | public class ForTestingUseOnlyBundleSymbol : IntermediateSymbol |
@@ -38,10 +38,10 @@ namespace ForTestingUseOnly.Symbols | |||
38 | 38 | ||
39 | public IntermediateField this[ForTestingUseOnlyBundleSymbolFields index] => this.Fields[(int)index]; | 39 | public IntermediateField this[ForTestingUseOnlyBundleSymbolFields index] => this.Fields[(int)index]; |
40 | 40 | ||
41 | public string BundleId | 41 | public string BundleCode |
42 | { | 42 | { |
43 | get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleId].AsString(); | 43 | get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleCode].AsString(); |
44 | set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleId, value); | 44 | set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleCode, value); |
45 | } | 45 | } |
46 | } | 46 | } |
47 | } | 47 | } |
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp index ba559b05..e65ac5ca 100644 --- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp +++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp | |||
@@ -14,7 +14,7 @@ public: // IBAFunctions | |||
14 | 14 | ||
15 | public: //IBootstrapperApplication | 15 | public: //IBootstrapperApplication |
16 | virtual STDMETHODIMP OnDetectRelatedBundle( | 16 | virtual STDMETHODIMP OnDetectRelatedBundle( |
17 | __in_z LPCWSTR wzBundleId, | 17 | __in_z LPCWSTR wzBundleCode, |
18 | __in BOOTSTRAPPER_RELATION_TYPE relationType, | 18 | __in BOOTSTRAPPER_RELATION_TYPE relationType, |
19 | __in_z LPCWSTR wzBundleTag, | 19 | __in_z LPCWSTR wzBundleTag, |
20 | __in BOOL fPerMachine, | 20 | __in BOOL fPerMachine, |
@@ -27,15 +27,15 @@ public: //IBootstrapperApplication | |||
27 | HRESULT hr = S_OK; | 27 | HRESULT hr = S_OK; |
28 | LPWSTR wzValue = NULL; | 28 | LPWSTR wzValue = NULL; |
29 | 29 | ||
30 | hr = BalGetRelatedBundleVariable(wzBundleId, STRING_VARIABLE, &wzValue); | 30 | hr = BalGetRelatedBundleVariable(wzBundleCode, STRING_VARIABLE, &wzValue); |
31 | 31 | ||
32 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: AString = %ws, Error: 0x%x", wzValue, hr); | 32 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: AString = %ws, Error: 0x%x", wzValue, hr); |
33 | 33 | ||
34 | hr = BalGetRelatedBundleVariable(wzBundleId, NUMBER_VARIABLE, &wzValue); | 34 | hr = BalGetRelatedBundleVariable(wzBundleCode, NUMBER_VARIABLE, &wzValue); |
35 | 35 | ||
36 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: ANumber = %ws, Error: 0x%x", wzValue, hr); | 36 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: ANumber = %ws, Error: 0x%x", wzValue, hr); |
37 | 37 | ||
38 | hr = __super::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel); | 38 | hr = __super::OnDetectRelatedBundle(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel); |
39 | 39 | ||
40 | ReleaseStr(wzValue); | 40 | ReleaseStr(wzValue); |
41 | return hr; | 41 | return hr; |
diff --git a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs index a0f42ee9..0d05700f 100644 --- a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs +++ b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs | |||
@@ -6,13 +6,13 @@ | |||
6 | <PackageGroup Id="BundlePackages"> | 6 | <PackageGroup Id="BundlePackages"> |
7 | <BundlePackage Id="ASP.Net_Core_6.0" Permanent="yes"> | 7 | <BundlePackage Id="ASP.Net_Core_6.0" Permanent="yes"> |
8 | <BundlePackagePayload Id="ASP.Net_Core_6.0" Name="aspnetcore-runtime-6.0.10-win-x64.exe" ProductName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" Description="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/2370bcad-45b1-4ccb-bc61-21ffd7116d63/1aa8efcabfb60ee778b913a5eb237a56/aspnetcore-runtime-6.0.10-win-x64.exe" Hash="4AF8DA7DE85BCB1D079A85CD3F4AAFDFC4E4D441B87DFCDFFC27C820D9F69513341BE5ACC987C47CACDC597CBC0CC89C7D746050E6D40AE02DB7391E8214352D" Size="8997144" Version="6.0.10.22476"> | 8 | <BundlePackagePayload Id="ASP.Net_Core_6.0" Name="aspnetcore-runtime-6.0.10-win-x64.exe" ProductName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" Description="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/2370bcad-45b1-4ccb-bc61-21ffd7116d63/1aa8efcabfb60ee778b913a5eb237a56/aspnetcore-runtime-6.0.10-win-x64.exe" Hash="4AF8DA7DE85BCB1D079A85CD3F4AAFDFC4E4D441B87DFCDFFC27C820D9F69513341BE5ACC987C47CACDC597CBC0CC89C7D746050E6D40AE02DB7391E8214352D" Size="8997144" Version="6.0.10.22476"> |
9 | <RemoteBundle BundleId="{5D69246A-5874-401D-9879-ECC18D5A1BAB}" DisplayName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" InstallSize="22958021" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{5d69246a-5874-401d-9879-ecc18d5a1bab}" ProtocolVersion="1" Version="6.0.10.22476" Win64="no" UpgradeCode="{B7C4CC53-CE40-39E9-9F43-81CE9F5CD47C}" /> | 9 | <RemoteBundle BundleCode="{5D69246A-5874-401D-9879-ECC18D5A1BAB}" DisplayName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" InstallSize="22958021" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{5d69246a-5874-401d-9879-ecc18d5a1bab}" ProtocolVersion="1" Version="6.0.10.22476" Win64="no" UpgradeCode="{B7C4CC53-CE40-39E9-9F43-81CE9F5CD47C}" /> |
10 | </BundlePackagePayload> | 10 | </BundlePackagePayload> |
11 | </BundlePackage> | 11 | </BundlePackage> |
12 | 12 | ||
13 | <BundlePackage Id="Dotnet_Runtime_6.0" Permanent="yes"> | 13 | <BundlePackage Id="Dotnet_Runtime_6.0" Permanent="yes"> |
14 | <BundlePackagePayload Id="Dotnet_Runtime_6.0" Name="dotnet-runtime-6.0.10-win-x64.exe" ProductName="Microsoft .NET Runtime - 6.0.10 (x64)" Description="Microsoft .NET Runtime - 6.0.10 (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/50336bc7-7fd1-4a12-b5a2-81ce0219edf9/8d862413975808de0d835888e41e49a7/dotnet-runtime-6.0.10-win-x64.exe" Hash="23E4C862AFEF34A2C0D6476A93274CE0158D28F1609E0404737663E4BE17263E61E5A8760382FB125D288A0965394E3D04B9E1C77F99DE80A2C590DD295B8732" Size="27912752" Version="6.0.10.31726"> | 14 | <BundlePackagePayload Id="Dotnet_Runtime_6.0" Name="dotnet-runtime-6.0.10-win-x64.exe" ProductName="Microsoft .NET Runtime - 6.0.10 (x64)" Description="Microsoft .NET Runtime - 6.0.10 (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/50336bc7-7fd1-4a12-b5a2-81ce0219edf9/8d862413975808de0d835888e41e49a7/dotnet-runtime-6.0.10-win-x64.exe" Hash="23E4C862AFEF34A2C0D6476A93274CE0158D28F1609E0404737663E4BE17263E61E5A8760382FB125D288A0965394E3D04B9E1C77F99DE80A2C590DD295B8732" Size="27912752" Version="6.0.10.31726"> |
15 | <RemoteBundle BundleId="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" /> | 15 | <RemoteBundle BundleCode="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" /> |
16 | </BundlePackagePayload> | 16 | </BundlePackagePayload> |
17 | </BundlePackage> | 17 | </BundlePackage> |
18 | </PackageGroup> | 18 | </PackageGroup> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs index cfeda6c4..51d6c508 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs | |||
@@ -3,18 +3,18 @@ | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly"> |
4 | <Fragment> | 4 | <Fragment> |
5 | <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" /> | 5 | <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" /> |
6 | <RelatedBundle Id="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" /> | 6 | <RelatedBundle Code="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" /> |
7 | <RelatedBundle Id="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" /> | 7 | <RelatedBundle Code="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" /> |
8 | <RelatedBundle Id="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" /> | 8 | <RelatedBundle Code="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" /> |
9 | <RelatedBundle Id="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" /> | 9 | <RelatedBundle Code="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" /> |
10 | <RelatedBundle Id="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" /> | 10 | <RelatedBundle Code="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" /> |
11 | <RelatedBundle Id="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" /> | 11 | <RelatedBundle Code="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" /> |
12 | <RelatedBundle Id="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" /> | 12 | <RelatedBundle Code="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" /> |
13 | <RelatedBundle Id="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" /> | 13 | <RelatedBundle Code="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" /> |
14 | <RelatedBundle Id="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" /> | 14 | <RelatedBundle Code="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" /> |
15 | <RelatedBundle Id="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" /> | 15 | <RelatedBundle Code="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" /> |
16 | <RelatedBundle Id="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" /> | 16 | <RelatedBundle Code="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" /> |
17 | <RelatedBundle Id="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" /> | 17 | <RelatedBundle Code="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" /> |
18 | 18 | ||
19 | <PackageGroup Id="BundlePackages"> | 19 | <PackageGroup Id="BundlePackages"> |
20 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> | 20 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs index 78c5493d..a808b124 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs | |||
@@ -5,7 +5,7 @@ | |||
5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly"> | 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly"> |
6 | <Fragment> | 6 | <Fragment> |
7 | <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" /> | 7 | <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" /> |
8 | <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" /> | 8 | <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" /> |
9 | <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" /> | 9 | <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" /> |
10 | 10 | ||
11 | <PackageGroup Id="BundlePackages"> | 11 | <PackageGroup Id="BundlePackages"> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs index 5da954ea..24379a56 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs | |||
@@ -5,7 +5,7 @@ | |||
5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly"> | 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly"> |
6 | <Fragment> | 6 | <Fragment> |
7 | <fortestinguseonly:ForTestingUseOnlyBundle Id="{B774BF3B-3E89-4D42-9D29-AFAB27C5772D}" /> | 7 | <fortestinguseonly:ForTestingUseOnlyBundle Id="{B774BF3B-3E89-4D42-9D29-AFAB27C5772D}" /> |
8 | <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" /> | 8 | <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" /> |
9 | <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" /> | 9 | <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" /> |
10 | 10 | ||
11 | <PackageGroup Id="BundlePackages"> | 11 | <PackageGroup Id="BundlePackages"> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs index e23c9f88..6458fc08 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
4 | <Fragment> | 4 | <Fragment> |
5 | <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" /> | 5 | <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" /> |
6 | 6 | ||
7 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
8 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes"> | 8 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes"> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs index b1f60b31..495798b5 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
4 | <Fragment> | 4 | <Fragment> |
5 | <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" /> | 5 | <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" /> |
6 | 6 | ||
7 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
8 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes"> | 8 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes"> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs index 509047d6..5dfff3e8 100644 --- a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
4 | <Fragment> | 4 | <Fragment> |
5 | <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" /> | 5 | <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" /> |
6 | 6 | ||
7 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> | 8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs index 5207be28..febf46ea 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
4 | <Fragment> | 4 | <Fragment> |
5 | <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" /> | 5 | <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" /> |
6 | 6 | ||
7 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> | 8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs index 3af7bbf2..889fdfbc 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs +++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <Fragment> | 6 | <Fragment> |
7 | <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" /> | 7 | <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" /> |
8 | 8 | ||
9 | <PackageGroup Id="BundlePackages"> | 9 | <PackageGroup Id="BundlePackages"> |
10 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)"> | 10 | <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)"> |
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs index b750c80c..da61d96e 100644 --- a/src/test/burn/WixTestTools/BundleVerifier.cs +++ b/src/test/burn/WixTestTools/BundleVerifier.cs | |||
@@ -62,7 +62,7 @@ namespace WixTestTools | |||
62 | public string GetExpectedCachedBundlePath() | 62 | public string GetExpectedCachedBundlePath() |
63 | { | 63 | { |
64 | var bundleSymbol = this.GetBundleSymbol(); | 64 | var bundleSymbol = this.GetBundleSymbol(); |
65 | var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleId, bundleSymbol.PerMachine); | 65 | var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.PerMachine); |
66 | return Path.Combine(cachePath, Path.GetFileName(this.Bundle)); | 66 | return Path.Combine(cachePath, Path.GetFileName(this.Bundle)); |
67 | } | 67 | } |
68 | 68 | ||
@@ -107,14 +107,14 @@ namespace WixTestTools | |||
107 | { | 107 | { |
108 | var bundleSymbol = this.GetBundleSymbol(); | 108 | var bundleSymbol = this.GetBundleSymbol(); |
109 | var x64 = bundleSymbol.Platform != Platform.X86; | 109 | var x64 = bundleSymbol.Platform != Platform.X86; |
110 | var bundleId = bundleSymbol.BundleId; | 110 | var bundleCode = bundleSymbol.BundleCode; |
111 | if (bundleSymbol.PerMachine) | 111 | if (bundleSymbol.PerMachine) |
112 | { | 112 | { |
113 | return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, x64, out registration); | 113 | return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, out registration); |
114 | } | 114 | } |
115 | else | 115 | else |
116 | { | 116 | { |
117 | return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleId, out registration); | 117 | return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, out registration); |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
@@ -141,8 +141,8 @@ namespace WixTestTools | |||
141 | 141 | ||
142 | public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath) | 142 | public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath) |
143 | { | 143 | { |
144 | Assert.False(this.TryGetRegistration(out _)); | 144 | Assert.False(this.TryGetRegistration(out _), $"Bundle cached at '{cachedBundlePath}' should not still be registered."); |
145 | Assert.False(File.Exists(cachedBundlePath)); | 145 | Assert.False(File.Exists(cachedBundlePath), $"Cached bundle should have been removed from package cache at '{cachedBundlePath}'."); |
146 | } | 146 | } |
147 | 147 | ||
148 | public void RemovePackageFromCache(string packageId) | 148 | public void RemovePackageFromCache(string packageId) |