From dea3a630b6ae10663dd6f7d855541f7f631a2b55 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 24 Jun 2020 18:47:38 +1000 Subject: Update dependencies. Run tests before packing and don't build twice. --- src/Samples/bafunctions/bafunctions.vcxproj | 10 +++++----- src/Samples/bafunctions/packages.config | 4 ++-- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 1 + src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 3 ++- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 10 +++++----- src/dnchost/packages.config | 4 ++-- src/mbahost/mbahost.vcxproj | 10 +++++----- src/mbahost/packages.config | 4 ++-- .../examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixext/WixToolset.Bal.wixext.csproj | 1 + src/wixlib/bal.wixproj | 10 +++------- src/wixlib/packages.config | 2 +- src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 10 +++++----- 21 files changed, 48 insertions(+), 49 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 92637507..d35c85c0 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02} DynamicLibrary - v141 + v142 Unicode BAFunctions bafunctions.def @@ -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 7cbb7bbe..65e7225a 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.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index 09580c2d..627ea67a 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -7,6 +7,7 @@ WixToolset.Dnc.Host WiX Toolset .NET Core BA Host WiX Toolset .NET Core BA Host + embedded diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 2c912f3d..0fedd9dc 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -11,6 +11,7 @@ 0693;1591 v2.0 Managed Bootstrapper Application entry point + embedded true @@ -44,7 +45,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.26\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.31\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 73365d26..d1b22e73 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 0fd7d9e5..6bab8063 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -1,9 +1,9 @@ - + - + Debug @@ -17,7 +17,7 @@ {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} DynamicLibrary - v141 + v142 Unicode dnchost dnchost.def @@ -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 e52c0a7a..f1e2c54b 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 4071942c..45fef1a1 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ {12C87C77-3547-44F8-8134-29BC915CB19D} DynamicLibrary - v141 + v142 Unicode mbahost mbahost.def @@ -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 7cbb7bbe..65e7225a 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/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 7fc831d1..b2c7dd29 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 04f4f9d1..958047b0 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 2c702a3b..1f61d9d1 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 ad599e23..dc2b8a5f 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 b863618a..7fb3b3aa 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 7cbb7bbe..65e7225a 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 fd03209f..393b403e 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/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index aef4c4d9..aa3c4033 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -9,6 +9,7 @@ WiX Toolset Bal Extension true build + embedded diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index ae8559d5..c23af015 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - - + + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -48,16 +48,12 @@ - - - - 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 8ffe0d58..f37af421 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/wixstdba/packages.config b/src/wixstdba/packages.config index 7cbb7bbe..65e7225a 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 6698c192..7d116490 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} DynamicLibrary - v141 + v142 Unicode WixStdBA wixstdba.def @@ -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