From f407e08ed9695a59e5f41cfc7a41cd3c8138817a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 7 Aug 2020 19:02:26 -0600 Subject: WIXFEAT:4863 Update to latest thmutil. --- src/Samples/bafunctions/bafunctions.vcxproj | 12 ++++++------ src/Samples/bafunctions/packages.config | 6 +++--- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 12 ++++++------ src/dnchost/packages.config | 6 +++--- src/mbahost/mbahost.vcxproj | 12 ++++++------ src/mbahost/packages.config | 6 +++--- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 12 ++++++------ src/test/examples/TestEngine/packages.config | 6 +++--- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixext/BalCompiler.cs | 10 +++++----- src/wixstdba/WixStandardBootstrapperApplication.cpp | 18 ++++++++++-------- src/wixstdba/packages.config | 6 +++--- src/wixstdba/wixstdba.vcxproj | 12 ++++++------ 19 files changed, 67 insertions(+), 65 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index e1e83dbe..e4adf40f 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -57,9 +57,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 34e10a05..e4a6186d 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 42e07501..83007f13 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -48,7 +48,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.33\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.35\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 500dc72d..5f14527c 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index f9a2546f..f6f44598 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -78,8 +78,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index dfeefbc4..6af3e475 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -5,7 +5,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 575187b4..6123d8f1 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -83,8 +83,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index f3c6255c..7d35694c 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index a7983a16..9e0d550c 100644 --- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 5b7e2c0a..982c0b9e 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 6ff0cfda..80b855a1 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index 8016ad15..eb0a59e8 100644 --- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 4890f609..cc772e37 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -68,8 +68,8 @@ 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}. - - - + + + \ No newline at end of file diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 34e10a05..e4a6186d 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index d99e1ba3..dc9402a6 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 294cf45c..c836adbe 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -491,7 +491,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) { Value = launchTarget, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -500,7 +500,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) { Value = launchTargetElevatedId, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -509,7 +509,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) { Value = launchArguments, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -518,7 +518,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) { Value = "yes", - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -528,7 +528,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) { Value = launchWorkingDir, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 8d07c760..c5ef59ec 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -183,6 +183,7 @@ static HRESULT DAPI GetVariableStringCallback( static HRESULT DAPI SetVariableStringCallback( __in_z LPCWSTR wzVariable, __in_z_opt LPCWSTR wzValue, + __in BOOL fFormatted, __in_opt LPVOID pvContext ); static LPCSTR LoggingRequestStateToString( @@ -975,7 +976,7 @@ public: // IBootstrapperApplication // If a restart was encountered and we are not suppressing restarts, then restart is required. m_fRestartRequired = (BOOTSTRAPPER_APPLY_RESTART_NONE != restart && BOOTSTRAPPER_RESTART_NEVER < m_command.restart); - BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL); + BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL, FALSE); // If a restart is required and we're not displaying a UI or we are not supposed to prompt for restart then allow the restart. m_fAllowRestart = m_fRestartRequired && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart); @@ -1905,7 +1906,7 @@ private: // privates hr = StrAllocString(&sczVariableValue, ++pwc, 0); BalExitOnFailure(hr, "Failed to copy variable value."); - hr = m_pEngine->SetVariableString(sczVariableName, sczVariableValue); + hr = m_pEngine->SetVariableString(sczVariableName, sczVariableValue, FALSE); BalExitOnFailure(hr, "Failed to set variable."); } else @@ -2891,7 +2892,7 @@ private: // privates } else if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON)) { - fLaunchTargetExists = BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); + fLaunchTargetExists = BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); } ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction); @@ -3192,24 +3193,24 @@ private: // privates hr = BalFormatString(sczUnformattedLaunchTarget, &sczLaunchTarget); BalExitOnFailure(hr, "Failed to format launch target variable: %ls", sczUnformattedLaunchTarget); - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) { hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID, &sczLaunchTargetElevatedId); BalExitOnFailure(hr, "Failed to get launch target elevated id '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID); } - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS)) { hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS, &sczUnformattedArguments); BalExitOnFailure(hr, "Failed to get launch arguments '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS); } - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_HIDDEN)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_HIDDEN)) { nCmdShow = SW_HIDE; } - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER)) { hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER, &sczUnformattedLaunchFolder); BalExitOnFailure(hr, "Failed to get launch working directory variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER); @@ -3879,10 +3880,11 @@ static HRESULT DAPI GetVariableStringCallback( static HRESULT DAPI SetVariableStringCallback( __in_z LPCWSTR wzVariable, __in_z_opt LPCWSTR wzValue, + __in BOOL fFormatted, __in_opt LPVOID /*pvContext*/ ) { - return BalSetStringVariable(wzVariable, wzValue); + return BalSetStringVariable(wzVariable, wzValue, fFormatted); } static LPCSTR LoggingRequestStateToString( diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index f3c6255c..7d35694c 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index b3400e35..a4ce7453 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -78,8 +78,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb