icsharpcode/ILSpy
1
0
Fork 0
mirror of https://github.com/icsharpcode/ILSpy.git synced 2026-10-12 02:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3779 from icsharpcode/reduce-api-diff

Browse Source 
Reduce public API diff against release/10.1
This commit is contained in:
Siegfried Pammer
2026-06-12 21:36:57 +02:00
committed by GitHub
parent 83879c4a07 2fd170ce77
commit efcf0149be
568 changed files with 1916 additions and 1918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ILSpy.ReadyToRun/ReadyToRunDisassembler.cs
+1 -1
View File
@@ -30,7 +30,7 @@ using ICSharpCode.Decompiler.Metadata;
using ILCompiler.Reflection.ReadyToRun;
using ILCompiler.Reflection.ReadyToRun.Amd64;
using ILSpy;
using ICSharpCode.ILSpy;
namespace ICSharpCode.ILSpy.ReadyToRun
{
ILSpy.ReadyToRun/ReadyToRunLanguage.cs
+2 -2
View File
@@ -42,8 +42,8 @@ using ICSharpCode.ILSpyX;
using ILCompiler.Reflection.ReadyToRun;
using ILSpy;
using ILSpy.Languages;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.Languages;
using MetadataReader = System.Reflection.Metadata.MetadataReader;
ILSpy.ReadyToRun/ReadyToRunOptionsViewModel.cs
+2 -2
View File
@@ -21,8 +21,8 @@ using System.Xml.Linq;
using CommunityToolkit.Mvvm.ComponentModel;
using ILSpy;
using ILSpy.Options;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.Options;
namespace ICSharpCode.ILSpy.ReadyToRun
{
ILSpy.Tests.Windows/ImageList/ImageListDecoderTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@ using System.Windows.Forms;
using AwesomeAssertions;
using ILSpy.ImageList;
using ICSharpCode.ILSpy.ImageList;
using NUnit.Framework;
ILSpy.Tests.Windows/ImageList/ImageListResourceEntryNodeTests.cs
+7 -7
View File
@@ -28,13 +28,13 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.ImageList;
using ILSpy.Languages;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.ImageList;
using ICSharpCode.ILSpy.Languages;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests.Windows/OpenFromGacDialogTests.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace ICSharpCode.ILSpy.Tests.Windows;
/// <summary>
/// Smoke test for the Windows-conditional GAC enumeration path used by
/// <c>ILSpy.Views.OpenFromGacDialog</c>. The shared
/// <c>ICSharpCode.ILSpy.Views.OpenFromGacDialog</c>. The shared
/// <see cref="UniversalAssemblyResolver.EnumerateGac"/> only returns entries when run
/// on Windows with a populated GAC; this test validates the project plumbing more than
/// the GAC contents — i.e. the call returns without throwing and the project compiles
ILSpy.Tests.Windows/ReservedFileSystemNameTests.cs
+1 -1
View File
@@ -24,7 +24,7 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.CSharp.ProjectDecompiler;
using ILSpy.Commands;
using ICSharpCode.ILSpy.Commands;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzeContextMenuTests.cs
+11 -11
View File
@@ -27,13 +27,13 @@ using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -137,7 +137,7 @@ public class AnalyzeContextMenuTests
var (window, vm) = await TestHarness.BootAsync();
var pane = await window.WaitForComponent<global::ILSpy.AssemblyTree.AssemblyListPane>();
var pane = await window.WaitForComponent<ICSharpCode.ILSpy.AssemblyTree.AssemblyListPane>();
var typeNode = vm.AssemblyTreeModel.FindNode<TypeTreeNode>(
"System.Linq", "System.Linq", "System.Linq.Enumerable");
vm.AssemblyTreeModel.SelectNode(typeNode);
@@ -146,7 +146,7 @@ public class AnalyzeContextMenuTests
var analyzerVm = AppComposition.Current.GetExport<AnalyzerTreeViewModel>();
var beforeCount = analyzerVm.Root.Children.Count;
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.RaiseEvent(new global::Avalonia.Input.KeyEventArgs {
Key = global::Avalonia.Input.Key.R,
KeyModifiers = global::Avalonia.Input.KeyModifiers.Control,
@@ -168,7 +168,7 @@ public class AnalyzeContextMenuTests
var (_, vm) = await TestHarness.BootAsync();
var dockWorkspace = AppComposition.Current.GetExport<global::ILSpy.Docking.DockWorkspace>();
var dockWorkspace = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Docking.DockWorkspace>();
var analyzerVm = AppComposition.Current.GetExport<AnalyzerTreeViewModel>();
var entry = AppComposition.Current.GetExport<ContextMenuEntryRegistry>()
.GetEntry(nameof(Resources.Analyze));
@@ -238,7 +238,7 @@ public class AnalyzeContextMenuTests
}
}
static AnalyzerTreeViewModel? FindAnalyzerPane(global::ILSpy.Docking.DockWorkspace dockWorkspace)
static AnalyzerTreeViewModel? FindAnalyzerPane(ICSharpCode.ILSpy.Docking.DockWorkspace dockWorkspace)
{
foreach (var dockable in WalkDockables(dockWorkspace.Layout))
{
ILSpy.Tests/Analyzers/AnalyzedMethodTreeNodeTests.cs
+6 -6
View File
@@ -25,12 +25,12 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ILSpy.Analyzers;
using ILSpy.Analyzers.TreeNodes;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.Analyzers.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzedTypeTreeNodeTests.cs
+6 -6
View File
@@ -26,12 +26,12 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpyX;
using ILSpy.Analyzers;
using ILSpy.Analyzers.TreeNodes;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.Analyzers.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerAutoExpandTests.cs
+3 -3
View File
@@ -24,9 +24,9 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerConstructorUsesTests.cs
+7 -7
View File
@@ -27,11 +27,11 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpyX.Analyzers;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -76,7 +76,7 @@ public class AnalyzerConstructorUsesTests
var assemblyList = vm.AssemblyTreeModel.AssemblyList!;
var context = new AnalyzerContext {
CancellationToken = CancellationToken.None,
Language = AppComposition.Current.GetExport<global::ILSpy.Languages.LanguageService>().CurrentLanguage,
Language = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Languages.LanguageService>().CurrentLanguage,
AssemblyList = assemblyList,
};
var results = analyzer.Analyze(ctor, context).Take(20).ToList();
@@ -107,7 +107,7 @@ public class AnalyzerConstructorUsesTests
var assemblyList = vm.AssemblyTreeModel.AssemblyList!;
var context = new AnalyzerContext {
CancellationToken = CancellationToken.None,
Language = AppComposition.Current.GetExport<global::ILSpy.Languages.LanguageService>().CurrentLanguage,
Language = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Languages.LanguageService>().CurrentLanguage,
AssemblyList = assemblyList,
};
var results = analyzer.Analyze(ctor, context).Take(20).ToList();
ILSpy.Tests/Analyzers/AnalyzerErrorDisplayTests.cs
+6 -6
View File
@@ -27,12 +27,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerNavigationTests.cs
+5 -5
View File
@@ -26,11 +26,11 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using ILSpy.Analyzers.TreeNodes;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Analyzers.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerPaneCopyResultsTests.cs
+6 -6
View File
@@ -25,12 +25,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerPaneRemoveTests.cs
+6 -6
View File
@@ -25,12 +25,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerPaneVisibilityTests.cs
+6 -6
View File
@@ -26,9 +26,9 @@ using AwesomeAssertions;
using Dock.Model.Core;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using NUnit.Framework;
@@ -88,10 +88,10 @@ public class AnalyzerPaneVisibilityTests
var (_, vm) = await TestHarness.BootAsync(3);
var dockWorkspace = AppComposition.Current.GetExport<DockWorkspace>();
var analyzer = AppComposition.Current.GetExport<AnalyzerTreeViewModel>();
var search = AppComposition.Current.GetExport<global::ILSpy.Search.SearchPaneModel>();
var search = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Search.SearchPaneModel>();
var paneIds = AllDockables(dockWorkspace.Layout)
.OfType<global::ILSpy.ViewModels.ToolPaneModel>()
.OfType<ICSharpCode.ILSpy.ViewModels.ToolPaneModel>()
.Select(p => p.Id)
.ToList();
paneIds.Should().Contain("AssemblyTree", "the assembly-tree pane is visible by default");
@@ -99,7 +99,7 @@ public class AnalyzerPaneVisibilityTests
paneIds.Should().NotContain("Analyzer", "Analyzer is hidden until invoked");
// ...but showing one materialises it into its home location.
dockWorkspace.ShowToolPane(global::ILSpy.Search.SearchPaneModel.PaneContentId);
dockWorkspace.ShowToolPane(ICSharpCode.ILSpy.Search.SearchPaneModel.PaneContentId);
AllDockables(dockWorkspace.Layout).Should().Contain(search,
"Show Search must materialise the hidden Search pane");
(search.Owner as IDock)!.Id.Should().Be("TopTools",
ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs
+8 -8
View File
@@ -26,14 +26,14 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using ILSpy.Analyzers;
using ILSpy.Analyzers.TreeNodes;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.Analyzers.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerSearchTreeNodeTests.cs
+6 -6
View File
@@ -27,12 +27,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.Analyzers;
using ILSpy.Analyzers;
using ILSpy.Analyzers.TreeNodes;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.Analyzers.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/AnalyzerTreeKeyboardTests.cs
+8 -8
View File
@@ -29,10 +29,10 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ILSpy.Analyzers;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
@@ -58,8 +58,8 @@ public class AnalyzerTreeKeyboardTests
analyzed.IsExpanded = false;
dockWorkspace.ShowToolPane(AnalyzerTreeViewModel.PaneContentId);
var view = await window.WaitForComponent<global::ILSpy.Analyzers.AnalyzerTreeView>();
var tree = await view.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var view = await window.WaitForComponent<ICSharpCode.ILSpy.Analyzers.AnalyzerTreeView>();
var tree = await view.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
tree.Focus();
Dispatcher.UIThread.RunJobs();
@@ -77,8 +77,8 @@ public class AnalyzerTreeKeyboardTests
// Analyze context-menu entry. Here a selected type lands as a node in the analyzer pane.
var (window, vm) = await TestHarness.BootAsync(3);
var analyzerVm = AppComposition.Current.GetExport<AnalyzerTreeViewModel>();
var pane = await window.WaitForComponent<global::ILSpy.AssemblyTree.AssemblyListPane>();
var tree = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var pane = await window.WaitForComponent<ICSharpCode.ILSpy.AssemblyTree.AssemblyListPane>();
var tree = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var typeNode = vm.AssemblyTreeModel.FindNode<TypeTreeNode>(
"System.Linq", "System.Linq", "System.Linq.Enumerable");
ILSpy.Tests/Analyzers/AnalyzerTreeNodeTests.cs
+6 -6
View File
@@ -26,12 +26,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.Analyzers;
using ILSpy.Analyzers;
using ILSpy.Analyzers.TreeNodes;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.Analyzers.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Analyzers/Library/MemberImplementsInterfaceAnalyzerTests.cs
+1 -1
View File
@@ -29,7 +29,7 @@ using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.Analyzers;
using ICSharpCode.ILSpyX.Analyzers.Builtin;
using ILSpy.Languages;
using ICSharpCode.ILSpy.Languages;
using NSubstitute;
ILSpy.Tests/Analyzers/Library/MethodUsesAnalyzerTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@ using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.Analyzers;
using ICSharpCode.ILSpyX.Analyzers.Builtin;
using ILSpy.Languages;
using ICSharpCode.ILSpy.Languages;
using NUnit.Framework;
ILSpy.Tests/Analyzers/Library/TypeUsedByAnalyzerTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@ using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.Analyzers;
using ICSharpCode.ILSpyX.Analyzers.Builtin;
using ILSpy.Languages;
using ICSharpCode.ILSpy.Languages;
using NUnit.Framework;
ILSpy.Tests/AppEnv/AppCompositionTests.cs
+1 -1
View File
@@ -20,7 +20,7 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ICSharpCode.ILSpy.AppEnv;
using NUnit.Framework;
ILSpy.Tests/AppEnv/CompositionErrorsTests.cs
+1 -1
View File
@@ -22,7 +22,7 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler;
using ILSpy.AppEnv;
using ICSharpCode.ILSpy.AppEnv;
using NUnit.Framework;
ILSpy.Tests/AppInitializationTests.cs
+1 -1
View File
@@ -21,7 +21,7 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy;
using ICSharpCode.ILSpy;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/AddToMainListContextMenuTests.cs
+3 -3
View File
@@ -25,9 +25,9 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/AssemblyListDecompileTests.cs
+4 -4
View File
@@ -26,10 +26,10 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Languages;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Languages;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/AssemblyTreeContextMenuTests.cs
+5 -5
View File
@@ -27,9 +27,9 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
@@ -51,7 +51,7 @@ public class AssemblyTreeContextMenuTests
// Assert — TreeGrid carries a ContextMenu. (The menu may be empty if no entries are
// registered yet; verifies only that the host is in place.)
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.ContextMenu.Should().NotBeNull();
}
@@ -77,7 +77,7 @@ public class AssemblyTreeContextMenuTests
// Act 1 — re-attach the context menu with our stub entries.
pane.AttachContextMenu(new IContextMenuEntryExport[] { export });
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var menu = grid.ContextMenu!;
// Trigger the build path the live Opening event would take.
ILSpy.Tests/AssemblyList/AssemblyTreeDragReorderTests.cs
+3 -3
View File
@@ -23,8 +23,8 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.Controls.TreeView;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Controls.TreeView;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
@@ -92,7 +92,7 @@ public class AssemblyTreeDragReorderTests
var root = (AssemblyListTreeNode)vm.AssemblyTreeModel.Root!;
var top = root.Children.OfType<AssemblyTreeNode>().ToArray();
top[0].CanDrag(new global::ICSharpCode.ILSpyX.TreeView.SharpTreeNode[] { top[0], top[1] })
top[0].CanDrag(new ICSharpCode.ILSpyX.TreeView.SharpTreeNode[] { top[0], top[1] })
.Should().BeTrue("top-level non-package assemblies are draggable");
top[0].IsExpanded = true;
ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs
+5 -5
View File
@@ -33,8 +33,8 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
@@ -61,7 +61,7 @@ public class AssemblyTreeExpanderHitboxTests
TestCapture.Step("system-linq-expanded-and-selected");
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
// Let rows realise and layout settle.
for (int i = 0; i < 8; i++)
@@ -72,7 +72,7 @@ public class AssemblyTreeExpanderHitboxTests
}
// Act — locate the expander toggle of the (expandable) assembly row.
var row = grid.GetVisualDescendants().OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>()
var row = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
.FirstOrDefault(r => RowMatches(r, assemblyNode));
row.Should().NotBeNull("the expanded assembly row must be realised");
var expander = row!.GetVisualDescendants().OfType<ToggleButton>()
@@ -110,6 +110,6 @@ public class AssemblyTreeExpanderHitboxTests
description: "clicking the enlarged expander area (below the glyph) must toggle the node");
}
static bool RowMatches(global::ILSpy.Controls.TreeView.SharpTreeViewItem row, SharpTreeNode target)
static bool RowMatches(ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem row, SharpTreeNode target)
=> ReferenceEquals(row.DataContext, target);
}
ILSpy.Tests/AssemblyList/AssemblyTreeFileDropTests.cs
+5 -5
View File
@@ -28,9 +28,9 @@ using Avalonia.Input;
using AwesomeAssertions;
using ILSpy.AssemblyTree;
using ILSpy.Controls.TreeView;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.Controls.TreeView;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
@@ -63,7 +63,7 @@ public class AssemblyTreeFileDropTests
// produce a "no" cursor and never reach our handler.
var (window, vm) = await TestHarness.BootAsync();
var pane = await window.WaitForComponent<AssemblyListPane>();
var tree = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var tree = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
DragDrop.GetAllowDrop(tree).Should().BeTrue();
}
@@ -229,7 +229,7 @@ public class AssemblyTreeFileDropTests
return path;
}
static void TryUnload(global::ICSharpCode.ILSpyX.AssemblyList list, string path)
static void TryUnload(ICSharpCode.ILSpyX.AssemblyList list, string path)
{
var match = list.GetAssemblies().FirstOrDefault(a =>
string.Equals(a.FileName, path, StringComparison.OrdinalIgnoreCase));
ILSpy.Tests/AssemblyList/AssemblyTreeSortTests.cs
+3 -3
View File
@@ -26,8 +26,8 @@ using Avalonia.Threading;
using AwesomeAssertions;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
@@ -46,7 +46,7 @@ public class AssemblyTreeSortTests
var model = vm.AssemblyTreeModel;
var list = model.AssemblyList!;
var pane = await window.WaitForComponent<AssemblyListPane>();
await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
// Open extra assemblies whose names are deliberately out of sorted order so the sort moves
// real rows around.
ILSpy.Tests/AssemblyList/AssemblyTreeTests.cs
+39 -39
View File
@@ -37,16 +37,16 @@ using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.Commands;
using ILSpy.Docking;
using ILSpy.Metadata;
using ILSpy.Metadata.CorTables;
using ILSpy.Search;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.Metadata;
using ICSharpCode.ILSpy.Metadata.CorTables;
using ICSharpCode.ILSpy.Search;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using NUnit.Framework;
@@ -89,7 +89,7 @@ public class AssemblyTreeTests
// Act — locate the realised DataGrid inside the AssemblyListPane.
var pane = await window.WaitForComponent<AssemblyListPane>();
var treeGrid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var treeGrid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
// Assert — SelectionMode is Extended.
treeGrid.SelectionMode.Should().Be(global::Avalonia.Controls.SelectionMode.Multiple,
@@ -247,14 +247,14 @@ public class AssemblyTreeTests
// Act 1 + Assert 1 — first access triggers the loading state.
var initialIcon = refNode.Icon;
initialIcon.Should().BeSameAs(global::ILSpy.Images.Images.AssemblyLoading);
initialIcon.Should().BeSameAs(ICSharpCode.ILSpy.Images.AssemblyLoading);
// Act 2 — wait for resolver to finish.
await Waiters.WaitForAsync(() =>
!ReferenceEquals(refNode.Icon, global::ILSpy.Images.Images.AssemblyLoading));
!ReferenceEquals(refNode.Icon, ICSharpCode.ILSpy.Images.AssemblyLoading));
// Assert 2 — icon settles on the resolved Assembly glyph.
refNode.Icon.Should().BeSameAs(global::ILSpy.Images.Images.Assembly);
refNode.Icon.Should().BeSameAs(ICSharpCode.ILSpy.Images.Assembly);
}
[AvaloniaTest]
@@ -371,8 +371,8 @@ public class AssemblyTreeTests
// Assert — non-null, icon is one of the two ref glyphs, label is non-empty.
((object?)memberRefNode).Should().NotBeNull(
"at least one TypeRef under System.Linq's references must have member references");
memberRefNode!.Icon.Should().BeOneOf(global::ILSpy.Images.Images.MethodReference,
global::ILSpy.Images.Images.FieldReference);
memberRefNode!.Icon.Should().BeOneOf(ICSharpCode.ILSpy.Images.MethodReference,
ICSharpCode.ILSpy.Images.FieldReference);
memberRefNode.Text.ToString().Should().NotBeNullOrWhiteSpace();
}
@@ -417,7 +417,7 @@ public class AssemblyTreeTests
// Assert — non-null, uses the ExportedType glyph, label is non-empty.
((object?)exportedNode).Should().NotBeNull(
"mscorlib must forward types to System.Private.CoreLib via ExportedType rows");
exportedNode!.Icon.Should().BeSameAs(global::ILSpy.Images.Images.ExportedType);
exportedNode!.Icon.Should().BeSameAs(ICSharpCode.ILSpy.Images.ExportedType);
exportedNode.Text.ToString().Should().NotBeNullOrWhiteSpace();
}
@@ -630,7 +630,7 @@ public class AssemblyTreeTests
}
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
vm.AssemblyTreeModel.SelectNode(enumerable);
await Waiters.WaitForAsync(() => ReferenceEquals(vm.AssemblyTreeModel.SelectedItem, enumerable));
@@ -654,7 +654,7 @@ public class AssemblyTreeTests
// Pick the bottom-most visible non-selected row — that's the strictest probe. If the
// bug regressed, CenterRowInView would scroll it up to the middle and offset would
// change.
var candidateRow = grid.GetVisualDescendants().OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>()
var candidateRow = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
.Where(r => !r.IsSelected
&& r.TranslatePoint(new Point(0, 0), scrollViewer) is { } p
&& p.Y >= 0 && p.Y + r.Bounds.Height <= scrollViewer.Viewport.Height)
@@ -707,7 +707,7 @@ public class AssemblyTreeTests
}
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
vm.AssemblyTreeModel.SelectNode(enumerable);
await Waiters.WaitForAsync(() => ReferenceEquals(vm.AssemblyTreeModel.SelectedItem, enumerable));
@@ -728,7 +728,7 @@ public class AssemblyTreeTests
"the test scenario requires the viewport be parked mid-list");
// Pick the bottom-most fully-visible non-selected row -- the strictest probe for an unwanted recentre.
var candidateRow = grid.GetVisualDescendants().OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>()
var candidateRow = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
.Where(r => !r.IsSelected
&& r.TranslatePoint(new Point(0, 0), scrollViewer) is { } p
&& p.Y >= 0 && p.Y + r.Bounds.Height <= scrollViewer.Viewport.Height)
@@ -774,7 +774,7 @@ public class AssemblyTreeTests
t.Expand();
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var scrollViewer = await grid.WaitForComponent<ScrollViewer>();
// Select + reveal the type, then let it settle on screen.
@@ -862,7 +862,7 @@ public class AssemblyTreeTests
// Act — invoke SaveCodeAsync with a temp path (bypassing the file picker so the test
// is deterministic).
var registry = AppComposition.Current.GetExport<MainMenuCommandRegistry>();
var saveCmd = (global::ILSpy.Commands.SaveCommand)registry.Commands
var saveCmd = (ICSharpCode.ILSpy.Commands.SaveCommand)registry.Commands
.Single(c => c.Metadata.Header == nameof(Resources._SaveCode))
.CreateExport().Value;
@@ -907,7 +907,7 @@ public class AssemblyTreeTests
TestCapture.Step("sacrificial-selected");
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.Focus();
Dispatcher.UIThread.RunJobs();
@@ -956,7 +956,7 @@ public class AssemblyTreeTests
await Waiters.WaitForAsync(() => ReferenceEquals(model.SelectedItem, firstAssembly));
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.Focus();
Dispatcher.UIThread.RunJobs();
@@ -987,7 +987,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var model = vm.AssemblyTreeModel;
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.Focus();
Dispatcher.UIThread.RunJobs();
@@ -1024,7 +1024,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var model = vm.AssemblyTreeModel;
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.Focus();
Dispatcher.UIThread.RunJobs();
@@ -1051,7 +1051,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var model = vm.AssemblyTreeModel;
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.Focus();
Dispatcher.UIThread.RunJobs();
@@ -1083,7 +1083,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var model = vm.AssemblyTreeModel;
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.Focus();
Dispatcher.UIThread.RunJobs();
@@ -1122,7 +1122,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var model = vm.AssemblyTreeModel;
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.Focus();
Dispatcher.UIThread.RunJobs();
@@ -1229,7 +1229,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var assemblyNode = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
assemblyNode.IsExpanded.Should().BeFalse("baseline: top-level assembly rows start collapsed");
@@ -1350,7 +1350,7 @@ public class AssemblyTreeTests
// Second metadata view via the new-tab carve-out — pick a different table so the
// content is unmistakable.
var methodTableNode = tablesNode.Children
.OfType<global::ILSpy.Metadata.CorTables.MethodTableTreeNode>().Single();
.OfType<ICSharpCode.ILSpy.Metadata.CorTables.MethodTableTreeNode>().Single();
vm.DockWorkspace.OpenNodeInNewTab(methodTableNode);
await Waiters.WaitForAsync(
@@ -1431,12 +1431,12 @@ public class AssemblyTreeTests
var settings = AppComposition.Current.GetExport<SettingsService>()
.SessionSettings.LanguageSettings;
settings.ShowApiLevel = global::ICSharpCode.ILSpyX.ApiVisibility.PublicOnly;
((int)getter.Filter(settings)).Should().Be((int)global::ILSpy.TreeNodes.FilterResult.Hidden,
settings.ShowApiLevel = ICSharpCode.ILSpyX.ApiVisibility.PublicOnly;
((int)getter.Filter(settings)).Should().Be((int)ICSharpCode.ILSpy.TreeNodes.FilterResult.Hidden,
"property accessors must be hidden by default — only ShowAll surfaces them");
settings.ShowApiLevel = global::ICSharpCode.ILSpyX.ApiVisibility.All;
((int)getter.Filter(settings)).Should().NotBe((int)global::ILSpy.TreeNodes.FilterResult.Hidden,
settings.ShowApiLevel = ICSharpCode.ILSpyX.ApiVisibility.All;
((int)getter.Filter(settings)).Should().NotBe((int)ICSharpCode.ILSpy.TreeNodes.FilterResult.Hidden,
"flipping to ShowAll must let accessors through");
}
@@ -1678,7 +1678,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.UpdateLayout();
var topLevelCount = vm.AssemblyTreeModel.Root!.Children.Count;
@@ -1725,7 +1725,7 @@ public class AssemblyTreeTests
var (window, vm) = await TestHarness.BootAsync(3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
grid.UpdateLayout();
var topLevelCount = vm.AssemblyTreeModel.Root!.Children.Count;
@@ -1739,7 +1739,7 @@ public class AssemblyTreeTests
TestCapture.Step("all-rows-selected");
// Act — plain left-click on the second visible row.
var targetRow = grid.GetVisualDescendants().OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>()
var targetRow = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
.OrderBy(r => r.TranslatePoint(new Point(0, 0), grid)?.Y ?? double.MaxValue)
.Skip(1).First();
var targetNode = targetRow.DataContext as SharpTreeNode;
ILSpy.Tests/AssemblyList/DefaultAssemblyListTests.cs
+2 -2
View File
@@ -26,8 +26,8 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX;
using ILSpy;
using ILSpy.AppEnv;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/DropSelectionBatchingTests.cs
+3 -3
View File
@@ -25,9 +25,9 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ILSpy.Views;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Views;
using Avalonia.Headless.NUnit;
ILSpy.Tests/AssemblyList/FindTreeNodeReferenceTests.cs
+1 -1
View File
@@ -22,7 +22,7 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/ManageAssemblyListsButtonStateTests.cs
+3 -3
View File
@@ -24,9 +24,9 @@ using Avalonia.Threading;
using AwesomeAssertions;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/ManageAssemblyListsSelectTests.cs
+3 -3
View File
@@ -23,9 +23,9 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/PreconfiguredAssemblyListTests.cs
+3 -3
View File
@@ -24,9 +24,9 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/ReloadAssemblyContextMenuTests.cs
+5 -5
View File
@@ -28,11 +28,11 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/RemoveAssemblyContextMenuTests.cs
+5 -5
View File
@@ -29,11 +29,11 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/ShowMetadataTokensTests.cs
+3 -3
View File
@@ -24,9 +24,9 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/TreeViewSettingsLiveReactivityTests.cs
+3 -3
View File
@@ -26,9 +26,9 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs
+5 -5
View File
@@ -26,10 +26,10 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
@@ -52,7 +52,7 @@ public class UseNestedNamespaceNodesGridVerification
var (window, vm) = await TestHarness.BootAsync(3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
// Expand an assembly so its namespace children become visible rows.
var assemblyNode = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs
+3 -3
View File
@@ -23,9 +23,9 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesScreenshot.cs
+3 -3
View File
@@ -23,9 +23,9 @@ using Avalonia.Headless;
using Avalonia.Headless.NUnit;
using Avalonia.Threading;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs
+3 -3
View File
@@ -23,9 +23,9 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/AssemblyTree/AssemblyTreeModelTests.cs
+3 -3
View File
@@ -22,8 +22,8 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using NUnit.Framework;
@@ -41,7 +41,7 @@ public class AssemblyTreeModelTests
public void Initialize_populates_AssemblyList_and_Root()
{
var model = AppComposition.Current.GetExport<AssemblyTreeModel>();
model.Should().NotBeNull("AssemblyTreeModel is [Export][Shared] in ILSpy.AssemblyTree.");
model.Should().NotBeNull("AssemblyTreeModel is [Export][Shared] in ICSharpCode.ILSpy.AssemblyTree.");
model.Initialize();
ILSpy.Tests/AssemblyTree/StartupAboutWelcomeTests.cs
+6 -6
View File
@@ -26,12 +26,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.Docking;
using ILSpy.TextView;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Commands/ClearAssemblyListCommandTests.cs
+2 -2
View File
@@ -26,8 +26,8 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using NUnit.Framework;
ILSpy.Tests/Commands/CommandLineArgumentsTests.cs
+5 -5
View File
@@ -22,11 +22,11 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ILSpy.Languages;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Languages;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Commands/GeneratePdbCommandTests.cs
+3 -3
View File
@@ -24,9 +24,9 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/Commands/HelpCommandTests.cs
+8 -8
View File
@@ -28,14 +28,14 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.Docking;
using ILSpy.Navigation;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.Navigation;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Commands/SaveCodeFallbackTests.cs
+4 -4
View File
@@ -24,10 +24,10 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.Languages;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Languages;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/Commands/SaveCommandEnablementTests.cs
+2 -2
View File
@@ -26,8 +26,8 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using NUnit.Framework;
ILSpy.Tests/Commands/SuggestedFileNameTests.cs
+1 -1
View File
@@ -18,7 +18,7 @@
using AwesomeAssertions;
using ILSpy.Commands;
using ICSharpCode.ILSpy.Commands;
using NUnit.Framework;
ILSpy.Tests/Compare/CompareContextMenuTests.cs
+11 -11
View File
@@ -25,13 +25,13 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.Compare;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Compare;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -53,7 +53,7 @@ public class CompareContextMenuTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 2);
var entry = AppComposition.Current.GetExport<global::ILSpy.ContextMenuEntryRegistry>()
var entry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.ContextMenuEntryRegistry>()
.Entries.Single(e => e.Metadata.Header == "Compare...").Value;
var assemblies = vm.AssemblyTreeModel.AssemblyList!.GetAssemblies()
.Where(a => a.IsLoadedAsValidAssembly).Take(2).ToList();
@@ -73,7 +73,7 @@ public class CompareContextMenuTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1);
var entry = AppComposition.Current.GetExport<global::ILSpy.ContextMenuEntryRegistry>()
var entry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.ContextMenuEntryRegistry>()
.Entries.Single(e => e.Metadata.Header == "Compare...").Value;
var coreLibName = typeof(object).Assembly.GetName().Name!;
var node = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>(coreLibName);
@@ -91,9 +91,9 @@ public class CompareContextMenuTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 2);
var entry = AppComposition.Current.GetExport<global::ILSpy.ContextMenuEntryRegistry>()
var entry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.ContextMenuEntryRegistry>()
.Entries.Single(e => e.Metadata.Header == "Compare...").Value;
var dockWorkspace = AppComposition.Current.GetExport<global::ILSpy.Docking.DockWorkspace>();
var dockWorkspace = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Docking.DockWorkspace>();
var assemblies = vm.AssemblyTreeModel.AssemblyList!.GetAssemblies()
.Where(a => a.IsLoadedAsValidAssembly).Take(2).ToList();
var nodes = assemblies.Select(a =>
ILSpy.Tests/Compare/CompareEngineTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ILSpy.Compare;
using ICSharpCode.ILSpy.Compare;
using NUnit.Framework;
ILSpy.Tests/Compare/CompareViewRenderTests.cs
+9 -9
View File
@@ -27,13 +27,13 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.Compare;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Compare;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -56,7 +56,7 @@ public class CompareViewRenderTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 2);
var entry = AppComposition.Current.GetExport<global::ILSpy.ContextMenuEntryRegistry>()
var entry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.ContextMenuEntryRegistry>()
.Entries.Single(e => e.Metadata.Header == "Compare...").Value;
var assemblies = new[] {
await vm.OpenFixtureAsync("FixtureA"),
@@ -84,7 +84,7 @@ public class CompareViewRenderTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 2);
var entry = AppComposition.Current.GetExport<global::ILSpy.ContextMenuEntryRegistry>()
var entry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.ContextMenuEntryRegistry>()
.Entries.Single(e => e.Metadata.Header == "Compare...").Value;
var assemblies = new[] {
await vm.OpenFixtureAsync("FixtureA"),
ILSpy.Tests/ContextMenus/ContextMenuFrameworkTests.cs
+1 -1
View File
@@ -25,7 +25,7 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy;
using ICSharpCode.ILSpy;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/CopyFullyQualifiedNameTests.cs
+6 -6
View File
@@ -26,12 +26,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/CreateDiagramContextMenuTests.cs
+6 -6
View File
@@ -25,12 +25,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/DecompileInNewViewTests.cs
+28 -28
View File
@@ -33,15 +33,15 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.Commands;
using ILSpy.Docking;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -172,7 +172,7 @@ public class DecompileInNewViewTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var nodeA = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
var nodeB = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>(TreeNavigation.CoreLibName);
@@ -188,7 +188,7 @@ public class DecompileInNewViewTests
await Task.Delay(25);
}
var rowB = grid.GetVisualDescendants().OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>()
var rowB = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
.FirstOrDefault(r => RowNodeEquals(r, nodeB));
rowB.Should().NotBeNull("the top-level CoreLib row must be realised");
@@ -230,7 +230,7 @@ public class DecompileInNewViewTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var assemblies = vm.AssemblyTreeModel.Root!.Children.OfType<AssemblyTreeNode>().Take(3).ToArray();
assemblies.Length.Should().BeGreaterThanOrEqualTo(3, "need three top-level rows to click");
@@ -246,8 +246,8 @@ public class DecompileInNewViewTests
await Task.Delay(25);
}
global::ILSpy.Controls.TreeView.SharpTreeViewItem Row(SharpTreeNode node) => grid.GetVisualDescendants()
.OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>()
ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem Row(SharpTreeNode node) => grid.GetVisualDescendants()
.OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
.First(r => RowNodeEquals(r, node));
async Task RightClick(SharpTreeNode node)
@@ -296,7 +296,7 @@ public class DecompileInNewViewTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var nodeA = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
var nodeB = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>(TreeNavigation.CoreLibName);
@@ -308,7 +308,7 @@ public class DecompileInNewViewTests
await Task.Delay(25);
}
var rowB = grid.GetVisualDescendants().OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>()
var rowB = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
.First(r => RowNodeEquals(r, nodeB));
int tabsBefore = vm.DockWorkspace.Documents!.VisibleDockables!.OfType<ContentTabPage>().Count();
@@ -342,7 +342,7 @@ public class DecompileInNewViewTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var nodeA = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
var nodeB = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>(TreeNavigation.CoreLibName);
@@ -388,7 +388,7 @@ public class DecompileInNewViewTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var assemblies = vm.AssemblyTreeModel.Root!.Children.OfType<AssemblyTreeNode>().Take(3).ToArray();
assemblies.Length.Should().BeGreaterThanOrEqualTo(3, "need three top-level rows");
@@ -441,7 +441,7 @@ public class DecompileInNewViewTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var documents = ((ILSpyDockFactory)vm.DockWorkspace.Factory).Documents!;
var assemblies = vm.AssemblyTreeModel.Root!.Children.OfType<AssemblyTreeNode>().Take(3).ToArray();
@@ -498,9 +498,9 @@ public class DecompileInNewViewTests
var registry = AppComposition.Current.GetExport<ContextMenuEntryRegistry>();
var tableNode = vm.AssemblyTreeModel.FindCoreLib()
.GetChild<global::ILSpy.Metadata.MetadataTreeNode>()
.GetChild<global::ILSpy.Metadata.MetadataTablesTreeNode>()
.GetChild<global::ILSpy.Metadata.CorTables.TypeDefTableTreeNode>();
.GetChild<ICSharpCode.ILSpy.Metadata.MetadataTreeNode>()
.GetChild<ICSharpCode.ILSpy.Metadata.MetadataTablesTreeNode>()
.GetChild<ICSharpCode.ILSpy.Metadata.CorTables.TypeDefTableTreeNode>();
var documents = ((ILSpyDockFactory)vm.DockWorkspace.Factory).Documents!;
int before = documents.VisibleDockables?.OfType<ContentTabPage>().Count() ?? 0;
@@ -511,23 +511,23 @@ public class DecompileInNewViewTests
await Waiters.WaitForAsync(
() => documents.VisibleDockables!.OfType<ContentTabPage>()
.Any(t => t.Content is global::ILSpy.ViewModels.MetadataTablePageModel));
.Any(t => t.Content is ICSharpCode.ILSpy.ViewModels.MetadataTablePageModel));
documents.VisibleDockables!.OfType<ContentTabPage>().Count()
.Should().BeGreaterThan(before, "a new tab must open");
var newTab = documents.VisibleDockables!.OfType<ContentTabPage>()
.First(t => t.Content is global::ILSpy.ViewModels.MetadataTablePageModel);
newTab.Content.Should().BeOfType<global::ILSpy.ViewModels.MetadataTablePageModel>(
.First(t => t.Content is ICSharpCode.ILSpy.ViewModels.MetadataTablePageModel);
newTab.Content.Should().BeOfType<ICSharpCode.ILSpy.ViewModels.MetadataTablePageModel>(
"the metadata-table node must open its grid page, not a decompiler tab");
}
static bool RowNodeEquals(global::ILSpy.Controls.TreeView.SharpTreeViewItem row, SharpTreeNode node)
static bool RowNodeEquals(ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem row, SharpTreeNode node)
=> ReferenceEquals(row.DataContext, node);
static SharpTreeNode? GridSelectedNode(global::ILSpy.Controls.TreeView.SharpTreeView grid)
static SharpTreeNode? GridSelectedNode(ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView grid)
=> grid.SelectedItem as SharpTreeNode;
static System.Collections.Generic.List<SharpTreeNode> GridSelectedNodes(global::ILSpy.Controls.TreeView.SharpTreeView grid)
static System.Collections.Generic.List<SharpTreeNode> GridSelectedNodes(ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView grid)
=> grid.SelectedItems!.Cast<object?>()
.OfType<SharpTreeNode>()
.ToList();
ILSpy.Tests/ContextMenus/DecompileReferenceContextMenuTests.cs
+4 -4
View File
@@ -26,10 +26,10 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.Properties;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/ExportProjectEntryTests.cs
+5 -5
View File
@@ -26,11 +26,11 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/KeyboardContextMenuFocusTests.cs
+7 -7
View File
@@ -30,11 +30,11 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -56,7 +56,7 @@ public class KeyboardContextMenuFocusTests
var vm = (MainWindowViewModel)window.DataContext!;
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1);
var pane = await window.WaitForComponent<AssemblyListPane>();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
var node = vm.AssemblyTreeModel.Root!.Children.OfType<AssemblyTreeNode>().First();
vm.AssemblyTreeModel.SelectNode(node);
@@ -68,7 +68,7 @@ public class KeyboardContextMenuFocusTests
}
var row = grid.GetVisualDescendants()
.OfType<global::ILSpy.Controls.TreeView.SharpTreeViewItem>().First();
.OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>().First();
row.Focus(NavigationMethod.Tab);
Dispatcher.UIThread.RunJobs();
ILSpy.Tests/ContextMenus/OpenContainingFolderTests.cs
+7 -7
View File
@@ -27,13 +27,13 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.Commands;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/ReferenceScopeAndNewTabTests.cs
+6 -6
View File
@@ -27,12 +27,12 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.Properties;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Search;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Search;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/SaveCodeSolutionContextMenuTests.cs
+4 -4
View File
@@ -26,10 +26,10 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/ContextMenus/SearchMsdnTests.cs
+7 -7
View File
@@ -27,13 +27,13 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.Commands;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Controls/SharpTreeViewEmptySpaceDropTests.cs
+1 -1
View File
@@ -25,7 +25,7 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using ILSpy.Controls.TreeView;
using ICSharpCode.ILSpy.Controls.TreeView;
using NUnit.Framework;
ILSpy.Tests/Controls/SharpTreeViewTests.cs
+1 -1
View File
@@ -28,7 +28,7 @@ using AwesomeAssertions;
using ICSharpCode.ILSpyX.TreeView;
using ILSpy.Controls.TreeView;
using ICSharpCode.ILSpy.Controls.TreeView;
using NUnit.Framework;
ILSpy.Tests/Diagnostics/GraphVizGraphTests.cs
+8 -8
View File
@@ -38,7 +38,7 @@ public class GraphVizGraphTests
{
// Every GraphVizGraph must start with `digraph G {` + the default `node [fontsize=16];`
// preamble. That preamble is what makes the generated DOT readable when dot renders it.
var g = new global::ILSpy.Util.GraphVizGraph();
var g = new ICSharpCode.ILSpy.Util.GraphVizGraph();
var sw = new StringWriter();
g.Save(sw);
var dot = sw.ToString();
@@ -52,8 +52,8 @@ public class GraphVizGraphTests
{
// A node emits as `<id> [label="...", shape=...]` — the box shape is what the
// CFG viewer relies on so every basic block reads as a rectangle.
var g = new global::ILSpy.Util.GraphVizGraph();
g.AddNode(new global::ILSpy.Util.GraphVizNode(42) { label = "BB.42", shape = "box" });
var g = new ICSharpCode.ILSpy.Util.GraphVizGraph();
g.AddNode(new ICSharpCode.ILSpy.Util.GraphVizNode(42) { label = "BB.42", shape = "box" });
var sw = new StringWriter();
g.Save(sw);
var dot = sw.ToString();
@@ -67,9 +67,9 @@ public class GraphVizGraphTests
{
// Successor edges have no color (rendered as black); dominator edges use green
// — that's how the CFG viewer distinguishes the two relationship overlays.
var g = new global::ILSpy.Util.GraphVizGraph();
g.AddEdge(new global::ILSpy.Util.GraphVizEdge(1, 2));
g.AddEdge(new global::ILSpy.Util.GraphVizEdge(1, 2) { color = "green" });
var g = new ICSharpCode.ILSpy.Util.GraphVizGraph();
g.AddEdge(new ICSharpCode.ILSpy.Util.GraphVizEdge(1, 2));
g.AddEdge(new ICSharpCode.ILSpy.Util.GraphVizEdge(1, 2) { color = "green" });
var sw = new StringWriter();
g.Save(sw);
var dot = sw.ToString();
@@ -82,8 +82,8 @@ public class GraphVizGraphTests
{
// A literal `"` inside a label would otherwise terminate the DOT string token
// early. The escaper turns it into `\"` so dot parses the whole label as one token.
var g = new global::ILSpy.Util.GraphVizGraph();
g.AddNode(new global::ILSpy.Util.GraphVizNode(0) { label = "a \"quoted\" label" });
var g = new ICSharpCode.ILSpy.Util.GraphVizGraph();
g.AddNode(new ICSharpCode.ILSpy.Util.GraphVizNode(0) { label = "a \"quoted\" label" });
var sw = new StringWriter();
g.Save(sw);
sw.ToString().Should().Contain("\"a \\\"quoted\\\" label\"");
ILSpy.Tests/Diagnostics/InputDiagnosticsTests.cs
+1 -1
View File
@@ -26,7 +26,7 @@ using Avalonia.Threading;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ICSharpCode.ILSpy.AppEnv;
using NUnit.Framework;
ILSpy.Tests/Diagnostics/StartupPerfTests.cs
+5 -5
View File
@@ -29,10 +29,10 @@ using Avalonia.Threading;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -125,7 +125,7 @@ public class StartupPerfTests
// (proxy for "tree is interactive").
var pane = await window.WaitForComponent<AssemblyListPane>();
var swGrid = Stopwatch.StartNew();
var grid = await pane.WaitForComponent<global::ILSpy.Controls.TreeView.SharpTreeView>();
var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
swGrid.Stop();
TestContext.Out.WriteLine($"SharpTreeView descendant available: {swGrid.ElapsedMilliseconds} ms");
ILSpy.Tests/Docking/ContentPageHierarchyTests.cs
+5 -5
View File
@@ -18,7 +18,7 @@
using AwesomeAssertions;
using ILSpy.ViewModels;
using ICSharpCode.ILSpy.ViewModels;
using NUnit.Framework;
@@ -36,10 +36,10 @@ public class ContentPageHierarchyTests
[Test]
public void All_Four_Content_Types_Derive_From_ContentPageModel()
{
typeof(global::ILSpy.TextView.DecompilerTabPageModel).Should().BeAssignableTo<ContentPageModel>();
typeof(ICSharpCode.ILSpy.TextView.DecompilerTabPageModel).Should().BeAssignableTo<ContentPageModel>();
typeof(MetadataTablePageModel).Should().BeAssignableTo<ContentPageModel>();
typeof(global::ILSpy.Compare.CompareTabPageModel).Should().BeAssignableTo<ContentPageModel>();
typeof(global::ILSpy.Options.OptionsPageModel).Should().BeAssignableTo<ContentPageModel>(
typeof(ICSharpCode.ILSpy.Compare.CompareTabPageModel).Should().BeAssignableTo<ContentPageModel>();
typeof(ICSharpCode.ILSpy.Options.OptionsPageModel).Should().BeAssignableTo<ContentPageModel>(
"OptionsPageModel must join the content hierarchy, not stay a bare ObservableObject");
}
@@ -56,7 +56,7 @@ public class ContentPageHierarchyTests
// One IsStaticContent, declared on the base -- not duck-typed across unrelated classes.
typeof(ContentPageModel).GetProperty(nameof(ContentPageModel.IsStaticContent))
.Should().NotBeNull("IsStaticContent lives on ContentPageModel");
typeof(global::ILSpy.Options.OptionsPageModel).GetProperty("IsStaticContent")!.DeclaringType
typeof(ICSharpCode.ILSpy.Options.OptionsPageModel).GetProperty("IsStaticContent")!.DeclaringType
.Should().Be(typeof(ContentPageModel), "OptionsPageModel must inherit IsStaticContent, not redeclare it");
}
}
ILSpy.Tests/Docking/DockWorkspaceTests.cs
+3 -3
View File
@@ -20,8 +20,8 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using NUnit.Framework;
@@ -38,7 +38,7 @@ public class DockWorkspaceTests
public void DockWorkspace_resolves_and_exposes_root_layout_with_three_tool_panes()
{
var workspace = AppComposition.Current.GetExport<DockWorkspace>();
workspace.Should().NotBeNull("DockWorkspace is [Export][Shared] in ILSpy.Docking.");
workspace.Should().NotBeNull("DockWorkspace is [Export][Shared] in ICSharpCode.ILSpy.Docking.");
workspace.Layout.Should().NotBeNull("ILSpyDockFactory.CreateLayout() wires the root dock in the ctor.");
workspace.Factory.Should().NotBeNull();
ILSpy.Tests/Docking/DockableViewOwnershipTests.cs
+3 -3
View File
@@ -21,9 +21,9 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.Docking;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Docking/DocumentTabContextMenuTests.cs
+7 -7
View File
@@ -24,11 +24,11 @@ using Avalonia.Threading;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ILSpy.TextView;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -63,7 +63,7 @@ public class DocumentTabContextMenuTests
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1);
var (a, _, _) = OpenThreeTabs(vm.DockWorkspace);
var menu = global::ILSpy.Themes.PreviewTabContextMenuBehavior.BuildDocumentContextMenu(a);
var menu = ICSharpCode.ILSpy.Themes.PreviewTabContextMenuBehavior.BuildDocumentContextMenu(a);
var items = menu.ItemsSource!.OfType<global::Avalonia.Controls.MenuItem>().ToList();
items.Select(m => m.Header).Should().Contain(new object[] {
@@ -92,7 +92,7 @@ public class DocumentTabContextMenuTests
await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1);
var (a, _, _) = OpenThreeTabs(vm.DockWorkspace);
var menu = global::ILSpy.Themes.PreviewTabContextMenuBehavior.BuildDocumentContextMenu(a);
var menu = ICSharpCode.ILSpy.Themes.PreviewTabContextMenuBehavior.BuildDocumentContextMenu(a);
var close = menu.ItemsSource!.OfType<global::Avalonia.Controls.MenuItem>()
.Single(m => Equals(m.Header, ICSharpCode.ILSpy.Properties.Resources.Close));
ILSpy.Tests/Docking/DocumentTabStripModeTests.cs
+5 -5
View File
@@ -34,11 +34,11 @@ using AwesomeAssertions;
using Dock.Avalonia.Controls;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TextView;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Docking/FrozenTabRefreshTests.cs
+7 -7
View File
@@ -24,13 +24,13 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ILSpy.Languages;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.Languages;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using NUnit.Framework;
ILSpy.Tests/Docking/LayoutPersistenceTests.cs
+15 -15
View File
@@ -27,9 +27,9 @@ using AwesomeAssertions;
using Dock.Model.Core;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ILSpy.ViewModels;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.ViewModels;
using NUnit.Framework;
@@ -63,7 +63,7 @@ public class LayoutPersistenceTests
var dockWorkspace = AppComposition.Current.GetExport<DockWorkspace>();
// Search is hidden by default; surface it so the round-trip covers a tool pane that
// lives in a materialised-on-demand dock, not just the assembly tree.
dockWorkspace.ShowToolPane(global::ILSpy.Search.SearchPaneModel.PaneContentId);
dockWorkspace.ShowToolPane(ICSharpCode.ILSpy.Search.SearchPaneModel.PaneContentId);
var path = Path.Combine(Path.GetTempPath(), $"ILSpy.Layout.test.{System.Guid.NewGuid():N}.json");
try
@@ -90,7 +90,7 @@ public class LayoutPersistenceTests
// non-null. Specifically: a RootDock with VisibleDockables containing the
// proportional dock tree, AND the tool panes resolved as the live singletons
// (CreateObject hook should have returned the MEF instances, not fresh ones).
var registryForRoundTrip = AppComposition.Current.GetExport<global::ILSpy.Commands.ToolPaneRegistry>();
var registryForRoundTrip = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Commands.ToolPaneRegistry>();
var roundTrip = new ILSpyDockFactory(registryForRoundTrip).LoadLayout(path);
((object?)roundTrip).Should().NotBeNull("LoadLayout must materialise the saved root dock");
var dockables = roundTrip!.VisibleDockables;
@@ -100,12 +100,12 @@ public class LayoutPersistenceTests
// Walk every dockable in the loaded tree. Every ToolPaneModel-typed entry
// must be reference-equal to the live MEF singleton — that's what proves
// the CreateObject hook fired during deserialization, not a fresh ctor.
var liveAssemblyTree = AppComposition.Current.GetExport<global::ILSpy.AssemblyTree.AssemblyTreeModel>();
var liveSearch = AppComposition.Current.GetExport<global::ILSpy.Search.SearchPaneModel>();
var liveAssemblyTree = AppComposition.Current.GetExport<ICSharpCode.ILSpy.AssemblyTree.AssemblyTreeModel>();
var liveSearch = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Search.SearchPaneModel>();
var allLoaded = Flatten(roundTrip).ToList();
allLoaded.OfType<global::ILSpy.AssemblyTree.AssemblyTreeModel>().Should().Contain(liveAssemblyTree,
allLoaded.OfType<ICSharpCode.ILSpy.AssemblyTree.AssemblyTreeModel>().Should().Contain(liveAssemblyTree,
"loaded AssemblyTreeModel must be the live MEF singleton, not a fresh instance");
allLoaded.OfType<global::ILSpy.Search.SearchPaneModel>().Should().Contain(liveSearch,
allLoaded.OfType<ICSharpCode.ILSpy.Search.SearchPaneModel>().Should().Contain(liveSearch,
"loaded SearchPaneModel must be the live MEF singleton, not a fresh instance");
}
finally
@@ -138,7 +138,7 @@ public class LayoutPersistenceTests
// Simulate the second-launch path: a NEW factory loads the saved layout
// instead of creating one. The factory MUST still expose MainTab + Documents
// so DockWorkspace can populate decompile content into them.
var registry = AppComposition.Current.GetExport<global::ILSpy.Commands.ToolPaneRegistry>();
var registry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Commands.ToolPaneRegistry>();
var factory = new ILSpyDockFactory(registry);
var loaded = factory.LoadLayout(path);
@@ -187,8 +187,8 @@ public class LayoutPersistenceTests
// Open two extra documents on top of the persistent MainTab. Content type is
// irrelevant for this test — the bug is structural, about ContentTabPage shells
// being persisted at all — so any ContentPageModel will do.
dockWorkspace.OpenNewTab(new global::ILSpy.TextView.DecompilerTabPageModel());
dockWorkspace.OpenNewTab(new global::ILSpy.TextView.DecompilerTabPageModel());
dockWorkspace.OpenNewTab(new ICSharpCode.ILSpy.TextView.DecompilerTabPageModel());
dockWorkspace.OpenNewTab(new ICSharpCode.ILSpy.TextView.DecompilerTabPageModel());
TestCapture.Step("three-document-tabs-open");
var sourceDocs = dockWorkspace.Documents!.VisibleDockables!
.OfType<ContentTabPage>().Count();
@@ -211,7 +211,7 @@ public class LayoutPersistenceTests
// Round-trip with a fresh factory. The loaded DocumentDock must contain exactly
// one ContentTabPage (the fresh MainTab repopulated by the load path); none of
// the extras may resurrect.
var registry = AppComposition.Current.GetExport<global::ILSpy.Commands.ToolPaneRegistry>();
var registry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Commands.ToolPaneRegistry>();
var factory = new ILSpyDockFactory(registry);
var loaded = factory.LoadLayout(path);
((object?)loaded).Should().NotBeNull();
@@ -238,7 +238,7 @@ public class LayoutPersistenceTests
{
// The "no saved layout yet" path on first launch. DockWorkspace falls back
// to factory.CreateLayout() when this returns null — that's the contract.
var registry = AppComposition.Current.GetExport<global::ILSpy.Commands.ToolPaneRegistry>();
var registry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Commands.ToolPaneRegistry>();
var factory = new ILSpyDockFactory(registry);
var nonExistent = Path.Combine(Path.GetTempPath(), $"ILSpy.Layout.missing.{System.Guid.NewGuid():N}.json");
@@ -252,7 +252,7 @@ public class LayoutPersistenceTests
{
// A corrupt sidecar (manually edited, version drift, mid-write crash) must
// not block startup. DockWorkspace silently falls back to defaults.
var registry = AppComposition.Current.GetExport<global::ILSpy.Commands.ToolPaneRegistry>();
var registry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.Commands.ToolPaneRegistry>();
var factory = new ILSpyDockFactory(registry);
var path = Path.Combine(Path.GetTempPath(), $"ILSpy.Layout.malformed.{System.Guid.NewGuid():N}.json");
File.WriteAllText(path, "{ this is not valid JSON");
ILSpy.Tests/Docking/MultiRowTabStripTests.cs
+5 -5
View File
@@ -28,11 +28,11 @@ using AwesomeAssertions;
using Dock.Avalonia.Controls;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TextView;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Docking/PreviewTabPromotionTests.cs
+6 -6
View File
@@ -27,11 +27,11 @@ using AwesomeAssertions;
using Dock.Avalonia.Controls;
using ILSpy.AppEnv;
using ILSpy.Docking;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -198,7 +198,7 @@ public class PreviewTabPromotionTests
// The One's active highlight is purple, every other document tab's is blue. The
// :selected:active Background binds to this converter on IsPreview; the (theme-unreliable)
// :active state makes a rendered assertion flaky, so verify the converter directly.
var conv = global::ILSpy.Themes.BoolToBrushConverter.PreviewOrActiveTabBackground;
var conv = ICSharpCode.ILSpy.Themes.BoolToBrushConverter.PreviewOrActiveTabBackground;
var culture = global::System.Globalization.CultureInfo.InvariantCulture;
(conv.Convert(true, typeof(global::Avalonia.Media.IBrush), null, culture)
as global::Avalonia.Media.ISolidColorBrush)!.Color
ILSpy.Tests/Docking/RunInNewTabTests.cs
+3 -3
View File
@@ -26,9 +26,9 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using NUnit.Framework;
ILSpy.Tests/Docking/SingletonDocumentTabTests.cs
+6 -6
View File
@@ -25,12 +25,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.Options;
using ILSpy.TextView;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Options;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Editor/CaretHighlightAdornerTests.cs
+6 -6
View File
@@ -25,12 +25,12 @@ using Avalonia.Headless.NUnit;
using AwesomeAssertions;
using ILSpy.AppEnv;
using ILSpy.AssemblyTree;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Editor/DecompilerViewTests.cs
+8 -8
View File
@@ -28,13 +28,13 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy.AppEnv;
using ILSpy.Commands;
using ILSpy.Languages;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Languages;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
@@ -486,7 +486,7 @@ public class DecompilerViewTests
// without the bridge they default false and every fold comes back collapsed.
var (_, vm) = await TestHarness.BootAsync(3);
var settings = AppComposition.Current.GetExport<global::ILSpy.SettingsService>();
var settings = AppComposition.Current.GetExport<ICSharpCode.ILSpy.SettingsService>();
settings.DisplaySettings.ExpandMemberDefinitions = true;
settings.DisplaySettings.ExpandUsingDeclarations = true;
ILSpy.Tests/Editor/DocumentationLinkTests.cs
+4 -4
View File
@@ -33,10 +33,10 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.TypeSystem;
using ILSpy.AssemblyTree;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.Util;
using ICSharpCode.ILSpy.AssemblyTree;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Util;
using NUnit.Framework;
ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs
+1 -1
View File
@@ -30,7 +30,7 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ILSpy.TextView;
using ICSharpCode.ILSpy.TextView;
using NUnit.Framework;
ILSpy.Tests/Editor/EditorCommandsTests.cs
+6 -6
View File
@@ -29,12 +29,12 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Editor/EditorZoomTests.cs
+1 -1
View File
@@ -18,7 +18,7 @@
using AwesomeAssertions;
using ILSpy.TextView;
using ICSharpCode.ILSpy.TextView;
using NUnit.Framework;
ILSpy.Tests/Editor/FoldingContextMenuTests.cs
+4 -4
View File
@@ -25,10 +25,10 @@ using AwesomeAssertions;
using ICSharpCode.ILSpy.Properties;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using NUnit.Framework;
ILSpy.Tests/Editor/FoldingsViewStateTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@ using AvaloniaEdit.Folding;
using AwesomeAssertions;
using ILSpy.TextView;
using ICSharpCode.ILSpy.TextView;
using NUnit.Framework;
ILSpy.Tests/Editor/HtmlClipboardCopyTests.cs
+3 -3
View File
@@ -26,9 +26,9 @@ using AvaloniaEdit;
using AwesomeAssertions;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.Views;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Editor/ILLanguageTooltipTests.cs
+7 -7
View File
@@ -30,13 +30,13 @@ using ICSharpCode.Decompiler.Disassembler;
using ICSharpCode.Decompiler.Documentation;
using ICSharpCode.Decompiler.TypeSystem;
using ILSpy;
using ILSpy.AppEnv;
using ILSpy.Languages;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Languages;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Editor/ReferenceClickTests.cs
+4 -4
View File
@@ -30,10 +30,10 @@ using AvaloniaEdit.Rendering;
using AwesomeAssertions;
using ILSpy.TextView;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;
ILSpy.Tests/Editor/XmlDocumentationTests.cs
+4 -4
View File
@@ -26,10 +26,10 @@ using AwesomeAssertions;
using ICSharpCode.Decompiler.Documentation;
using ICSharpCode.Decompiler.TypeSystem;
using ILSpy.AppEnv;
using ILSpy.TreeNodes;
using ILSpy.ViewModels;
using ILSpy.Views;
using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpy.Views;
using NUnit.Framework;

Some files were not shown because too many files have changed in this diff Show More