Skip to content

Commit 103beb4

Browse files
zadjii-msftzadjii-msft
committed
I just want to run the scratch project, I have no idea how this got so brboken
1 parent 5926cc2 commit 103beb4

File tree

9 files changed

+56
-55
lines changed

9 files changed

+56
-55
lines changed

‎scratch/ScratchIslandApp/Package/Package.wapproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</ItemGroup>
5050

5151
<ItemGroup>
52-
<Reference Include="Microsoft.Terminal.TerminalConnection">
52+
<!-- <Reference Include="Microsoft.Terminal.TerminalConnection">
5353
<HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
5454
<Implementation>$(OpenConsoleCommonOutDir)TerminalConnection\TerminalConnection.dll</Implementation>
5555
<IsWinMDFile>true</IsWinMDFile>
@@ -62,7 +62,7 @@
6262
<IsWinMDFile>true</IsWinMDFile>
6363
<Private>true</Private>
6464
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
65-
</Reference>
65+
</Reference> -->
6666
</ItemGroup>
6767

6868

‎scratch/ScratchIslandApp/SampleApp/MyPage.cpp

+5-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "MyPage.h"
66
#include <LibraryResources.h>
77
#include "MyPage.g.cpp"
8-
#include "MySettings.h"
98

109
using namespace std::chrono_literals;
1110
using namespace winrt::Microsoft::Terminal;
@@ -26,24 +25,6 @@ namespace winrt::SampleApp::implementation
2625

2726
void MyPage::Create()
2827
{
29-
auto settings = winrt::make_self<implementation::MySettings>();
30-
31-
auto connectionSettings{ TerminalConnection::ConptyConnection::CreateSettings(L"cmd.exe /k echo This TermControl is hosted in-proc...",
32-
winrt::hstring{},
33-
L"",
34-
nullptr,
35-
32,
36-
80,
37-
winrt::guid()) };
38-
39-
// "Microsoft.Terminal.TerminalConnection.ConptyConnection"
40-
winrt::hstring myClass{ winrt::name_of<TerminalConnection::ConptyConnection>() };
41-
TerminalConnection::ConnectionInformation connectInfo{ myClass, connectionSettings };
42-
43-
TerminalConnection::ITerminalConnection conn{ TerminalConnection::ConnectionInformation::CreateConnection(connectInfo) };
44-
Control::TermControl control{ *settings, *settings, conn };
45-
46-
InProcContent().Children().Append(control);
4728
}
4829

4930
// Method Description:
@@ -58,4 +39,9 @@ namespace winrt::SampleApp::implementation
5839
return { L"Sample Application" };
5940
}
6041

42+
winrt::fire_and_forget MyPage::Create_Click(const winrt::Windows::Foundation::IInspectable& s, const winrt::Windows::Foundation::IInspectable& e)
43+
{
44+
co_await winrt::resume_foreground(Dispatcher());
45+
}
46+
6147
}

‎scratch/ScratchIslandApp/SampleApp/MyPage.h

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ namespace winrt::SampleApp::implementation
1717

1818
hstring Title();
1919

20+
winrt::fire_and_forget Create_Click(const winrt::Windows::Foundation::IInspectable& s, const winrt::Windows::Foundation::IInspectable& e);
21+
2022
private:
2123
friend struct MyPageT<MyPage>; // for Xaml to bind events
2224
};

‎scratch/ScratchIslandApp/SampleApp/MyPage.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
xmlns:local="using:SampleApp"
1010
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1111
xmlns:mux="using:Microsoft.UI.Xaml.Controls"
12-
xmlns:terminal="using:Microsoft.Terminal.Control"
1312
mc:Ignorable="d">
1413

1514
<Grid x:Name="Root"
@@ -23,7 +22,8 @@
2322
<TextBox x:Name="GuidInput"
2423
Width="400"
2524
PlaceholderText="{}{guid here}" />
26-
<Button Grid.Row="0">
25+
<Button Grid.Row="0"
26+
Click="Create_Click">
2727
Create
2828
</Button>
2929

‎scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj

+10-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@
1717
<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
1818
<XamlComponentResourceLocation>nested</XamlComponentResourceLocation>
1919
</PropertyGroup>
20+
21+
<PropertyGroup Label="NuGet Dependencies">
22+
<TerminalCppWinrt>true</TerminalCppWinrt>
23+
<TerminalXamlApplicationToolkit>true</TerminalXamlApplicationToolkit>
24+
</PropertyGroup>
2025
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
26+
<Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
2127
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
22-
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
28+
2329
<ItemDefinitionGroup>
2430

2531
<ClCompile>
@@ -147,14 +153,15 @@
147153
<!-- ========================= Globals ======================== -->
148154
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
149155

156+
<!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
157+
<Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
158+
150159
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
151-
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
152160
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
153161
<PropertyGroup>
154162
<ErrorText>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}.</ErrorText>
155163
</PropertyGroup>
156164
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets'))" />
157-
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
158165
</Target>
159166

160167
<!--

‎scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj

+14-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,16 @@
1111
<!-- sets a bunch of Windows Universal properties -->
1212
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
1313
</PropertyGroup>
14+
15+
<PropertyGroup Label="NuGet Dependencies">
16+
<TerminalCppWinrt>true</TerminalCppWinrt>
17+
<TerminalXamlApplicationToolkit>true</TerminalXamlApplicationToolkit>
18+
</PropertyGroup>
1419
<Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
20+
<Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
1521
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
16-
<Import Project="$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
22+
23+
1724
<!-- ========================= XAML files ======================== -->
1825
<ItemGroup>
1926
<!-- DON'T PUT XAML FILES HERE! Put them in SampleAppLib.vcxproj -->
@@ -79,15 +86,18 @@
7986
</Reference>
8087
</ItemGroup>
8188

89+
<!-- ========================= Globals ======================== -->
90+
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
91+
92+
<!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
93+
<Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
8294

8395
<Import Project="$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
84-
<Import Project="$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
8596
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8697
<PropertyGroup>
8798
<ErrorText>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}.</ErrorText>
8899
</PropertyGroup>
89100
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets'))" />
90-
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
91101
</Target>
92102

93103
<ItemDefinitionGroup>
@@ -101,5 +111,5 @@
101111
<AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain %(AdditionalOptions)</AdditionalOptions>
102112
</Link>
103113
</ItemDefinitionGroup>
104-
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
114+
105115
</Project>

‎scratch/ScratchIslandApp/SampleApp/pch.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSampleAppProvider);
6363
#include <shellapi.h>
6464
#include <shobjidl_core.h>
6565

66-
#include <winrt/Microsoft.Terminal.Core.h>
67-
#include <winrt/Microsoft.Terminal.Control.h>
68-
#include <winrt/Microsoft.Terminal.TerminalConnection.h>
66+
// #include <winrt/Microsoft.Terminal.Core.h>
67+
// #include <winrt/Microsoft.Terminal.Control.h>
68+
// #include <winrt/Microsoft.Terminal.TerminalConnection.h>
6969

7070
// Manually include til after we include Windows.Foundation to give it winrt superpowers
7171
#include "til.h"

‎scratch/ScratchIslandApp/WindowExe/SampleIslandWindow.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ void SampleIslandWindow::_HandleCreateWindow(const WPARAM, const LPARAM lParam)
104104

105105
void SampleIslandWindow::Initialize()
106106
{
107-
const bool initialized = (_interopWindowHandle != nullptr);
108-
109107
_source = DesktopWindowXamlSource{};
110108

111109
auto interop = _source.as<IDesktopWindowXamlSourceNative>();

‎scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
43

54
<PropertyGroup Label="Globals">
65
<ProjectGuid>{b4427499-9fde-4208-b456-5bc580637633}</ProjectGuid>
@@ -16,7 +15,14 @@
1615
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
1716
</PropertyGroup>
1817

18+
<PropertyGroup Label="NuGet Dependencies">
19+
<TerminalCppWinrt>true</TerminalCppWinrt>
20+
<TerminalXamlApplicationToolkit>true</TerminalXamlApplicationToolkit>
21+
<TerminalVCRTForwarders>true</TerminalVCRTForwarders>
22+
</PropertyGroup>
23+
1924
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
25+
<Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
2026
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
2127

2228
<ItemDefinitionGroup>
@@ -30,7 +36,7 @@
3036
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
3137
</ClCompile>
3238
<Link>
33-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
39+
<AdditionalDependencies>gdi32.lib;dwmapi.lib;Shcore.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
3440
</Link>
3541
</ItemDefinitionGroup>
3642
<PropertyGroup>
@@ -85,7 +91,7 @@
8591
interfaces). However, it too is necessary for Terminal.Control to be able to
8692
marshall the Core types across the boundary.
8793
-->
88-
<Reference Include="Microsoft.Terminal.Core">
94+
<!-- <Reference Include="Microsoft.Terminal.Core">
8995
<HintPath>$(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd</HintPath>
9096
<IsWinMDFile>true</IsWinMDFile>
9197
<Private>true</Private>
@@ -104,7 +110,7 @@
104110
<IsWinMDFile>true</IsWinMDFile>
105111
<Private>true</Private>
106112
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
107-
</Reference>
113+
</Reference> -->
108114
</ItemGroup>
109115
<!--
110116
This ItemGroup and the Globals PropertyGroup below it are required in order
@@ -137,17 +143,12 @@
137143

138144
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
139145

140-
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
141-
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
142-
<Import Project="..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets" Condition="Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets')" />
146+
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets')" />
143147
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
144148
<PropertyGroup>
145149
<ErrorText>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}.</ErrorText>
146150
</PropertyGroup>
147-
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets'))" />
148-
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props'))" />
149-
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
150-
<Error Condition="!Exists('..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.4\build\native\Microsoft.VCRTForwarders.140.targets'))" />
151+
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.$(TerminalMUXVersion)\build\native\Microsoft.UI.Xaml.targets'))" />
151152
</Target>
152153

153154
<!-- Override GetPackagingOutputs to roll up all our dependencies.
@@ -204,34 +205,31 @@
204205
The Sample sln needs to do this manually - the real exe has a
205206
ProjectReference to TerminalConnection.vcxproj and can figure this out on
206207
its own. -->
207-
<ItemGroup>
208+
<!-- <ItemGroup>
208209
<_TerminalConnectionDlls Include="$(OpenConsoleCommonOutDir)\TerminalConnection\*.dll" />
209210
210211
<PackagingOutputs Include="@(_TerminalConnectionDlls)">
211212
<ProjectName>$(ProjectName)</ProjectName>
212213
<OutputGroup>BuiltProjectOutputGroup</OutputGroup>
213214
<TargetPath>%(Filename)%(Extension)</TargetPath>
214215
</PackagingOutputs>
215-
</ItemGroup>
216+
</ItemGroup> -->
216217
<!-- **END TERMINAL CONNECTION HACK** -->
217218

218219
<!-- Same thing again here, with WindowsTerminal.exe -->
219-
<ItemGroup>
220+
<!-- <ItemGroup>
220221
<_WindowsTerminalExe Include="$(OpenConsoleCommonOutDir)\WindowsTerminal\*.exe" />
221222
222223
<PackagingOutputs Include="@(_WindowsTerminalExe)">
223224
<ProjectName>$(ProjectName)</ProjectName>
224225
<OutputGroup>BuiltProjectOutputGroup</OutputGroup>
225226
<TargetPath>%(Filename)%(Extension)</TargetPath>
226227
</PackagingOutputs>
227-
</ItemGroup>
228+
</ItemGroup> -->
228229
</Target>
229230

230-
231-
232-
233-
234231
<Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
235-
<Import Project="..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets" Condition="Exists('..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets')" />
232+
<Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
233+
236234
</Project>
237235

0 commit comments

Comments
 (0)