From 20bbfc8ad82e6246f5357d8bc183a5fc0ea3fac7 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 11 Dec 2019 20:15:08 +1100 Subject: Setup WixToolset.Mba.Core project and nuget package. --- appveyor.cmd | 1 + balutil.sln | 10 ++ src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs | 17 ++++ .../WixToolset.BootstrapperCore.config | 26 ----- src/WixToolset.Mba.Core/WixToolset.Mba.Core.config | 26 +++++ src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | 111 +++++++++++++++++++++ src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec | 21 ++++ src/WixToolset.Mba.Core/packages.config | 5 + src/balutil/balutil.nuspec | 2 +- src/balutil/balutil.vcxproj | 9 +- src/balutil/packages.config | 4 +- 11 files changed, 199 insertions(+), 33 deletions(-) create mode 100644 src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs delete mode 100644 src/WixToolset.Mba.Core/WixToolset.BootstrapperCore.config create mode 100644 src/WixToolset.Mba.Core/WixToolset.Mba.Core.config create mode 100644 src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj create mode 100644 src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec create mode 100644 src/WixToolset.Mba.Core/packages.config diff --git a/appveyor.cmd b/appveyor.cmd index ee397c4a..1aceb3b0 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -8,6 +8,7 @@ msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp msbuild -p:Configuration=Release -t:Pack src\balutil\balutil.vcxproj +msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj @popd @endlocal \ No newline at end of file diff --git a/balutil.sln b/balutil.sln index 58f61391..9ed8e3f5 100644 --- a/balutil.sln +++ b/balutil.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 15.0.26124.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "src\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,6 +23,14 @@ Global {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64 {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32 {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32 + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.ActiveCfg = Debug|Any CPU + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.Build.0 = Debug|Any CPU + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.ActiveCfg = Debug|Any CPU + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.Build.0 = Debug|Any CPU + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.ActiveCfg = Release|Any CPU + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.Build.0 = Release|Any + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.ActiveCfg = Release|Any CPU + {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs b/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..386748a8 --- /dev/null +++ b/src/WixToolset.Mba.Core/Properties/AssemblyInfo.cs @@ -0,0 +1,17 @@ +// 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; + +[assembly: AssemblyTitle("Managed Bootstrapper Application Core (WiX)")] +[assembly: AssemblyDescription("Managed Bootstrapper Application Core")] +[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("6f4e0cc9-8ad4-4b5a-a669-3aafff67a76f")] + +[assembly: CLSCompliantAttribute(true)] diff --git a/src/WixToolset.Mba.Core/WixToolset.BootstrapperCore.config b/src/WixToolset.Mba.Core/WixToolset.BootstrapperCore.config deleted file mode 100644 index 1e284001..00000000 --- a/src/WixToolset.Mba.Core/WixToolset.BootstrapperCore.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config new file mode 100644 index 00000000..1e284001 --- /dev/null +++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.config @@ -0,0 +1,26 @@ + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj new file mode 100644 index 00000000..16d278b0 --- /dev/null +++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj @@ -0,0 +1,111 @@ + + + + + + + {E7E1841E-A58E-4901-B9CA-4845B807D45F} + WixToolset.Mba.Core + Library + WixToolset.Mba.Core + 0693;1591 + v2.0 + Managed Bootstrapper Application entry point + + + true + false + $(DefineConstants);DEBUG;TRACE + + + true + true + $(DefineConstants);TRACE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + + + + + + + + ..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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}. + + + + + + $(OutputPath)\$(AssemblyName).xml + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec new file mode 100644 index 00000000..04eee9ec --- /dev/null +++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec @@ -0,0 +1,21 @@ + + + + $id$ + $version$ + WiX Toolset Team + WiX Toolset Team + + https://licenses.nuget.org/MS-RL + https://github.com/wixtoolset/BootstrapperCore + false + $description$ + $copyright$ + + + + + + + + diff --git a/src/WixToolset.Mba.Core/packages.config b/src/WixToolset.Mba.Core/packages.config new file mode 100644 index 00000000..3702a604 --- /dev/null +++ b/src/WixToolset.Mba.Core/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec index 67ed9bde..0a26004a 100644 --- a/src/balutil/balutil.nuspec +++ b/src/balutil/balutil.nuspec @@ -12,7 +12,7 @@ $description$ $copyright$ - + diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj index a8b97615..42aa909e 100644 --- a/src/balutil/balutil.vcxproj +++ b/src/balutil/balutil.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -70,6 +70,7 @@ + @@ -87,8 +88,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/balutil/packages.config b/src/balutil/packages.config index 52c84cf0..769c5a6e 100644 --- a/src/balutil/packages.config +++ b/src/balutil/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb