From 2a14c230453744ea896948ca0b4f6692f2962bee Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 12 Jan 2019 16:49:42 -0600 Subject: Integrate into latest v4. --- src/Cpp.Build.props | 100 +++++++++++++++ src/Directory.Build.props | 26 ++++ src/Directory.Build.targets | 48 ++++++++ src/FindLocalWix.props | 8 ++ src/ca/CustomMsiErrors.h | 10 ++ src/ca/packages.config | 5 + src/ca/precomp.h | 1 - src/ca/uica.vcxproj | 40 +++--- .../TestData/WixUI_Minimal/Package.en-us.wxl | 11 ++ .../TestData/WixUI_Minimal/Package.wxs | 22 ++++ .../TestData/WixUI_Minimal/PackageComponents.wxs | 12 ++ .../TestData/WixUI_Minimal/example.txt | 1 + src/test/WixToolsetTest.UI/UIExtensionFixture.cs | 32 +++++ .../WixToolsetTest.UI/WixToolsetTest.UI.csproj | 38 ++++++ src/wixext/UIDecompiler.cs | 2 + src/wixext/UIExtensionData.cs | 36 ++---- src/wixext/UIExtensionFactory.cs | 16 +++ src/wixext/WixToolset.UI.wixext.csproj | 29 +++++ src/wixext/WixToolset.UI.wixext.targets | 11 ++ src/wixext/WixUIExtension.csproj | 31 ----- src/wixlib/UIExtension.wixproj | 114 ----------------- src/wixlib/caSuffix.wxi | 28 +++++ src/wixlib/packages.config | 5 + src/wixlib/ui.wixproj | 135 +++++++++++++++++++++ 24 files changed, 568 insertions(+), 193 deletions(-) create mode 100644 src/Cpp.Build.props create mode 100644 src/Directory.Build.props create mode 100644 src/Directory.Build.targets create mode 100644 src/FindLocalWix.props create mode 100644 src/ca/CustomMsiErrors.h create mode 100644 src/ca/packages.config create mode 100644 src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs create mode 100644 src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/example.txt create mode 100644 src/test/WixToolsetTest.UI/UIExtensionFixture.cs create mode 100644 src/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj create mode 100644 src/wixext/UIExtensionFactory.cs create mode 100644 src/wixext/WixToolset.UI.wixext.csproj create mode 100644 src/wixext/WixToolset.UI.wixext.targets delete mode 100644 src/wixext/WixUIExtension.csproj delete mode 100644 src/wixlib/UIExtension.wixproj create mode 100644 src/wixlib/caSuffix.wxi create mode 100644 src/wixlib/packages.config create mode 100644 src/wixlib/ui.wixproj (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props new file mode 100644 index 00000000..296b36ca --- /dev/null +++ b/src/Cpp.Build.props @@ -0,0 +1,100 @@ + + + + + + Win32 + $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ + $(OutputPath)$(Platform)\ + + + + + $(DisableSpecificCompilerWarnings) + Level4 + $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + Use + precomp.h + StdCall + true + false + -YlprecompDefine + /Zc:threadSafeInit- %(AdditionalOptions) + true + + + $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) + $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) + + + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + + + $(ProjectSubSystem) + $(ProjectModuleDefinitionFile) + $(ResourceOnlyDll) + true + $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) + /IGNORE:4099 %(AdditionalOptions) + + + + + + NoExtensions + + + + + CDecl + + + + + OldStyle + true + true + + + + + Disabled + EnableFastChecks + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + + + + + + MultiThreadedDebugDll + + + + + MinSpace + NDEBUG;%(PreprocessorDefinitions) + true + true + MultiThreaded + + + true + true + + + + + + MultiThreadedDll + + + + + $(LinkKeyFile) + $(LinkDelaySign) + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..e853e22d --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,26 @@ + + + + + + Debug + false + + $(MSBuildProjectName) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) + $(BaseOutputPath)obj\$(ProjectName)\ + $(BaseOutputPath)$(Configuration)\ + + WiX Toolset Team + WiX Toolset + Copyright (c) .NET Foundation and contributors. All rights reserved. + MS-RL + WiX Toolset + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 00000000..dac7452a --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,48 @@ + + + + + + + true + $(SolutionPath) + $(NCrunchOriginalSolutionPath) + + + + + + + $([System.IO.File]::ReadAllText($(TheSolutionPath))) + $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) + (?<="[PackageName]", ")(.*)(?=", ") + + + + + + %(Identity) + $(SolutionFileContent.Contains('\%(Identity).csproj')) + + + + + $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) + $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) + + + + + + + + + + + diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props new file mode 100644 index 00000000..a784e352 --- /dev/null +++ b/src/FindLocalWix.props @@ -0,0 +1,8 @@ + + + + + + $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets + + diff --git a/src/ca/CustomMsiErrors.h b/src/ca/CustomMsiErrors.h new file mode 100644 index 00000000..b568d01c --- /dev/null +++ b/src/ca/CustomMsiErrors.h @@ -0,0 +1,10 @@ +#pragma once +// 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. + +#define msierrSQLFailedCreateDatabase 26201 +#define msierrSQLFailedDropDatabase 26202 +#define msierrSQLFailedConnectDatabase 26203 +#define msierrSQLFailedExecString 26204 +#define msierrSQLDatabaseAlreadyExists 26205 + +//Last available is 26250 \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config new file mode 100644 index 00000000..265886d9 --- /dev/null +++ b/src/ca/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/ca/precomp.h b/src/ca/precomp.h index dcdf2653..e95240c6 100644 --- a/src/ca/precomp.h +++ b/src/ca/precomp.h @@ -7,7 +7,6 @@ #include #include -#include "wixstrsafe.h" #include "wcautil.h" #include "aclutil.h" #include "fileutil.h" diff --git a/src/ca/uica.vcxproj b/src/ca/uica.vcxproj index 92e20e1a..f6e0ef2a 100644 --- a/src/ca/uica.vcxproj +++ b/src/ca/uica.vcxproj @@ -1,8 +1,10 @@ + + + - Debug @@ -13,34 +15,28 @@ Win32 - - - Debug - ARM - - - Release - ARM - - {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981} DynamicLibrary MultiByte uica + v141 uica.def + WiX Toolset UI CustomAction - + + - $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\libs\wcautil - msi.lib;shlwapi.lib;dutil.lib;wcautil.lib + msi.lib;shlwapi.lib - + + Create + @@ -49,11 +45,17 @@ + - - - - + + + + + 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/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.en-us.wxl b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs new file mode 100644 index 00000000..68ff98fd --- /dev/null +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/PackageComponents.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/PackageComponents.wxs new file mode 100644 index 00000000..c50785a1 --- /dev/null +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/PackageComponents.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/example.txt b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/test/WixToolsetTest.UI/UIExtensionFixture.cs new file mode 100644 index 00000000..43694c49 --- /dev/null +++ b/src/test/WixToolsetTest.UI/UIExtensionFixture.cs @@ -0,0 +1,32 @@ +// 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. + +namespace WixToolsetTest.UI +{ + using System.Linq; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using WixToolset.UI; + using Xunit; + + public class UIExtensionFixture + { + [Fact(Skip = "Currently fails")] + public void CanBuildUsingWixUIMinimal() + { + var folder = TestData.Get(@"TestData\WixUI_Minimal"); + var build = new Builder(folder, typeof(UIExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(Build, "Property"); + Assert.Equal(new[] + { + "Property:", + }, results.OrderBy(s => s).ToArray()); + } + + private static void Build(string[] args) + { + var result = WixRunner.Execute(args) + .AssertSuccess(); + } + } +} diff --git a/src/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj new file mode 100644 index 00000000..4a3ba5e7 --- /dev/null +++ b/src/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj @@ -0,0 +1,38 @@ + + + + + + netcoreapp2.1 + false + + + + NU1701 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixext/UIDecompiler.cs b/src/wixext/UIDecompiler.cs index 4bdd48fc..2493e7c7 100644 --- a/src/wixext/UIDecompiler.cs +++ b/src/wixext/UIDecompiler.cs @@ -2,6 +2,7 @@ namespace WixToolset.Extensions { +#if TODO_CONSIDER_DECOMPILER using System; using System.Collections; using System.Diagnostics; @@ -54,4 +55,5 @@ namespace WixToolset.Extensions } } } +#endif } diff --git a/src/wixext/UIExtensionData.cs b/src/wixext/UIExtensionData.cs index a833b82b..327d20c8 100644 --- a/src/wixext/UIExtensionData.cs +++ b/src/wixext/UIExtensionData.cs @@ -1,43 +1,23 @@ // 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. -namespace WixToolset.Extensions +namespace WixToolset.UI { - using System; - using System.Reflection; using WixToolset.Data; using WixToolset.Extensibility; - /// - /// The WiX Toolset UI Extension. - /// - public sealed class UIExtensionData : ExtensionData + public sealed class UIExtensionData : BaseExtensionData { - /// - /// Gets the default culture. - /// - /// The default culture. - public override string DefaultCulture - { - get { return "en-us"; } - } + public override string DefaultCulture => "en-US"; - /// - /// Gets the library associated with this extension. - /// - /// The table definitions to use while loading the library. - /// The loaded library. - public override Library GetLibrary(TableDefinitionCollection tableDefinitions) + public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) { - return UIExtensionData.GetExtensionLibrary(tableDefinitions); + tupleDefinition = null; + return tupleDefinition != null; } - /// - /// Internal mechanism to access the extension's library. - /// - /// Extension's library. - internal static Library GetExtensionLibrary(TableDefinitionCollection tableDefinitions) + public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) { - return ExtensionData.LoadLibraryHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.ui.wixlib", tableDefinitions); + return Intermediate.Load(typeof(UIExtensionData).Assembly, "WixToolset.UI.ui.wixlib", tupleDefinitions); } } } diff --git a/src/wixext/UIExtensionFactory.cs b/src/wixext/UIExtensionFactory.cs new file mode 100644 index 00000000..1c9caacc --- /dev/null +++ b/src/wixext/UIExtensionFactory.cs @@ -0,0 +1,16 @@ +// 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. + +namespace WixToolset.UI +{ + using System; + using System.Collections.Generic; + using WixToolset.Extensibility; + + public class UIExtensionFactory : BaseExtensionFactory + { + protected override IEnumerable ExtensionTypes => new[] + { + typeof(UIExtensionData), + }; + } +} diff --git a/src/wixext/WixToolset.UI.wixext.csproj b/src/wixext/WixToolset.UI.wixext.csproj new file mode 100644 index 00000000..f8b47f63 --- /dev/null +++ b/src/wixext/WixToolset.UI.wixext.csproj @@ -0,0 +1,29 @@ + + + + + + netstandard2.0 + WixToolset.UI + WiX Toolset UI Extension + WiX Toolset UI Extension + true + build + + + + + + + + + + + + + + + + + + diff --git a/src/wixext/WixToolset.UI.wixext.targets b/src/wixext/WixToolset.UI.wixext.targets new file mode 100644 index 00000000..b07a0886 --- /dev/null +++ b/src/wixext/WixToolset.UI.wixext.targets @@ -0,0 +1,11 @@ + + + + + + $(MSBuildThisFileDirectory)..\tools\WixToolset.UI.wixext.dll + + + + + diff --git a/src/wixext/WixUIExtension.csproj b/src/wixext/WixUIExtension.csproj deleted file mode 100644 index ba1b5c58..00000000 --- a/src/wixext/WixUIExtension.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - {33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A} - WixUIExtension - Library - WixToolset.Extensions - - - - - - - Data\ui.wixlib - - - - - - - - - - false - - - - diff --git a/src/wixlib/UIExtension.wixproj b/src/wixlib/UIExtension.wixproj deleted file mode 100644 index 213205a2..00000000 --- a/src/wixlib/UIExtension.wixproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - {2D4FF07B-26F8-4BEF-B41C-E4383F86DC32} - ui - Library - true - true - - ICE45 - en-us - - - - - $(DefineConstants); - bannerBmp=$(MSBuildProjectDirectory)\Bitmaps\bannrbmp.bmp; - dialogBmp=$(MSBuildProjectDirectory)\Bitmaps\dlgbmp.bmp; - exclamationIco=$(MSBuildProjectDirectory)\Bitmaps\exclamic.ico; - infoIco=$(MSBuildProjectDirectory)\Bitmaps\info.ico; - licenseRtf=$(MSBuildProjectDirectory)\license.rtf; - newIco=$(MSBuildProjectDirectory)\Bitmaps\new.ico; - upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi new file mode 100644 index 00000000..a56a2393 --- /dev/null +++ b/src/wixlib/caSuffix.wxi @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config new file mode 100644 index 00000000..7964daed --- /dev/null +++ b/src/wixlib/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/wixlib/ui.wixproj b/src/wixlib/ui.wixproj new file mode 100644 index 00000000..37ad94d0 --- /dev/null +++ b/src/wixlib/ui.wixproj @@ -0,0 +1,135 @@ + + + + + + + {2D4FF07B-26F8-4BEF-B41C-E4383F86DC32} + ui + Library + true + true + en-us + + + + + $(DefineConstants); + bannerBmp=$(MSBuildProjectDirectory)\Bitmaps\bannrbmp.bmp; + dialogBmp=$(MSBuildProjectDirectory)\Bitmaps\dlgbmp.bmp; + exclamationIco=$(MSBuildProjectDirectory)\Bitmaps\exclamic.ico; + infoIco=$(MSBuildProjectDirectory)\Bitmaps\info.ico; + licenseRtf=$(MSBuildProjectDirectory)\license.rtf; + newIco=$(MSBuildProjectDirectory)\Bitmaps\new.ico; + upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uica + {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981} + + + + + + + + + + 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