From e4f1a4310f09e3777d035f35f4b4ca69d69f5083 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 22 Jun 2020 14:34:24 +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/dnchost/dnchost.vcxproj | 8 +-- src/dnchost/packages.config | 4 +- src/mbahost/mbahost.vcxproj | 8 +-- src/mbahost/packages.config | 4 +- .../TestData/FullFramework2MBA/Bundle.wxs | 8 +-- .../TestData/FullFramework4MBA/Bundle.wxs | 8 +-- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../Example.FullFramework2MBA.csproj | 50 +++---------------- .../FullFramework2MBA/FullFramework2BAFactory.cs | 1 + .../FullFramework2MBA/Properties/AssemblyInfo.cs | 18 ------- .../examples/FullFramework2MBA/packages.config | 4 -- .../Example.FullFramework4MBA.csproj | 3 +- .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 8 +-- src/test/examples/TestEngine/packages.config | 4 +- .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixext/BalBurnBackendExtension.cs | 15 ++++++ src/wixlib/bal.wixproj | 4 +- src/wixlib/packages.config | 2 +- src/wixlib/wixstdba.wxs | 58 +++++++++++----------- src/wixstdba/packages.config | 4 +- src/wixstdba/wixstdba.vcxproj | 10 ++-- 26 files changed, 101 insertions(+), 142 deletions(-) delete mode 100644 src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs delete mode 100644 src/test/examples/FullFramework2MBA/packages.config (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index d4de1461..92637507 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 1b4c9487..7cbb7bbe 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -2,6 +2,6 @@ - - + + \ 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 579284f5..2c912f3d 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.22\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.26\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 0565784e..73365d26 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/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index f61c084e..0fd7d9e5 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -1,9 +1,9 @@ - + - + Debug @@ -69,9 +69,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/dnchost/packages.config b/src/dnchost/packages.config index fdcf876c..e52c0a7a 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 037adc99..4071942c 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -68,9 +68,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/mbahost/packages.config b/src/mbahost/packages.config index 1b4c9487..7cbb7bbe 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs index b38e9f6e..f5999c98 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs @@ -3,10 +3,10 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> - - - - + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs index b3072e63..ae27457f 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs @@ -3,10 +3,10 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> - - - - + + + + diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 1224fa49..7fc831d1 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 d08565ff..04f4f9d1 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -1,56 +1,20 @@ - - - + - {CC4236FC-226E-4232-AB50-24CBEC4D314D} + net20 Example.FullFramework2MBA - Library Example.FullFramework2MBA - v2.0 - false - - - true - false - $(DefineConstants);DEBUG;TRACE - - - true - true - $(DefineConstants);TRACE + embedded + win-x86 - - - - - + + - - - - - - - - - ..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\lib\net20\WixToolset.Mba.Core.dll - + - - - - - - - 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/FullFramework2MBA/FullFramework2BAFactory.cs b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs index 40cff30f..647c2040 100644 --- a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs +++ b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs @@ -1,5 +1,6 @@ // 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. +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] namespace Example.FullFramework2MBA { using WixToolset.Mba.Core; diff --git a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs b/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs deleted file mode 100644 index 640c17ad..00000000 --- a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -using System; -using System.Reflection; -using System.Runtime.InteropServices; -using WixToolset.Mba.Core; - -[assembly: AssemblyTitle("Example.FullFramework2MBA")] -[assembly: AssemblyDescription("Example.FullFramework2MBA")] -[assembly: AssemblyProduct("WiX Toolset")] -[assembly: AssemblyCompany("WiX Toolset Team")] -[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] - -// Types should not be visible to COM by default. -[assembly: ComVisible(false)] -[assembly: Guid("7A671EAF-FAE5-41A2-83DD-C35AB3779651")] - -[assembly: BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config deleted file mode 100644 index 1f2a91d9..00000000 --- a/src/test/examples/FullFramework2MBA/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ 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 51f7090f..2c702a3b 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -5,11 +5,12 @@ net48 Full Framework v4 MBA + win-x86 - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index dc013b68..ad599e23 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 ef54389d..b863618a 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 1b4c9487..7cbb7bbe 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -2,6 +2,6 @@ - - + + \ 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 02d400ee..fd03209f 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/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index c81955be..b767d2c0 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -3,6 +3,7 @@ namespace WixToolset.Bal { using System; + using System.Collections.Generic; using System.Linq; using WixToolset.Bal.Tuples; using WixToolset.Data; @@ -12,6 +13,20 @@ namespace WixToolset.Bal public class BalBurnBackendExtension : BaseBurnBackendExtension { + private static readonly IntermediateTupleDefinition[] BurnTupleDefinitions = + { + BalTupleDefinitions.WixBalBAFactoryAssembly, + BalTupleDefinitions.WixBalBAFunctions, + BalTupleDefinitions.WixBalCondition, + BalTupleDefinitions.WixBalPackageInfo, + BalTupleDefinitions.WixDncOptions, + BalTupleDefinitions.WixMbaPrereqInformation, + BalTupleDefinitions.WixStdbaOptions, + BalTupleDefinitions.WixStdbaOverridableVariable, + }; + + protected override IEnumerable TupleDefinitions => BurnTupleDefinitions; + public override void BundleFinalize() { base.BundleFinalize(); diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 45ca7f88..ae8559d5 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -57,7 +57,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/wixlib/packages.config b/src/wixlib/packages.config index 6e79c4c9..8ffe0d58 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs index 5c99747d..1b5e1342 100644 --- a/src/wixlib/wixstdba.wxs +++ b/src/wixlib/wixstdba.wxs @@ -13,11 +13,11 @@ - - - !(wix.WixStdbaLicenseRtfName=license.rtf) - - + + + !(wix.WixStdbaLicenseRtfName=license.rtf) + + @@ -30,11 +30,11 @@ - - - !(wix.WixStdbaLicenseRtfName=license.rtf) - - + + + !(wix.WixStdbaLicenseRtfName=license.rtf) + + @@ -45,11 +45,11 @@ - - - !(wix.WixStdbaLicenseUrl) - - + + + !(wix.WixStdbaLicenseUrl) + + @@ -60,11 +60,11 @@ - - - !(wix.WixStdbaLicenseUrl) - - + + + !(wix.WixStdbaLicenseUrl) + + @@ -76,18 +76,18 @@ - - - !(wix.WixStdbaLicenseUrl) - - + + + !(wix.WixStdbaLicenseUrl) + + - - - - + + + + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 1b4c9487..7cbb7bbe 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index e97c4692..6698c192 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -107,9 +107,9 @@ 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}. - + - + - + \ No newline at end of file -- cgit v1.2.3-55-g6feb