From a37013d41f0702cbdf2aee6dce95d26dafc069b4 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 1 Aug 2020 10:20:31 -0600
Subject: WIXFEAT:4763 Change "string" variable type to literal and add
 "formatted".

---
 src/balutil/BalBootstrapperEngine.cpp | 4 +++-
 src/balutil/balutil.cpp               | 5 +++--
 src/balutil/balutil.vcxproj           | 8 ++++----
 src/balutil/inc/IBootstrapperEngine.h | 3 ++-
 src/balutil/inc/balutil.h             | 3 ++-
 src/balutil/packages.config           | 4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'src/balutil')

diff --git a/src/balutil/BalBootstrapperEngine.cpp b/src/balutil/BalBootstrapperEngine.cpp
index 945940c5..6a0c66d6 100644
--- a/src/balutil/BalBootstrapperEngine.cpp
+++ b/src/balutil/BalBootstrapperEngine.cpp
@@ -391,7 +391,8 @@ public: // IBootstrapperEngine
 
     virtual STDMETHODIMP SetVariableString(
         __in_z LPCWSTR wzVariable,
-        __in_z_opt LPCWSTR wzValue
+        __in_z_opt LPCWSTR wzValue,
+        __in BOOL fFormatted
         )
     {
         BAENGINE_SETVARIABLESTRING_ARGS args = { };
@@ -400,6 +401,7 @@ public: // IBootstrapperEngine
         args.cbSize = sizeof(args);
         args.wzVariable = wzVariable;
         args.wzValue = wzValue;
+        args.fFormatted = fFormatted;
 
         results.cbSize = sizeof(results);
 
diff --git a/src/balutil/balutil.cpp b/src/balutil/balutil.cpp
index 7567752c..ebfaede4 100644
--- a/src/balutil/balutil.cpp
+++ b/src/balutil/balutil.cpp
@@ -225,7 +225,8 @@ LExit:
 
 DAPI_(HRESULT) BalSetStringVariable(
     __in_z LPCWSTR wzVariable,
-    __in_z_opt LPCWSTR wzValue
+    __in_z_opt LPCWSTR wzValue,
+    __in BOOL fFormatted
     )
 {
     HRESULT hr = S_OK;
@@ -236,7 +237,7 @@ DAPI_(HRESULT) BalSetStringVariable(
         ExitOnRootFailure(hr, "BalInitialize() must be called first.");
     }
 
-    hr = vpEngine->SetVariableString(wzVariable, wzValue);
+    hr = vpEngine->SetVariableString(wzVariable, wzValue, fFormatted);
 
 LExit:
     return hr;
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 72c23991..39be0bed 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -2,8 +2,8 @@
 <!-- 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. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
+  <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')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -106,8 +106,8 @@
     <PropertyGroup>
       <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>
     </PropertyGroup>
-    <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'))" />
-    <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'))" />
+    <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'))" />
+    <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'))" />
     <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'))" />
   </Target>
 </Project>
diff --git a/src/balutil/inc/IBootstrapperEngine.h b/src/balutil/inc/IBootstrapperEngine.h
index 3fe3d401..3b648df1 100644
--- a/src/balutil/inc/IBootstrapperEngine.h
+++ b/src/balutil/inc/IBootstrapperEngine.h
@@ -89,7 +89,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
 
     STDMETHOD(SetVariableString)(
         __in_z LPCWSTR wzVariable,
-        __in_z_opt LPCWSTR wzValue
+        __in_z_opt LPCWSTR wzValue,
+        __in BOOL fFormatted
         ) = 0;
 
     STDMETHOD(SetVariableVersion)(
diff --git a/src/balutil/inc/balutil.h b/src/balutil/inc/balutil.h
index e0f5874c..b718e48b 100644
--- a/src/balutil/inc/balutil.h
+++ b/src/balutil/inc/balutil.h
@@ -131,7 +131,8 @@ BalSetStringVariable - sets a string variable in the engine.
 ********************************************************************/
 DAPI_(HRESULT) BalSetStringVariable(
     __in_z LPCWSTR wzVariable,
-    __in_z_opt LPCWSTR wzValue
+    __in_z_opt LPCWSTR wzValue,
+    __in BOOL fFormatted
     );
 
 /*******************************************************************
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 56f0cea3..e8417860 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb