From 946837a7462fe6afe6b5f29d816e91c3ecda1c11 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 21 Apr 2020 17:38:39 +1000 Subject: Update dependencies. --- src/Samples/bafunctions/bafunctions.vcxproj | 8 ++++---- src/Samples/bafunctions/packages.config | 4 ++-- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 8 ++++---- src/mbahost/packages.config | 4 ++-- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 4 ---- .../examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | 6 +++--- src/test/examples/FullFramework2MBA/packages.config | 2 +- .../examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/wixstdba/WixStandardBootstrapperApplication.cpp | 3 ++- src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 8 ++++---- 15 files changed, 33 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index a7b0c11a..89c7b553 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -57,8 +57,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 56b68f10..bb4c9d19 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 1bc39813..5d08e607 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -44,7 +44,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.18\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 9123df31..0fa223c0 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 6dd6298f..cdcea2a4 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -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}. - - + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 56b68f10..bb4c9d19 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index e798063e..d93ed74a 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -30,10 +30,6 @@ namespace WixToolsetTest.Bal "-o", bundleFile, }); compileResult.AssertSuccess(); - Assert.Equal(new[] - { - "BurnBackend didn't provide Wixout so skipping BalExtension PostBind verification." - }, compileResult.Messages.Select(x => x.ToString()).ToArray()); Assert.True(File.Exists(bundleFile)); } diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 09348ac8..494d1987 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -3,7 +3,7 @@ - + {CC4236FC-226E-4232-AB50-24CBEC4D314D} Example.FullFramework2MBA @@ -40,7 +40,7 @@ - ..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll + ..\..\..\..\packages\WixToolset.Mba.Core.4.0.18\lib\net20\WixToolset.Mba.Core.dll @@ -67,7 +67,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}. - + diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config index 9950b1b6..59d81db0 100644 --- a/src/test/examples/FullFramework2MBA/packages.config +++ b/src/test/examples/FullFramework2MBA/packages.config @@ -1,4 +1,4 @@  - + \ 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 549e096e..40f6d008 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 44ba2c9b..554d54f6 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -63,8 +63,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 56b68f10..bb4c9d19 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index afc6a3ee..2a05b1cb 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -705,6 +705,7 @@ public: // IBootstrapperApplication virtual STDMETHODIMP OnExecutePackageBegin( __in_z LPCWSTR wzPackageId, __in BOOL fExecute, + __in BOOTSTRAPPER_ACTION_STATE action, __inout BOOL* pfCancel ) { @@ -759,7 +760,7 @@ public: // IBootstrapperApplication } ReleaseStr(sczFormattedString); - return __super::OnExecutePackageBegin(wzPackageId, fExecute, pfCancel); + return __super::OnExecutePackageBegin(wzPackageId, fExecute, action, pfCancel); } diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 56b68f10..bb4c9d19 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 009bdb54..1c55d41a 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -107,8 +107,8 @@ 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}. - - + + -- cgit v1.2.3-55-g6feb