Skip to content

Commit 73f7fd1

Browse files
timuniemaxkatz6
andauthored
Remove Console support in DevTools (#13920)
* Remove Console support in DevTools * Adjust breaking changes * And remove Microsoft.CodeAnalysis --------- Co-authored-by: Max Katz <[email protected]>
1 parent d44bd39 commit 73f7fd1

File tree

10 files changed

+12
-373
lines changed

10 files changed

+12
-373
lines changed

api/Avalonia.Diagnostics.nupkg.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0001</DiagnosticId>
6+
<Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/ConsoleView.xaml</Target>
7+
<Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
8+
<Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
9+
</Suppression>
10+
</Suppressions>

src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
1818
<ProjectReference Include="..\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
1919
</ItemGroup>
20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.8.0" />
23-
</ItemGroup>
2420
<Import Project="..\..\build\EmbedXaml.props" />
2521
<Import Project="..\..\build\BuildTargets.targets" />
2622
<Import Project="..\..\build\NullableEnable.props" />

src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs

Lines changed: 0 additions & 113 deletions
This file was deleted.

src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public MainViewModel(AvaloniaObject root)
6767
}
6868
});
6969
}
70-
Console = new ConsoleViewModel(UpdateConsoleContext);
7170
}
7271

7372
public bool FreezePopups
@@ -152,8 +151,6 @@ public bool ShowRenderTimeGraphOverlay
152151
public void ToggleRenderTimeGraphOverlay()
153152
=> ShowRenderTimeGraphOverlay = !ShowRenderTimeGraphOverlay;
154153

155-
public ConsoleViewModel Console { get; }
156-
157154
public ViewModelBase? Content
158155
{
159156
get { return _content; }
@@ -236,16 +233,6 @@ public string? PointerOverElementName
236233
private set => RaiseAndSetIfChanged(ref _pointerOverElementName, value);
237234
}
238235

239-
private void UpdateConsoleContext(ConsoleContext context)
240-
{
241-
context.root = _root;
242-
243-
if (Content is TreePageViewModel tree)
244-
{
245-
context.e = tree.SelectedNode?.Visual;
246-
}
247-
}
248-
249236
public void SelectControl(Control control)
250237
{
251238
var tree = Content as TreePageViewModel;

src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Setter Property="Margin" Value="10 0 -20 0"/>
2121
</Style>
2222
</UserControl.Styles>
23-
<Grid Name="rootGrid" RowDefinitions="Auto,Auto,*,Auto,0,Auto">
23+
<Grid Name="rootGrid" RowDefinitions="Auto,Auto,*,Auto,Auto">
2424
<Menu>
2525
<MenuItem Header="_File">
2626
<MenuItem Header="E_xit" Command="{Binding $parent[Window].Close}" />
@@ -56,13 +56,6 @@
5656
</MenuItem>
5757
</MenuItem>
5858
<MenuItem Header="_View">
59-
<MenuItem Header="_Console" Command="{Binding $parent[views:MainView].ToggleConsole}">
60-
<MenuItem.Icon>
61-
<CheckBox BorderThickness="0"
62-
IsChecked="{Binding Console.IsVisible}"
63-
IsEnabled="False" />
64-
</MenuItem.Icon>
65-
</MenuItem>
6659
<MenuItem Header="Control _Details">
6760
<MenuItem Header="Show Implemented Interfaces" Command="{Binding ToggleShowImplementedInterfaces}">
6861
<MenuItem.Icon>
@@ -273,13 +266,7 @@
273266
Background="{DynamicResource ThemeControlMidBrush}"
274267
IsVisible="False" />
275268

276-
<views:ConsoleView Name="console"
277-
Grid.Row="4"
278-
DataContext="{Binding Console}"
279-
IsVisible="{Binding IsVisible}" />
280-
281-
282-
<Border Grid.Row="5"
269+
<Border Grid.Row="4"
283270
BorderBrush="{DynamicResource ThemeControlMidBrush}"
284271
BorderThickness="0,1,0,0">
285272
<Grid ColumnDefinitions="*, Auto">

0 commit comments

Comments
 (0)