Skip to content

Commit ac08b7c

Browse files
zadjii-msftzadjii-msft
committed
remove dead code
1 parent 9703212 commit ac08b7c

File tree

9 files changed

+123
-44
lines changed

9 files changed

+123
-44
lines changed

‎src/cascadia/TerminalApp/TerminalPage.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ namespace winrt::TerminalApp::implementation
130130
_setTitleBarContentHandlers(*this, _tabRow);
131131
}
132132

133-
// if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode)
134-
// {
135-
// _isFullscreen = true;
136-
// }
137-
138133
// Hookup our event handlers to the ShortcutActionDispatch
139134
_RegisterActionCallbacks();
140135

‎src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,13 @@
2727
<Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
2828
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
2929
<Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
30-
3130
<ItemDefinitionGroup>
3231
<ClCompile>
3332
<!-- For CLI11: It uses dynamic_cast to cast types around, which depends
3433
on being compiled with RTTI (/GR). -->
3534
<RuntimeTypeInfo>true</RuntimeTypeInfo>
3635
</ClCompile>
3736
</ItemDefinitionGroup>
38-
3937
<!-- ========================= XAML files ======================== -->
4038
<ItemGroup>
4139
<!-- HERE BE DRAGONS:
@@ -229,11 +227,10 @@
229227
<DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
230228
<SubType>Code</SubType>
231229
</Midl>
232-
<Midl Include="../Tab.idl"/>
230+
<Midl Include="../Tab.idl" />
233231
</ItemGroup>
234232
<!-- ========================= Misc Files ======================== -->
235233
<ItemGroup>
236-
<PRIResource Include="..\Resources\*\Resources.resw" />
237234
<None Include="../packages.config" />
238235
</ItemGroup>
239236
<!-- ========================= Project References ======================== -->
@@ -287,6 +284,9 @@
287284
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
288285
</Reference>
289286
</ItemGroup>
287+
<ItemGroup>
288+
<PRIResource Include="..\Resources\en-US\Resources.resw" />
289+
</ItemGroup>
290290
<!-- ====================== Compiler & Linker Flags ===================== -->
291291
<ItemDefinitionGroup>
292292
<ClCompile>
@@ -301,7 +301,6 @@
301301
</ItemDefinitionGroup>
302302
<!-- ========================= Globals ======================== -->
303303
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
304-
305304
<Import Project="..\..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
306305
<Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
307306
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -311,7 +310,6 @@
311310
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
312311
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
313312
</Target>
314-
315313
<!--
316314
By default, the PRI file will contain resource paths beginning with the
317315
project name. Since we enabled XBF embedding, this *also* includes App.xbf.
@@ -345,4 +343,4 @@
345343
<Target Name="_TerminalAppGenerateUserSettingsH" Inputs="..\userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile">
346344
<Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" />
347345
</Target>
348-
</Project>
346+
</Project>

‎src/cascadia/TerminalConnection/TerminalConnection.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<Midl Include="TelnetConnection.idl" />
6060
</ItemGroup>
6161
<ItemGroup>
62-
<PRIResource Include="Resources\*\Resources.resw" />
6362
<None Include="packages.config" />
6463
</ItemGroup>
6564
<!-- ========================= Project References ======================== -->
@@ -80,6 +79,9 @@
8079
<Project>{58a03bb2-df5a-4b66-91a0-7ef3ba01269a}</Project>
8180
</ProjectReference>
8281
</ItemGroup>
82+
<ItemGroup>
83+
<PRIResource Include="Resources\en-US\Resources.resw" />
84+
</ItemGroup>
8385
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
8486
<Import Project="..\..\..\packages\vcpkg-cpprestsdk.2.10.14\build\native\vcpkg-cpprestsdk.targets" Condition="Exists('..\..\..\packages\vcpkg-cpprestsdk.2.10.14\build\native\vcpkg-cpprestsdk.targets')" />
8587
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -95,4 +97,4 @@
9597
</Link>
9698
</ItemDefinitionGroup>
9799
<Import Project="..\..\..\packages\vcpkg-telnetpp.1.0.1\build\native\vcpkg-telnetpp.targets" Condition="Exists('..\..\..\packages\vcpkg-telnetpp.1.0.1\build\native\vcpkg-telnetpp.targets')" />
98-
</Project>
100+
</Project>

‎src/cascadia/TerminalControl/TerminalControl.vcxproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
projects compile properly when they depend on this "Microsoft.winmd."
2020
-->
2121
<CppWinRTNamespaceMergeDepth>3</CppWinRTNamespaceMergeDepth>
22-
2322
<!--
2423
DON'T REDIRECT OUR OUTPUT.
2524
Setting this will tell cppwinrt.build.post.props to copy our output from
@@ -28,10 +27,8 @@
2827
<NoOutputRedirection>true</NoOutputRedirection>
2928
<XamlComponentResourceLocation>nested</XamlComponentResourceLocation>
3029
</PropertyGroup>
31-
3230
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
3331
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
34-
3532
<ItemGroup>
3633
<ClInclude Include="pch.h" />
3734
<ClInclude Include="SearchBoxControl.h">
@@ -85,9 +82,6 @@
8582
<None Include="packages.config" />
8683
<None Include="TerminalControl.def" />
8784
</ItemGroup>
88-
<ItemGroup>
89-
<PRIResource Include="Resources\*\Resources.resw" />
90-
</ItemGroup>
9185
<!-- ========================= Project References ======================== -->
9286
<ItemGroup>
9387
<ProjectReference Include="..\..\types\lib\types.vcxproj" />
@@ -122,9 +116,10 @@
122116
<SubType>Designer</SubType>
123117
</Page>
124118
</ItemGroup>
125-
119+
<ItemGroup>
120+
<PRIResource Include="Resources\en-US\Resources.resw" />
121+
</ItemGroup>
126122
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
127-
128123
<ItemDefinitionGroup>
129124
<Link>
130125
<AdditionalDependencies>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)</AdditionalDependencies>
@@ -133,4 +128,4 @@
133128
<AdditionalIncludeDirectories>$(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134129
</ClCompile>
135130
</ItemDefinitionGroup>
136-
</Project>
131+
</Project>

‎src/cascadia/WindowsTerminal/IslandWindow.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,6 @@ void IslandWindow::_HandleCreateWindow(const WPARAM, const LPARAM lParam) noexce
145145
ShowWindow(_window.get(), nCmdShow);
146146

147147
UpdateWindow(_window.get());
148-
149-
// if (launchMode == winrt::TerminalApp::LaunchMode::FullscreenMode)
150-
// {
151-
// _SetIsFullscreen(true);
152-
// }
153148
}
154149

155150
// Method Description:

‎src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,6 @@ void NonClientIslandWindow::Initialize()
210210
// then make sure to update it's visual state to reflect if we're in the
211211
// maximized state on launch.
212212
_titlebar.Loaded([this](auto&&, auto&&) { _OnMaximizeChange(); });
213-
214-
// _titlebar.Visibility(!_fullscreen ? Visibility::Visible : Visibility::Collapsed);
215213
}
216214

217215
// Method Description:

‎src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<!-- Resources -->
124124
<!-- This resw only defines things that are used in this package's AppxManifest,
125125
so it's not in the common resource items. -->
126-
<PRIResource Include="Resources\*\Resources.resw" />
126+
<PRIResource Include="Resources\en-US\Resources.resw" />
127127
<PRIResource Include="Resources\Resources.resw" />
128128
<PRIResource Include="Resources\Resources.devicefamily-core.resw" />
129129
</ItemGroup>
@@ -173,4 +173,4 @@
173173
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props'))" />
174174
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
175175
</Target>
176-
</Project>
176+
</Project>

‎src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters‎

Lines changed: 93 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,106 @@
1313
<ItemGroup>
1414
<None Include="PropertySheet.props" />
1515
<None Include="packages.config" />
16+
<None Include="@(Content)" />
17+
<None Include="@(Content)" />
18+
<None Include="@(Content)" />
19+
<None Include="@(Content)" />
20+
<None Include="@(Content)" />
21+
<None Include="@(Content)" />
22+
<None Include="@(Content)" />
23+
<None Include="@(Content)" />
24+
<None Include="@(Content)" />
25+
<None Include="@(Content)" />
26+
<None Include="@(Content)" />
27+
<None Include="@(Content)" />
28+
<None Include="@(Content)" />
29+
<None Include="@(Content)" />
30+
<None Include="@(Content)" />
31+
<None Include="@(Content)" />
32+
<None Include="@(Content)" />
33+
<None Include="@(Content)" />
34+
<None Include="@(Content)" />
35+
<None Include="@(Content)" />
36+
<None Include="@(Content)" />
37+
<None Include="@(Content)" />
38+
<None Include="@(Content)" />
39+
<None Include="@(Content)" />
40+
<None Include="@(Content)" />
41+
<None Include="@(Content)" />
42+
<None Include="@(Content)" />
43+
<None Include="@(Content)" />
44+
<None Include="@(Content)" />
45+
<None Include="@(Content)" />
46+
<None Include="@(Content)" />
47+
<None Include="@(Content)" />
48+
<None Include="@(Content)" />
49+
<None Include="@(Content)" />
50+
<None Include="@(Content)" />
51+
<None Include="@(Content)" />
52+
<None Include="@(Content)" />
53+
<None Include="@(Content)" />
54+
<None Include="@(Content)" />
55+
<None Include="@(Content)" />
56+
<None Include="@(Content)" />
57+
<None Include="@(Content)" />
58+
<None Include="@(Content)" />
59+
<None Include="@(Content)" />
60+
<None Include="@(Content)" />
61+
<None Include="@(Content)" />
62+
<None Include="@(Content)" />
63+
<None Include="@(Content)" />
64+
<None Include="@(Content)" />
65+
<None Include="@(Content)" />
66+
<None Include="@(Content)" />
67+
<None Include="@(Content)" />
68+
<None Include="@(Content)" />
69+
<None Include="@(Content)" />
70+
<None Include="@(Content)" />
71+
<None Include="@(Content)" />
72+
<None Include="@(Content)" />
73+
<None Include="@(Content)" />
74+
<None Include="@(Content)" />
75+
<None Include="@(Content)" />
76+
<None Include="@(Content)" />
77+
<None Include="@(Content)" />
78+
<None Include="@(Content)" />
79+
<None Include="@(Content)" />
80+
<None Include="@(Content)" />
81+
<None Include="@(Content)" />
82+
<None Include="@(Content)" />
83+
<None Include="@(Content)" />
84+
<None Include="@(Content)" />
85+
<None Include="@(Content)" />
86+
<None Include="@(Content)" />
87+
<None Include="@(Content)" />
88+
<None Include="@(Content)" />
89+
<None Include="@(Content)" />
90+
<None Include="@(Content)" />
91+
<None Include="@(Content)" />
92+
<None Include="@(Content)" />
93+
<None Include="@(Content)" />
94+
<None Include="@(Content)" />
95+
<None Include="@(Content)" />
96+
<None Include="@(Content)" />
97+
<None Include="@(Content)" />
98+
<None Include="@(Content)" />
99+
<None Include="@(Content)" />
100+
<None Include="@(Content)" />
101+
<None Include="@(Content)" />
102+
<None Include="@(Content)" />
103+
<None Include="@(Content)" />
104+
<None Include="@(Content)" />
105+
<None Include="@(Content)" />
16106
</ItemGroup>
17107
<ItemGroup>
18108
<Filter Include="Resources">
19109
<UniqueIdentifier>{4718a03b-f768-4d96-9106-096573a315a3}</UniqueIdentifier>
20110
</Filter>
21111
</ItemGroup>
22112
<ItemGroup>
23-
<PRIResource Include="Resources.devicefamily-core.resw">
24-
<Filter>Resources</Filter>
25-
</PRIResource>
26-
<PRIResource Include="Resources\*\Resources.resw">
27-
<Filter>Resources</Filter>
28-
</PRIResource>
29-
<PRIResource Include="Resources.resw">
30-
<Filter>Resources</Filter>
31-
</PRIResource>
113+
<PRIResource Include="Resources\en-US\Resources.resw" />
114+
<PRIResource Include="Resources\Resources.resw" />
115+
<PRIResource Include="Resources\Resources.devicefamily-core.resw" />
32116
</ItemGroup>
33117
<ItemGroup>
34118
<Image Include="internal-background.png" />

‎src/dep/fmt/fmt.vcxproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,23 @@
1616
</ClCompile>
1717
</ItemDefinitionGroup>
1818
<ItemGroup>
19-
<ClCompile Include="$(SolutionDir)\oss\fmt\src\*.cc" />
19+
<ClCompile Include="..\..\..\oss\fmt\src\format.cc" />
20+
<ClCompile Include="..\..\..\oss\fmt\src\os.cc" />
2021
</ItemGroup>
2122
<ItemGroup>
22-
<ClInclude Include="$(SolutionDir)\oss\fmt\include\fmt\*.h" />
23+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\chrono.h" />
24+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\color.h" />
25+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\compile.h" />
26+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\core.h" />
27+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\format-inl.h" />
28+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\format.h" />
29+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\locale.h" />
30+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\os.h" />
31+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\ostream.h" />
32+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\posix.h" />
33+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\printf.h" />
34+
<ClInclude Include="..\..\..\oss\fmt\include\fmt\ranges.h" />
2335
</ItemGroup>
2436
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
2537
<Import Project="$(SolutionDir)src\common.build.post.props" />
26-
</Project>
38+
</Project>

0 commit comments

Comments
 (0)
⚡