From 94cc82139b10aa098e0586fbad80b0412c788527 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 24 Oct 2020 20:18:26 -0500 Subject: Update dependencies. --- src/Samples/bafunctions/bafunctions.vcxproj | 16 ++++++++-------- src/Samples/bafunctions/packages.config | 8 ++++---- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 2 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 7 ++++--- src/WixToolset.Mba.Host/packages.config | 4 ++-- src/dnchost/dnchost.vcxproj | 16 ++++++++-------- src/dnchost/packages.config | 8 ++++---- src/mbahost/mbahost.vcxproj | 16 ++++++++-------- src/mbahost/packages.config | 8 ++++---- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 4 ++-- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 4 ++-- .../examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 4 ++-- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 16 ++++++++-------- src/test/examples/TestEngine/packages.config | 8 ++++---- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 4 ++-- src/wixext/WixToolset.Bal.wixext.csproj | 2 +- src/wixlib/bal.wixproj | 2 +- src/wixstdba/WixStandardBootstrapperApplication.cpp | 11 ++++++++--- src/wixstdba/packages.config | 8 ++++---- src/wixstdba/precomp.h | 1 + src/wixstdba/wixstdba.vcxproj | 16 ++++++++-------- 22 files changed, 87 insertions(+), 80 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index e4adf40f..f347f2d3 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -52,14 +52,14 @@ - + 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 e4a6186d..5c253606 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.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index 707edd1b..a79b3f96 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -38,6 +38,6 @@ - + diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 83007f13..9b21446b 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -15,6 +15,7 @@ v2.0 Managed Bootstrapper Application entry point embedded + false true @@ -48,7 +49,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.35\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.40\lib\net20\WixToolset.Mba.Core.dll @@ -82,7 +83,7 @@ - + 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}. @@ -93,7 +94,7 @@ - + diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 5f14527c..f4675f10 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index f6f44598..99c545df 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -66,7 +66,7 @@ - + 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}. @@ -77,9 +77,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 6af3e475..d5f7cc2d 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -3,9 +3,9 @@ - + - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 6123d8f1..9aa7dbbd 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -71,7 +71,7 @@ - + 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}. @@ -82,9 +82,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 7d35694c..40cb1671 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -3,8 +3,8 @@ - - - - + + + + \ 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 9e0d550c..9b206803 100644 --- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -12,7 +12,7 @@ - - + + \ 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 982c0b9e..10e2be8a 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 80b855a1..a8654874 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index eb0a59e8..f2ee19a4 100644 --- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -17,7 +17,7 @@ - - + + \ 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 543668d2..d0a7ac59 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -36,7 +36,7 @@ - + @@ -67,9 +67,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}. - - - - + + + + \ No newline at end of file diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index e4a6186d..5c253606 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 dc9402a6..32305ef9 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index 4cc790c8..6bfadd1b 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 5657ffbd..38cdf242 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index c5ef59ec..44c77057 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -264,7 +264,7 @@ public: // IBootstrapperApplication __in BOOTSTRAPPER_RELATION_TYPE relationType, __in LPCWSTR wzBundleTag, __in BOOL fPerMachine, - __in DWORD64 dw64Version, + __in LPCWSTR wzVersion, __in BOOTSTRAPPER_RELATED_OPERATION operation, __inout BOOL* pfCancel ) @@ -281,7 +281,7 @@ public: // IBootstrapperApplication m_fDowngrading = TRUE; } - return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, dw64Version, operation, pfCancel); + return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, operation, pfCancel); } @@ -2272,6 +2272,7 @@ private: // privates HRESULT hr = S_OK; ULARGE_INTEGER uliVersion = { }; LPWSTR sczCurrentPath = NULL; + VERUTIL_VERSION* pVersion = NULL; hr = PathForCurrentProcess(&sczCurrentPath, NULL); BalExitOnFailure(hr, "Failed to get bundle path."); @@ -2279,10 +2280,14 @@ private: // privates hr = FileVersion(sczCurrentPath, &uliVersion.HighPart, &uliVersion.LowPart); BalExitOnFailure(hr, "Failed to get bundle file version."); - hr = m_pEngine->SetVariableVersion(WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION, uliVersion.QuadPart); + hr = VerVersionFromQword(uliVersion.QuadPart, &pVersion); + BalExitOnFailure(hr, "Failed to create bundle file version."); + + hr = m_pEngine->SetVariableVersion(WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION, pVersion->sczVersion); BalExitOnFailure(hr, "Failed to set WixBundleFileVersion variable."); LExit: + ReleaseVerutilVersion(pVersion); ReleaseStr(sczCurrentPath); return hr; diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 7d35694c..40cb1671 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -3,8 +3,8 @@ - - - - + + + + \ No newline at end of file diff --git a/src/wixstdba/precomp.h b/src/wixstdba/precomp.h index 9c2b9f6a..547183bd 100644 --- a/src/wixstdba/precomp.h +++ b/src/wixstdba/precomp.h @@ -30,6 +30,7 @@ #include "shelutil.h" #include "strutil.h" #include "thmutil.h" +#include "verutil.h" #include "uriutil.h" #include "xmlutil.h" diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index a4ce7453..220be9e6 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -66,7 +66,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + 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}. @@ -77,9 +77,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - - + + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb