@joebigelow / wix-1 / commits / a37013d4

WIXFEAT:4763 Change "string" variable type to literal and add "formatted".

Sean Hall committed Aug 1, 2020 at 10:20 UTC a37013d41f0702cbdf2aee6dce95d26dafc069b4
16 files changed +103 -54
src/WixToolset.Mba.Core/Engine.cs
+2 -2
@@ -79,7 +79,7 @@ namespace WixToolset.Mba.Core
79 IntPtr pValue = Marshal.SecureStringToCoTaskMemUnicode(value);
80 try
81 {
82 - this.engine.SetVariableString(name, pValue);
82 + this.engine.SetVariableString(name, pValue, true);
83 }
84 finally
85 {
@@ -115,7 +115,7 @@ namespace WixToolset.Mba.Core
115 IntPtr pValue = Marshal.StringToCoTaskMemUni(value);
116 try
117 {
118 - this.engine.SetVariableString(name, pValue);
118 + this.engine.SetVariableString(name, pValue, true);
119 }
120 finally
121 {
src/WixToolset.Mba.Core/IBootstrapperEngine.cs
+2 -1
@@ -106,7 +106,8 @@ namespace WixToolset.Mba.Core
106
107 void SetVariableString(
108 [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
109 - IntPtr wzValue
109 + IntPtr wzValue,
110 + [MarshalAs(UnmanagedType.Bool)] bool fFormatted
111 );
112
113 void SetVariableVersion(
src/balutil/BalBootstrapperEngine.cpp
+3 -1
@@ -391,7 +391,8 @@ public: // IBootstrapperEngine
391
392 virtual STDMETHODIMP SetVariableString(
393 __in_z LPCWSTR wzVariable,
394 - __in_z_opt LPCWSTR wzValue
394 + __in_z_opt LPCWSTR wzValue,
395 + __in BOOL fFormatted
396 )
397 {
398 BAENGINE_SETVARIABLESTRING_ARGS args = { };
@@ -400,6 +401,7 @@ public: // IBootstrapperEngine
401 args.cbSize = sizeof(args);
402 args.wzVariable = wzVariable;
403 args.wzValue = wzValue;
404 + args.fFormatted = fFormatted;
405
406 results.cbSize = sizeof(results);
407
src/balutil/balutil.cpp
+3 -2
@@ -225,7 +225,8 @@ LExit:
225
226 DAPI_(HRESULT) BalSetStringVariable(
227 __in_z LPCWSTR wzVariable,
228 - __in_z_opt LPCWSTR wzValue
228 + __in_z_opt LPCWSTR wzValue,
229 + __in BOOL fFormatted
230 )
231 {
232 HRESULT hr = S_OK;
@@ -236,7 +237,7 @@ DAPI_(HRESULT) BalSetStringVariable(
237 ExitOnRootFailure(hr, "BalInitialize() must be called first.");
238 }
239
239 - hr = vpEngine->SetVariableString(wzVariable, wzValue);
240 + hr = vpEngine->SetVariableString(wzVariable, wzValue, fFormatted);
241
242 LExit:
243 return hr;
src/balutil/balutil.vcxproj
+4 -4
@@ -2,8 +2,8 @@
2 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
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.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
6 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
5 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" />
6 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" />
7
8 <ItemGroup Label="ProjectConfigurations">
9 <ProjectConfiguration Include="Debug|ARM">
@@ -106,8 +106,8 @@
106 <PropertyGroup>
107 <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>
108 </PropertyGroup>
109 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
110 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
109 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" />
110 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props'))" />
111 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
112 </Target>
113 </Project>
src/balutil/inc/IBootstrapperEngine.h
+2 -1
@@ -89,7 +89,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
89
90 STDMETHOD(SetVariableString)(
91 __in_z LPCWSTR wzVariable,
92 - __in_z_opt LPCWSTR wzValue
92 + __in_z_opt LPCWSTR wzValue,
93 + __in BOOL fFormatted
94 ) = 0;
95
96 STDMETHOD(SetVariableVersion)(
src/balutil/inc/balutil.h
+2 -1
@@ -131,7 +131,8 @@ BalSetStringVariable - sets a string variable in the engine.
131 ********************************************************************/
132 DAPI_(HRESULT) BalSetStringVariable(
133 __in_z LPCWSTR wzVariable,
134 - __in_z_opt LPCWSTR wzValue
134 + __in_z_opt LPCWSTR wzValue,
135 + __in BOOL fFormatted
136 );
137
138 /*******************************************************************
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="2.1.65" targetFramework="native" developmentDependency="true" />
4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
5 - <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" />
5 + <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" />
6 </packages>
\ No newline at end of file
src/bextutil/BextBundleExtensionEngine.cpp
+3 -18
@@ -225,23 +225,6 @@ public: // IBundleExtensionEngine
225 return m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_LOG, &args, &results, m_pvBundleExtensionEngineProcContext);
226 }
227
228 - virtual STDMETHODIMP SetVariableLiteralString(
229 - __in_z LPCWSTR wzVariable,
230 - __in_z_opt LPCWSTR wzValue
231 - )
232 - {
233 - BUNDLE_EXTENSION_ENGINE_SETVARIABLELITERALSTRING_ARGS args = { };
234 - BUNDLE_EXTENSION_ENGINE_SETVARIABLELITERALSTRING_RESULTS results = { };
235 -
236 - args.cbSize = sizeof(args);
237 - args.wzVariable = wzVariable;
238 - args.wzValue = wzValue;
239 -
240 - results.cbSize = sizeof(results);
241 -
242 - return m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLELITERALSTRING, &args, &results, m_pvBundleExtensionEngineProcContext);
243 - }
244 -
228 virtual STDMETHODIMP SetVariableNumeric(
229 __in_z LPCWSTR wzVariable,
230 __in LONGLONG llValue
@@ -261,7 +244,8 @@ public: // IBundleExtensionEngine
244
245 virtual STDMETHODIMP SetVariableString(
246 __in_z LPCWSTR wzVariable,
264 - __in_z_opt LPCWSTR wzValue
247 + __in_z_opt LPCWSTR wzValue,
248 + __in BOOL fFormatted
249 )
250 {
251 BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_ARGS args = { };
@@ -270,6 +254,7 @@ public: // IBundleExtensionEngine
254 args.cbSize = sizeof(args);
255 args.wzVariable = wzVariable;
256 args.wzValue = wzValue;
257 + args.fFormatted = fFormatted;
258
259 results.cbSize = sizeof(results);
260
src/bextutil/bextutil.cpp
+46 -4
@@ -119,6 +119,29 @@ DAPIV_(HRESULT) BextLog(
119 {
120 HRESULT hr = S_OK;
121 va_list args;
122 +
123 + if (!vpEngine)
124 + {
125 + hr = E_POINTER;
126 + ExitOnRootFailure(hr, "BextInitialize() must be called first.");
127 + }
128 +
129 + va_start(args, szFormat);
130 + hr = BextLogArgs(level, szFormat, args);
131 + va_end(args);
132 +
133 +LExit:
134 + return hr;
135 +}
136 +
137 +
138 +DAPI_(HRESULT) BextLogArgs(
139 + __in BUNDLE_EXTENSION_LOG_LEVEL level,
140 + __in_z __format_string LPCSTR szFormat,
141 + __in va_list args
142 + )
143 +{
144 + HRESULT hr = S_OK;
145 LPSTR sczFormattedAnsi = NULL;
146 LPWSTR sczMessage = NULL;
147
@@ -128,9 +151,7 @@ DAPIV_(HRESULT) BextLog(
151 ExitOnRootFailure(hr, "BextInitialize() must be called first.");
152 }
153
131 - va_start(args, szFormat);
154 hr = StrAnsiAllocFormattedArgs(&sczFormattedAnsi, szFormat, args);
133 - va_end(args);
155 ExitOnFailure(hr, "Failed to format log string.");
156
157 hr = StrAllocStringAnsi(&sczMessage, sczFormattedAnsi, 0, CP_UTF8);
@@ -153,6 +174,29 @@ DAPIV_(HRESULT) BextLogError(
174 {
175 HRESULT hr = S_OK;
176 va_list args;
177 +
178 + if (!vpEngine)
179 + {
180 + hr = E_POINTER;
181 + ExitOnRootFailure(hr, "BextInitialize() must be called first.");
182 + }
183 +
184 + va_start(args, szFormat);
185 + hr = BextLogErrorArgs(hrError, szFormat, args);
186 + va_end(args);
187 +
188 +LExit:
189 + return hr;
190 +}
191 +
192 +
193 +DAPI_(HRESULT) BextLogErrorArgs(
194 + __in HRESULT hrError,
195 + __in_z __format_string LPCSTR szFormat,
196 + __in va_list args
197 + )
198 +{
199 + HRESULT hr = S_OK;
200 LPSTR sczFormattedAnsi = NULL;
201 LPWSTR sczMessage = NULL;
202
@@ -162,9 +206,7 @@ DAPIV_(HRESULT) BextLogError(
206 ExitOnRootFailure(hr, "BextInitialize() must be called first.");
207 }
208
165 - va_start(args, szFormat);
209 hr = StrAnsiAllocFormattedArgs(&sczFormattedAnsi, szFormat, args);
167 - va_end(args);
210 ExitOnFailure(hr, "Failed to format error log string.");
211
212 hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x: %S", hrError, sczFormattedAnsi);
src/bextutil/bextutil.vcxproj
+4 -4
@@ -2,8 +2,8 @@
2 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
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.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
6 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
5 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" />
6 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" />
7
8 <ItemGroup Label="ProjectConfigurations">
9 <ProjectConfiguration Include="Debug|ARM">
@@ -95,8 +95,8 @@
95 <PropertyGroup>
96 <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>
97 </PropertyGroup>
98 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
99 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
98 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" />
99 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props'))" />
100 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
101 </Target>
102 </Project>
src/bextutil/inc/IBundleExtensionEngine.h
+2 -6
@@ -42,11 +42,6 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973
42 __in_z LPCWSTR wzMessage
43 ) = 0;
44
45 - STDMETHOD(SetVariableLiteralString)(
46 - __in_z LPCWSTR wzVariable,
47 - __in_z_opt LPCWSTR wzValue
48 - ) = 0;
49 -
45 STDMETHOD(SetVariableNumeric)(
46 __in_z LPCWSTR wzVariable,
47 __in LONGLONG llValue
@@ -54,7 +49,8 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973
49
50 STDMETHOD(SetVariableString)(
51 __in_z LPCWSTR wzVariable,
57 - __in_z_opt LPCWSTR wzValue
52 + __in_z_opt LPCWSTR wzValue,
53 + __in BOOL fFormatted
54 ) = 0;
55
56 STDMETHOD(SetVariableVersion)(
src/bextutil/inc/bextutil.h
+20
@@ -71,6 +71,16 @@ DAPIV_(HRESULT) BextLog(
71 ...
72 );
73
74 +/*******************************************************************
75 + BextLogArgs - logs a message with the engine.
76 +
77 +********************************************************************/
78 +DAPI_(HRESULT) BextLogArgs(
79 + __in BUNDLE_EXTENSION_LOG_LEVEL level,
80 + __in_z __format_string LPCSTR szFormat,
81 + __in va_list args
82 + );
83 +
84 /*******************************************************************
85 BextLogError - logs an error message with the engine.
86
@@ -81,6 +91,16 @@ DAPIV_(HRESULT) BextLogError(
91 ...
92 );
93
94 +/*******************************************************************
95 + BextLogErrorArgs - logs an error message with the engine.
96 +
97 +********************************************************************/
98 +DAPI_(HRESULT) BextLogErrorArgs(
99 + __in HRESULT hr,
100 + __in_z __format_string LPCSTR szFormat,
101 + __in va_list args
102 + );
103 +
104 #ifdef __cplusplus
105 }
106 #endif
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="2.1.65" targetFramework="native" developmentDependency="true" />
4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
5 - <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" />
5 + <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" />
6 </packages>
\ No newline at end of file
src/mbanative/mbanative.vcxproj
+4 -4
@@ -5,8 +5,8 @@
5 <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')" />
6 <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')" />
7 <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')" />
8 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
9 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
8 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" />
9 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" />
10
11 <ItemGroup Label="ProjectConfigurations">
12 <ProjectConfiguration Include="Debug|ARM">
@@ -102,7 +102,7 @@
102 <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'))" />
103 <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'))" />
104 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
105 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
106 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
105 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" />
106 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props'))" />
107 </Target>
108 </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="2.1.65" targetFramework="native" developmentDependency="true" />
7 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
8 - <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
7 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" />
8 + <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" />
9 </packages>
\ No newline at end of file