From 045024c3b35e3bee44f33fbe0fb43a1704a18c5c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 19 Dec 2020 19:56:38 -0600 Subject: Add the missing x64 wxs files and update dependencies. --- src/CSharp.Build.props | 2 ++ src/Directory.Build.targets | 8 ++++++++ src/Samples/bafunctions/bafunctions.vcxproj | 4 ++-- src/Samples/bafunctions/packages.config | 2 +- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 2 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 8 +------- src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 4 ++++ src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 4 ++-- src/dnchost/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 4 ++-- src/mbahost/packages.config | 2 +- src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 4 ---- .../WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | 4 ---- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 4 ++-- src/test/examples/TestEngine/packages.config | 2 +- src/wixlib/BalExtension_arm64.wxs | 7 +++++++ src/wixlib/BalExtension_x64.wxs | 7 +++++++ src/wixlib/bal.wixproj | 2 +- src/wixstdba/packages.config | 2 +- src/wixstdba/wixstdba.vcxproj | 4 ++-- 21 files changed, 47 insertions(+), 33 deletions(-) create mode 100644 src/wixlib/BalExtension_arm64.wxs create mode 100644 src/wixlib/BalExtension_x64.wxs (limited to 'src') diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props index b12f4c6e..81d24ad1 100644 --- a/src/CSharp.Build.props +++ b/src/CSharp.Build.props @@ -5,7 +5,9 @@ --> + true true $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + false diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index dac7452a..cb988931 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -9,6 +9,11 @@ See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 --> + + false + $(OutputPath)\$(AssemblyName).xml + + true $(SolutionPath) @@ -45,4 +50,7 @@ + + + diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 755d0ca6..7f6c71a5 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,7 +2,7 @@ - + @@ -73,7 +73,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/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index b078faf8..0f17a2f2 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 a79b3f96..8849ddbf 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 WixToolset.Dnc.Host WiX Toolset .NET Core BA Host WiX Toolset .NET Core BA Host diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 7bda988c..69674b90 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -11,11 +11,9 @@ WixToolset.Mba.Host Library WixToolset.Mba.Host - 0693;1591 v2.0 Managed Bootstrapper Application entry point embedded - false true @@ -49,7 +47,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.44\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.45\lib\net20\WixToolset.Mba.Core.dll @@ -96,8 +94,4 @@ - - - $(OutputPath)\$(AssemblyName).xml - \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec index d1633cb0..f4f84847 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec @@ -10,6 +10,10 @@ false $description$ $copyright$ + + + + diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 6192f1b7..9e481965 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 5959d6ea..18c2dcf3 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,7 +4,7 @@ - + @@ -96,7 +96,7 @@ - + diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index cf40ae64..bc4a6ca6 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index c05304d4..dc038be5 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,7 +5,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 4b6974b3..d0e0bc3e 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/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 199b82e2..c9ab4219 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -7,10 +7,6 @@ false - - NU1701 - - diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 6542e77f..38c8926c 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -6,10 +6,6 @@ netcoreapp3.1 - - NU1701 - - diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index b420c18e..fa8925a8 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,7 +1,7 @@ - + @@ -76,7 +76,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/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index b078faf8..0f17a2f2 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/wixlib/BalExtension_arm64.wxs b/src/wixlib/BalExtension_arm64.wxs new file mode 100644 index 00000000..1b9e11d2 --- /dev/null +++ b/src/wixlib/BalExtension_arm64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/BalExtension_x64.wxs b/src/wixlib/BalExtension_x64.wxs new file mode 100644 index 00000000..69a597ae --- /dev/null +++ b/src/wixlib/BalExtension_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 8c88c3ce..ba1a2349 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -7,7 +7,7 @@ - + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 4b6974b3..d0e0bc3e 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 a9d518b4..d1de6404 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,7 +5,7 @@ - + @@ -94,7 +94,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + -- cgit v1.2.3-55-g6feb