8deeffb6 · joebigelow/wix-1 · siGit Code & Deploy

src/WixToolset.Mba.Core/BootstrapperApplication.cs

+6 -6

@@ -1343,9 +1343,9 @@ namespace WixToolset.Mba.Core

1343 return args.HResult;

1344 }

1345

1346 - int IBootstrapperApplication.OnDetectPackageComplete(string wzPackageId, int hrStatus, PackageState state)

1346 + int IBootstrapperApplication.OnDetectPackageComplete(string wzPackageId, int hrStatus, PackageState state, bool fCached)

1347 {

1348 - DetectPackageCompleteEventArgs args = new DetectPackageCompleteEventArgs(wzPackageId, hrStatus, state);

1348 + DetectPackageCompleteEventArgs args = new DetectPackageCompleteEventArgs(wzPackageId, hrStatus, state, fCached);

1349 this.OnDetectPackageComplete(args);

1350

1351 return args.HResult;

@@ -1378,9 +1378,9 @@ namespace WixToolset.Mba.Core

1378 return args.HResult;

1379 }

1380

1381 - int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, PackageState state, bool fInstallCondition, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)

1381 + int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, PackageState state, bool fCached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, ref RequestState pRequestedState, ref BOOTSTRAPPER_CACHE_TYPE pRequestedCacheType, ref bool fCancel)

1382 {

1383 - PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, state, fInstallCondition, recommendedState, pRequestedState, fCancel);

1383 + PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, state, fCached, installCondition, recommendedState, recommendedCacheType, pRequestedState, pRequestedCacheType, fCancel);

1384 this.OnPlanPackageBegin(args);

1385

1386 pRequestedState = args.State;

@@ -1428,9 +1428,9 @@ namespace WixToolset.Mba.Core

1428 return args.HResult;

1429 }

1430

1431 - int IBootstrapperApplication.OnPlannedPackage(string wzPackageId, ActionState execute, ActionState rollback)

1431 + int IBootstrapperApplication.OnPlannedPackage(string wzPackageId, ActionState execute, ActionState rollback, bool fPlannedCache, bool fPlannedUncache)

1432 {

1433 - var args = new PlannedPackageEventArgs(wzPackageId, execute, rollback);

1433 + var args = new PlannedPackageEventArgs(wzPackageId, execute, rollback, fPlannedCache, fPlannedUncache);

1434 this.OnPlannedPackage(args);

1435

1436 return args.HResult;

src/WixToolset.Mba.Core/Engine.cs

+20 -16

@@ -62,7 +62,7 @@ namespace WixToolset.Mba.Core

62 /// <inheritdoc/>

63 public bool ContainsVariable(string name)

64 {

65 - int capacity = 0;

65 + IntPtr capacity = new IntPtr(0);

66 int ret = this.engine.GetVariableString(name, IntPtr.Zero, ref capacity);

67 return NativeMethods.E_NOTFOUND != ret;

68 }

@@ -101,14 +101,15 @@ namespace WixToolset.Mba.Core

101 /// <inheritdoc/>

102 public string EscapeString(string input)

103 {

104 - int capacity = InitialBufferSize;

105 - StringBuilder sb = new StringBuilder(capacity);

104 + IntPtr capacity = new IntPtr(InitialBufferSize);

105 + StringBuilder sb = new StringBuilder(capacity.ToInt32());

106

107 // Get the size of the buffer.

108 int ret = this.engine.EscapeString(input, sb, ref capacity);

109 if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)

110 {

111 - sb.Capacity = ++capacity; // Add one for the null terminator.

111 + capacity = new IntPtr(capacity.ToInt32() + 1); // Add one for the null terminator.

112 + sb.Capacity = capacity.ToInt32();

113 ret = this.engine.EscapeString(input, sb, ref capacity);

114 }

115

@@ -132,14 +133,15 @@ namespace WixToolset.Mba.Core

133 /// <inheritdoc/>

134 public string FormatString(string format)

135 {

135 - int capacity = InitialBufferSize;

136 - StringBuilder sb = new StringBuilder(capacity);

136 + IntPtr capacity = new IntPtr(InitialBufferSize);

137 + StringBuilder sb = new StringBuilder(capacity.ToInt32());

138

139 // Get the size of the buffer.

140 int ret = this.engine.FormatString(format, sb, ref capacity);

141 if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)

142 {

142 - sb.Capacity = ++capacity; // Add one for the null terminator.

143 + capacity = new IntPtr(capacity.ToInt32() + 1); // Add one for the null terminator.

144 + sb.Capacity = capacity.ToInt32();

145 ret = this.engine.FormatString(format, sb, ref capacity);

146 }

147

@@ -343,9 +345,9 @@ namespace WixToolset.Mba.Core

345 /// <exception cref="Exception">An error occurred getting the variable.</exception>

346 internal IntPtr getStringVariable(string name, out int length)

347 {

346 - int capacity = InitialBufferSize;

348 + IntPtr capacity = new IntPtr(InitialBufferSize);

349 bool success = false;

348 - IntPtr pValue = Marshal.AllocCoTaskMem(capacity * UnicodeEncoding.CharSize);

350 + IntPtr pValue = Marshal.AllocCoTaskMem(capacity.ToInt32() * UnicodeEncoding.CharSize);

351 try

352 {

353 // Get the size of the buffer.

@@ -353,7 +355,7 @@ namespace WixToolset.Mba.Core

355 if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)

356 {

357 // Don't need to add 1 for the null terminator, the engine already includes that.

356 - pValue = Marshal.ReAllocCoTaskMem(pValue, capacity * UnicodeEncoding.CharSize);

358 + pValue = Marshal.ReAllocCoTaskMem(pValue, capacity.ToInt32() * UnicodeEncoding.CharSize);

359 ret = this.engine.GetVariableString(name, pValue, ref capacity);

360 }

361

@@ -363,9 +365,10 @@ namespace WixToolset.Mba.Core

365 }

366

367 // The engine only returns the exact length of the string if the buffer was too small, so calculate it ourselves.

366 - for (length = 0; length < capacity; ++length)

368 + int maxLength = capacity.ToInt32();

369 + for (length = 0; length < maxLength; ++length)

370 {

368 - if(0 == Marshal.ReadInt16(pValue, length * UnicodeEncoding.CharSize))

371 + if (0 == Marshal.ReadInt16(pValue, length * UnicodeEncoding.CharSize))

372 {

373 break;

374 }

@@ -392,9 +395,9 @@ namespace WixToolset.Mba.Core

395 /// <exception cref="Exception">An error occurred getting the variable.</exception>

396 internal IntPtr getVersionVariable(string name, out int length)

397 {

395 - int capacity = InitialBufferSize;

398 + IntPtr capacity = new IntPtr(InitialBufferSize);

399 bool success = false;

397 - IntPtr pValue = Marshal.AllocCoTaskMem(capacity * UnicodeEncoding.CharSize);

400 + IntPtr pValue = Marshal.AllocCoTaskMem(capacity.ToInt32() * UnicodeEncoding.CharSize);

401 try

402 {

403 // Get the size of the buffer.

@@ -402,7 +405,7 @@ namespace WixToolset.Mba.Core

405 if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)

406 {

407 // Don't need to add 1 for the null terminator, the engine already includes that.

405 - pValue = Marshal.ReAllocCoTaskMem(pValue, capacity * UnicodeEncoding.CharSize);

408 + pValue = Marshal.ReAllocCoTaskMem(pValue, capacity.ToInt32() * UnicodeEncoding.CharSize);

409 ret = this.engine.GetVariableVersion(name, pValue, ref capacity);

410 }

411

@@ -412,7 +415,8 @@ namespace WixToolset.Mba.Core

415 }

416

417 // The engine only returns the exact length of the string if the buffer was too small, so calculate it ourselves.

415 - for (length = 0; length < capacity; ++length)

418 + int maxLength = capacity.ToInt32();

419 + for (length = 0; length < maxLength; ++length)

420 {

421 if (0 == Marshal.ReadInt16(pValue, length * UnicodeEncoding.CharSize))

422 {

src/WixToolset.Mba.Core/EventArgs.cs

+44 -26

@@ -617,22 +617,18 @@ namespace WixToolset.Mba.Core

617 }

618

619 /// <summary>

620 - /// Additional arguments used when the detection for a specific package has completed.

620 + /// Additional arguments for <see cref="IDefaultBootstrapperApplication.DetectPackageComplete"/>.

621 /// </summary>

622 [Serializable]

623 public class DetectPackageCompleteEventArgs : StatusEventArgs

624 {

625 - /// <summary>

626 - /// Creates a new instance of the <see cref="DetectPackageCompleteEventArgs"/> class.

627 - /// </summary>

628 - /// <param name="packageId">The identity of the package detected.</param>

629 - /// <param name="hrStatus">The return code of the operation.</param>

630 - /// <param name="state">The state of the specified package.</param>

631 - public DetectPackageCompleteEventArgs(string packageId, int hrStatus, PackageState state)

625 + /// <summary />

626 + public DetectPackageCompleteEventArgs(string packageId, int hrStatus, PackageState state, bool cached)

627 : base(hrStatus)

628 {

629 this.PackageId = packageId;

630 this.State = state;

631 + this.Cached = cached;

632 }

633

634 /// <summary>

@@ -644,6 +640,11 @@ namespace WixToolset.Mba.Core

640 /// Gets the state of the specified package.

641 /// </summary>

642 public PackageState State { get; private set; }

643 +

644 + /// <summary>

645 + /// Gets whether any part of the package is cached.

646 + /// </summary>

647 + public bool Cached { get; private set; }

648 }

649

650 /// <summary>

@@ -725,23 +726,18 @@ namespace WixToolset.Mba.Core

726 [Serializable]

727 public class PlanPackageBeginEventArgs : CancellableHResultEventArgs

728 {

728 - /// <summary>

729 - ///

730 - /// </summary>

731 - /// <param name="packageId"></param>

732 - /// <param name="currentState"></param>

733 - /// <param name="installCondition"></param>

734 - /// <param name="recommendedState"></param>

735 - /// <param name="state"></param>

736 - /// <param name="cancelRecommendation"></param>

737 - public PlanPackageBeginEventArgs(string packageId, PackageState currentState, bool installCondition, RequestState recommendedState, RequestState state, bool cancelRecommendation)

729 + /// <summary />

730 + public PlanPackageBeginEventArgs(string packageId, PackageState currentState, bool cached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, RequestState state, BOOTSTRAPPER_CACHE_TYPE cacheType, bool cancelRecommendation)

731 : base(cancelRecommendation)

732 {

733 this.PackageId = packageId;

734 this.CurrentState = currentState;

735 + this.Cached = cached;

736 this.InstallCondition = installCondition;

737 this.RecommendedState = recommendedState;

738 + this.RecommendedCacheType = recommendedCacheType;

739 this.State = state;

740 + this.CacheType = cacheType;

741 }

742

743 /// <summary>

@@ -754,20 +750,35 @@ namespace WixToolset.Mba.Core

750 /// </summary>

751 public PackageState CurrentState { get; private set; }

752

753 + /// <summary>

754 + /// Gets whether any part of the package is cached.

755 + /// </summary>

756 + public bool Cached { get; private set; }

757 +

758 /// <summary>

759 /// Gets the evaluated result of the package's install condition.

760 /// </summary>

760 - public bool InstallCondition { get; private set; }

761 + public BOOTSTRAPPER_PACKAGE_CONDITION_RESULT InstallCondition { get; private set; }

762

763 /// <summary>

764 /// Gets the recommended requested state for the package.

765 /// </summary>

766 public RequestState RecommendedState { get; private set; }

767

768 + /// <summary>

769 + /// The authored cache type of the package.

770 + /// </summary>

771 + public BOOTSTRAPPER_CACHE_TYPE RecommendedCacheType { get; private set; }

772 +

773 /// <summary>

774 /// Gets or sets the requested state for the package.

775 /// </summary>

776 public RequestState State { get; set; }

777 +

778 + /// <summary>

779 + /// Gets or sets the requested cache type for the package.

780 + /// </summary>

781 + public BOOTSTRAPPER_CACHE_TYPE CacheType { get; set; }

782 }

783

784 /// <summary>

@@ -936,17 +947,14 @@ namespace WixToolset.Mba.Core

947 [Serializable]

948 public class PlannedPackageEventArgs : HResultEventArgs

949 {

939 - /// <summary>

940 - ///

941 - /// </summary>

942 - /// <param name="packageId"></param>

943 - /// <param name="execute"></param>

944 - /// <param name="rollback"></param>

945 - public PlannedPackageEventArgs(string packageId, ActionState execute, ActionState rollback)

950 + /// <summary />

951 + public PlannedPackageEventArgs(string packageId, ActionState execute, ActionState rollback, bool cache, bool uncache)

952 {

953 this.PackageId = packageId;

954 this.Execute = execute;

955 this.Rollback = rollback;

956 + this.Cache = cache;

957 + this.Uncache = uncache;

958 }

959

960 /// <summary>

@@ -963,6 +971,16 @@ namespace WixToolset.Mba.Core

971 /// Gets the planned rollback action.

972 /// </summary>

973 public ActionState Rollback { get; private set; }

974 +

975 + /// <summary>

976 + /// Gets whether the package will be cached.

977 + /// </summary>

978 + public bool Cache { get; private set; }

979 +

980 + /// <summary>

981 + /// Gets whether the package will be removed from the package cache.

982 + /// </summary>

983 + public bool Uncache { get; private set; }

984 }

985

986 /// <summary>

src/WixToolset.Mba.Core/IBootstrapperApplication.cs

+51 -18

@@ -251,16 +251,13 @@ namespace WixToolset.Mba.Core

251 /// <summary>

252 /// See <see cref="IDefaultBootstrapperApplication.DetectPackageComplete"/>.

253 /// </summary>

254 - /// <param name="wzPackageId"></param>

255 - /// <param name="hrStatus"></param>

256 - /// <param name="state"></param>

257 - /// <returns></returns>

254 [PreserveSig]

255 [return: MarshalAs(UnmanagedType.I4)]

256 int OnDetectPackageComplete(

257 [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,

258 int hrStatus,

263 - [MarshalAs(UnmanagedType.U4)] PackageState state

259 + [MarshalAs(UnmanagedType.U4)] PackageState state,

260 + [MarshalAs(UnmanagedType.Bool)] bool fCached

261 );

262

263 /// <summary>

@@ -309,21 +306,17 @@ namespace WixToolset.Mba.Core

306 /// <summary>

307 /// See <see cref="IDefaultBootstrapperApplication.PlanPackageBegin"/>.

308 /// </summary>

312 - /// <param name="wzPackageId"></param>

313 - /// <param name="state"></param>

314 - /// <param name="fInstallCondition"></param>

315 - /// <param name="recommendedState"></param>

316 - /// <param name="pRequestedState"></param>

317 - /// <param name="fCancel"></param>

318 - /// <returns></returns>

309 [PreserveSig]

310 [return: MarshalAs(UnmanagedType.I4)]

311 int OnPlanPackageBegin(

312 [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,

313 [MarshalAs(UnmanagedType.U4)] PackageState state,

324 - [MarshalAs(UnmanagedType.Bool)] bool fInstallCondition,

314 + [MarshalAs(UnmanagedType.Bool)] bool fCached,

315 + [MarshalAs(UnmanagedType.U4)] BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,

316 [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,

317 + [MarshalAs(UnmanagedType.U4)] BOOTSTRAPPER_CACHE_TYPE recommendedCacheType,

318 [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,

319 + [MarshalAs(UnmanagedType.U4)] ref BOOTSTRAPPER_CACHE_TYPE pRequestedCacheType,

320 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel

321 );

322

@@ -406,16 +399,14 @@ namespace WixToolset.Mba.Core

399 /// <summary>

400 /// See <see cref="IDefaultBootstrapperApplication.PlannedPackage"/>.

401 /// </summary>

409 - /// <param name="wzPackageId"></param>

410 - /// <param name="execute"></param>

411 - /// <param name="rollback"></param>

412 - /// <returns></returns>

402 [PreserveSig]

403 [return: MarshalAs(UnmanagedType.I4)]

404 int OnPlannedPackage(

405 [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,

406 [MarshalAs(UnmanagedType.U4)] ActionState execute,

418 - [MarshalAs(UnmanagedType.U4)] ActionState rollback

407 + [MarshalAs(UnmanagedType.U4)] ActionState rollback,

408 + [MarshalAs(UnmanagedType.Bool)] bool fPlannedCache,

409 + [MarshalAs(UnmanagedType.Bool)] bool fPlannedUncache

410 );

411

412 /// <summary>

@@ -1641,6 +1632,27 @@ namespace WixToolset.Mba.Core

1632 Restart,

1633 }

1634

1635 + /// <summary>

1636 + /// The cache strategy to be used for the package.

1637 + /// </summary>

1638 + public enum BOOTSTRAPPER_CACHE_TYPE

1639 + {

1640 + /// <summary>

1641 + /// The package will be cached in order to securely run the package, but will always be cleaned from the cache at the end.

1642 + /// </summary>

1643 + Remove,

1644 +

1645 + /// <summary>

1646 + /// The package will be cached in order to run the package, and then kept in the cache until the package is uninstalled.

1647 + /// </summary>

1648 + Keep,

1649 +

1650 + /// <summary>

1651 + /// The package will always be cached and stay in the cache, unless the package and bundle are both being uninstalled.

1652 + /// </summary>

1653 + Force,

1654 + }

1655 +

1656 /// <summary>

1657 /// The available actions for <see cref="IDefaultBootstrapperApplication.CacheAcquireComplete"/>.

1658 /// </summary>

@@ -1736,6 +1748,27 @@ namespace WixToolset.Mba.Core

1748 Suspend,

1749 }

1750

1751 + /// <summary>

1752 + /// The result of evaluating a condition from a package.

1753 + /// </summary>

1754 + public enum BOOTSTRAPPER_PACKAGE_CONDITION_RESULT

1755 + {

1756 + /// <summary>

1757 + /// No condition was authored.

1758 + /// </summary>

1759 + Default,

1760 +

1761 + /// <summary>

1762 + /// Evaluated to false.

1763 + /// </summary>

1764 + False,

1765 +

1766 + /// <summary>

1767 + /// Evaluated to true.

1768 + /// </summary>

1769 + True,

1770 + }

1771 +

1772 /// <summary>

1773 /// The available actions for <see cref="IDefaultBootstrapperApplication.CacheAcquireResolving"/>.

1774 /// </summary>

src/WixToolset.Mba.Core/IBootstrapperEngine.cs

+4 -20

@@ -39,57 +39,41 @@ namespace WixToolset.Mba.Core

39 /// <summary>

40 /// See <see cref="IEngine.GetVariableString(string)"/>.

41 /// </summary>

42 - /// <param name="wzVariable"></param>

43 - /// <param name="wzValue"></param>

44 - /// <param name="pcchValue"></param>

45 - /// <returns></returns>

42 [PreserveSig]

43 int GetVariableString(

44 [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,

45 IntPtr wzValue,

50 - [MarshalAs(UnmanagedType.U4)] ref int pcchValue

46 + ref IntPtr pcchValue

47 );

48

49 /// <summary>

50 /// See <see cref="IEngine.GetVariableVersion(string)"/>.

51 /// </summary>

56 - /// <param name="wzVariable"></param>

57 - /// <param name="wzValue"></param>

58 - /// <param name="pcchValue"></param>

59 - /// <returns></returns>

52 [PreserveSig]

53 int GetVariableVersion(

54 [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,

55 IntPtr wzValue,

64 - [MarshalAs(UnmanagedType.U4)] ref int pcchValue

56 + ref IntPtr pcchValue

57 );

58

59 /// <summary>

60 /// See <see cref="IEngine.FormatString(string)"/>.

61 /// </summary>

70 - /// <param name="wzIn"></param>

71 - /// <param name="wzOut"></param>

72 - /// <param name="pcchOut"></param>

73 - /// <returns></returns>

62 [PreserveSig]

63 int FormatString(

64 [MarshalAs(UnmanagedType.LPWStr)] string wzIn,

65 [MarshalAs(UnmanagedType.LPWStr), Out] StringBuilder wzOut,

78 - [MarshalAs(UnmanagedType.U4)] ref int pcchOut

66 + ref IntPtr pcchOut

67 );

68

69 /// <summary>

70 /// See <see cref="IEngine.EscapeString(string)"/>.

71 /// </summary>

84 - /// <param name="wzIn"></param>

85 - /// <param name="wzOut"></param>

86 - /// <param name="pcchOut"></param>

87 - /// <returns></returns>

72 [PreserveSig]

73 int EscapeString(

74 [MarshalAs(UnmanagedType.LPWStr)] string wzIn,

75 [MarshalAs(UnmanagedType.LPWStr), Out] StringBuilder wzOut,

92 - [MarshalAs(UnmanagedType.U4)] ref int pcchOut

76 + ref IntPtr pcchOut

77 );

78

79 /// <summary>

src/WixToolset.Mba.Core/IPackageInfo.cs

+1 -1

@@ -10,7 +10,7 @@ namespace WixToolset.Mba.Core

10 /// <summary>

11 ///

12 /// </summary>

13 - CacheType CacheType { get; }

13 + BOOTSTRAPPER_CACHE_TYPE CacheType { get; }

14

15 /// <summary>

16 /// Place for the BA to store it's own custom data for this package.

src/WixToolset.Mba.Core/PackageInfo.cs

+7 -28

@@ -7,27 +7,6 @@ namespace WixToolset.Mba.Core

7 using System.Xml;

8 using System.Xml.XPath;

9

10 - /// <summary>

11 - ///

12 - /// </summary>

13 - public enum CacheType

14 - {

15 - /// <summary>

16 - ///

17 - /// </summary>

18 - No,

19 -

20 - /// <summary>

21 - ///

22 - /// </summary>

23 - Yes,

24 -

25 - /// <summary>

26 - ///

27 - /// </summary>

28 - Always,

29 - }

30 -

10 /// <summary>

11 ///

12 /// </summary>

@@ -113,7 +92,7 @@ namespace WixToolset.Mba.Core

92 public string InstallCondition { get; internal set; }

93

94 /// <inheritdoc/>

116 - public CacheType CacheType { get; internal set; }

95 + public BOOTSTRAPPER_CACHE_TYPE CacheType { get; internal set; }

96

97 /// <inheritdoc/>

98 public bool PrereqPackage { get; internal set; }

@@ -198,7 +177,7 @@ namespace WixToolset.Mba.Core

177 /// <param name="node"></param>

178 /// <param name="attributeName"></param>

179 /// <returns></returns>

201 - public static CacheType? GetCacheTypeAttribute(XPathNavigator node, string attributeName)

180 + public static BOOTSTRAPPER_CACHE_TYPE? GetCacheTypeAttribute(XPathNavigator node, string attributeName)

181 {

182 string attributeValue = BootstrapperApplicationData.GetAttribute(node, attributeName);

183

@@ -207,17 +186,17 @@ namespace WixToolset.Mba.Core

186 return null;

187 }

188

210 - if (attributeValue.Equals("yes", StringComparison.InvariantCulture))

189 + if (attributeValue.Equals("keep", StringComparison.InvariantCulture))

190 {

212 - return CacheType.Yes;

191 + return BOOTSTRAPPER_CACHE_TYPE.Keep;

192 }

214 - else if (attributeValue.Equals("always", StringComparison.InvariantCulture))

193 + else if (attributeValue.Equals("force", StringComparison.InvariantCulture))

194 {

216 - return CacheType.Always;

195 + return BOOTSTRAPPER_CACHE_TYPE.Force;

196 }

197 else

198 {

220 - return CacheType.No;

199 + return BOOTSTRAPPER_CACHE_TYPE.Remove;

200 }

201 }

202

src/balutil/BalBootstrapperEngine.cpp

+5 -5

@@ -107,7 +107,7 @@ public: // IBootstrapperEngine

107 virtual STDMETHODIMP GetVariableString(

108 __in_z LPCWSTR wzVariable,

109 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

110 - __inout DWORD* pcchValue

110 + __inout SIZE_T* pcchValue

111 )

112 {

113 HRESULT hr = S_OK;

@@ -134,7 +134,7 @@ public: // IBootstrapperEngine

134 virtual STDMETHODIMP GetVariableVersion(

135 __in_z LPCWSTR wzVariable,

136 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

137 - __inout DWORD* pcchValue

137 + __inout SIZE_T* pcchValue

138 )

139 {

140 HRESULT hr = S_OK;

@@ -161,7 +161,7 @@ public: // IBootstrapperEngine

161 virtual STDMETHODIMP FormatString(

162 __in_z LPCWSTR wzIn,

163 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

164 - __inout DWORD* pcchOut

164 + __inout SIZE_T* pcchOut

165 )

166 {

167 HRESULT hr = S_OK;

@@ -188,7 +188,7 @@ public: // IBootstrapperEngine

188 virtual STDMETHODIMP EscapeString(

189 __in_z LPCWSTR wzIn,

190 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

191 - __inout DWORD* pcchOut

191 + __inout SIZE_T* pcchOut

192 )

193 {

194 HRESULT hr = S_OK;

@@ -485,7 +485,7 @@ public: // IBootstrapperEngine

485 }

486

487 virtual STDMETHODIMP Apply(

488 - __in_opt HWND hwndParent

488 + __in HWND hwndParent

489 )

490 {

491 BAENGINE_APPLY_ARGS args = { };

src/balutil/balcondition.cpp

+3 -3

@@ -78,7 +78,7 @@ DAPI_(HRESULT) BalConditionEvaluate(

78 )

79 {

80 HRESULT hr = S_OK;

81 - DWORD_PTR cchMessage = 0;

81 + SIZE_T cchMessage = 0;

82

83 hr = pEngine->EvaluateCondition(pCondition->sczCondition, pfResult);

84 ExitOnFailure(hr, "Failed to evaluate condition with bootstrapper engine.");

@@ -91,7 +91,7 @@ DAPI_(HRESULT) BalConditionEvaluate(

91 ExitOnFailure(hr, "Failed to get length of message.");

92 }

93

94 - hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, reinterpret_cast<DWORD*>(&cchMessage));

94 + hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, &cchMessage);

95 if (E_MOREDATA == hr)

96 {

97 ++cchMessage;

@@ -99,7 +99,7 @@ DAPI_(HRESULT) BalConditionEvaluate(

99 hr = StrAllocSecure(psczMessage, cchMessage);

100 ExitOnFailure(hr, "Failed to allocate string for condition's formatted message.");

101

102 - hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, reinterpret_cast<DWORD*>(&cchMessage));

102 + hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, &cchMessage);

103 }

104 ExitOnFailure(hr, "Failed to format condition's message.");

105 }

src/balutil/balinfo.cpp

+6 -6

@@ -261,17 +261,17 @@ static HRESULT ParsePackagesFromXml(

261 hr = XmlGetAttributeEx(pNode, L"Cache", &scz);

262 ExitOnFailure(hr, "Failed to get cache type for package.");

263

264 - if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"no", -1))

264 + if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"remove", -1))

265 {

266 - prgPackages[iPackage].cacheType = BAL_INFO_CACHE_TYPE_NO;

266 + prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_REMOVE;

267 }

268 - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"yes", -1))

268 + else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"keep", -1))

269 {

270 - prgPackages[iPackage].cacheType = BAL_INFO_CACHE_TYPE_YES;

270 + prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP;

271 }

272 - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"always", -1))

272 + else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"force", -1))

273 {

274 - prgPackages[iPackage].cacheType = BAL_INFO_CACHE_TYPE_ALWAYS;

274 + prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_FORCE;

275 }

276

277 ++iPackage;

src/balutil/balutil.cpp

+5 -5

@@ -96,7 +96,7 @@ DAPI_(HRESULT) BalFormatString(

96 )

97 {

98 HRESULT hr = S_OK;

99 - DWORD cch = 0;

99 + SIZE_T cch = 0;

100

101 if (!vpEngine)

102 {

@@ -106,7 +106,7 @@ DAPI_(HRESULT) BalFormatString(

106

107 if (*psczOut)

108 {

109 - hr = StrMaxLength(*psczOut, reinterpret_cast<DWORD_PTR*>(&cch));

109 + hr = StrMaxLength(*psczOut, &cch);

110 ExitOnFailure(hr, "Failed to determine length of value.");

111 }

112

@@ -172,7 +172,7 @@ DAPI_(BOOL) BalVariableExists(

172 )

173 {

174 HRESULT hr = S_OK;

175 - DWORD cch = 0;

175 + SIZE_T cch = 0;

176

177 if (!vpEngine)

178 {

@@ -194,7 +194,7 @@ DAPI_(HRESULT) BalGetStringVariable(

194 )

195 {

196 HRESULT hr = S_OK;

197 - DWORD cch = 0;

197 + SIZE_T cch = 0;

198

199 if (!vpEngine)

200 {

@@ -204,7 +204,7 @@ DAPI_(HRESULT) BalGetStringVariable(

204

205 if (*psczValue)

206 {

207 - hr = StrMaxLength(*psczValue, reinterpret_cast<DWORD_PTR*>(&cch));

207 + hr = StrMaxLength(*psczValue, &cch);

208 ExitOnFailure(hr, "Failed to determine length of value.");

209 }

210

src/balutil/balutil.vcxproj

+4 -4

@@ -2,8 +2,8 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" />

6 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" />

5 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />

6 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />

7

8 <ItemGroup Label="ProjectConfigurations">

9 <ProjectConfiguration Include="Debug|ARM64">

@@ -98,8 +98,8 @@

98 <PropertyGroup>

99 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

100 </PropertyGroup>

101 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" />

101 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />

102 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />

103 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props'))" />

103 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />

104 </Target>

105 </Project>

\ No newline at end of file

src/balutil/inc/BalBaseBAFunctions.h

+9 -3

@@ -222,7 +222,8 @@ public: // IBootstrapperApplication

222 virtual STDMETHODIMP OnDetectPackageComplete(

223 __in_z LPCWSTR /*wzPackageId*/,

224 __in HRESULT /*hrStatus*/,

225 - __in BOOTSTRAPPER_PACKAGE_STATE /*state*/

225 + __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,

226 + __in BOOL /*fCached*/

227 )

228 {

229 return S_OK;

@@ -257,9 +258,12 @@ public: // IBootstrapperApplication

258 virtual STDMETHODIMP OnPlanPackageBegin(

259 __in_z LPCWSTR /*wzPackageId*/,

260 __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,

260 - __in BOOL /*fInstallCondition*/,

261 + __in BOOL /*fCached*/,

262 + __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT /*installCondition*/,

263 __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,

264 + __in BOOTSTRAPPER_CACHE_TYPE /*recommendedCacheType*/,

265 __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestState*/,

266 + __inout BOOTSTRAPPER_CACHE_TYPE* /*pRequestedCacheType*/,

267 __inout BOOL* /*pfCancel*/

268 )

269 {

@@ -313,7 +317,9 @@ public: // IBootstrapperApplication

317 virtual STDMETHODIMP OnPlannedPackage(

318 __in_z LPCWSTR /*wzPackageId*/,

319 __in BOOTSTRAPPER_ACTION_STATE /*execute*/,

316 - __in BOOTSTRAPPER_ACTION_STATE /*rollback*/

320 + __in BOOTSTRAPPER_ACTION_STATE /*rollback*/,

321 + __in BOOL /*fPlannedCache*/,

322 + __in BOOL /*fPlannedUncache*/

323 )

324 {

325 return S_OK;

src/balutil/inc/BalBaseBootstrapperApplication.h

+9 -3

@@ -228,7 +228,8 @@ public: // IBootstrapperApplication

228 virtual STDMETHODIMP OnDetectPackageComplete(

229 __in_z LPCWSTR /*wzPackageId*/,

230 __in HRESULT /*hrStatus*/,

231 - __in BOOTSTRAPPER_PACKAGE_STATE /*state*/

231 + __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,

232 + __in BOOL /*fCached*/

233 )

234 {

235 return S_OK;

@@ -265,9 +266,12 @@ public: // IBootstrapperApplication

266 virtual STDMETHODIMP OnPlanPackageBegin(

267 __in_z LPCWSTR /*wzPackageId*/,

268 __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,

268 - __in BOOL /*fInstallCondition*/,

269 + __in BOOL /*fCached*/,

270 + __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT /*installCondition*/,

271 __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,

272 + __in BOOTSTRAPPER_CACHE_TYPE /*recommendedCacheType*/,

273 __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestState*/,

274 + __inout BOOTSTRAPPER_CACHE_TYPE* /*pRequestedCacheType*/,

275 __inout BOOL* pfCancel

276 )

277 {

@@ -325,7 +329,9 @@ public: // IBootstrapperApplication

329 virtual STDMETHODIMP OnPlannedPackage(

330 __in_z LPCWSTR /*wzPackageId*/,

331 __in BOOTSTRAPPER_ACTION_STATE /*execute*/,

328 - __in BOOTSTRAPPER_ACTION_STATE /*rollback*/

332 + __in BOOTSTRAPPER_ACTION_STATE /*rollback*/,

333 + __in BOOL /*fPlannedCache*/,

334 + __in BOOL /*fPlannedUncache*/

335 )

336 {

337 return S_OK;

src/balutil/inc/BalBaseBootstrapperApplicationProc.h

+3 -3

@@ -159,7 +159,7 @@ static HRESULT BalBaseBAProcOnDetectPackageComplete(

159 __inout BA_ONDETECTPACKAGECOMPLETE_RESULTS* /*pResults*/

160 )

161 {

162 - return pBA->OnDetectPackageComplete(pArgs->wzPackageId, pArgs->hrStatus, pArgs->state);

162 + return pBA->OnDetectPackageComplete(pArgs->wzPackageId, pArgs->hrStatus, pArgs->state, pArgs->fCached);

163 }

164

165 static HRESULT BalBaseBAProcOnPlanRelatedBundle(

@@ -177,7 +177,7 @@ static HRESULT BalBaseBAProcOnPlanPackageBegin(

177 __inout BA_ONPLANPACKAGEBEGIN_RESULTS* pResults

178 )

179 {

180 - return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->state, pArgs->fInstallCondition, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);

180 + return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->state, pArgs->fCached, pArgs->installCondition, pArgs->recommendedState, pArgs->recommendedCacheType, &pResults->requestedState, &pResults->requestedCacheType, &pResults->fCancel);

181 }

182

183 static HRESULT BalBaseBAProcOnPlanPatchTarget(

@@ -213,7 +213,7 @@ static HRESULT BalBaseBAProcOnPlannedPackage(

213 __inout BA_ONPLANNEDPACKAGE_RESULTS* /*pResults*/

214 )

215 {

216 - return pBA->OnPlannedPackage(pArgs->wzPackageId, pArgs->execute, pArgs->rollback);

216 + return pBA->OnPlannedPackage(pArgs->wzPackageId, pArgs->execute, pArgs->rollback, pArgs->fPlannedCache, pArgs->fPlannedUncache);

217 }

218

219 static HRESULT BalBaseBAProcOnApplyBegin(

src/balutil/inc/IBootstrapperApplication.h

+9 -3

@@ -135,7 +135,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A

135 STDMETHOD(OnDetectPackageComplete)(

136 __in_z LPCWSTR wzPackageId,

137 __in HRESULT hrStatus,

138 - __in BOOTSTRAPPER_PACKAGE_STATE state

138 + __in BOOTSTRAPPER_PACKAGE_STATE state,

139 + __in BOOL fCached

140 ) = 0;

141

142 // OnDetectPackageComplete - called after the engine completes detection.

@@ -164,9 +165,12 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A

165 STDMETHOD(OnPlanPackageBegin)(

166 __in_z LPCWSTR wzPackageId,

167 __in BOOTSTRAPPER_PACKAGE_STATE state,

167 - __in BOOL fInstallCondition,

168 + __in BOOL fCached,

169 + __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,

170 __in BOOTSTRAPPER_REQUEST_STATE recommendedState,

171 + __in BOOTSTRAPPER_CACHE_TYPE recommendedCacheType,

172 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,

173 + __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType,

174 __inout BOOL* pfCancel

175 ) = 0;

176

@@ -214,7 +218,9 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A

218 STDMETHOD(OnPlannedPackage)(

219 __in_z LPCWSTR wzPackageId,

220 __in BOOTSTRAPPER_ACTION_STATE execute,

217 - __in BOOTSTRAPPER_ACTION_STATE rollback

221 + __in BOOTSTRAPPER_ACTION_STATE rollback,

222 + __in BOOL fPlannedCache,

223 + __in BOOL fPlannedUncache

224 ) = 0;

225

226 // OnPlanComplete - called when the engine completes planning.

src/balutil/inc/IBootstrapperEngine.h

+5 -5

@@ -16,25 +16,25 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8

16 STDMETHOD(GetVariableString)(

17 __in_z LPCWSTR wzVariable,

18 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

19 - __inout DWORD* pcchValue

19 + __inout SIZE_T* pcchValue

20 ) = 0;

21

22 STDMETHOD(GetVariableVersion)(

23 __in_z LPCWSTR wzVariable,

24 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

25 - __inout DWORD* pcchValue

25 + __inout SIZE_T * pcchValue

26 ) = 0;

27

28 STDMETHOD(FormatString)(

29 __in_z LPCWSTR wzIn,

30 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

31 - __inout DWORD* pcchOut

31 + __inout SIZE_T * pcchOut

32 ) = 0;

33

34 STDMETHOD(EscapeString)(

35 __in_z LPCWSTR wzIn,

36 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

37 - __inout DWORD* pcchOut

37 + __inout SIZE_T * pcchOut

38 ) = 0;

39

40 STDMETHOD(EvaluateCondition)(

@@ -114,7 +114,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8

114 ) = 0;

115

116 STDMETHOD(Apply)(

117 - __in_opt HWND hwndParent

117 + __in HWND hwndParent

118 ) = 0;

119

120 STDMETHOD(Quit)(

src/balutil/inc/balinfo.h

+1 -8

@@ -18,13 +18,6 @@ typedef enum BAL_INFO_PACKAGE_TYPE

18 BAL_INFO_PACKAGE_TYPE_BUNDLE_PATCH,

19 } BAL_INFO_PACKAGE_TYPE;

20

21 -typedef enum BAL_INFO_CACHE_TYPE

22 -{

23 - BAL_INFO_CACHE_TYPE_NO,

24 - BAL_INFO_CACHE_TYPE_YES,

25 - BAL_INFO_CACHE_TYPE_ALWAYS,

26 -} BAL_INFO_CACHE_TYPE;

27 -

21

22 typedef struct _BAL_INFO_PACKAGE

23 {

@@ -39,7 +32,7 @@ typedef struct _BAL_INFO_PACKAGE

32 LPWSTR sczUpgradeCode;

33 LPWSTR sczVersion;

34 LPWSTR sczInstallCondition;

42 - BAL_INFO_CACHE_TYPE cacheType;

35 + BOOTSTRAPPER_CACHE_TYPE cacheType;

36 BOOL fPrereqPackage;

37 LPWSTR sczPrereqLicenseFile;

38 LPWSTR sczPrereqLicenseUrl;

src/balutil/inc/balutil.h

+1 -1

@@ -51,7 +51,7 @@ DAPI_(void) BalInitialize(

51 ********************************************************************/

52 DAPI_(HRESULT) BalInitializeFromCreateArgs(

53 __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,

54 - __out IBootstrapperEngine** ppEngine

54 + __out_opt IBootstrapperEngine** ppEngine

55 );

56

57 /*******************************************************************

src/balutil/packages.config

+2 -2

@@ -1,6 +1,6 @@

1 <?xml version="1.0" encoding="utf-8"?>

2 <packages>

3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />

4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" />

5 - <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" />

4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />

5 + <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />

6 </packages>

\ No newline at end of file

src/bextutil/BextBundleExtensionEngine.cpp

+4 -4

@@ -56,7 +56,7 @@ public: // IBundleExtensionEngine

56 virtual STDMETHODIMP EscapeString(

57 __in_z LPCWSTR wzIn,

58 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

59 - __inout DWORD* pcchOut

59 + __inout SIZE_T* pcchOut

60 )

61 {

62 HRESULT hr = S_OK;

@@ -107,7 +107,7 @@ public: // IBundleExtensionEngine

107 virtual STDMETHODIMP FormatString(

108 __in_z LPCWSTR wzIn,

109 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

110 - __inout DWORD* pcchOut

110 + __inout SIZE_T* pcchOut

111 )

112 {

113 HRESULT hr = S_OK;

@@ -159,7 +159,7 @@ public: // IBundleExtensionEngine

159 virtual STDMETHODIMP GetVariableString(

160 __in_z LPCWSTR wzVariable,

161 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

162 - __inout DWORD* pcchValue

162 + __inout SIZE_T* pcchValue

163 )

164 {

165 HRESULT hr = S_OK;

@@ -186,7 +186,7 @@ public: // IBundleExtensionEngine

186 virtual STDMETHODIMP GetVariableVersion(

187 __in_z LPCWSTR wzVariable,

188 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

189 - __inout DWORD* pcchValue

189 + __inout SIZE_T* pcchValue

190 )

191 {

192 HRESULT hr = S_OK;

src/bextutil/bextutil.vcxproj

+4 -4

@@ -2,8 +2,8 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" />

6 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" />

5 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />

6 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />

7

8 <ItemGroup Label="ProjectConfigurations">

9 <ProjectConfiguration Include="Debug|ARM64">

@@ -87,8 +87,8 @@

87 <PropertyGroup>

88 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

89 </PropertyGroup>

90 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" />

90 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />

91 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />

92 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props'))" />

92 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />

93 </Target>

94 </Project>

\ No newline at end of file

src/bextutil/inc/IBundleExtensionEngine.h

+5 -5

@@ -7,18 +7,18 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973

7 STDMETHOD(EscapeString)(

8 __in_z LPCWSTR wzIn,

9 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

10 - __inout DWORD * pcchOut

10 + __inout SIZE_T* pcchOut

11 ) = 0;

12

13 STDMETHOD(EvaluateCondition)(

14 __in_z LPCWSTR wzCondition,

15 - __out BOOL * pf

15 + __out BOOL* pf

16 ) = 0;

17

18 STDMETHOD(FormatString)(

19 __in_z LPCWSTR wzIn,

20 __out_ecount_opt(*pcchOut) LPWSTR wzOut,

21 - __inout DWORD * pcchOut

21 + __inout SIZE_T* pcchOut

22 ) = 0;

23

24 STDMETHOD(GetVariableNumeric)(

@@ -29,13 +29,13 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973

29 STDMETHOD(GetVariableString)(

30 __in_z LPCWSTR wzVariable,

31 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

32 - __inout DWORD* pcchValue

32 + __inout SIZE_T* pcchValue

33 ) = 0;

34

35 STDMETHOD(GetVariableVersion)(

36 __in_z LPCWSTR wzVariable,

37 __out_ecount_opt(*pcchValue) LPWSTR wzValue,

38 - __inout DWORD* pcchValue

38 + __inout SIZE_T* pcchValue

39 ) = 0;

40

41 STDMETHOD(Log)(

src/bextutil/packages.config

+2 -2

@@ -1,6 +1,6 @@

1 <?xml version="1.0" encoding="utf-8"?>

2 <packages>

3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />

4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" />

5 - <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" />

4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />

5 + <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />

6 </packages>

\ No newline at end of file

src/mbanative/mbanative.vcxproj

+4 -4

@@ -2,11 +2,11 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" />

5 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />

6 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />

7 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />

8 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />

9 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" />

9 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />

10

11 <ItemGroup Label="ProjectConfigurations">

12 <ProjectConfiguration Include="Debug|ARM64">

@@ -96,7 +96,7 @@

96 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />

97 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />

98 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />

99 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" />

100 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props'))" />

99 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />

100 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />

101 </Target>

102 </Project>

\ No newline at end of file

src/mbanative/packages.config

+2 -2

@@ -4,6 +4,6 @@

4 <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />

5 <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />

6 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />

7 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" />

8 - <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" />

7 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />

8 + <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />

9 </packages>

\ No newline at end of file

src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj

+10 -10

@@ -3,9 +3,9 @@

3

4

5 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

6 - <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" />

7 - <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" />

8 - <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" />

6 + <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />

7 + <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" />

8 + <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />

9 <ItemGroup Label="ProjectConfigurations">

10 <ProjectConfiguration Include="Debug|Win32">

11 <Configuration>Debug</Configuration>

@@ -50,10 +50,10 @@

50 <Reference Include="System" />

51 <Reference Include="System.Core" />

52 <Reference Include="WixBuildTools.TestSupport">

53 - <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath>

53 + <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>

54 </Reference>

55 <Reference Include="WixBuildTools.TestSupport.Native">

56 - <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>

56 + <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>

57 </Reference>

58 </ItemGroup>

59 <ItemGroup>

@@ -62,14 +62,14 @@

62 </ProjectReference>

63 </ItemGroup>

64 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

65 - <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" />

65 + <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" />

66 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

67 <PropertyGroup>

68 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

69 </PropertyGroup>

70 - <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" />

71 - <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" />

72 - <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" />

73 - <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props'))" />

70 + <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />

71 + <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />

72 + <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />

73 + <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />

74 </Target>

75 </Project>

\ No newline at end of file

src/test/BalUtilUnitTest/packages.config

+4 -4

@@ -1,10 +1,10 @@

1 <?xml version="1.0" encoding="utf-8"?>

3 <packages>

4 - <package id="WixBuildTools.TestSupport" version="4.0.47" />

5 - <package id="WixBuildTools.TestSupport.Native" version="4.0.47" />

6 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" />

7 - <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" />

4 + <package id="WixBuildTools.TestSupport" version="4.0.50" />

5 + <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />

6 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />

7 + <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />

8 <package id="xunit.abstractions" version="2.0.3" />

9 <package id="xunit.assert" version="2.4.1" />

10 <package id="xunit.core" version="2.4.1" />

src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj

+10 -10

@@ -3,9 +3,9 @@

3

4

5 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

6 - <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" />

7 - <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" />

8 - <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" />

6 + <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />

7 + <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" />

8 + <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />

9 <ItemGroup Label="ProjectConfigurations">

10 <ProjectConfiguration Include="Debug|Win32">

11 <Configuration>Debug</Configuration>

@@ -49,10 +49,10 @@

49 <Reference Include="System" />

50 <Reference Include="System.Core" />

51 <Reference Include="WixBuildTools.TestSupport">

52 - <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath>

52 + <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>

53 </Reference>

54 <Reference Include="WixBuildTools.TestSupport.Native">

55 - <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>

55 + <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>

56 </Reference>

57 </ItemGroup>

58 <ItemGroup>

@@ -61,14 +61,14 @@

61 </ProjectReference>

62 </ItemGroup>

63 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

64 - <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" />

64 + <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" />

65 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

66 <PropertyGroup>

67 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

68 </PropertyGroup>

69 - <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" />

70 - <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" />

71 - <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" />

72 - <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props'))" />

69 + <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />

70 + <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />

71 + <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />

72 + <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />

73 </Target>

74 </Project>

\ No newline at end of file

src/test/BextUtilUnitTest/packages.config