From 9dc922fc37a479dd560675ac4ea1ce3713ae0ada Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett (MSFT)" Date: Tue, 5 Nov 2019 14:29:11 -0800 Subject: [PATCH] Unify and clean up the common build properties (#3429) This commit cleans up and deduplicates all of the common build preamble/postamble across exe, dll, lib and c++/winrt projects. The following specific changes have been made: * All projects now define their ConfigurationType * All projects now set all their properties *before* including a common build file (or any other build files) * cppwinrt.pre and cppwinrt.post now delegate most of their configuration to common.pre and common.post * (becuase of the above,) all build options are conserved between console and c++/winrt components, including specific warnings and preprocessor definitions. * More properties that are configurable per-project are now conditioned so the common props don't override them. * The exe, dll, exe.or.dll, and lib postincludes have been merged into pre or post and switched based on condition as required * Shared items (-shared, -common) are now explicitly vcxitems instead of vcxproj files. * The link line is now manipulated after Microsoft.Cpp sets it, so the libraries we specify "win". All console things link first against onecore_apiset.lib. * Fix all compilation errors caused by build unification * Move CascadiaPackage's resources into a separate item file Fixes #922. --- OpenConsole.sln | 4 - src/buffer/out/lib/bufferout.vcxproj | 23 +- .../TextBuffer.Unit.Tests.vcxproj | 18 +- .../CascadiaPackage/CascadiaPackage.wapproj | 227 +--------------- src/cascadia/CascadiaResources.build.items | 248 ++++++++++++++++++ .../TerminalApp.LocalTests.vcxproj | 45 ++-- .../PublicTerminalCore.vcxproj | 17 +- src/cascadia/TerminalApp/App.cpp | 2 +- .../TerminalApp/GlobalAppSettings.cpp | 4 +- .../TerminalApp/MinMaxCloseControl.cpp | 6 +- src/cascadia/TerminalApp/TerminalApp.vcxproj | 31 +-- src/cascadia/TerminalApp/TerminalPage.cpp | 8 +- src/cascadia/TerminalApp/TitlebarControl.cpp | 12 +- .../TerminalApp/lib/TerminalAppLib.vcxproj | 40 ++- .../AzureConnection-ARM64.cpp | 14 +- .../TerminalConnection.vcxproj | 39 ++- src/cascadia/TerminalControl/TermControl.cpp | 14 +- .../TerminalControl/TerminalControl.vcxproj | 34 +-- src/cascadia/TerminalControl/UiaTextRange.cpp | 9 +- .../TerminalControl/XamlUiaTextRange.cpp | 12 +- .../TerminalCore/lib/terminalcore-lib.vcxproj | 17 +- ...n.vcxproj => terminalcore-common.vcxitems} | 0 .../TerminalSettings/TerminalSettings.vcxproj | 29 +- .../UnitTests_TerminalCore/UnitTests.vcxproj | 20 +- src/cascadia/WinRTUtils/WinRTUtils.vcxproj | 35 +-- .../WindowsTerminal/WindowsTerminal.vcxproj | 42 ++- .../ut_app/TerminalApp.UnitTests.vcxproj | 45 ++-- src/common.build.dll.props | 12 - src/common.build.exe.or.dll.props | 25 -- src/common.build.exe.props | 7 - src/common.build.lib.props | 11 - src/common.build.post.props | 52 ++-- src/common.build.pre.props | 48 +++- src/cppwinrt.build.post.props | 18 +- src/cppwinrt.build.pre.props | 94 ++----- src/host/dll/host.vcxproj | 16 +- src/host/exe/Host.EXE.vcxproj | 18 +- src/host/ft_host/Host.FeatureTests.vcxproj | 16 +- ...st-common.vcxproj => host-common.vcxitems} | 0 src/host/lib/hostlib.vcxproj | 10 +- src/host/ut_host/Host.UnitTests.vcxproj | 18 +- src/host/ut_lib/host.unittest.vcxproj | 21 +- .../base/lib/InteractivityBase.vcxproj | 18 +- .../onecore/lib/onecore.LIB.vcxproj | 18 +- src/interactivity/win32/lib/win32.LIB.vcxproj | 18 +- .../Interactivity.Win32.UnitTests.vcxproj | 18 +- src/internal/internal.vcxproj | 16 +- src/propsheet/propsheet.vcxproj | 19 +- src/propslib/propslib.vcxproj | 18 +- src/renderer/base/lib/base.vcxproj | 18 +- src/renderer/dx/lib/dx.vcxproj | 18 +- src/renderer/gdi/lib/gdi.vcxproj | 18 +- src/renderer/uia/lib/uia.vcxproj | 16 +- src/renderer/vt/lib/vt.vcxproj | 8 +- src/renderer/vt/ut_lib/vt.unittest.vcxproj | 23 +- ...on.vcxproj => vt-renderer-common.vcxitems} | 0 src/server/lib/server.vcxproj | 23 +- src/terminal/adapter/lib/adapter.vcxproj | 16 +- .../ut_adapter/Adapter.UnitTests.vcxproj | 18 +- src/terminal/input/lib/terminalinput.vcxproj | 16 +- .../parser/ft_fuzzer/VTCommandFuzzer.vcxproj | 18 +- .../parser/ft_fuzzwrapper/FuzzWrapper.vcxproj | 18 +- src/terminal/parser/lib/parser.vcxproj | 20 +- ...-common.vcxproj => parser-common.vcxitems} | 0 .../parser/ut_parser/Parser.UnitTests.vcxproj | 16 +- src/tools/buffersize/buffersize.vcxproj | 12 +- src/tools/closetest/CloseTest.vcxproj | 12 +- src/tools/echokey/ConEchoKey.vcxproj | 10 +- src/tools/fontlist/FontList.vcxproj | 12 +- src/tools/nihilist/Nihilist.vcxproj | 10 +- src/tools/scratch/Scratch.vcxproj | 10 +- src/tools/vtpipeterm/VtPipeTerm.vcxproj | 18 +- src/tsf/tsf.vcxproj | 18 +- src/types/lib/types.vcxproj | 16 +- src/types/ut_types/Types.Unit.Tests.vcxproj | 16 +- src/winconpty/winconpty.vcxproj | 19 +- 76 files changed, 899 insertions(+), 986 deletions(-) create mode 100644 src/cascadia/CascadiaResources.build.items rename src/cascadia/TerminalCore/{terminalcore-common.vcxproj => terminalcore-common.vcxitems} (100%) delete mode 100644 src/common.build.dll.props delete mode 100644 src/common.build.exe.or.dll.props delete mode 100644 src/common.build.exe.props delete mode 100644 src/common.build.lib.props rename src/host/{host-common.vcxproj => host-common.vcxitems} (100%) rename src/renderer/vt/{vt-renderer-common.vcxproj => vt-renderer-common.vcxitems} (100%) rename src/terminal/parser/{lib/parser-common.vcxproj => parser-common.vcxitems} (100%) diff --git a/OpenConsole.sln b/OpenConsole.sln index 36ebf7121..9d8a0e7d7 100644 --- a/OpenConsole.sln +++ b/OpenConsole.sln @@ -99,10 +99,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Propsheet.DLL", "src\propsh EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build Common", "_Build Common", "{04170EEF-983A-4195-BFEF-2321E5E38A1E}" ProjectSection(SolutionItems) = preProject - src\common.build.dll.props = src\common.build.dll.props - src\common.build.exe.or.dll.props = src\common.build.exe.or.dll.props - src\common.build.exe.props = src\common.build.exe.props - src\common.build.lib.props = src\common.build.lib.props src\common.build.post.props = src\common.build.post.props src\common.build.pre.props = src\common.build.pre.props src\common.build.tests.props = src\common.build.tests.props diff --git a/src/buffer/out/lib/bufferout.vcxproj b/src/buffer/out/lib/bufferout.vcxproj index c38c4118c..b2c10664e 100644 --- a/src/buffer/out/lib/bufferout.vcxproj +++ b/src/buffer/out/lib/bufferout.vcxproj @@ -1,5 +1,13 @@ + + {0CF235BD-2DA0-407E-90EE-C467E8BBC714} + Win32Proj + bufferout + BufferOut + ConBufferOut + StaticLibrary + @@ -49,19 +57,6 @@ - - {0CF235BD-2DA0-407E-90EE-C467E8BBC714} - Win32Proj - bufferout - BufferOut - ConBufferOut - - - - $(SolutionDir)\dep;$(SolutionDir)\dep\Console;$(SolutionDir)\dep\Win32K;$(SolutionDir)\dep\AppModel;$(SolutionDir)\dep\MinCore;%(AdditionalIncludeDirectories) - - - - \ No newline at end of file + diff --git a/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj index 2998c3460..0b2492922 100644 --- a/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj +++ b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj @@ -1,5 +1,13 @@ + + {531C23E7-4B76-4C08-8BBD-04164CB628C9} + Win32Proj + TextBufferUnitTests + TextBuffer.Unit.Tests + TextBuffer.Unit.Tests + DynamicLibrary + @@ -17,20 +25,12 @@ - - {531C23E7-4B76-4C08-8BBD-04164CB628C9} - Win32Proj - TextBufferUnitTests - TextBuffer.Unit.Tests - TextBuffer.Unit.Tests - ..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories) - - \ No newline at end of file + diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj index 5290efa55..0552ced51 100644 --- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj +++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj @@ -45,233 +45,14 @@ - - Images\LargeTile.scale-100.png - - - Images\LargeTile.scale-125.png - - - Images\LargeTile.scale-150.png - - - Images\LargeTile.scale-200.png - - - Images\LargeTile.scale-400.png - - - Images\LockScreenLogo.scale-100.png - - - Images\LockScreenLogo.scale-125.png - - - Images\LockScreenLogo.scale-150.png - - - Images\LockScreenLogo.scale-200.png - - - Images\LockScreenLogo.scale-400.png - - - Images\SmallTile.scale-100.png - - - Images\SmallTile.scale-125.png - - - Images\SmallTile.scale-150.png - - - Images\SmallTile.scale-200.png - - - Images\SmallTile.scale-400.png - - - Images\SplashScreen.scale-100.png - - - Images\SplashScreen.scale-125.png - - - Images\SplashScreen.scale-150.png - - - Images\SplashScreen.scale-200.png - - - Images\SplashScreen.scale-400.png - - - Images\Square150x150Logo.scale-100.png - - - Images\Square150x150Logo.scale-125.png - - - Images\Square150x150Logo.scale-150.png - - - Images\Square150x150Logo.scale-200.png - - - Images\Square150x150Logo.scale-400.png - - - Images\Square44x44Logo.scale-100.png - - - Images\Square44x44Logo.scale-125.png - - - Images\Square44x44Logo.scale-150.png - - - Images\Square44x44Logo.scale-200.png - - - Images\Square44x44Logo.scale-400.png - - - Images\Square44x44Logo.targetsize-16.png - - - Images\Square44x44Logo.targetsize-16_altform-unplated.png - - - Images\Square44x44Logo.targetsize-20.png - - - Images\Square44x44Logo.targetsize-20_altform-unplated.png - - - Images\Square44x44Logo.targetsize-24.png - - - Images\Square44x44Logo.targetsize-24_altform-unplated.png - - - Images\Square44x44Logo.targetsize-256.png - - - Images\Square44x44Logo.targetsize-256_altform-unplated.png - - - Images\Square44x44Logo.targetsize-30.png - - - Images\Square44x44Logo.targetsize-30_altform-unplated.png - - - Images\Square44x44Logo.targetsize-32.png - - - Images\Square44x44Logo.targetsize-32_altform-unplated.png - - - Images\Square44x44Logo.targetsize-36.png - - - Images\Square44x44Logo.targetsize-36_altform-unplated.png - - - Images\Square44x44Logo.targetsize-40.png - - - Images\Square44x44Logo.targetsize-40_altform-unplated.png - - - Images\Square44x44Logo.targetsize-48.png - - - Images\Square44x44Logo.targetsize-48_altform-unplated.png - - - Images\Square44x44Logo.targetsize-60.png - - - Images\Square44x44Logo.targetsize-60_altform-unplated.png - - - Images\Square44x44Logo.targetsize-64.png - - - Images\Square44x44Logo.targetsize-64_altform-unplated.png - - - Images\Square44x44Logo.targetsize-72.png - - - Images\Square44x44Logo.targetsize-72_altform-unplated.png - - - Images\Square44x44Logo.targetsize-80.png - - - Images\Square44x44Logo.targetsize-80_altform-unplated.png - - - Images\Square44x44Logo.targetsize-96.png - - - Images\Square44x44Logo.targetsize-96_altform-unplated.png - - - Images\StoreLogo.scale-100.png - - - Images\StoreLogo.scale-125.png - - - Images\StoreLogo.scale-150.png - - - Images\StoreLogo.scale-200.png - - - Images\StoreLogo.scale-400.png - - - Images\Wide310x150Logo.scale-100.png - - - Images\Wide310x150Logo.scale-125.png - - - Images\Wide310x150Logo.scale-150.png - - - Images\Wide310x150Logo.scale-200.png - - - Images\Wide310x150Logo.scale-400.png - - - - Cascadia.ttf - - - - - - - - - - - - - - - defaults.json - + + + diff --git a/src/cascadia/CascadiaResources.build.items b/src/cascadia/CascadiaResources.build.items new file mode 100644 index 000000000..a06026669 --- /dev/null +++ b/src/cascadia/CascadiaResources.build.items @@ -0,0 +1,248 @@ + + + + + Images\LargeTile.scale-100.png + + + Images\LargeTile.scale-125.png + + + Images\LargeTile.scale-150.png + + + Images\LargeTile.scale-200.png + + + Images\LargeTile.scale-400.png + + + Images\LockScreenLogo.scale-100.png + + + Images\LockScreenLogo.scale-125.png + + + Images\LockScreenLogo.scale-150.png + + + Images\LockScreenLogo.scale-200.png + + + Images\LockScreenLogo.scale-400.png + + + Images\SmallTile.scale-100.png + + + Images\SmallTile.scale-125.png + + + Images\SmallTile.scale-150.png + + + Images\SmallTile.scale-200.png + + + Images\SmallTile.scale-400.png + + + Images\SplashScreen.scale-100.png + + + Images\SplashScreen.scale-125.png + + + Images\SplashScreen.scale-150.png + + + Images\SplashScreen.scale-200.png + + + Images\SplashScreen.scale-400.png + + + Images\Square150x150Logo.scale-100.png + + + Images\Square150x150Logo.scale-125.png + + + Images\Square150x150Logo.scale-150.png + + + Images\Square150x150Logo.scale-200.png + + + Images\Square150x150Logo.scale-400.png + + + Images\Square44x44Logo.scale-100.png + + + Images\Square44x44Logo.scale-125.png + + + Images\Square44x44Logo.scale-150.png + + + Images\Square44x44Logo.scale-200.png + + + Images\Square44x44Logo.scale-400.png + + + Images\Square44x44Logo.targetsize-16.png + + + Images\Square44x44Logo.targetsize-16_altform-unplated.png + + + Images\Square44x44Logo.targetsize-20.png + + + Images\Square44x44Logo.targetsize-20_altform-unplated.png + + + Images\Square44x44Logo.targetsize-24.png + + + Images\Square44x44Logo.targetsize-24_altform-unplated.png + + + Images\Square44x44Logo.targetsize-256.png + + + Images\Square44x44Logo.targetsize-256_altform-unplated.png + + + Images\Square44x44Logo.targetsize-30.png + + + Images\Square44x44Logo.targetsize-30_altform-unplated.png + + + Images\Square44x44Logo.targetsize-32.png + + + Images\Square44x44Logo.targetsize-32_altform-unplated.png + + + Images\Square44x44Logo.targetsize-36.png + + + Images\Square44x44Logo.targetsize-36_altform-unplated.png + + + Images\Square44x44Logo.targetsize-40.png + + + Images\Square44x44Logo.targetsize-40_altform-unplated.png + + + Images\Square44x44Logo.targetsize-48.png + + + Images\Square44x44Logo.targetsize-48_altform-unplated.png + + + Images\Square44x44Logo.targetsize-60.png + + + Images\Square44x44Logo.targetsize-60_altform-unplated.png + + + Images\Square44x44Logo.targetsize-64.png + + + Images\Square44x44Logo.targetsize-64_altform-unplated.png + + + Images\Square44x44Logo.targetsize-72.png + + + Images\Square44x44Logo.targetsize-72_altform-unplated.png + + + Images\Square44x44Logo.targetsize-80.png + + + Images\Square44x44Logo.targetsize-80_altform-unplated.png + + + Images\Square44x44Logo.targetsize-96.png + + + Images\Square44x44Logo.targetsize-96_altform-unplated.png + + + Images\StoreLogo.scale-100.png + + + Images\StoreLogo.scale-125.png + + + Images\StoreLogo.scale-150.png + + + Images\StoreLogo.scale-200.png + + + Images\StoreLogo.scale-400.png + + + Images\Wide310x150Logo.scale-100.png + + + Images\Wide310x150Logo.scale-125.png + + + Images\Wide310x150Logo.scale-150.png + + + Images\Wide310x150Logo.scale-200.png + + + Images\Wide310x150Logo.scale-400.png + + + + Cascadia.ttf + + + + ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-100.png + + + ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-200.png + + + ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-100.png + + + ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-200.png + + + ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-100.png + + + ProfileIcons\{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.scale-200.png + + + ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-100.png + + + ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-200.png + + + ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-100.png + + + ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-200.png + + + + defaults.json + + + diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj index f89c39ac1..43c9a7898 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj @@ -1,5 +1,29 @@  + + {CA5CAD1A-b11c-4ddb-a4fe-c3afae9b5506} + Win32Proj + TerminalAppLocalTests + LocalTests_TerminalApp + TerminalApp.LocalTests + DynamicLibrary + 10.0.18362.0 + 10.0.18362.0 + + true + + + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + @@ -40,15 +64,6 @@ - - {CA5CAD1A-b11c-4ddb-a4fe-c3afae9b5506} - Win32Proj - TerminalAppLocalTests - LocalTests_TerminalApp - TerminalApp.LocalTests - 10.0.18362.0 - 10.0.18362.0 - @@ -70,21 +85,9 @@ - - - - $(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\ - $(OpenConsoleDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ - - <_CppWinrtBinRoot>"$(OpenConsoleDir)$(Platform)\$(Configuration)\" diff --git a/src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj b/src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj index 56d187473..3a352596d 100644 --- a/src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj +++ b/src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj @@ -1,17 +1,17 @@ - - - - DynamicLibrary - 16.0 {84848BFA-931D-42CE-9ADF-01EE54DE7890} Win32Proj PublicTerminalCore PublicTerminalCore + DynamicLibrary + + + + Create @@ -22,6 +22,7 @@ + {1cf55140-ef6a-4736-a403-957e4f7430bb} @@ -45,12 +46,12 @@ {48d21369-3d7b-4431-9967-24e81292cf62} + - %(AdditionalIncludeDirectories) pch.h - + - \ No newline at end of file + diff --git a/src/cascadia/TerminalApp/App.cpp b/src/cascadia/TerminalApp/App.cpp index a2825e79a..531966dc0 100644 --- a/src/cascadia/TerminalApp/App.cpp +++ b/src/cascadia/TerminalApp/App.cpp @@ -199,7 +199,7 @@ namespace winrt::TerminalApp::implementation dialog.RequestedTheme(_settings->GlobalSettings().GetRequestedTheme()); // Display the dialog. - Controls::ContentDialogResult result = co_await dialog.ShowAsync(Controls::ContentDialogPlacement::Popup); + co_await dialog.ShowAsync(Controls::ContentDialogPlacement::Popup); // After the dialog is dismissed, the dialog lock (held by `lock`) will // be released so another can be shown diff --git a/src/cascadia/TerminalApp/GlobalAppSettings.cpp b/src/cascadia/TerminalApp/GlobalAppSettings.cpp index 1972c6d90..d98947d67 100644 --- a/src/cascadia/TerminalApp/GlobalAppSettings.cpp +++ b/src/cascadia/TerminalApp/GlobalAppSettings.cpp @@ -383,14 +383,14 @@ std::string GlobalAppSettings::_SerializeInitialPosition(const std::optional - - - - + + {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} + TerminalApp + TerminalApp DynamicLibrary Console true + + true + + - - {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} - TerminalApp - TerminalApp - + @@ -85,14 +89,6 @@ <_BinRoot Condition="'$(Platform)' == 'Win32'">$(OpenConsoleDir)$(Configuration)\ - - - true - $(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories); @@ -105,7 +101,6 @@ /INCLUDE:DllMain - diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 65fee5a4d..040fd03cc 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -666,7 +666,7 @@ namespace winrt::TerminalApp::implementation _tabView.TabItems().RemoveAt(tabIndex); auto focusedTabIndex = _GetFocusedTabIndex(); - if (tabIndex == focusedTabIndex) + if (gsl::narrow_cast(tabIndex) == focusedTabIndex) { auto const tabCount = gsl::narrow_cast(_tabs.size()); if (focusedTabIndex >= tabCount) @@ -1175,7 +1175,7 @@ namespace winrt::TerminalApp::implementation // Arguments: // - sender: the control that originated this event // - eventArgs: the event's constituent arguments - void TerminalPage::_OnTabItemsChanged(const IInspectable& sender, const Windows::Foundation::Collections::IVectorChangedEventArgs& eventArgs) + void TerminalPage::_OnTabItemsChanged(const IInspectable& /*sender*/, const Windows::Foundation::Collections::IVectorChangedEventArgs& /*eventArgs*/) { _UpdateTabView(); } @@ -1200,7 +1200,7 @@ namespace winrt::TerminalApp::implementation // Arguments: // - sender: the control that originated this event // - eventArgs: the event's constituent arguments - void TerminalPage::_OnTabSelectionChanged(const IInspectable& sender, const WUX::Controls::SelectionChangedEventArgs& eventArgs) + void TerminalPage::_OnTabSelectionChanged(const IInspectable& sender, const WUX::Controls::SelectionChangedEventArgs& /*eventArgs*/) { auto tabView = sender.as(); auto selectedIndex = tabView.SelectedIndex(); @@ -1252,7 +1252,7 @@ namespace winrt::TerminalApp::implementation // Arguments: // - sender: the control that originated this event // - eventArgs: the event's constituent arguments - void TerminalPage::_OnTabCloseRequested(const IInspectable& sender, const MUX::Controls::TabViewTabCloseRequestedEventArgs& eventArgs) + void TerminalPage::_OnTabCloseRequested(const IInspectable& /*sender*/, const MUX::Controls::TabViewTabCloseRequestedEventArgs& eventArgs) { const auto tabViewItem = eventArgs.Tab(); _RemoveTabViewItem(tabViewItem); diff --git a/src/cascadia/TerminalApp/TitlebarControl.cpp b/src/cascadia/TerminalApp/TitlebarControl.cpp index a34b6c9bd..0fb9aa11e 100644 --- a/src/cascadia/TerminalApp/TitlebarControl.cpp +++ b/src/cascadia/TerminalApp/TitlebarControl.cpp @@ -34,8 +34,8 @@ namespace winrt::TerminalApp::implementation ContentRoot().Content(content); } - void TitlebarControl::Root_SizeChanged(const IInspectable& sender, - const Windows::UI::Xaml::SizeChangedEventArgs& e) + void TitlebarControl::Root_SizeChanged(const IInspectable& /*sender*/, + const Windows::UI::Xaml::SizeChangedEventArgs& /*e*/) { const auto windowWidth = ActualWidth(); const auto minMaxCloseWidth = MinMaxCloseControl().ActualWidth(); @@ -66,17 +66,17 @@ namespace winrt::TerminalApp::implementation } } - void TitlebarControl::Maximize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e) + void TitlebarControl::Maximize_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::RoutedEventArgs const& /*e*/) { _OnMaximizeOrRestore(HTMAXBUTTON); } - void TitlebarControl::DragBar_DoubleTapped(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& e) + void TitlebarControl::DragBar_DoubleTapped(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& /*e*/) { _OnMaximizeOrRestore(HTCAPTION); } - void TitlebarControl::Minimize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e) + void TitlebarControl::Minimize_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::RoutedEventArgs const& /*e*/) { if (_window) { @@ -84,7 +84,7 @@ namespace winrt::TerminalApp::implementation } } - void TitlebarControl::Close_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e) + void TitlebarControl::Close_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::RoutedEventArgs const& /*e*/) { ::PostMessage(_window, WM_SYSCOMMAND, SC_CLOSE, 0); } diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj index d689c7c6c..42723e97a 100644 --- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj @@ -1,13 +1,23 @@ - - - - - + + {CA5CAD1A-9A12-429C-B551-8562EC954746} + Win32Proj + TerminalApp + TerminalAppLib + TerminalAppLib + 10.0.17763.0 StaticLibrary Console true + + + true + false + + @@ -249,25 +261,7 @@ - - {CA5CAD1A-9A12-429C-B551-8562EC954746} - Win32Proj - TerminalApp - TerminalAppLib - TerminalAppLib - 10.0.17763.0 - - - - true - - - + true + + + + x64-windows @@ -21,6 +28,7 @@ arm64-windows + @@ -58,11 +66,7 @@ - - - kernel32.lib;%(AdditionalDependencies) - - + - true - - + + diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index a3d01f666..aa764e02c 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -630,8 +630,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } const auto modifiers = _GetPressedModifierKeys(); - const auto vkey = static_cast(e.OriginalKey()); - const auto scanCode = e.KeyStatus().ScanCode; + const auto vkey = gsl::narrow_cast(e.OriginalKey()); + const auto scanCode = gsl::narrow_cast(e.KeyStatus().ScanCode); bool handled = false; // GH#2235: Terminal::Settings hasn't been modified to differentiate between AltGr and Ctrl+Alt yet. @@ -1020,7 +1020,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } } - void TermControl::_ScrollbarChangeHandler(Windows::Foundation::IInspectable const& sender, + void TermControl::_ScrollbarChangeHandler(Windows::Foundation::IInspectable const& /*sender*/, Controls::Primitives::RangeBaseValueChangedEventArgs const& args) { const auto newValue = args.NewValue(); @@ -1276,11 +1276,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation { auto terminalPosition = _GetTerminalPosition(cursorPosition); - const short lastVisibleRow = std::max(_terminal->GetViewport().Height() - 1, 0); - const short lastVisibleCol = std::max(_terminal->GetViewport().Width() - 1, 0); + const short lastVisibleRow = std::max(_terminal->GetViewport().Height() - 1, 0); + const short lastVisibleCol = std::max(_terminal->GetViewport().Width() - 1, 0); - terminalPosition.Y = std::clamp(terminalPosition.Y, short{ 0 }, lastVisibleRow); - terminalPosition.X = std::clamp(terminalPosition.X, short{ 0 }, lastVisibleCol); + terminalPosition.Y = std::clamp(terminalPosition.Y, 0, lastVisibleRow); + terminalPosition.X = std::clamp(terminalPosition.X, 0, lastVisibleCol); // save location (for rendering) + render _terminal->SetEndSelectionPosition(terminalPosition); diff --git a/src/cascadia/TerminalControl/TerminalControl.vcxproj b/src/cascadia/TerminalControl/TerminalControl.vcxproj index 171a1025c..0006cc30d 100644 --- a/src/cascadia/TerminalControl/TerminalControl.vcxproj +++ b/src/cascadia/TerminalControl/TerminalControl.vcxproj @@ -1,20 +1,27 @@ - - + + {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} + TerminalControl + Microsoft.Terminal.TerminalControl DynamicLibrary Console true + + + true + + - - {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} - TerminalControl - Microsoft.Terminal.TerminalControl - + @@ -69,6 +76,9 @@ false + + + dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies) @@ -77,14 +87,4 @@ $(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories) - - - true - - - diff --git a/src/cascadia/TerminalControl/UiaTextRange.cpp b/src/cascadia/TerminalControl/UiaTextRange.cpp index 61734b94c..cf0ff93f8 100644 --- a/src/cascadia/TerminalControl/UiaTextRange.cpp +++ b/src/cascadia/TerminalControl/UiaTextRange.cpp @@ -34,6 +34,7 @@ std::deque UiaTextRange::GetSelectionRanges(_In_ IUiaData* pData, { UiaTextRangeBase* temp = ranges[0]; ranges.pop_front(); + temp->Release(); } THROW_HR(E_INVALIDARG); } @@ -173,10 +174,10 @@ IFACEMETHODIMP UiaTextRange::Clone(_Outptr_result_maybenull_ ITextRangeProvider* return S_OK; } -IFACEMETHODIMP UiaTextRange::FindText(_In_ BSTR text, - _In_ BOOL searchBackward, - _In_ BOOL ignoreCase, - _Outptr_result_maybenull_ ITextRangeProvider** ppRetVal) +IFACEMETHODIMP UiaTextRange::FindText(_In_ BSTR /*text*/, + _In_ BOOL /*searchBackward*/, + _In_ BOOL /*ignoreCase*/, + _Outptr_result_maybenull_ ITextRangeProvider** /*ppRetVal*/) { // TODO GitHub #605: Search functionality return E_NOTIMPL; diff --git a/src/cascadia/TerminalControl/XamlUiaTextRange.cpp b/src/cascadia/TerminalControl/XamlUiaTextRange.cpp index 4ca5c5245..80a9b623d 100644 --- a/src/cascadia/TerminalControl/XamlUiaTextRange.cpp +++ b/src/cascadia/TerminalControl/XamlUiaTextRange.cpp @@ -60,18 +60,18 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation THROW_IF_FAILED(_uiaProvider->ExpandToEnclosingUnit(static_cast(unit))); } - XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindAttribute(int32_t textAttributeId, - winrt::Windows::Foundation::IInspectable val, - bool searchBackward) + XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindAttribute(int32_t /*textAttributeId*/, + winrt::Windows::Foundation::IInspectable /*val*/, + bool /*searchBackward*/) { // TODO GitHub #2161: potential accessibility improvement // we don't support this currently throw winrt::hresult_not_implemented(); } - XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindText(winrt::hstring text, - bool searchBackward, - bool ignoreCase) + XamlAutomation::ITextRangeProvider XamlUiaTextRange::FindText(winrt::hstring /*text*/, + bool /*searchBackward*/, + bool /*ignoreCase*/) { // TODO GitHub #605: Search functionality // we need to wrap this around the UiaTextRange FindText() function diff --git a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj index f6085e342..d3b9312c1 100644 --- a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj +++ b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj @@ -1,21 +1,21 @@ - - - - - - - {CA5CAD1A-ABCD-429C-B551-8562EC954746} Win32Proj TerminalCore TerminalCore + StaticLibrary 10.0.17763.0 - 10.0.18362.0 Microsoft.Terminal.Core + + + + + + + @@ -51,6 +51,5 @@ - diff --git a/src/cascadia/TerminalCore/terminalcore-common.vcxproj b/src/cascadia/TerminalCore/terminalcore-common.vcxitems similarity index 100% rename from src/cascadia/TerminalCore/terminalcore-common.vcxproj rename to src/cascadia/TerminalCore/terminalcore-common.vcxitems diff --git a/src/cascadia/TerminalSettings/TerminalSettings.vcxproj b/src/cascadia/TerminalSettings/TerminalSettings.vcxproj index b40d1d8ae..982de90ec 100644 --- a/src/cascadia/TerminalSettings/TerminalSettings.vcxproj +++ b/src/cascadia/TerminalSettings/TerminalSettings.vcxproj @@ -1,20 +1,26 @@ - - + + {CA5CAD1A-d7ec-4107-b7c6-79cb77ae2907} + TerminalSettings + Microsoft.Terminal.Settings DynamicLibrary Console true + + true + + - - {CA5CAD1A-d7ec-4107-b7c6-79cb77ae2907} - TerminalSettings - Microsoft.Terminal.Settings - + @@ -48,14 +54,5 @@ - - - true - - diff --git a/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj b/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj index 44f9c9555..d4911ce43 100644 --- a/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj +++ b/src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj @@ -1,7 +1,17 @@  + + {2C2BEEF4-9333-4D05-B12A-1905CBF112F9} + Win32Proj + TerminalCoreUnitTests + UnitTests_TerminalCore + Terminal.Core.Unit.Tests + DynamicLibrary + + + @@ -34,13 +44,6 @@ - - {2C2BEEF4-9333-4D05-B12A-1905CBF112F9} - Win32Proj - TerminalCoreUnitTests - UnitTests_TerminalCore - Terminal.Core.Unit.Tests - ..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalSettings\Generated Files";%(AdditionalIncludeDirectories) @@ -51,7 +54,6 @@ - - \ No newline at end of file + diff --git a/src/cascadia/WinRTUtils/WinRTUtils.vcxproj b/src/cascadia/WinRTUtils/WinRTUtils.vcxproj index ab4078c28..60a41a343 100644 --- a/src/cascadia/WinRTUtils/WinRTUtils.vcxproj +++ b/src/cascadia/WinRTUtils/WinRTUtils.vcxproj @@ -1,14 +1,23 @@ - - - - - + + {CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE} + Win32Proj + WinRTUtils + WinRTUtils + WinRTUtils StaticLibrary Console true + + true + + @@ -50,22 +59,6 @@ - - {CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE} - Win32Proj - WinRTUtils - WinRTUtils - WinRTUtils - - - - true - - diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj index 045dea339..a89124dc5 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj @@ -1,32 +1,32 @@ - - - - Application - Windows - false - Windows Store - - - 15.0 {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} Win32Proj WindowsTerminal WindowsTerminal WindowsTerminal + Application + false + Windows Store 10.0.18362.0 + + true + + + + true + $(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories); @@ -76,14 +76,14 @@ - + - + - + @@ -98,12 +98,12 @@ WindowsLocalDebugger - - - true - + + + + 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}. @@ -114,12 +114,6 @@ - - - - - - + true + + + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + @@ -29,15 +53,6 @@ - - {CA5CAD1A-9333-4D05-B12A-1905CBF112F9} - Win32Proj - TerminalAppUnitTests - UnitTests_TerminalApp - Terminal.App.Unit.Tests - 10.0.18362.0 - 10.0.18362.0 - @@ -62,21 +77,9 @@ - - - - $(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\ - $(OpenConsoleDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ - - <_CppWinrtBinRoot>"$(OpenConsoleDir)$(Platform)\$(Configuration)\" diff --git a/src/common.build.dll.props b/src/common.build.dll.props deleted file mode 100644 index a24b8212d..000000000 --- a/src/common.build.dll.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - DynamicLibrary - - - - _USRDLL;%(PreprocessorDefinitions) - - - diff --git a/src/common.build.exe.or.dll.props b/src/common.build.exe.or.dll.props deleted file mode 100644 index 6846cf7a8..000000000 --- a/src/common.build.exe.or.dll.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - _WINDOWS;%(PreprocessorDefinitions) - - - $(OutDir)$(TargetName)FullPDB.pdb - onecore_apiset.lib;dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;uxtheme.lib;dwmapi.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;%(AdditionalDependencies) - - gdi32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies) - - - diff --git a/src/common.build.exe.props b/src/common.build.exe.props deleted file mode 100644 index c6b693df2..000000000 --- a/src/common.build.exe.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - Application - - diff --git a/src/common.build.lib.props b/src/common.build.lib.props deleted file mode 100644 index 8dbef91da..000000000 --- a/src/common.build.lib.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - StaticLibrary - - - - _LIB;%(PreprocessorDefinitions) - - - diff --git a/src/common.build.post.props b/src/common.build.post.props index 950696142..97cd40077 100644 --- a/src/common.build.post.props +++ b/src/common.build.post.props @@ -1,35 +1,57 @@  - - - $(SolutionDir)\bin\$(Platform)\$(Configuration)\ - $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ - + - + + ProgramDatabase + + + gdi32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies) + onecore_apiset.lib;dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;uxtheme.lib;dwmapi.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;%(AdditionalDependencies) + - - - + + + + + _USRDLL;%(PreprocessorDefinitions) + + + + + + + _LIB;%(PreprocessorDefinitions) + + + + $(SolutionDir)\dep\;$(CAExcludePath) + diff --git a/src/common.build.pre.props b/src/common.build.pre.props index fc3c97c08..5cae1cb10 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -1,6 +1,19 @@ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + + AuditMode @@ -39,22 +52,18 @@ ARM64 + - 10.0.18362.0 + 10.0.18362.0 + + v142 Unicode false - - true - - - false - true - - + Use @@ -63,8 +72,8 @@ true - 4201;4312;4467 - EXTERNAL_BUILD;%(PreprocessorDefinitions) + 4201;4312;4467;%(DisableSpecificWarnings) + _WINDOWS;EXTERNAL_BUILD;%(PreprocessorDefinitions) true precomp.h $(IntDir)$(TargetName).pdb @@ -76,14 +85,21 @@ /std:c++17 /utf-8 %(AdditionalOptions) - EXTERNAL_BUILD;_UNICODE;UNICODE;%(PreprocessorDefinitions) + EXTERNAL_BUILD;_UNICODE;UNICODE;%(PreprocessorDefinitions) + $(OutDir)$(TargetName)FullPDB.pdb Windows true + + + true + false + + Disabled @@ -93,7 +109,13 @@ true + + + false + true + + MaxSpeed @@ -107,12 +129,14 @@ true + WIN32;%(PreprocessorDefinitions) + $(SolutionDir)\src\StaticAnalysis.ruleset diff --git a/src/cppwinrt.build.post.props b/src/cppwinrt.build.post.props index 6ef2b6337..181a8d192 100644 --- a/src/cppwinrt.build.post.props +++ b/src/cppwinrt.build.post.props @@ -1,17 +1,6 @@ - - - - $(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\ - $(OpenConsoleDir)\bin\$(Platform)\$(Configuration)\$(ProjectName)\ - $(OpenConsoleDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ - + - - - 10.0.18362.0 - 10.0.18362.0 + + 10.0.18362.0 + 10.0.18362.0 true true en-US @@ -43,90 +41,35 @@ false - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM64 - - - Release - ARM64 - - - - DynamicLibrary - v142 - Unicode false - - true - true - - - false - true - false - + + + + Use pch.h $(IntDir)pch.pch - Level4 - true - %(AdditionalOptions) /permissive- /bigobj /Zc:twoPhase- /std:c++17 - 28204 - _WINRT_DLL;%(PreprocessorDefinitions) + + + %(AdditionalOptions) /permissive- /bigobj /Zc:twoPhase- + 28204;%(DisableSpecificWarnings) + $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - Console + Console true - $(ProjectName).def - - - - - - Disabled - - - - - - - true - - - true - true - $(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\src\cascadia\WinRTUtils\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\gsl\include;$(OpenConsoleDir)\dep\wil\include;%(AdditionalIncludeDirectories) + $(OpenConsoleDir)\src\cascadia\WinRTUtils\inc;%(AdditionalIncludeDirectories) WindowsApp.lib;%(AdditionalDependencies) @@ -134,6 +77,15 @@ + + + + _WINRT_DLL;%(PreprocessorDefinitions) + + + $(ProjectName).def + + diff --git a/src/host/dll/host.vcxproj b/src/host/dll/host.vcxproj index 7fcc7c497..52fe65da4 100644 --- a/src/host/dll/host.vcxproj +++ b/src/host/dll/host.vcxproj @@ -1,5 +1,13 @@ + + {E437B604-3E98-4F40-A927-E173E818EA4B} + Win32Proj + host + Host.DLL + ConhostV2 + DynamicLibrary + @@ -53,13 +61,6 @@ - - {E437B604-3E98-4F40-A927-E173E818EA4B} - Win32Proj - host - Host.DLL - ConhostV2 - @@ -76,6 +77,5 @@ - diff --git a/src/host/exe/Host.EXE.vcxproj b/src/host/exe/Host.EXE.vcxproj index 76d7fc55c..53fc946d8 100644 --- a/src/host/exe/Host.EXE.vcxproj +++ b/src/host/exe/Host.EXE.vcxproj @@ -1,5 +1,13 @@ + + {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} + Win32Proj + HostEXE + Host.EXE + OpenConsole + Application + @@ -65,13 +73,6 @@ - - {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} - Win32Proj - HostEXE - Host.EXE - OpenConsole - @@ -86,6 +87,5 @@ - - \ No newline at end of file + diff --git a/src/host/ft_host/Host.FeatureTests.vcxproj b/src/host/ft_host/Host.FeatureTests.vcxproj index 43a403010..05d8d544f 100644 --- a/src/host/ft_host/Host.FeatureTests.vcxproj +++ b/src/host/ft_host/Host.FeatureTests.vcxproj @@ -1,5 +1,13 @@ + + {8CDB8850-7484-4EC7-B45B-181F85B2EE54} + Win32Proj + HostFeatureTests + Host.Tests.Feature + ConHost.Feature.Tests + DynamicLibrary + @@ -44,20 +52,12 @@ - - {8CDB8850-7484-4EC7-B45B-181F85B2EE54} - Win32Proj - HostFeatureTests - Host.Tests.Feature - ConHost.Feature.Tests - $(ProjectDir);%(AdditionalIncludeDirectories) - diff --git a/src/host/host-common.vcxproj b/src/host/host-common.vcxitems similarity index 100% rename from src/host/host-common.vcxproj rename to src/host/host-common.vcxitems diff --git a/src/host/lib/hostlib.vcxproj b/src/host/lib/hostlib.vcxproj index 83a0e5545..adc112419 100644 --- a/src/host/lib/hostlib.vcxproj +++ b/src/host/lib/hostlib.vcxproj @@ -1,16 +1,16 @@ - - - {06EC74CB-9A12-429C-B551-8562EC954746} Win32Proj hostlib Host ConhostV2Lib + StaticLibrary + + + - - \ No newline at end of file + diff --git a/src/host/ut_host/Host.UnitTests.vcxproj b/src/host/ut_host/Host.UnitTests.vcxproj index cd40d0c8b..acaffb06f 100644 --- a/src/host/ut_host/Host.UnitTests.vcxproj +++ b/src/host/ut_host/Host.UnitTests.vcxproj @@ -1,5 +1,13 @@ + + {531C23E7-4B76-4C08-8AAD-04164CB628C9} + Win32Proj + HostUnitTests + Host.Tests.Unit + Conhost.Unit.Tests + DynamicLibrary + @@ -90,20 +98,12 @@ - - {531C23E7-4B76-4C08-8AAD-04164CB628C9} - Win32Proj - HostUnitTests - Host.Tests.Unit - Conhost.Unit.Tests - ..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories) - - \ No newline at end of file + diff --git a/src/host/ut_lib/host.unittest.vcxproj b/src/host/ut_lib/host.unittest.vcxproj index bc9994c39..75821ebc8 100644 --- a/src/host/ut_lib/host.unittest.vcxproj +++ b/src/host/ut_lib/host.unittest.vcxproj @@ -1,25 +1,22 @@ - - - - - - INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions) - - - - StaticLibrary - {06EC74CB-9A12-429C-B551-8562EC954747} Win32Proj hostlib.unittest Host.unittest ConhostV2Lib.unittest + StaticLibrary + + + + + + INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions) + + - diff --git a/src/interactivity/base/lib/InteractivityBase.vcxproj b/src/interactivity/base/lib/InteractivityBase.vcxproj index 57075e72c..9ee7c364a 100644 --- a/src/interactivity/base/lib/InteractivityBase.vcxproj +++ b/src/interactivity/base/lib/InteractivityBase.vcxproj @@ -1,5 +1,13 @@  + + {06EC74CB-9A12-429C-B551-8562EC964846} + Win32Proj + Base + InteractivityBase + ConInteractivityBaseLib + StaticLibrary + @@ -35,14 +43,6 @@ - - {06EC74CB-9A12-429C-B551-8562EC964846} - Win32Proj - Base - InteractivityBase - ConInteractivityBaseLib - - - \ No newline at end of file + diff --git a/src/interactivity/onecore/lib/onecore.LIB.vcxproj b/src/interactivity/onecore/lib/onecore.LIB.vcxproj index 8b104fd08..4dee9c0fa 100644 --- a/src/interactivity/onecore/lib/onecore.LIB.vcxproj +++ b/src/interactivity/onecore/lib/onecore.LIB.vcxproj @@ -1,5 +1,13 @@  + + {06EC74CB-9A12-428C-B551-8537EC964726} + Win32Proj + OneCore + InteractivityOneCore + ConInteractivityOneCoreLib + StaticLibrary + @@ -30,14 +38,6 @@ - - {06EC74CB-9A12-428C-B551-8537EC964726} - Win32Proj - OneCore - InteractivityOneCore - ConInteractivityOneCoreLib - - - \ No newline at end of file + diff --git a/src/interactivity/win32/lib/win32.LIB.vcxproj b/src/interactivity/win32/lib/win32.LIB.vcxproj index d9afadfee..61ecaefc9 100644 --- a/src/interactivity/win32/lib/win32.LIB.vcxproj +++ b/src/interactivity/win32/lib/win32.LIB.vcxproj @@ -1,5 +1,13 @@ + + {06EC74CB-9A12-429C-B551-8532EC964726} + Win32Proj + win32 + InteractivityWin32 + ConInteractivityWin32Lib + StaticLibrary + @@ -54,19 +62,11 @@ - - {06EC74CB-9A12-429C-B551-8532EC964726} - Win32Proj - win32 - InteractivityWin32 - ConInteractivityWin32Lib - ..\..\..\inc;%(AdditionalIncludeDirectories) - - \ No newline at end of file + diff --git a/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj b/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj index ef2eb2419..953e8002f 100644 --- a/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj +++ b/src/interactivity/win32/ut_interactivity_win32/Interactivity.Win32.UnitTests.vcxproj @@ -1,5 +1,13 @@ + + {d3b92829-26cb-411a-bda2-7f5da3d25dd4} + Win32Proj + InteractivityWin32UnitTests + Interactivity.Win32.Tests.Unit + Conhost.Interactivity.Win32.Unit.Tests + DynamicLibrary + @@ -57,20 +65,12 @@ - - {d3b92829-26cb-411a-bda2-7f5da3d25dd4} - Win32Proj - InteractivityWin32UnitTests - Interactivity.Win32.Tests.Unit - Conhost.Interactivity.Win32.Unit.Tests - ..;$(SolutionDir)src\inc;$(Solutiondir)src\inc\test;%(AdditionalIncludeDirectories) - - \ No newline at end of file + diff --git a/src/internal/internal.vcxproj b/src/internal/internal.vcxproj index 793865d7c..332586eb1 100644 --- a/src/internal/internal.vcxproj +++ b/src/internal/internal.vcxproj @@ -1,5 +1,13 @@ + + {EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} + Win32Proj + internal + Internal + ConInt + StaticLibrary + @@ -11,14 +19,6 @@ - - {EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} - Win32Proj - internal - Internal - ConInt - - diff --git a/src/propsheet/propsheet.vcxproj b/src/propsheet/propsheet.vcxproj index 583eff62b..5aefea291 100644 --- a/src/propsheet/propsheet.vcxproj +++ b/src/propsheet/propsheet.vcxproj @@ -1,5 +1,13 @@ + + {5D23E8E1-3C64-4CC1-A8F7-6861677F7239} + Win32Proj + propsheet + Propsheet.DLL + console + DynamicLibrary + @@ -49,16 +57,6 @@ - - DynamicLibrary - - - {5D23E8E1-3C64-4CC1-A8F7-6861677F7239} - Win32Proj - propsheet - Propsheet.DLL - console - @@ -81,6 +79,5 @@ - diff --git a/src/propslib/propslib.vcxproj b/src/propslib/propslib.vcxproj index ed40731db..e1f4bf283 100644 --- a/src/propslib/propslib.vcxproj +++ b/src/propslib/propslib.vcxproj @@ -1,5 +1,13 @@  + + {345FD5A4-B32B-4F29-BD1C-B033BD2C35CC} + Win32Proj + propslib + PropertiesLibrary + ConProps + StaticLibrary + @@ -16,14 +24,6 @@ - - {345FD5A4-B32B-4F29-BD1C-B033BD2C35CC} - Win32Proj - propslib - PropertiesLibrary - ConProps - - - \ No newline at end of file + diff --git a/src/renderer/base/lib/base.vcxproj b/src/renderer/base/lib/base.vcxproj index 03f238e9a..bafc76d37 100644 --- a/src/renderer/base/lib/base.vcxproj +++ b/src/renderer/base/lib/base.vcxproj @@ -1,5 +1,13 @@  + + {AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F} + Win32Proj + base + RendererBase + ConRenderBase + StaticLibrary + @@ -28,14 +36,6 @@ - - {AF0A096A-8B3A-4949-81EF-7DF8F0FEE91F} - Win32Proj - base - RendererBase - ConRenderBase - - - \ No newline at end of file + diff --git a/src/renderer/dx/lib/dx.vcxproj b/src/renderer/dx/lib/dx.vcxproj index df4208367..b4185300d 100644 --- a/src/renderer/dx/lib/dx.vcxproj +++ b/src/renderer/dx/lib/dx.vcxproj @@ -1,5 +1,13 @@  + + {48D21369-3D7B-4431-9967-24E81292CF62} + Win32Proj + dx + RendererDx + ConRenderDx + StaticLibrary + @@ -15,14 +23,6 @@ - - {48D21369-3D7B-4431-9967-24E81292CF62} - Win32Proj - dx - RendererDx - ConRenderDx - - - \ No newline at end of file + diff --git a/src/renderer/gdi/lib/gdi.vcxproj b/src/renderer/gdi/lib/gdi.vcxproj index d64e4ad5f..b925bc773 100644 --- a/src/renderer/gdi/lib/gdi.vcxproj +++ b/src/renderer/gdi/lib/gdi.vcxproj @@ -1,5 +1,13 @@  + + {1C959542-BAC2-4E55-9A6D-13251914CBB9} + Win32Proj + gdi + RendererGdi + ConRenderGdi + StaticLibrary + @@ -14,14 +22,6 @@ - - {1C959542-BAC2-4E55-9A6D-13251914CBB9} - Win32Proj - gdi - RendererGdi - ConRenderGdi - - - \ No newline at end of file + diff --git a/src/renderer/uia/lib/uia.vcxproj b/src/renderer/uia/lib/uia.vcxproj index 1bb36777b..ca7dcc29b 100644 --- a/src/renderer/uia/lib/uia.vcxproj +++ b/src/renderer/uia/lib/uia.vcxproj @@ -1,5 +1,13 @@  + + {48D21369-3D7B-4431-9967-24E81292CF63} + Win32Proj + uia + RendererUia + ConRenderUia + StaticLibrary + @@ -11,14 +19,6 @@ - - {48D21369-3D7B-4431-9967-24E81292CF63} - Win32Proj - uia - RendererUia - ConRenderUia - - diff --git a/src/renderer/vt/lib/vt.vcxproj b/src/renderer/vt/lib/vt.vcxproj index 468d236e6..c08dd333c 100644 --- a/src/renderer/vt/lib/vt.vcxproj +++ b/src/renderer/vt/lib/vt.vcxproj @@ -1,16 +1,16 @@  - - - {990F2657-8580-4828-943F-5DD657D11842} Win32Proj vt RendererVt ConRenderVt + StaticLibrary + + + - diff --git a/src/renderer/vt/ut_lib/vt.unittest.vcxproj b/src/renderer/vt/ut_lib/vt.unittest.vcxproj index 8892d23d8..b2f71422a 100644 --- a/src/renderer/vt/ut_lib/vt.unittest.vcxproj +++ b/src/renderer/vt/ut_lib/vt.unittest.vcxproj @@ -1,25 +1,22 @@  - - - - - INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions) - - - - StaticLibrary - - {990F2657-8580-4828-943F-5DD657D11843} Win32Proj vt.unittest RendererVt.unittest ConRenderVt.unittest + StaticLibrary + + + + + INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions) + + + - - \ No newline at end of file + diff --git a/src/renderer/vt/vt-renderer-common.vcxproj b/src/renderer/vt/vt-renderer-common.vcxitems similarity index 100% rename from src/renderer/vt/vt-renderer-common.vcxproj rename to src/renderer/vt/vt-renderer-common.vcxitems diff --git a/src/server/lib/server.vcxproj b/src/server/lib/server.vcxproj index a2a1baedc..e6bd12063 100644 --- a/src/server/lib/server.vcxproj +++ b/src/server/lib/server.vcxproj @@ -1,5 +1,13 @@  + + {18D09A24-8240-42D6-8CB6-236EEE820262} + Win32Proj + server + Server + ConServer + StaticLibrary + @@ -47,19 +55,6 @@ - - {18D09A24-8240-42D6-8CB6-236EEE820262} - Win32Proj - server - Server - ConServer - - - - $(SolutionDir)\dep;$(SolutionDir)\dep\Console;$(SolutionDir)\dep\Win32K;$(SolutionDir)\dep\MinCore;%(AdditionalIncludeDirectories) - - - - \ No newline at end of file + diff --git a/src/terminal/adapter/lib/adapter.vcxproj b/src/terminal/adapter/lib/adapter.vcxproj index 9b511056a..fb83b43ad 100644 --- a/src/terminal/adapter/lib/adapter.vcxproj +++ b/src/terminal/adapter/lib/adapter.vcxproj @@ -1,5 +1,13 @@  + + {DCF55140-EF6A-4736-A403-957E4F7430BB} + Win32Proj + adapter + TerminalAdapter + ConTermAdapt + StaticLibrary + @@ -38,14 +46,6 @@ {1CF55140-EF6A-4736-A403-957E4F7430BB} - - {DCF55140-EF6A-4736-A403-957E4F7430BB} - Win32Proj - adapter - TerminalAdapter - ConTermAdapt - - diff --git a/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj b/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj index 2a0b48f38..f58693e68 100644 --- a/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj +++ b/src/terminal/adapter/ut_adapter/Adapter.UnitTests.vcxproj @@ -1,5 +1,13 @@  + + {6AF01638-84CF-4B65-9870-484DFFCAC772} + Win32Proj + AdapterUnitTests + TerminalAdapter.UnitTests + ConAdapter.Unit.Tests + DynamicLibrary + @@ -47,20 +55,12 @@ {dcf55140-ef6a-4736-a403-957e4f7430bb} - - {6AF01638-84CF-4B65-9870-484DFFCAC772} - Win32Proj - AdapterUnitTests - TerminalAdapter.UnitTests - ConAdapter.Unit.Tests - ..;%(AdditionalIncludeDirectories) - - \ No newline at end of file + diff --git a/src/terminal/input/lib/terminalinput.vcxproj b/src/terminal/input/lib/terminalinput.vcxproj index aed8b45e4..9f9229cf4 100644 --- a/src/terminal/input/lib/terminalinput.vcxproj +++ b/src/terminal/input/lib/terminalinput.vcxproj @@ -1,5 +1,13 @@ + + {1CF55140-EF6A-4736-A403-957E4F7430BB} + Win32Proj + adapter + TerminalInput + TerminalInput + StaticLibrary + @@ -16,14 +24,6 @@ {18d09a24-8240-42d6-8cb6-236eee820263} - - {1CF55140-EF6A-4736-A403-957E4F7430BB} - Win32Proj - adapter - TerminalInput - TerminalInput - - diff --git a/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj b/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj index 1b2af52c6..f135d3e16 100644 --- a/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj +++ b/src/terminal/parser/ft_fuzzer/VTCommandFuzzer.vcxproj @@ -1,5 +1,13 @@  + + {96927B31-D6E8-4ABD-B03E-A5088A30BEBE} + Win32Proj + VTCommandFuzzer + TerminalParser.Fuzzer + VTCommandFuzzer + Application + @@ -14,13 +22,6 @@ - - {96927B31-D6E8-4ABD-B03E-A5088A30BEBE} - Win32Proj - VTCommandFuzzer - TerminalParser.Fuzzer - VTCommandFuzzer - stdafx.h @@ -31,7 +32,6 @@ - - \ No newline at end of file + diff --git a/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj b/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj index dd4c122b1..3357c7a45 100644 --- a/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj +++ b/src/terminal/parser/ft_fuzzwrapper/FuzzWrapper.vcxproj @@ -1,5 +1,13 @@  + + {F210A4AE-E02A-4BFC-80BB-F50A672FE763} + Win32Proj + FuzzWrapper + TerminalParser.FuzzWrapper + ConTerm.Parser.FuzzWrapper + Application + @@ -17,13 +25,6 @@ {3ae13314-1939-4dfa-9c14-38ca0834050c} - - {F210A4AE-E02A-4BFC-80BB-F50A672FE763} - Win32Proj - FuzzWrapper - TerminalParser.FuzzWrapper - ConTerm.Parser.FuzzWrapper - _CONSOLE;%(PreprocessorDefinitions) @@ -33,7 +34,6 @@ - - \ No newline at end of file + diff --git a/src/terminal/parser/lib/parser.vcxproj b/src/terminal/parser/lib/parser.vcxproj index 9cb410779..d0889b344 100644 --- a/src/terminal/parser/lib/parser.vcxproj +++ b/src/terminal/parser/lib/parser.vcxproj @@ -1,22 +1,22 @@  - - - - - - - - - {3AE13314-1939-4DFA-9C14-38CA0834050C} Win32Proj parser TerminalParser ConTermParser + StaticLibrary + + + + + + + + + - diff --git a/src/terminal/parser/lib/parser-common.vcxproj b/src/terminal/parser/parser-common.vcxitems similarity index 100% rename from src/terminal/parser/lib/parser-common.vcxproj rename to src/terminal/parser/parser-common.vcxitems diff --git a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj index 65773c0f4..250a7f8b1 100644 --- a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj +++ b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj @@ -1,5 +1,13 @@  + + {12144E07-FE63-4D33-9231-748B8D8C3792} + Win32Proj + ParserUnitTests + TerminalParser.UnitTests + ConParser.Unit.Tests + DynamicLibrary + @@ -36,16 +44,8 @@ - - {12144E07-FE63-4D33-9231-748B8D8C3792} - Win32Proj - ParserUnitTests - TerminalParser.UnitTests - ConParser.Unit.Tests - - diff --git a/src/tools/buffersize/buffersize.vcxproj b/src/tools/buffersize/buffersize.vcxproj index 4d0a270d4..3c6093ca4 100644 --- a/src/tools/buffersize/buffersize.vcxproj +++ b/src/tools/buffersize/buffersize.vcxproj @@ -1,16 +1,17 @@  - - - - {ED82003F-FC5D-4E94-8B47-F480018ED064} Win32Proj buffersize buffersize buffersize + Application + + + + _CONSOLE;%(PreprocessorDefinitions) @@ -21,7 +22,6 @@ - - \ No newline at end of file + diff --git a/src/tools/closetest/CloseTest.vcxproj b/src/tools/closetest/CloseTest.vcxproj index 218568f1b..33e767218 100644 --- a/src/tools/closetest/CloseTest.vcxproj +++ b/src/tools/closetest/CloseTest.vcxproj @@ -1,16 +1,17 @@  - - - - {C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB} Win32Proj CloseTest CloseTest CloseTest + Application + + + + _CONSOLE;%(PreprocessorDefinitions) @@ -21,7 +22,6 @@ - - \ No newline at end of file + diff --git a/src/tools/echokey/ConEchoKey.vcxproj b/src/tools/echokey/ConEchoKey.vcxproj index b55eacfc1..9d91d6ccb 100644 --- a/src/tools/echokey/ConEchoKey.vcxproj +++ b/src/tools/echokey/ConEchoKey.vcxproj @@ -1,16 +1,17 @@ - - - - {814CBEEE-894E-4327-A6E1-740504850098} Win32Proj ConEchoKey ConEchoKey ConEchoKey + Application + + + + _CONSOLE;%(PreprocessorDefinitions) @@ -21,7 +22,6 @@ - diff --git a/src/tools/fontlist/FontList.vcxproj b/src/tools/fontlist/FontList.vcxproj index 2e8038ba9..9c0098d42 100644 --- a/src/tools/fontlist/FontList.vcxproj +++ b/src/tools/fontlist/FontList.vcxproj @@ -1,16 +1,17 @@  - - - - {919544AC-D39B-463F-8414-3C3C67CF727C} Win32Proj FontList FontList FontList + Application + + + + _CONSOLE;%(PreprocessorDefinitions) @@ -21,7 +22,6 @@ - - \ No newline at end of file + diff --git a/src/tools/nihilist/Nihilist.vcxproj b/src/tools/nihilist/Nihilist.vcxproj index 8a9c59936..149661843 100644 --- a/src/tools/nihilist/Nihilist.vcxproj +++ b/src/tools/nihilist/Nihilist.vcxproj @@ -1,16 +1,17 @@ - - - - {FC802440-AD6A-4919-8F2C-7701F2B38D79} Win32Proj Nihilist Nihilist Nihilist + Application + + + + _CONSOLE;%(PreprocessorDefinitions) @@ -21,7 +22,6 @@ - diff --git a/src/tools/scratch/Scratch.vcxproj b/src/tools/scratch/Scratch.vcxproj index 6ecc9b612..f2d014159 100644 --- a/src/tools/scratch/Scratch.vcxproj +++ b/src/tools/scratch/Scratch.vcxproj @@ -1,16 +1,17 @@ - - - - {ED82003F-FC5D-4E94-8B36-F480018ED064} Win32Proj Scratch Scratch Scratch + Application + + + + _CONSOLE;%(PreprocessorDefinitions) @@ -21,7 +22,6 @@ - diff --git a/src/tools/vtpipeterm/VtPipeTerm.vcxproj b/src/tools/vtpipeterm/VtPipeTerm.vcxproj index 4581bf226..c724f5f02 100644 --- a/src/tools/vtpipeterm/VtPipeTerm.vcxproj +++ b/src/tools/vtpipeterm/VtPipeTerm.vcxproj @@ -1,5 +1,14 @@  + + {814DBDDE-894E-4327-A6E1-740504850098} + Win32Proj + VtPipeTerm + VtPipeTerm + VtPipeTerm + Application + 10.0.18362.0 + @@ -8,14 +17,6 @@ - - {814DBDDE-894E-4327-A6E1-740504850098} - Win32Proj - VtPipeTerm - VtPipeTerm - VtPipeTerm - 10.0.18362.0 - _CONSOLE;%(PreprocessorDefinitions) @@ -26,7 +27,6 @@ - diff --git a/src/tsf/tsf.vcxproj b/src/tsf/tsf.vcxproj index 21abe04d5..6ef3f344d 100644 --- a/src/tsf/tsf.vcxproj +++ b/src/tsf/tsf.vcxproj @@ -1,5 +1,13 @@  + + {2FD12FBB-1DDB-46D8-B818-1023C624CACA} + Win32Proj + tsf + TextServicesFramework + ConTSF + StaticLibrary + @@ -24,14 +32,6 @@ - - {2FD12FBB-1DDB-46D8-B818-1023C624CACA} - Win32Proj - tsf - TextServicesFramework - ConTSF - - - \ No newline at end of file + diff --git a/src/types/lib/types.vcxproj b/src/types/lib/types.vcxproj index 107319f2e..538c5f699 100644 --- a/src/types/lib/types.vcxproj +++ b/src/types/lib/types.vcxproj @@ -1,5 +1,13 @@  + + {18D09A24-8240-42D6-8CB6-236EEE820263} + Win32Proj + types + Types + ConTypes + StaticLibrary + @@ -43,14 +51,6 @@ - - {18D09A24-8240-42D6-8CB6-236EEE820263} - Win32Proj - types - Types - ConTypes - - \ No newline at end of file diff --git a/src/types/ut_types/Types.Unit.Tests.vcxproj b/src/types/ut_types/Types.Unit.Tests.vcxproj index dea3e4bce..2091eeef9 100644 --- a/src/types/ut_types/Types.Unit.Tests.vcxproj +++ b/src/types/ut_types/Types.Unit.Tests.vcxproj @@ -1,5 +1,13 @@ + + {34de34d3-1cd6-4ee3-8bd9-a26b5b27ec73} + Win32Proj + TypesUnitTests + Types.Unit.Tests + Types.Unit.Tests + DynamicLibrary + @@ -17,20 +25,12 @@ - - {34de34d3-1cd6-4ee3-8bd9-a26b5b27ec73} - Win32Proj - TypesUnitTests - Types.Unit.Tests - Types.Unit.Tests - ..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories) - diff --git a/src/winconpty/winconpty.vcxproj b/src/winconpty/winconpty.vcxproj index 6ffd09468..338ac994e 100644 --- a/src/winconpty/winconpty.vcxproj +++ b/src/winconpty/winconpty.vcxproj @@ -1,5 +1,13 @@ + + {58a03bb2-df5a-4b66-91a0-7ef3ba01269a} + Win32Proj + winconpty + winconpty + conpty + DynamicLibrary + @@ -15,23 +23,12 @@ %(AdditionalIncludeDirectories) - - {58a03bb2-df5a-4b66-91a0-7ef3ba01269a} - Win32Proj - winconpty - winconpty - conpty - - winconpty.def - - - onecoreuap_apiset.lib;%(AdditionalDependencies)