From 8cbebf7ade3898412aa2c3bc861992eba67200e2 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 23 Jun 2022 06:36:23 +1000 Subject: [PATCH] chore(windows): move general package units to common --- .../windows/delphi/packages}/PackageFileFormats.pas | 0 .../windows/delphi/packages}/PackageInfo.pas | 0 .../windows/delphi/packages}/kmpinffile.pas | 0 developer/src/kmcomp/kmcomp.dpr | 6 +++--- developer/src/kmcomp/kmcomp.dproj | 6 +++--- developer/src/kmconvert/kmconvert.dpr | 4 ++-- developer/src/kmconvert/kmconvert.dproj | 4 ++-- .../KeyboardPackageVersionsTestSuite.dpr | 6 +++--- .../KeyboardPackageVersionsTestSuite.dproj | 6 +++--- developer/src/tike/Tike.dpr | 6 +++--- developer/src/tike/Tike.dproj | 6 +++--- windows/src/buildtools/buildpkg/buildpkg.dpr | 6 +++--- windows/src/buildtools/buildpkg/buildpkg.dproj | 6 +++--- windows/src/desktop/kmshell/kmshell.dpr | 6 +++--- windows/src/desktop/kmshell/kmshell.dproj | 6 +++--- windows/src/desktop/setup/setup.dpr | 6 +++--- windows/src/desktop/setup/setup.dproj | 6 +++--- windows/src/engine/kmcomapi/kmcomapi.dpr | 6 +++--- windows/src/engine/kmcomapi/kmcomapi.dproj | 6 +++--- .../src/test/manual-tests/inffiletests/packageinftool.dpr | 6 +++--- .../src/test/manual-tests/inffiletests/packageinftool.dproj | 6 +++--- .../test/unit-tests/package-info/PackageInfoTestSuite.dpr | 4 ++-- .../test/unit-tests/package-info/PackageInfoTestSuite.dproj | 4 ++-- .../src/test/unit-tests/windows-setup/WindowsSetupTest.dpr | 6 +++--- .../test/unit-tests/windows-setup/WindowsSetupTest.dproj | 6 +++--- 25 files changed, 62 insertions(+), 62 deletions(-) rename {windows/src/global/delphi/general => common/windows/delphi/packages}/PackageFileFormats.pas (100%) rename {windows/src/global/delphi/general => common/windows/delphi/packages}/PackageInfo.pas (100%) rename {windows/src/global/delphi/general => common/windows/delphi/packages}/kmpinffile.pas (100%) diff --git a/windows/src/global/delphi/general/PackageFileFormats.pas b/common/windows/delphi/packages/PackageFileFormats.pas similarity index 100% rename from windows/src/global/delphi/general/PackageFileFormats.pas rename to common/windows/delphi/packages/PackageFileFormats.pas diff --git a/windows/src/global/delphi/general/PackageInfo.pas b/common/windows/delphi/packages/PackageInfo.pas similarity index 100% rename from windows/src/global/delphi/general/PackageInfo.pas rename to common/windows/delphi/packages/PackageInfo.pas diff --git a/windows/src/global/delphi/general/kmpinffile.pas b/common/windows/delphi/packages/kmpinffile.pas similarity index 100% rename from windows/src/global/delphi/general/kmpinffile.pas rename to common/windows/delphi/packages/kmpinffile.pas diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr index a1571b65f2..9133f855ae 100644 --- a/developer/src/kmcomp/kmcomp.dpr +++ b/developer/src/kmcomp/kmcomp.dpr @@ -12,9 +12,9 @@ uses CompilePackage in '..\..\..\windows\src\global\delphi\general\CompilePackage.pas', CRC32 in '..\..\..\common\windows\delphi\general\CRC32.pas', kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas', - PackageInfo in '..\..\..\windows\src\global\delphi\general\PackageInfo.pas', - PackageFileFormats in '..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas', - kmpinffile in '..\..\..\windows\src\global\delphi\general\kmpinffile.pas', + PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas', + PackageFileFormats in '..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', + kmpinffile in '..\..\..\common\windows\delphi\packages\kmpinffile.pas', RedistFiles in '..\tike\main\RedistFiles.pas', DebugPaths in '..\..\..\common\windows\delphi\general\DebugPaths.pas', httpuploader in '..\..\..\common\windows\delphi\general\httpuploader.pas', diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj index bd70b4fe18..26c57f743b 100644 --- a/developer/src/kmcomp/kmcomp.dproj +++ b/developer/src/kmcomp/kmcomp.dproj @@ -159,9 +159,9 @@ - - - + + + diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr index 57491c4525..95b5780d91 100644 --- a/developer/src/kmconvert/kmconvert.dpr +++ b/developer/src/kmconvert/kmconvert.dpr @@ -28,10 +28,10 @@ uses utildir in '..\..\..\common\windows\delphi\general\utildir.pas', TextFileFormat in '..\common\delphi\general\TextFileFormat.pas', kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas', - PackageInfo in '..\..\..\windows\src\global\delphi\general\PackageInfo.pas', + PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas', JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas', VersionInfo in '..\..\..\common\windows\delphi\general\VersionInfo.pas', - PackageFileFormats in '..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas', + PackageFileFormats in '..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', Keyman.Developer.System.Project.ProjectLog in '..\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas', BCP47Tag in '..\..\..\common\windows\delphi\general\BCP47Tag.pas', Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas', diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj index 040175bca9..2d0d1684fb 100644 --- a/developer/src/kmconvert/kmconvert.dproj +++ b/developer/src/kmconvert/kmconvert.dproj @@ -134,10 +134,10 @@ - + - + diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr index 4ba296068b..83a0006536 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr @@ -14,10 +14,10 @@ uses Keyman.Test.System.CompilePackageVersioningTest in 'Keyman.Test.System.CompilePackageVersioningTest.pas', CompilePackage in '..\..\..\..\..\windows\src\global\delphi\general\CompilePackage.pas', VisualKeyboard in '..\..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas', - kmpinffile in '..\..\..\..\..\windows\src\global\delphi\general\kmpinffile.pas', + kmpinffile in '..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', kpsfile in '..\..\..\..\..\windows\src\global\delphi\general\kpsfile.pas', - PackageFileFormats in '..\..\..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas', - PackageInfo in '..\..\..\..\..\windows\src\global\delphi\general\PackageInfo.pas', + PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', + PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas', StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas', utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas', diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj index 7340df8fce..ed68c59e1b 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj @@ -94,10 +94,10 @@ - + - - + + diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr index a041aff469..b1e77bb9b6 100644 --- a/developer/src/tike/Tike.dpr +++ b/developer/src/tike/Tike.dpr @@ -60,9 +60,9 @@ uses DebugBitBtn in '..\common\delphi\components\DebugBitBtn.pas', DebugListBox in '..\common\delphi\components\DebugListBox.pas', GetOsVersion in '..\..\..\common\windows\delphi\general\GetOsVersion.pas', - PackageFileFormats in '..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas', - PackageInfo in '..\..\..\windows\src\global\delphi\general\PackageInfo.pas', - kmpinffile in '..\..\..\windows\src\global\delphi\general\kmpinffile.pas', + PackageFileFormats in '..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', + PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas', + kmpinffile in '..\..\..\common\windows\delphi\packages\kmpinffile.pas', RedistFiles in 'main\RedistFiles.pas', UfrmBitmapEditor in 'child\UfrmBitmapEditor.pas' {frmBitmapEditor}, VisualKeyboard in '..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas', diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj index e6a7925bd2..37b7e53fae 100644 --- a/developer/src/tike/Tike.dproj +++ b/developer/src/tike/Tike.dproj @@ -195,9 +195,9 @@ - - - + + +
frmBitmapEditor
diff --git a/windows/src/buildtools/buildpkg/buildpkg.dpr b/windows/src/buildtools/buildpkg/buildpkg.dpr index a30bb4ec22..7f753f433c 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dpr +++ b/windows/src/buildtools/buildpkg/buildpkg.dpr @@ -8,15 +8,15 @@ uses CompilePackageInstaller in '..\..\global\delphi\general\CompilePackageInstaller.pas', utilsystem in '..\..\..\..\common\windows\delphi\general\utilsystem.pas', CompilePackage in '..\..\global\delphi\general\CompilePackage.pas', - kmpinffile in '..\..\global\delphi\general\kmpinffile.pas', + kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', kpsfile in '..\..\global\delphi\general\kpsfile.pas', - PackageInfo in '..\..\global\delphi\general\PackageInfo.pas', + PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', utildir in '..\..\..\..\common\windows\delphi\general\utildir.pas', utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas', utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas', Unicode in '..\..\..\..\common\windows\delphi\general\Unicode.pas', VersionInfo in '..\..\..\..\common\windows\delphi\general\VersionInfo.pas', - PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas', + PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', GetOsVersion in '..\..\..\..\common\windows\delphi\general\GetOsVersion.pas', RegistryKeys in '..\..\..\..\common\windows\delphi\general\RegistryKeys.pas', KeymanDeveloperOptions in '..\..\..\..\developer\src\tike\main\KeymanDeveloperOptions.pas', diff --git a/windows/src/buildtools/buildpkg/buildpkg.dproj b/windows/src/buildtools/buildpkg/buildpkg.dproj index 071f9d57d1..15ea9883b3 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dproj +++ b/windows/src/buildtools/buildpkg/buildpkg.dproj @@ -95,15 +95,15 @@ - + - + - + diff --git a/windows/src/desktop/kmshell/kmshell.dpr b/windows/src/desktop/kmshell/kmshell.dpr index f5ab8a3352..bb612358e5 100644 --- a/windows/src/desktop/kmshell/kmshell.dpr +++ b/windows/src/desktop/kmshell/kmshell.dpr @@ -109,9 +109,9 @@ uses CRC32 in '..\..\..\..\common\windows\delphi\general\CRC32.pas', input_installlayoutortip in '..\..\global\delphi\winapi\input_installlayoutortip.pas', KPInstallPackageStartMenu in '..\..\global\delphi\general\KPInstallPackageStartMenu.pas', - kmpinffile in '..\..\global\delphi\general\kmpinffile.pas', - PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas', - PackageInfo in '..\..\global\delphi\general\PackageInfo.pas', + kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', + PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', + PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas', utilwow64 in '..\..\global\delphi\general\utilwow64.pas', KPUninstallPackageStartMenu in '..\..\global\delphi\general\KPUninstallPackageStartMenu.pas', diff --git a/windows/src/desktop/kmshell/kmshell.dproj b/windows/src/desktop/kmshell/kmshell.dproj index e2f0c626c8..771525a887 100644 --- a/windows/src/desktop/kmshell/kmshell.dproj +++ b/windows/src/desktop/kmshell/kmshell.dproj @@ -250,9 +250,9 @@ - - - + + + diff --git a/windows/src/desktop/setup/setup.dpr b/windows/src/desktop/setup/setup.dpr index 547377d6f0..9f3ac7350a 100644 --- a/windows/src/desktop/setup/setup.dpr +++ b/windows/src/desktop/setup/setup.dpr @@ -32,14 +32,14 @@ uses Keyman.System.UpgradeRegistryKeys in '..\..\global\delphi\general\Keyman.System.UpgradeRegistryKeys.pas', Keyman.Setup.System.InstallInfo in 'Keyman.Setup.System.InstallInfo.pas', Keyman.Setup.System.OnlineResourceCheck in 'Keyman.Setup.System.OnlineResourceCheck.pas', - PackageInfo in '..\..\global\delphi\general\PackageInfo.pas', + PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas', utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas', StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas', utildir in '..\..\..\..\common\windows\delphi\general\utildir.pas', JsonUtil in '..\..\..\..\common\windows\delphi\general\JsonUtil.pas', - kmpinffile in '..\..\global\delphi\general\kmpinffile.pas', - PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas', + kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', + PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', Keyman.Setup.System.ResourceDownloader in 'Keyman.Setup.System.ResourceDownloader.pas', httpuploader in '..\..\..\..\common\windows\delphi\general\httpuploader.pas', Keyman.System.MITLicense in '..\..\global\delphi\general\Keyman.System.MITLicense.pas', diff --git a/windows/src/desktop/setup/setup.dproj b/windows/src/desktop/setup/setup.dproj index c6c0b10647..2c51bccea5 100644 --- a/windows/src/desktop/setup/setup.dproj +++ b/windows/src/desktop/setup/setup.dproj @@ -135,14 +135,14 @@ - + - - + + diff --git a/windows/src/engine/kmcomapi/kmcomapi.dpr b/windows/src/engine/kmcomapi/kmcomapi.dpr index 8c6f76e7bf..065ff1729c 100644 --- a/windows/src/engine/kmcomapi/kmcomapi.dpr +++ b/windows/src/engine/kmcomapi/kmcomapi.dpr @@ -61,9 +61,9 @@ uses keymancontext in 'keymancontext.pas', utilvararray in 'util\utilvararray.pas', kpinstallpackage in 'processes\package\kpinstallpackage.pas', - kmpinffile in '..\..\global\delphi\general\kmpinffile.pas', - PackageInfo in '..\..\global\delphi\general\PackageInfo.pas', - PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas', + kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', + PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', + PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', ttinfo in '..\..\..\..\common\windows\delphi\general\ttinfo.pas', keymanerrorcodes in 'util\keymanerrorcodes.pas', kpuninstallpackage in 'processes\package\kpuninstallpackage.pas', diff --git a/windows/src/engine/kmcomapi/kmcomapi.dproj b/windows/src/engine/kmcomapi/kmcomapi.dproj index bd7ec2bbc1..e5c3d5aff0 100644 --- a/windows/src/engine/kmcomapi/kmcomapi.dproj +++ b/windows/src/engine/kmcomapi/kmcomapi.dproj @@ -199,9 +199,9 @@ - - - + + + diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr index 55bc64ca64..347477e438 100644 --- a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr +++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr @@ -6,7 +6,7 @@ program packageinftool; uses System.SysUtils, - PackageInfo in '..\..\global\delphi\general\PackageInfo.pas', + PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas', utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas', StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas', @@ -19,9 +19,9 @@ uses RegistryKeys in '..\..\..\..\common\windows\delphi\general\RegistryKeys.pas', GetOsVersion in '..\..\..\..\common\windows\delphi\general\GetOsVersion.pas', kpsfile in '..\..\global\delphi\general\kpsfile.pas', - PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas', + PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', packageinf in 'packageinf.pas', - kmpinffile in '..\..\global\delphi\general\kmpinffile.pas', + kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', JsonUtil in '..\..\..\..\common\windows\delphi\general\JsonUtil.pas'; begin diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj index 906fcf7add..4b0a5634ba 100644 --- a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj +++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj @@ -88,7 +88,7 @@ MainSource - + @@ -101,9 +101,9 @@ - + - + Cfg_2 diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr index d5c18b5649..ca4de5f620 100644 --- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr +++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr @@ -8,7 +8,7 @@ uses {$IFDEF TESTINSIGHT} TestInsight.DUnitX, {$ENDIF } - PackageInfo in '..\..\..\global\delphi\general\PackageInfo.pas', + PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas', utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas', StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas', @@ -21,7 +21,7 @@ uses RegistryKeys in '..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas', GetOsVersion in '..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas', kpsfile in '..\..\..\global\delphi\general\kpsfile.pas', - PackageFileFormats in '..\..\..\global\delphi\general\PackageFileFormats.pas', + PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', DUnitX.Loggers.Console, DUnitX.Loggers.Xml.NUnit, DUnitX.TestFramework, diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj index 46d4c38c72..5151051b4b 100644 --- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj +++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj @@ -91,7 +91,7 @@ MainSource - + @@ -104,7 +104,7 @@ - + diff --git a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr index 1874072f49..0905e3cb5a 100644 --- a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr +++ b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr @@ -13,7 +13,7 @@ uses DUnitX.TestFramework, Keyman.System.Test.InstallInfoTest in 'Keyman.System.Test.InstallInfoTest.pas', Keyman.Setup.System.InstallInfo in '..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas', - PackageInfo in '..\..\..\global\delphi\general\PackageInfo.pas', + PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas', utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas', StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas', utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas', @@ -27,8 +27,8 @@ uses GetOsVersion in '..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas', VersionInfo in '..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas', SetupStrings in '..\..\..\desktop\setup\SetupStrings.pas', - kmpinffile in '..\..\..\global\delphi\general\kmpinffile.pas', - PackageFileFormats in '..\..\..\global\delphi\general\PackageFileFormats.pas', + kmpinffile in '..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', + PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas', Keyman.Setup.System.SetupUILanguageManager in '..\..\..\desktop\setup\Keyman.Setup.System.SetupUILanguageManager.pas', Keyman.System.UILanguageManager in '..\..\..\global\delphi\general\Keyman.System.UILanguageManager.pas', Keyman.Setup.System.MsiUtils in '..\..\..\desktop\setup\Keyman.Setup.System.MsiUtils.pas'; diff --git a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj index 0069c42bb1..e52340cb74 100644 --- a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj +++ b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj @@ -103,7 +103,7 @@ - + @@ -117,8 +117,8 @@ - - + +