maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Misc things tooling around in here

Browse source
This commit is contained in:
Mike Griese 2019-08-20 08:23:58 -05:00
parent 46cca6ba57
commit c5e20398db
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
View file

@ -5,6 +5,7 @@
#include "../TerminalApp/ColorScheme.h"
#include "../TerminalApp/CascadiaSettings.h"
#include <winrt/Microsoft.Terminal.TerminalConnection.h>
using namespace Microsoft::Console;
using namespace TerminalApp;
@ -31,6 +32,7 @@ namespace TerminalAppLocalTests
END_TEST_CLASS()
TEST_METHOD(TryCreateWinRTType);
TEST_METHOD(TryCreateConnection);
TEST_METHOD(ValidateProfilesExist);
TEST_METHOD(ValidateDefaultProfileExists);
TEST_METHOD(ValidateDuplicateProfiles);
@ -56,6 +58,12 @@ namespace TerminalAppLocalTests
return root;
}
void SettingsTests::TryCreateConnection()
{
winrt::Microsoft::Terminal::TerminalConnection::EchoConnection conn{};
VERIFY_IS_NOT_NULL(conn);
}
void SettingsTests::TryCreateWinRTType()
{
winrt::Microsoft::Terminal::Settings::TerminalSettings settings{};

1
src/cascadia/WindowsTerminal/AppHost.h
View file

@ -3,7 +3,6 @@
#include "pch.h"
#include <winrt/Microsoft.Terminal.TerminalControl.h>
#include <winrt/TerminalApp.h>
#include "NonClientIslandWindow.h"

3
src/cascadia/WindowsTerminal/main.cpp
View file

@ -4,6 +4,7 @@
#include "pch.h"
#include "AppHost.h"
#include "resource.h"
// #include <winrt/Microsoft.Terminal.TerminalConnection.h>
using namespace winrt;
using namespace Windows::UI;
@ -107,6 +108,8 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
// provides an implementation of Windows.UI.Xaml.Application.
AppHost host;
// winrt::Microsoft::Terminal::TerminalConnection::EchoConnection conn{};
// !!! LOAD BEARING !!!
// This is _magic_. Do the initial loading of our settings *BEFORE* we
// initialize our COM apartment type. This is because the Windows.Storage

2
tools/openterm.cmd
View file

@ -24,8 +24,8 @@ rem Generate a unique name, so that we can debug multiple revisions of the binar
(xcopy /Y %_last_build_bin%\console.dll %TEMP%\%copy_dir%\console.dll*) > nul
(xcopy /Y %_last_build%\*.dll %TEMP%\%copy_dir%\*.dll*) > nul
(xcopy /Y %_last_build%\WindowsTerminal.exe %TEMP%\%copy_dir%\WindowsTerminal.exe*) > nul
(xcopy /Y %_last_build%\*.xbf %TEMP%\%copy_dir%\*.xbf*) > nul
(xcopy /Y %_last_build%\WindowsTerminal.exe %TEMP%\%copy_dir%\WindowsTerminal.exe*) > nul
rem If the resources.pri file is older than WindowsTerminal.exe binary, than we
rem definitely need to rebuild it. This step will only work once the