From 51aafa0fd97636c422d37cf55e151502bf1db768 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Fri, 12 Jun 2026 19:44:36 +0200 Subject: [PATCH] Move ILSpy UI code back to the ICSharpCode.ILSpy root namespace The Avalonia port had placed the UI app in an ILSpy.* namespace tree, while the csproj RootNamespace and every prior release (through 10.1) use ICSharpCode.ILSpy.*. Restoring the historical namespace reduces the public API diff against release/10.1 for plugin authors and removes the shadowing that forced global:: qualifiers in the test project. The Images class and AccessOverlayIcon enum move back into the root namespace (as in 10.1), since an ICSharpCode.ILSpy.Images namespace would shadow the Images class for all code inside ICSharpCode.ILSpy. Assisted-by: Claude:claude-fable-5:Claude Code --- ILSpy.ReadyToRun/ReadyToRunDisassembler.cs | 2 +- ILSpy.ReadyToRun/ReadyToRunLanguage.cs | 4 +- .../ReadyToRunOptionsViewModel.cs | 4 +- .../ImageList/ImageListDecoderTests.cs | 2 +- .../ImageListResourceEntryNodeTests.cs | 14 ++-- ILSpy.Tests.Windows/OpenFromGacDialogTests.cs | 2 +- .../ReservedFileSystemNameTests.cs | 2 +- .../Analyzers/AnalyzeContextMenuTests.cs | 22 +++--- .../Analyzers/AnalyzedMethodTreeNodeTests.cs | 12 +-- .../Analyzers/AnalyzedTypeTreeNodeTests.cs | 12 +-- .../Analyzers/AnalyzerAutoExpandTests.cs | 6 +- .../Analyzers/AnalyzerConstructorUsesTests.cs | 14 ++-- .../Analyzers/AnalyzerErrorDisplayTests.cs | 12 +-- .../Analyzers/AnalyzerNavigationTests.cs | 10 +-- .../Analyzers/AnalyzerPaneCopyResultsTests.cs | 12 +-- .../Analyzers/AnalyzerPaneRemoveTests.cs | 12 +-- .../Analyzers/AnalyzerPaneVisibilityTests.cs | 12 +-- .../Analyzers/AnalyzerResultHighlightTests.cs | 16 ++-- .../Analyzers/AnalyzerSearchTreeNodeTests.cs | 12 +-- .../Analyzers/AnalyzerTreeKeyboardTests.cs | 16 ++-- .../Analyzers/AnalyzerTreeNodeTests.cs | 12 +-- .../MemberImplementsInterfaceAnalyzerTests.cs | 2 +- .../Library/MethodUsesAnalyzerTests.cs | 2 +- .../Library/TypeUsedByAnalyzerTests.cs | 2 +- ILSpy.Tests/AppEnv/AppCompositionTests.cs | 2 +- ILSpy.Tests/AppEnv/CompositionErrorsTests.cs | 2 +- ILSpy.Tests/AppInitializationTests.cs | 2 +- .../AddToMainListContextMenuTests.cs | 6 +- .../AssemblyListDecompileTests.cs | 8 +- .../AssemblyTreeContextMenuTests.cs | 10 +-- .../AssemblyTreeDragReorderTests.cs | 4 +- .../AssemblyTreeExpanderHitboxTests.cs | 10 +-- .../AssemblyList/AssemblyTreeFileDropTests.cs | 8 +- .../AssemblyList/AssemblyTreeSortTests.cs | 6 +- ILSpy.Tests/AssemblyList/AssemblyTreeTests.cs | 74 +++++++++---------- .../AssemblyList/DefaultAssemblyListTests.cs | 4 +- .../DropSelectionBatchingTests.cs | 6 +- .../FindTreeNodeReferenceTests.cs | 2 +- .../ManageAssemblyListsButtonStateTests.cs | 6 +- .../ManageAssemblyListsSelectTests.cs | 6 +- .../PreconfiguredAssemblyListTests.cs | 6 +- .../ReloadAssemblyContextMenuTests.cs | 10 +-- .../RemoveAssemblyContextMenuTests.cs | 10 +-- .../AssemblyList/ShowMetadataTokensTests.cs | 6 +- .../TreeViewSettingsLiveReactivityTests.cs | 6 +- ...UseNestedNamespaceNodesGridVerification.cs | 10 +-- .../UseNestedNamespaceNodesLiveTests.cs | 6 +- .../UseNestedNamespaceNodesScreenshot.cs | 6 +- .../UseNestedNamespaceNodesTests.cs | 6 +- .../AssemblyTree/AssemblyTreeModelTests.cs | 6 +- .../AssemblyTree/StartupAboutWelcomeTests.cs | 12 +-- .../Commands/ClearAssemblyListCommandTests.cs | 4 +- .../Commands/CommandLineArgumentsTests.cs | 10 +-- .../Commands/GeneratePdbCommandTests.cs | 6 +- ILSpy.Tests/Commands/HelpCommandTests.cs | 16 ++-- ILSpy.Tests/Commands/SaveCodeFallbackTests.cs | 8 +- .../Commands/SaveCommandEnablementTests.cs | 4 +- .../Commands/SuggestedFileNameTests.cs | 2 +- .../Compare/CompareContextMenuTests.cs | 22 +++--- ILSpy.Tests/Compare/CompareEngineTests.cs | 2 +- ILSpy.Tests/Compare/CompareViewRenderTests.cs | 18 ++--- .../ContextMenus/ContextMenuFrameworkTests.cs | 2 +- .../CopyFullyQualifiedNameTests.cs | 12 +-- .../CreateDiagramContextMenuTests.cs | 12 +-- .../ContextMenus/DecompileInNewViewTests.cs | 56 +++++++------- .../DecompileReferenceContextMenuTests.cs | 8 +- .../ContextMenus/ExportProjectEntryTests.cs | 10 +-- .../KeyboardContextMenuFocusTests.cs | 14 ++-- .../ContextMenus/OpenContainingFolderTests.cs | 14 ++-- .../ReferenceScopeAndNewTabTests.cs | 12 +-- .../SaveCodeSolutionContextMenuTests.cs | 8 +- ILSpy.Tests/ContextMenus/SearchMsdnTests.cs | 14 ++-- .../SharpTreeViewEmptySpaceDropTests.cs | 2 +- ILSpy.Tests/Controls/SharpTreeViewTests.cs | 2 +- ILSpy.Tests/Diagnostics/GraphVizGraphTests.cs | 16 ++-- .../Diagnostics/InputDiagnosticsTests.cs | 2 +- ILSpy.Tests/Diagnostics/StartupPerfTests.cs | 10 +-- .../Docking/ContentPageHierarchyTests.cs | 10 +-- ILSpy.Tests/Docking/DockWorkspaceTests.cs | 6 +- .../Docking/DockableViewOwnershipTests.cs | 6 +- .../Docking/DocumentTabContextMenuTests.cs | 14 ++-- .../Docking/DocumentTabStripModeTests.cs | 10 +-- ILSpy.Tests/Docking/FrozenTabRefreshTests.cs | 14 ++-- ILSpy.Tests/Docking/LayoutPersistenceTests.cs | 30 ++++---- ILSpy.Tests/Docking/MultiRowTabStripTests.cs | 10 +-- .../Docking/PreviewTabPromotionTests.cs | 12 +-- ILSpy.Tests/Docking/RunInNewTabTests.cs | 6 +- .../Docking/SingletonDocumentTabTests.cs | 12 +-- .../Editor/CaretHighlightAdornerTests.cs | 12 +-- ILSpy.Tests/Editor/DecompilerViewTests.cs | 16 ++-- ILSpy.Tests/Editor/DocumentationLinkTests.cs | 8 +- .../DocumentationRendererTooltipWidthTests.cs | 2 +- ILSpy.Tests/Editor/EditorCommandsTests.cs | 12 +-- ILSpy.Tests/Editor/EditorZoomTests.cs | 2 +- ILSpy.Tests/Editor/FoldingContextMenuTests.cs | 8 +- ILSpy.Tests/Editor/FoldingsViewStateTests.cs | 2 +- ILSpy.Tests/Editor/HtmlClipboardCopyTests.cs | 6 +- ILSpy.Tests/Editor/ILLanguageTooltipTests.cs | 14 ++-- ILSpy.Tests/Editor/ReferenceClickTests.cs | 8 +- ILSpy.Tests/Editor/XmlDocumentationTests.cs | 8 +- ILSpy.Tests/EntityReferenceResolveTests.cs | 4 +- ILSpy.Tests/FixtureAssembly.cs | 2 +- ILSpy.Tests/Input/HeadlessMmbPointerTests.cs | 30 ++++---- .../Languages/CSharpBracketSearcherTests.cs | 4 +- .../Languages/CSharpILMixedLanguageTests.cs | 10 +-- .../Languages/ExportPreviewRowTests.cs | 2 +- ILSpy.Tests/Languages/LanguageServiceTests.cs | 6 +- ...uageVersionAffectsDecompilerOutputTests.cs | 10 +-- .../Languages/LanguageVersionDropdownTests.cs | 10 +-- .../Languages/ProjectExportRunnerTests.cs | 10 +-- ILSpy.Tests/Languages/ProjectExportTests.cs | 12 +-- ILSpy.Tests/Languages/SolutionExportTests.cs | 10 +-- .../MainWindow/AboutPageUpdateSectionTests.cs | 10 +-- .../LanguageVersionPersistenceTests.cs | 6 +- ILSpy.Tests/MainWindow/MainMenuTests.cs | 4 +- .../MainWindow/MainToolBarLayoutTests.cs | 14 ++-- ILSpy.Tests/MainWindow/MainWindowTests.cs | 14 ++-- ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs | 4 +- .../ToolPaneDeferredContentTests.cs | 2 +- .../MainWindow/ToolPaneRegistryTests.cs | 12 +-- .../WindowMenuOpenDocumentsTests.cs | 6 +- ILSpy.Tests/Metadata/CompiledFilterTests.cs | 2 +- .../CustomDebugInformationRowDetailsTests.cs | 8 +- .../Metadata/DebugDirectoryChildNodesTests.cs | 2 +- ILSpy.Tests/Metadata/EmbeddedPdbTreeTests.cs | 6 +- .../Metadata/FilterStatePresenterTests.cs | 2 +- .../Metadata/FilterStateSerializerTests.cs | 2 +- ILSpy.Tests/Metadata/FlagsFilterPopupTests.cs | 4 +- .../Metadata/FlagsSchemaInfererTests.cs | 2 +- ILSpy.Tests/Metadata/FlagsTooltipTests.cs | 2 +- .../Metadata/GoToTokenContextMenuTests.cs | 8 +- ILSpy.Tests/Metadata/GoToTokenHistoryTests.cs | 4 +- ILSpy.Tests/Metadata/HeapTreeTests.cs | 2 +- .../Metadata/HideEmptyMetadataTablesTests.cs | 10 +-- .../HideEmptyMetadataTablesUiBindingTests.cs | 10 +-- .../Metadata/MetadataCellTooltipTests.cs | 2 +- .../Metadata/MetadataColumnBuilderTests.cs | 4 +- .../MetadataDisablesLanguageSwitchingTests.cs | 12 +-- .../MetadataFilterRowEndToEndTests.cs | 4 +- ILSpy.Tests/Metadata/MetadataFilterTests.cs | 22 +++--- .../Metadata/MetadataNodeIconParityTests.cs | 28 +++---- .../MetadataProtocolHandlerDrillDownTests.cs | 12 +-- .../Metadata/MetadataRowActivationTests.cs | 18 ++--- .../Metadata/MetadataRowDetailsTests.cs | 6 +- .../MetadataTabSessionRestoreTests.cs | 12 +-- .../Metadata/MetadataTablesTreeTests.cs | 2 +- .../Metadata/MetadataTokenNavigationTests.cs | 10 +-- .../Metadata/MetadataTooltipParityTests.cs | 6 +- .../Metadata/MetadataTreeShapeTests.cs | 4 +- ILSpy.Tests/Metadata/PEHeaderTreeTests.cs | 22 +++--- .../ShowInMetadataContextMenuTests.cs | 8 +- .../Metadata/TypedMetadataTableTreeTests.cs | 6 +- .../BrowseBackForwardCommandTests.cs | 12 +-- ILSpy.Tests/Navigation/NavigationTests.cs | 6 +- .../Navigation/ViewStateRoundTripTests.cs | 10 +-- ILSpy.Tests/NuGetFeeds/FakeNuGetFeedClient.cs | 2 +- .../NuGetFeeds/NuGetFeedSettingsTests.cs | 2 +- .../OpenFromNuGetFeedViewModelTests.cs | 4 +- .../Options/ApiVisibilityFilterTests.cs | 16 ++-- .../Options/DisplaySettingsReactionTests.cs | 10 +-- .../Options/OptionsPageScrollReachTests.cs | 12 +-- ILSpy.Tests/Options/OptionsTabTests.cs | 18 ++--- .../SessionSettingsFilterStatesTests.cs | 10 +-- ILSpy.Tests/Options/TabOptionsGroupTests.cs | 10 +-- ILSpy.Tests/Options/ThemePickerTests.cs | 8 +- .../Plugins/TestPluginCompositionTests.cs | 6 +- ILSpy.Tests/ResetAppStateAttribute.cs | 4 +- ILSpy.Tests/Resources/BamlResourceTests.cs | 16 ++-- ILSpy.Tests/Resources/IconCompositionTests.cs | 1 - ILSpy.Tests/Resources/ResourceFactoryTests.cs | 14 ++-- ILSpy.Tests/Search/ScopeSearchToTests.cs | 12 +-- ILSpy.Tests/Search/SearchInputFocusTests.cs | 12 +-- .../SearchPaneAssemblyListChangedTests.cs | 10 +-- ILSpy.Tests/Search/SearchPaneModelTests.cs | 4 +- ILSpy.Tests/Search/SearchPaneNicetiesTests.cs | 16 ++-- .../Search/SearchPaneSortableColumnsTests.cs | 8 +- .../Search/SearchPaneStreamingTests.cs | 12 +-- ILSpy.Tests/Search/SearchPaneViewTests.cs | 12 +-- .../Search/SearchPrefixParsingTests.cs | 2 +- ILSpy.Tests/Search/SearchProgressTests.cs | 12 +-- .../Search/SearchResultContextMenuTests.cs | 12 +-- .../Search/SearchResultNavigationTests.cs | 10 +-- .../Search/SearchResultSortOrderTests.cs | 10 +-- ILSpy.Tests/Search/SearchTermFilterTests.cs | 6 +- ILSpy.Tests/Search/ShowSearchCommandTests.cs | 10 +-- ILSpy.Tests/SessionSettingsTests.cs | 2 +- .../SessionSettingsMultiLineTabsTests.cs | 2 +- ILSpy.Tests/TestApp.axaml.cs | 6 +- ILSpy.Tests/TestCaptureExtensions.cs | 4 +- ILSpy.Tests/TestHarness.cs | 10 +-- .../TextView/DisplaySettingsBridgeTests.cs | 4 +- .../TextView/OutputLengthLimitTests.cs | 2 +- .../ThemeAwareHighlightingColorizerTests.cs | 2 +- ILSpy.Tests/Themes/ThemeManagerTests.cs | 2 +- ILSpy.Tests/TreeNavigation.cs | 4 +- ILSpy.Tests/TreeNodeAssertions.cs | 22 +++--- .../Updates/UpdatePanelViewModelTests.cs | 4 +- ILSpy.Tests/Util/MessageBusTests.cs | 2 +- ILSpy.Tests/Views/DebugStepsTests.cs | 14 ++-- .../Views/FlagsFilterPopupKeyboardTests.cs | 4 +- ILSpy.Tests/Views/MainMenuTests.cs | 2 +- .../Views/OpenFromGacDialogStructureTests.cs | 2 +- .../OpenFromNuGetFeedDialogStructureTests.cs | 4 +- ILSpy.Tests/Waiters.cs | 8 +- ILSpy/Analyzers/AnalyzeContextMenuEntry.cs | 6 +- ILSpy/Analyzers/AnalyzedAccessorTreeNode.cs | 2 +- ILSpy/Analyzers/AnalyzedEventTreeNode.cs | 6 +- ILSpy/Analyzers/AnalyzedFieldTreeNode.cs | 6 +- ILSpy/Analyzers/AnalyzedMethodTreeNode.cs | 12 +-- ILSpy/Analyzers/AnalyzedModuleTreeNode.cs | 10 +-- ILSpy/Analyzers/AnalyzedPropertyTreeNode.cs | 6 +- ILSpy/Analyzers/AnalyzedTypeTreeNode.cs | 16 ++-- ILSpy/Analyzers/AnalyzerEntityTreeNode.cs | 10 +-- ILSpy/Analyzers/AnalyzerErrorNode.cs | 4 +- ILSpy/Analyzers/AnalyzerMetadata.cs | 2 +- ILSpy/Analyzers/AnalyzerRegistry.cs | 2 +- ILSpy/Analyzers/AnalyzerRootNode.cs | 6 +- ILSpy/Analyzers/AnalyzerSearchTreeNode.cs | 6 +- ILSpy/Analyzers/AnalyzerTreeNode.cs | 8 +- ILSpy/Analyzers/AnalyzerTreeView.axaml | 6 +- ILSpy/Analyzers/AnalyzerTreeView.axaml.cs | 8 +- ILSpy/Analyzers/AnalyzerTreeViewModel.cs | 8 +- .../CopyAnalysisResultsContextMenuEntry.cs | 4 +- .../CopyAnalyzerErrorContextMenuEntry.cs | 4 +- .../RemoveAnalyzeContextMenuEntry.cs | 2 +- ILSpy/App.axaml | 22 +++--- ILSpy/App.axaml.cs | 8 +- ILSpy/AppEnv/AppComposition.cs | 2 +- ILSpy/AppEnv/AppLog.cs | 2 +- ILSpy/AppEnv/AssertionFailedDialog.cs | 2 +- ILSpy/AppEnv/CommandLineArguments.cs | 2 +- ILSpy/AppEnv/CompositionErrors.cs | 2 +- ILSpy/AppEnv/GlobalExceptionHandler.cs | 2 +- ILSpy/AppEnv/ILSpyTraceListener.cs | 2 +- ILSpy/AppEnv/InputDiagnostics.cs | 2 +- ILSpy/AppEnv/ResourceHelper.cs | 2 +- ILSpy/AppEnv/StartupErrorWindow.cs | 2 +- ILSpy/AppEnv/StartupExceptions.cs | 2 +- ILSpy/AppEnv/UiContext.cs | 2 +- ILSpy/AssemblyTree/AssemblyListPane.axaml | 6 +- ILSpy/AssemblyTree/AssemblyListPane.axaml.cs | 16 ++-- ILSpy/AssemblyTree/AssemblyRowDropHandler.cs | 4 +- ILSpy/AssemblyTree/AssemblyTreeModel.cs | 12 +-- ILSpy/AssemblyTree/TreeNodeLocator.cs | 4 +- ILSpy/Commands/AboutCommand.cs | 8 +- ILSpy/Commands/BrowseBackCommand.cs | 4 +- ILSpy/Commands/CommandManager.cs | 2 +- ILSpy/Commands/CompareContextMenuEntry.cs | 10 +-- .../CopyFullyQualifiedNameContextMenuEntry.cs | 4 +- .../Commands/CreateDiagramContextMenuEntry.cs | 10 +-- ILSpy/Commands/DecompileAllCommand.cs | 12 +-- ILSpy/Commands/DecompileInNewViewCommand.cs | 10 +-- .../DecompileMetadataRowInNewTabCommand.cs | 6 +- .../DecompileReferenceContextMenuEntry.cs | 2 +- ILSpy/Commands/ExportCommandAttribute.cs | 2 +- .../Commands/ExportProjectContextMenuEntry.cs | 6 +- ILSpy/Commands/ExportToolPaneAttribute.cs | 4 +- .../ExtractPackageEntryContextMenuEntry.cs | 10 +-- ILSpy/Commands/FileCommands.cs | 18 ++--- ILSpy/Commands/FilePickers.cs | 4 +- ILSpy/Commands/FoldingContextMenuEntries.cs | 2 +- ILSpy/Commands/GeneratePdbContextMenuEntry.cs | 6 +- ILSpy/Commands/GoToTokenContextMenuEntry.cs | 6 +- ILSpy/Commands/HelpCommands.cs | 4 +- ILSpy/Commands/IProtocolHandler.cs | 4 +- ILSpy/Commands/MainMenuCommandRegistry.cs | 2 +- .../OpenCommandLineHereContextMenuEntry.cs | 4 +- .../OpenContainingFolderContextMenuEntry.cs | 6 +- ILSpy/Commands/Pdb2XmlCommand.cs | 10 +-- ILSpy/Commands/PdbGenerator.cs | 10 +-- ILSpy/Commands/ProjectExport.cs | 16 ++-- ILSpy/Commands/ProjectExportOptions.cs | 2 +- ILSpy/Commands/ProjectExporter.cs | 4 +- ILSpy/Commands/ResourceLinkGenerator.cs | 2 +- ILSpy/Commands/SaveCodeContextMenuEntry.cs | 8 +- ILSpy/Commands/SaveCodeHelper.cs | 12 +-- ILSpy/Commands/SearchMsdnContextMenuEntry.cs | 4 +- ILSpy/Commands/SelectPdbContextMenuEntry.cs | 8 +- ILSpy/Commands/SetThemeCommand.cs | 2 +- ILSpy/Commands/ShowCFGContextMenuEntry.cs | 4 +- .../ShowInMetadataContextMenuEntry.cs | 8 +- ILSpy/Commands/ShowOptionsCommand.cs | 8 +- ILSpy/Commands/ShowSearchToolbarCommand.cs | 4 +- ILSpy/Commands/SimpleCommand.cs | 2 +- ILSpy/Commands/SolutionExport.cs | 12 +-- ILSpy/Commands/ToolPaneRegistry.cs | 10 +-- ILSpy/Commands/ToolbarCommandRegistry.cs | 2 +- ILSpy/Commands/ViewCommands.cs | 4 +- ILSpy/Commands/WindowCommands.cs | 4 +- ILSpy/CompareEngine.cs | 2 +- ILSpy/ContextMenuEntry.cs | 4 +- ILSpy/ContextMenuProvider.cs | 6 +- ILSpy/Controls/FlagsFilterPopup.cs | 4 +- ILSpy/Controls/GrayscaleAwareImage.cs | 2 +- ILSpy/Controls/IndependentFlagGroup.cs | 4 +- ILSpy/Controls/MutexChipGroup.cs | 4 +- ILSpy/Controls/ResourceObjectTable.axaml | 2 +- ILSpy/Controls/ResourceObjectTable.axaml.cs | 2 +- ILSpy/Controls/ResourceStringTable.axaml | 2 +- ILSpy/Controls/ResourceStringTable.axaml.cs | 2 +- ILSpy/Controls/TreeLines.cs | 2 +- ILSpy/Controls/TreeView/AvaloniaDragDrop.cs | 2 +- .../AvaloniaPlatformRoutedEventArgs.cs | 2 +- ILSpy/Controls/TreeView/SharpTreeView.axaml | 4 +- ILSpy/Controls/TreeView/SharpTreeView.cs | 2 +- ILSpy/Controls/TreeView/SharpTreeViewItem.cs | 2 +- .../Controls/TreeView/TreeIndentConverter.cs | 2 +- .../Controls/TreeView/TreeSelectionBinder.cs | 2 +- ILSpy/DecompilationOptions.cs | 2 +- ILSpy/Docking/DockWorkspace.cs | 58 +++++++-------- ILSpy/Docking/DockableViewRecycling.cs | 2 +- ILSpy/Docking/IDockableViewOwner.cs | 2 +- ILSpy/Docking/ILSpyDockFactory.cs | 6 +- ILSpy/Docking/ILSpyDockJson.cs | 4 +- ILSpy/EntityReference.cs | 2 +- ILSpy/Entry.cs | 2 +- ILSpy/FireAndForgetExtensions.cs | 4 +- ILSpy/ILSpy.csproj | 2 +- ILSpy/Images.cs | 2 +- ILSpy/LanguageSettings.cs | 2 +- ILSpy/Languages/CSharpBracketSearcher.cs | 4 +- .../CSharpHighlightingTokenWriter.cs | 4 +- ILSpy/Languages/CSharpILMixedLanguage.cs | 4 +- ILSpy/Languages/CSharpLanguage.DebugSteps.cs | 12 +-- ILSpy/Languages/CSharpLanguage.cs | 6 +- ILSpy/Languages/IDebugStepProvider.cs | 2 +- ILSpy/Languages/ILAstLanguage.cs | 14 ++-- ILSpy/Languages/ILLanguage.cs | 6 +- ILSpy/Languages/IResourceFileHandler.cs | 2 +- ILSpy/Languages/Language.cs | 6 +- ILSpy/Languages/LanguageService.cs | 8 +- ILSpy/Metadata/BlobHeapTreeNode.cs | 4 +- ILSpy/Metadata/CoffHeaderTreeNode.cs | 8 +- ILSpy/Metadata/CompiledFilter.cs | 2 +- .../CorTables/AssemblyRefTableTreeNode.cs | 2 +- .../CorTables/AssemblyTableTreeNode.cs | 2 +- .../CorTables/ClassLayoutTableTreeNode.cs | 2 +- .../CorTables/ConstantTableTreeNode.cs | 2 +- .../CorTables/CustomAttributeTableTreeNode.cs | 2 +- .../CorTables/DeclSecurityTableTreeNode.cs | 2 +- .../CorTables/EventMapTableTreeNode.cs | 2 +- .../Metadata/CorTables/EventTableTreeNode.cs | 2 +- .../CorTables/ExportedTypeTableTreeNode.cs | 2 +- .../CorTables/FieldLayoutTableTreeNode.cs | 2 +- .../CorTables/FieldMarshalTableTreeNode.cs | 2 +- .../CorTables/FieldRVATableTreeNode.cs | 2 +- .../Metadata/CorTables/FieldTableTreeNode.cs | 2 +- ILSpy/Metadata/CorTables/FileTableTreeNode.cs | 2 +- .../GenericParamConstraintTableTreeNode.cs | 2 +- .../CorTables/GenericParamTableTreeNode.cs | 2 +- .../CorTables/ImplMapTableTreeNode.cs | 2 +- .../CorTables/InterfaceImplTableTreeNode.cs | 2 +- .../ManifestResourceTableTreeNode.cs | 2 +- .../CorTables/MemberRefTableTreeNode.cs | 2 +- .../CorTables/MethodImplTableTreeNode.cs | 2 +- .../CorTables/MethodSemanticsTableTreeNode.cs | 2 +- .../CorTables/MethodSpecTableTreeNode.cs | 2 +- .../Metadata/CorTables/MethodTableTreeNode.cs | 2 +- .../CorTables/ModuleRefTableTreeNode.cs | 2 +- .../Metadata/CorTables/ModuleTableTreeNode.cs | 2 +- .../CorTables/NestedClassTableTreeNode.cs | 2 +- .../Metadata/CorTables/ParamTableTreeNode.cs | 2 +- .../CorTables/PropertyMapTableTreeNode.cs | 2 +- .../CorTables/PropertyTableTreeNode.cs | 2 +- ILSpy/Metadata/CorTables/PtrTableTreeNode.cs | 2 +- .../CorTables/StandAloneSigTableTreeNode.cs | 2 +- .../CorTables/TypeDefTableTreeNode.cs | 2 +- .../CorTables/TypeRefTableTreeNode.cs | 2 +- .../CorTables/TypeSpecTableTreeNode.cs | 2 +- ILSpy/Metadata/DataDirectoriesTreeNode.cs | 10 +-- ILSpy/Metadata/DebugDirectoryChildNodes.cs | 8 +- ILSpy/Metadata/DebugDirectoryTreeNode.cs | 10 +-- .../CustomDebugInformationTableTreeNode.cs | 4 +- .../DebugTables/DocumentTableTreeNode.cs | 2 +- .../DebugTables/ImportScopeTableTreeNode.cs | 2 +- .../DebugTables/LocalConstantTableTreeNode.cs | 2 +- .../DebugTables/LocalScopeTableTreeNode.cs | 2 +- .../DebugTables/LocalVariableTableTreeNode.cs | 2 +- .../MethodDebugInformationTableTreeNode.cs | 2 +- .../StateMachineMethodTableTreeNode.cs | 2 +- ILSpy/Metadata/DosHeaderTreeNode.cs | 8 +- ILSpy/Metadata/FilterState.cs | 2 +- ILSpy/Metadata/FilterStatePersistence.cs | 2 +- ILSpy/Metadata/FilterStatePresenter.cs | 2 +- ILSpy/Metadata/FlagsSchema.cs | 2 +- ILSpy/Metadata/FlagsSchemaInferer.cs | 2 +- ILSpy/Metadata/FlagsTooltip.cs | 2 +- ILSpy/Metadata/GuidHeapTreeNode.cs | 2 +- ILSpy/Metadata/Helpers.cs | 2 +- ILSpy/Metadata/MetadataCellTooltip.cs | 2 +- ILSpy/Metadata/MetadataColumnBuilder.cs | 16 ++-- ILSpy/Metadata/MetadataHeapTreeNode.cs | 8 +- ILSpy/Metadata/MetadataNavigator.cs | 6 +- ILSpy/Metadata/MetadataProtocolHandler.cs | 8 +- ILSpy/Metadata/MetadataRowDetails.cs | 4 +- ILSpy/Metadata/MetadataTableTreeNode.cs | 8 +- ILSpy/Metadata/MetadataTablesTreeNode.cs | 14 ++-- ILSpy/Metadata/MetadataTextWriter.cs | 4 +- ILSpy/Metadata/MetadataTokenReference.cs | 2 +- ILSpy/Metadata/MetadataTreeNode.cs | 8 +- ILSpy/Metadata/OptionalHeaderTreeNode.cs | 8 +- ILSpy/Metadata/StringHeapTreeNode.cs | 4 +- .../UnsupportedMetadataTableTreeNode.cs | 4 +- ILSpy/Metadata/UserStringHeapTreeNode.cs | 4 +- ILSpy/NavigationEntry.cs | 8 +- ILSpy/NavigationHistory.cs | 2 +- ILSpy/NuGetFeeds/INuGetFeedClient.cs | 2 +- ILSpy/NuGetFeeds/NuGetFeedClient.cs | 2 +- ILSpy/NuGetFeeds/NuGetFeedSettings.cs | 2 +- ILSpy/Options/DecompilerSettingsPanel.axaml | 4 +- .../Options/DecompilerSettingsPanel.axaml.cs | 2 +- ILSpy/Options/DecompilerSettingsViewModel.cs | 4 +- ILSpy/Options/DisplaySettingReactions.cs | 2 +- ILSpy/Options/DisplaySettings.cs | 2 +- ILSpy/Options/DisplaySettingsPanel.axaml | 4 +- ILSpy/Options/DisplaySettingsPanel.axaml.cs | 2 +- ILSpy/Options/DisplaySettingsViewModel.cs | 2 +- ILSpy/Options/ExportOptionPageAttribute.cs | 2 +- ILSpy/Options/IOptionPage.cs | 4 +- ILSpy/Options/IOptionsMetadata.cs | 2 +- ILSpy/Options/MiscSettings.cs | 2 +- ILSpy/Options/MiscSettingsPanel.axaml | 4 +- ILSpy/Options/MiscSettingsPanel.axaml.cs | 2 +- ILSpy/Options/MiscSettingsViewModel.cs | 2 +- ILSpy/Options/OptionsPageModel.cs | 4 +- ILSpy/Options/OptionsPageView.axaml | 6 +- ILSpy/Options/OptionsPageView.axaml.cs | 2 +- ILSpy/Program.cs | 2 +- ILSpy/Search/AvaloniaSearchResultFactory.cs | 38 +++++----- ILSpy/Search/RunningSearch.cs | 4 +- .../ScopeSearchToAssemblyContextMenuEntry.cs | 4 +- .../ScopeSearchToNamespaceContextMenuEntry.cs | 4 +- ILSpy/Search/SearchPane.axaml | 4 +- ILSpy/Search/SearchPane.axaml.cs | 6 +- ILSpy/Search/SearchPaneModel.cs | 36 ++++----- ILSpy/SessionSettings.cs | 2 +- ILSpy/SettingsService.cs | 6 +- ILSpy/SmartTextOutputExtensions.cs | 6 +- ILSpy/SolutionWriter.cs | 4 +- ILSpy/TaskbarProgressService.cs | 2 +- ILSpy/TextView/AvaloniaEditTextOutput.cs | 2 +- ILSpy/TextView/BracketHighlightRenderer.cs | 2 +- ILSpy/TextView/CaretHighlightAdorner.cs | 2 +- ILSpy/TextView/DecompilerTabPageModel.cs | 28 +++---- ILSpy/TextView/DecompilerTextEditor.cs | 4 +- ILSpy/TextView/DecompilerTextView.axaml | 4 +- ILSpy/TextView/DecompilerTextView.axaml.cs | 12 +-- ILSpy/TextView/DecompilerTextViewState.cs | 2 +- ILSpy/TextView/DefinitionLookup.cs | 2 +- .../DeterminateProgressWidthConverter.cs | 2 +- ILSpy/TextView/DocumentationRenderer.cs | 4 +- ILSpy/TextView/EditorCommands.cs | 2 +- ILSpy/TextView/EditorZoom.cs | 2 +- ILSpy/TextView/FoldingsViewState.cs | 2 +- ILSpy/TextView/HighlightingService.cs | 4 +- ILSpy/TextView/HtmlClipboardCopy.cs | 2 +- ILSpy/TextView/IBracketSearcher.cs | 2 +- ILSpy/TextView/ISmartTextOutput.cs | 2 +- .../TextView/OutputLengthExceededException.cs | 2 +- ILSpy/TextView/ReferenceElementGenerator.cs | 2 +- ILSpy/TextView/ReferenceSegment.cs | 2 +- ILSpy/TextView/TextMarkerService.cs | 2 +- .../ThemeAwareHighlightingColorizer.cs | 4 +- ILSpy/TextView/UIElementGenerator.cs | 2 +- ILSpy/TextView/ViewState.cs | 4 +- ILSpy/TextView/VisualLineReferenceText.cs | 2 +- ILSpy/TextView/ZoomButtons.axaml | 2 +- ILSpy/TextView/ZoomButtons.axaml.cs | 4 +- ILSpy/Themes/BoolToBrushConverter.cs | 2 +- .../DocumentSwitcherDropdownBehavior.cs | 6 +- ILSpy/Themes/MultiRowTabStripBehavior.cs | 4 +- ILSpy/Themes/PreviewTabClassBehavior.cs | 4 +- ILSpy/Themes/PreviewTabContextMenuBehavior.cs | 8 +- .../Themes/PreviewTabFreezeButtonBehavior.cs | 8 +- ILSpy/Themes/SyntaxColor.cs | 2 +- ILSpy/Themes/SyntaxColorPalettes.cs | 2 +- ILSpy/Themes/ThemeManager.cs | 2 +- ILSpy/TreeNodes/AssemblyListTreeNode.cs | 2 +- ...ssemblyReferenceReferencedTypesTreeNode.cs | 6 +- ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs | 16 ++-- ILSpy/TreeNodes/AssemblyTreeNode.cs | 32 ++++---- ILSpy/TreeNodes/BamlResourceEntryNode.cs | 8 +- ILSpy/TreeNodes/BamlResourceNodeFactory.cs | 10 +-- ILSpy/TreeNodes/BaseTypesEntryNode.cs | 12 +-- ILSpy/TreeNodes/BaseTypesTreeNode.cs | 6 +- ILSpy/TreeNodes/ComparisonEntryTreeNode.cs | 30 ++++---- ILSpy/TreeNodes/CursorResourceEntryNode.cs | 12 +-- ILSpy/TreeNodes/DerivedTypesEntryNode.cs | 8 +- ILSpy/TreeNodes/DerivedTypesTreeNode.cs | 6 +- ILSpy/TreeNodes/EventTreeNode.cs | 10 +-- ILSpy/TreeNodes/ExportedTypeTreeNode.cs | 6 +- ILSpy/TreeNodes/ExtensionTreeNode.cs | 11 ++- ILSpy/TreeNodes/FieldTreeNode.cs | 22 +++--- ILSpy/TreeNodes/FilterResult.cs | 2 +- ILSpy/TreeNodes/ILSpyTreeNode.cs | 8 +- ILSpy/TreeNodes/IMemberTreeNode.cs | 2 +- ILSpy/TreeNodes/IconResourceEntryNode.cs | 12 +-- ILSpy/TreeNodes/ImageListResourceEntryNode.cs | 18 ++--- .../TreeNodes/ImageListResourceNodeFactory.cs | 2 +- ILSpy/TreeNodes/ImageResourceEntryNode.cs | 10 +-- ILSpy/TreeNodes/MemberReferenceTreeNode.cs | 10 +-- ILSpy/TreeNodes/MethodTreeNode.cs | 28 +++---- ILSpy/TreeNodes/ModuleReferenceTreeNode.cs | 10 +-- ILSpy/TreeNodes/NamespaceTreeNode.cs | 8 +- ILSpy/TreeNodes/NaturalStringComparer.cs | 2 +- ILSpy/TreeNodes/PackageFolderTreeNode.cs | 6 +- ILSpy/TreeNodes/PropertyTreeNode.cs | 12 +-- ILSpy/TreeNodes/ReferenceFolderTreeNode.cs | 6 +- ILSpy/TreeNodes/ResourceEntryNode.cs | 12 +-- ILSpy/TreeNodes/ResourceListTreeNode.cs | 6 +- ILSpy/TreeNodes/ResourceTreeNode.cs | 12 +-- ILSpy/TreeNodes/ResourcesFileTreeNode.cs | 12 +-- ILSpy/TreeNodes/TypeReferenceTreeNode.cs | 6 +- ILSpy/TreeNodes/TypeTreeNode.cs | 26 +++---- ILSpy/TreeNodes/XamlResourceEntryNode.cs | 6 +- ILSpy/TreeNodes/XmlResourceEntryNode.cs | 8 +- ILSpy/Updates/UpdateService.cs | 2 +- ILSpy/Updates/UpdateSettings.cs | 2 +- ILSpy/Util/GraphVizGraph.cs | 2 +- ILSpy/Util/ImageListDecoder.cs | 2 +- ILSpy/Util/MessageBus.cs | 6 +- ILSpy/Util/ShellHelper.cs | 2 +- ILSpy/Util/WeakEventSource.cs | 2 +- ILSpy/ViewLocator.cs | 18 ++--- ILSpy/ViewModels/CompareTabPageModel.cs | 4 +- ILSpy/ViewModels/ContentPageModel.cs | 2 +- ILSpy/ViewModels/ContentTabPage.cs | 10 +-- ILSpy/ViewModels/DebugStepsPaneModel.cs | 12 +-- ILSpy/ViewModels/MainWindowViewModel.cs | 8 +- ILSpy/ViewModels/MetadataTablePageModel.cs | 12 +-- .../OpenFromNuGetFeedDialogViewModel.cs | 4 +- ILSpy/ViewModels/TabPageMenuItem.cs | 2 +- ILSpy/ViewModels/TabPageModel.cs | 2 +- ILSpy/ViewModels/ToolPaneMenuItem.cs | 2 +- ILSpy/ViewModels/ToolPaneModel.cs | 4 +- ILSpy/ViewModels/UpdatePanelViewModel.cs | 4 +- ILSpy/ViewModels/ViewModelBase.cs | 2 +- ILSpy/Views/CompareView.axaml | 4 +- ILSpy/Views/CompareView.axaml.cs | 2 +- ILSpy/Views/ContentTabPageView.axaml | 4 +- ILSpy/Views/ContentTabPageView.axaml.cs | 4 +- ILSpy/Views/CreateListDialog.axaml | 2 +- ILSpy/Views/CreateListDialog.axaml.cs | 2 +- ILSpy/Views/DebugSteps.axaml | 4 +- ILSpy/Views/DebugSteps.axaml.cs | 4 +- ILSpy/Views/ExportProjectDialog.axaml | 4 +- ILSpy/Views/ExportProjectDialog.axaml.cs | 6 +- ILSpy/Views/GacEntry.cs | 2 +- ILSpy/Views/MainMenu.axaml.cs | 14 ++-- ILSpy/Views/MainToolBar.axaml | 8 +- ILSpy/Views/MainToolBar.axaml.cs | 14 ++-- ILSpy/Views/MainWindow.axaml | 12 +-- ILSpy/Views/MainWindow.axaml.cs | 14 ++-- ILSpy/Views/ManageAssemblyListsDialog.axaml | 2 +- .../Views/ManageAssemblyListsDialog.axaml.cs | 2 +- ILSpy/Views/MetadataTablePage.axaml | 4 +- ILSpy/Views/MetadataTablePage.axaml.cs | 10 +-- ILSpy/Views/OpenFromGacDialog.axaml | 2 +- ILSpy/Views/OpenFromGacDialog.axaml.cs | 2 +- ILSpy/Views/OpenFromNuGetFeedDialog.axaml | 8 +- ILSpy/Views/OpenFromNuGetFeedDialog.axaml.cs | 6 +- ILSpy/Views/UpdatePanel.axaml | 4 +- ILSpy/Views/UpdatePanel.axaml.cs | 2 +- TestPlugin/AboutPageAddition.cs | 6 +- TestPlugin/ContextMenuCommand.cs | 2 +- TestPlugin/CustomLanguage.cs | 6 +- TestPlugin/CustomOptionsViewModel.cs | 4 +- TestPlugin/MainMenuCommand.cs | 4 +- 568 files changed, 1897 insertions(+), 1899 deletions(-) diff --git a/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs b/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs index d70485ca4..3c196a921 100644 --- a/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs +++ b/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs @@ -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 { diff --git a/ILSpy.ReadyToRun/ReadyToRunLanguage.cs b/ILSpy.ReadyToRun/ReadyToRunLanguage.cs index fe7db176f..47a26fe75 100644 --- a/ILSpy.ReadyToRun/ReadyToRunLanguage.cs +++ b/ILSpy.ReadyToRun/ReadyToRunLanguage.cs @@ -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; diff --git a/ILSpy.ReadyToRun/ReadyToRunOptionsViewModel.cs b/ILSpy.ReadyToRun/ReadyToRunOptionsViewModel.cs index b25eee314..a027f0874 100644 --- a/ILSpy.ReadyToRun/ReadyToRunOptionsViewModel.cs +++ b/ILSpy.ReadyToRun/ReadyToRunOptionsViewModel.cs @@ -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 { diff --git a/ILSpy.Tests.Windows/ImageList/ImageListDecoderTests.cs b/ILSpy.Tests.Windows/ImageList/ImageListDecoderTests.cs index 5e0c20ead..1cd796688 100644 --- a/ILSpy.Tests.Windows/ImageList/ImageListDecoderTests.cs +++ b/ILSpy.Tests.Windows/ImageList/ImageListDecoderTests.cs @@ -23,7 +23,7 @@ using System.Windows.Forms; using AwesomeAssertions; -using ILSpy.ImageList; +using ICSharpCode.ILSpy.ImageList; using NUnit.Framework; diff --git a/ILSpy.Tests.Windows/ImageList/ImageListResourceEntryNodeTests.cs b/ILSpy.Tests.Windows/ImageList/ImageListResourceEntryNodeTests.cs index 5e91aa958..0841f4851 100644 --- a/ILSpy.Tests.Windows/ImageList/ImageListResourceEntryNodeTests.cs +++ b/ILSpy.Tests.Windows/ImageList/ImageListResourceEntryNodeTests.cs @@ -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; diff --git a/ILSpy.Tests.Windows/OpenFromGacDialogTests.cs b/ILSpy.Tests.Windows/OpenFromGacDialogTests.cs index 3123c7035..4862dfbaf 100644 --- a/ILSpy.Tests.Windows/OpenFromGacDialogTests.cs +++ b/ILSpy.Tests.Windows/OpenFromGacDialogTests.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.ILSpy.Tests.Windows; /// /// Smoke test for the Windows-conditional GAC enumeration path used by -/// ILSpy.Views.OpenFromGacDialog. The shared +/// ICSharpCode.ILSpy.Views.OpenFromGacDialog. The shared /// 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 diff --git a/ILSpy.Tests.Windows/ReservedFileSystemNameTests.cs b/ILSpy.Tests.Windows/ReservedFileSystemNameTests.cs index da2b55e55..71fc3402d 100644 --- a/ILSpy.Tests.Windows/ReservedFileSystemNameTests.cs +++ b/ILSpy.Tests.Windows/ReservedFileSystemNameTests.cs @@ -24,7 +24,7 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.CSharp.ProjectDecompiler; -using ILSpy.Commands; +using ICSharpCode.ILSpy.Commands; using NUnit.Framework; diff --git a/ILSpy.Tests/Analyzers/AnalyzeContextMenuTests.cs b/ILSpy.Tests/Analyzers/AnalyzeContextMenuTests.cs index d0d330501..fa8ca234d 100644 --- a/ILSpy.Tests/Analyzers/AnalyzeContextMenuTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzeContextMenuTests.cs @@ -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(); + var pane = await window.WaitForComponent(); var typeNode = vm.AssemblyTreeModel.FindNode( "System.Linq", "System.Linq", "System.Linq.Enumerable"); vm.AssemblyTreeModel.SelectNode(typeNode); @@ -146,7 +146,7 @@ public class AnalyzeContextMenuTests var analyzerVm = AppComposition.Current.GetExport(); var beforeCount = analyzerVm.Root.Children.Count; - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); + var dockWorkspace = AppComposition.Current.GetExport(); var analyzerVm = AppComposition.Current.GetExport(); var entry = AppComposition.Current.GetExport() .GetEntry(nameof(Resources.Analyze)); @@ -238,7 +238,7 @@ public class AnalyzeContextMenuTests } } - static AnalyzerTreeViewModel? FindAnalyzerPane(global::ILSpy.Docking.DockWorkspace dockWorkspace) + static AnalyzerTreeViewModel? FindAnalyzerPane(global::ICSharpCode.ILSpy.Docking.DockWorkspace dockWorkspace) { foreach (var dockable in WalkDockables(dockWorkspace.Layout)) { diff --git a/ILSpy.Tests/Analyzers/AnalyzedMethodTreeNodeTests.cs b/ILSpy.Tests/Analyzers/AnalyzedMethodTreeNodeTests.cs index ca5856a40..a44aa17b3 100644 --- a/ILSpy.Tests/Analyzers/AnalyzedMethodTreeNodeTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzedMethodTreeNodeTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzedTypeTreeNodeTests.cs b/ILSpy.Tests/Analyzers/AnalyzedTypeTreeNodeTests.cs index f9eb0a634..be3d8c4e9 100644 --- a/ILSpy.Tests/Analyzers/AnalyzedTypeTreeNodeTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzedTypeTreeNodeTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerAutoExpandTests.cs b/ILSpy.Tests/Analyzers/AnalyzerAutoExpandTests.cs index cca9cb9df..d7cca1d3d 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerAutoExpandTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerAutoExpandTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerConstructorUsesTests.cs b/ILSpy.Tests/Analyzers/AnalyzerConstructorUsesTests.cs index 9755dbc62..1f8b63a72 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerConstructorUsesTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerConstructorUsesTests.cs @@ -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().CurrentLanguage, + Language = AppComposition.Current.GetExport().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().CurrentLanguage, + Language = AppComposition.Current.GetExport().CurrentLanguage, AssemblyList = assemblyList, }; var results = analyzer.Analyze(ctor, context).Take(20).ToList(); diff --git a/ILSpy.Tests/Analyzers/AnalyzerErrorDisplayTests.cs b/ILSpy.Tests/Analyzers/AnalyzerErrorDisplayTests.cs index 568e6e686..4ab86469e 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerErrorDisplayTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerErrorDisplayTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerNavigationTests.cs b/ILSpy.Tests/Analyzers/AnalyzerNavigationTests.cs index 97fdbacc9..210a62403 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerNavigationTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerNavigationTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerPaneCopyResultsTests.cs b/ILSpy.Tests/Analyzers/AnalyzerPaneCopyResultsTests.cs index b422f2f5d..4b1c56980 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerPaneCopyResultsTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerPaneCopyResultsTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerPaneRemoveTests.cs b/ILSpy.Tests/Analyzers/AnalyzerPaneRemoveTests.cs index db53e1bac..23d767d1e 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerPaneRemoveTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerPaneRemoveTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerPaneVisibilityTests.cs b/ILSpy.Tests/Analyzers/AnalyzerPaneVisibilityTests.cs index ed2507afc..783d8f02f 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerPaneVisibilityTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerPaneVisibilityTests.cs @@ -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(); var analyzer = AppComposition.Current.GetExport(); - var search = AppComposition.Current.GetExport(); + var search = AppComposition.Current.GetExport(); var paneIds = AllDockables(dockWorkspace.Layout) - .OfType() + .OfType() .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(global::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", diff --git a/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs b/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs index 06826921f..d0fcc0f83 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerSearchTreeNodeTests.cs b/ILSpy.Tests/Analyzers/AnalyzerSearchTreeNodeTests.cs index 6cabadf1b..62eac0f42 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerSearchTreeNodeTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerSearchTreeNodeTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/AnalyzerTreeKeyboardTests.cs b/ILSpy.Tests/Analyzers/AnalyzerTreeKeyboardTests.cs index c5d9bbf9e..727508a62 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerTreeKeyboardTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerTreeKeyboardTests.cs @@ -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(); - var tree = await view.WaitForComponent(); + var view = await window.WaitForComponent(); + var tree = await view.WaitForComponent(); 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(); - var pane = await window.WaitForComponent(); - var tree = await pane.WaitForComponent(); + var pane = await window.WaitForComponent(); + var tree = await pane.WaitForComponent(); var typeNode = vm.AssemblyTreeModel.FindNode( "System.Linq", "System.Linq", "System.Linq.Enumerable"); diff --git a/ILSpy.Tests/Analyzers/AnalyzerTreeNodeTests.cs b/ILSpy.Tests/Analyzers/AnalyzerTreeNodeTests.cs index 0a9255caf..b2787d025 100644 --- a/ILSpy.Tests/Analyzers/AnalyzerTreeNodeTests.cs +++ b/ILSpy.Tests/Analyzers/AnalyzerTreeNodeTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/Library/MemberImplementsInterfaceAnalyzerTests.cs b/ILSpy.Tests/Analyzers/Library/MemberImplementsInterfaceAnalyzerTests.cs index 16442d935..c2c6b621a 100644 --- a/ILSpy.Tests/Analyzers/Library/MemberImplementsInterfaceAnalyzerTests.cs +++ b/ILSpy.Tests/Analyzers/Library/MemberImplementsInterfaceAnalyzerTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/Library/MethodUsesAnalyzerTests.cs b/ILSpy.Tests/Analyzers/Library/MethodUsesAnalyzerTests.cs index 7ae1c0bad..94b6cf1a3 100644 --- a/ILSpy.Tests/Analyzers/Library/MethodUsesAnalyzerTests.cs +++ b/ILSpy.Tests/Analyzers/Library/MethodUsesAnalyzerTests.cs @@ -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; diff --git a/ILSpy.Tests/Analyzers/Library/TypeUsedByAnalyzerTests.cs b/ILSpy.Tests/Analyzers/Library/TypeUsedByAnalyzerTests.cs index 3d9d0afe8..6cea9cd10 100644 --- a/ILSpy.Tests/Analyzers/Library/TypeUsedByAnalyzerTests.cs +++ b/ILSpy.Tests/Analyzers/Library/TypeUsedByAnalyzerTests.cs @@ -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; diff --git a/ILSpy.Tests/AppEnv/AppCompositionTests.cs b/ILSpy.Tests/AppEnv/AppCompositionTests.cs index 0bade8c5f..cddc2a53f 100644 --- a/ILSpy.Tests/AppEnv/AppCompositionTests.cs +++ b/ILSpy.Tests/AppEnv/AppCompositionTests.cs @@ -20,7 +20,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; using NUnit.Framework; diff --git a/ILSpy.Tests/AppEnv/CompositionErrorsTests.cs b/ILSpy.Tests/AppEnv/CompositionErrorsTests.cs index d32522316..16ff6a272 100644 --- a/ILSpy.Tests/AppEnv/CompositionErrorsTests.cs +++ b/ILSpy.Tests/AppEnv/CompositionErrorsTests.cs @@ -22,7 +22,7 @@ using AwesomeAssertions; using ICSharpCode.Decompiler; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; using NUnit.Framework; diff --git a/ILSpy.Tests/AppInitializationTests.cs b/ILSpy.Tests/AppInitializationTests.cs index 0ea901b03..6e60f75fe 100644 --- a/ILSpy.Tests/AppInitializationTests.cs +++ b/ILSpy.Tests/AppInitializationTests.cs @@ -21,7 +21,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; +using ICSharpCode.ILSpy; using NUnit.Framework; diff --git a/ILSpy.Tests/AssemblyList/AddToMainListContextMenuTests.cs b/ILSpy.Tests/AssemblyList/AddToMainListContextMenuTests.cs index 762506a09..07c644bb3 100644 --- a/ILSpy.Tests/AssemblyList/AddToMainListContextMenuTests.cs +++ b/ILSpy.Tests/AssemblyList/AddToMainListContextMenuTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/AssemblyListDecompileTests.cs b/ILSpy.Tests/AssemblyList/AssemblyListDecompileTests.cs index 0035a1a24..eeaa5ca83 100644 --- a/ILSpy.Tests/AssemblyList/AssemblyListDecompileTests.cs +++ b/ILSpy.Tests/AssemblyList/AssemblyListDecompileTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/AssemblyTreeContextMenuTests.cs b/ILSpy.Tests/AssemblyList/AssemblyTreeContextMenuTests.cs index daa2accce..853cf6109 100644 --- a/ILSpy.Tests/AssemblyList/AssemblyTreeContextMenuTests.cs +++ b/ILSpy.Tests/AssemblyList/AssemblyTreeContextMenuTests.cs @@ -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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); + var grid = await pane.WaitForComponent(); var menu = grid.ContextMenu!; // Trigger the build path the live Opening event would take. diff --git a/ILSpy.Tests/AssemblyList/AssemblyTreeDragReorderTests.cs b/ILSpy.Tests/AssemblyList/AssemblyTreeDragReorderTests.cs index 99492035b..68f039c1e 100644 --- a/ILSpy.Tests/AssemblyList/AssemblyTreeDragReorderTests.cs +++ b/ILSpy.Tests/AssemblyList/AssemblyTreeDragReorderTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs b/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs index 726b5ccf0..377681917 100644 --- a/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs +++ b/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs @@ -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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); // 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() + var row = grid.GetVisualDescendants().OfType() .FirstOrDefault(r => RowMatches(r, assemblyNode)); row.Should().NotBeNull("the expanded assembly row must be realised"); var expander = row!.GetVisualDescendants().OfType() @@ -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(global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem row, SharpTreeNode target) => ReferenceEquals(row.DataContext, target); } diff --git a/ILSpy.Tests/AssemblyList/AssemblyTreeFileDropTests.cs b/ILSpy.Tests/AssemblyList/AssemblyTreeFileDropTests.cs index 68e46c917..b10c1ca41 100644 --- a/ILSpy.Tests/AssemblyList/AssemblyTreeFileDropTests.cs +++ b/ILSpy.Tests/AssemblyList/AssemblyTreeFileDropTests.cs @@ -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(); - var tree = await pane.WaitForComponent(); + var tree = await pane.WaitForComponent(); DragDrop.GetAllowDrop(tree).Should().BeTrue(); } diff --git a/ILSpy.Tests/AssemblyList/AssemblyTreeSortTests.cs b/ILSpy.Tests/AssemblyList/AssemblyTreeSortTests.cs index 3619869ef..104333a8c 100644 --- a/ILSpy.Tests/AssemblyList/AssemblyTreeSortTests.cs +++ b/ILSpy.Tests/AssemblyList/AssemblyTreeSortTests.cs @@ -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(); - await pane.WaitForComponent(); + await pane.WaitForComponent(); // Open extra assemblies whose names are deliberately out of sorted order so the sort moves // real rows around. diff --git a/ILSpy.Tests/AssemblyList/AssemblyTreeTests.cs b/ILSpy.Tests/AssemblyList/AssemblyTreeTests.cs index 3991f5cc7..906fbccb1 100644 --- a/ILSpy.Tests/AssemblyList/AssemblyTreeTests.cs +++ b/ILSpy.Tests/AssemblyList/AssemblyTreeTests.cs @@ -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(); - var treeGrid = await pane.WaitForComponent(); + var treeGrid = await pane.WaitForComponent(); // 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(global::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, global::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(global::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(global::ICSharpCode.ILSpy.Images.MethodReference, + global::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(global::ICSharpCode.ILSpy.Images.ExportedType); exportedNode.Text.ToString().Should().NotBeNullOrWhiteSpace(); } @@ -630,7 +630,7 @@ public class AssemblyTreeTests } var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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() + var candidateRow = grid.GetVisualDescendants().OfType() .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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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() + var candidateRow = grid.GetVisualDescendants().OfType() .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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var scrollViewer = await grid.WaitForComponent(); // 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(); - var saveCmd = (global::ILSpy.Commands.SaveCommand)registry.Commands + var saveCmd = (global::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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); grid.Focus(); Dispatcher.UIThread.RunJobs(); @@ -956,7 +956,7 @@ public class AssemblyTreeTests await Waiters.WaitForAsync(() => ReferenceEquals(model.SelectedItem, firstAssembly)); var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); grid.Focus(); Dispatcher.UIThread.RunJobs(); @@ -1229,7 +1229,7 @@ public class AssemblyTreeTests var (window, vm) = await TestHarness.BootAsync(3); var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var assemblyNode = vm.AssemblyTreeModel.FindNode("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().Single(); + .OfType().Single(); vm.DockWorkspace.OpenNodeInNewTab(methodTableNode); await Waiters.WaitForAsync( @@ -1432,11 +1432,11 @@ public class AssemblyTreeTests var settings = AppComposition.Current.GetExport() .SessionSettings.LanguageSettings; settings.ShowApiLevel = global::ICSharpCode.ILSpyX.ApiVisibility.PublicOnly; - ((int)getter.Filter(settings)).Should().Be((int)global::ILSpy.TreeNodes.FilterResult.Hidden, + ((int)getter.Filter(settings)).Should().Be((int)global::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, + ((int)getter.Filter(settings)).Should().NotBe((int)global::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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); 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() + var targetRow = grid.GetVisualDescendants().OfType() .OrderBy(r => r.TranslatePoint(new Point(0, 0), grid)?.Y ?? double.MaxValue) .Skip(1).First(); var targetNode = targetRow.DataContext as SharpTreeNode; diff --git a/ILSpy.Tests/AssemblyList/DefaultAssemblyListTests.cs b/ILSpy.Tests/AssemblyList/DefaultAssemblyListTests.cs index 4126b0973..3cc94dd73 100644 --- a/ILSpy.Tests/AssemblyList/DefaultAssemblyListTests.cs +++ b/ILSpy.Tests/AssemblyList/DefaultAssemblyListTests.cs @@ -26,8 +26,8 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX; -using ILSpy; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; using NUnit.Framework; diff --git a/ILSpy.Tests/AssemblyList/DropSelectionBatchingTests.cs b/ILSpy.Tests/AssemblyList/DropSelectionBatchingTests.cs index bafece793..3e15c1016 100644 --- a/ILSpy.Tests/AssemblyList/DropSelectionBatchingTests.cs +++ b/ILSpy.Tests/AssemblyList/DropSelectionBatchingTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/FindTreeNodeReferenceTests.cs b/ILSpy.Tests/AssemblyList/FindTreeNodeReferenceTests.cs index 06cc134c8..36968be9c 100644 --- a/ILSpy.Tests/AssemblyList/FindTreeNodeReferenceTests.cs +++ b/ILSpy.Tests/AssemblyList/FindTreeNodeReferenceTests.cs @@ -22,7 +22,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/AssemblyList/ManageAssemblyListsButtonStateTests.cs b/ILSpy.Tests/AssemblyList/ManageAssemblyListsButtonStateTests.cs index 2125cf864..13d83e4b2 100644 --- a/ILSpy.Tests/AssemblyList/ManageAssemblyListsButtonStateTests.cs +++ b/ILSpy.Tests/AssemblyList/ManageAssemblyListsButtonStateTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/ManageAssemblyListsSelectTests.cs b/ILSpy.Tests/AssemblyList/ManageAssemblyListsSelectTests.cs index 244389a5e..f113af562 100644 --- a/ILSpy.Tests/AssemblyList/ManageAssemblyListsSelectTests.cs +++ b/ILSpy.Tests/AssemblyList/ManageAssemblyListsSelectTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/PreconfiguredAssemblyListTests.cs b/ILSpy.Tests/AssemblyList/PreconfiguredAssemblyListTests.cs index c976f0f99..4adfdf110 100644 --- a/ILSpy.Tests/AssemblyList/PreconfiguredAssemblyListTests.cs +++ b/ILSpy.Tests/AssemblyList/PreconfiguredAssemblyListTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/ReloadAssemblyContextMenuTests.cs b/ILSpy.Tests/AssemblyList/ReloadAssemblyContextMenuTests.cs index f3b50c9ca..0c84dd585 100644 --- a/ILSpy.Tests/AssemblyList/ReloadAssemblyContextMenuTests.cs +++ b/ILSpy.Tests/AssemblyList/ReloadAssemblyContextMenuTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/RemoveAssemblyContextMenuTests.cs b/ILSpy.Tests/AssemblyList/RemoveAssemblyContextMenuTests.cs index e6b6e3045..5ab4d4afc 100644 --- a/ILSpy.Tests/AssemblyList/RemoveAssemblyContextMenuTests.cs +++ b/ILSpy.Tests/AssemblyList/RemoveAssemblyContextMenuTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/ShowMetadataTokensTests.cs b/ILSpy.Tests/AssemblyList/ShowMetadataTokensTests.cs index f297a3840..5d83f5310 100644 --- a/ILSpy.Tests/AssemblyList/ShowMetadataTokensTests.cs +++ b/ILSpy.Tests/AssemblyList/ShowMetadataTokensTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/TreeViewSettingsLiveReactivityTests.cs b/ILSpy.Tests/AssemblyList/TreeViewSettingsLiveReactivityTests.cs index 09fb5973d..523243d10 100644 --- a/ILSpy.Tests/AssemblyList/TreeViewSettingsLiveReactivityTests.cs +++ b/ILSpy.Tests/AssemblyList/TreeViewSettingsLiveReactivityTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs index 7df5444b2..753ecd869 100644 --- a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs +++ b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs @@ -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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); // Expand an assembly so its namespace children become visible rows. var assemblyNode = vm.AssemblyTreeModel.FindNode("System.Linq"); diff --git a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs index 74c6226af..c34d0be77 100644 --- a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs +++ b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesScreenshot.cs b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesScreenshot.cs index f5033a2bc..9cbf8f55f 100644 --- a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesScreenshot.cs +++ b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesScreenshot.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs index 1043daabf..b9bbdc313 100644 --- a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs +++ b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs @@ -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; diff --git a/ILSpy.Tests/AssemblyTree/AssemblyTreeModelTests.cs b/ILSpy.Tests/AssemblyTree/AssemblyTreeModelTests.cs index 106159a19..d0a44536d 100644 --- a/ILSpy.Tests/AssemblyTree/AssemblyTreeModelTests.cs +++ b/ILSpy.Tests/AssemblyTree/AssemblyTreeModelTests.cs @@ -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(); - model.Should().NotBeNull("AssemblyTreeModel is [Export][Shared] in ILSpy.AssemblyTree."); + model.Should().NotBeNull("AssemblyTreeModel is [Export][Shared] in ICSharpCode.ILSpy.AssemblyTree."); model.Initialize(); diff --git a/ILSpy.Tests/AssemblyTree/StartupAboutWelcomeTests.cs b/ILSpy.Tests/AssemblyTree/StartupAboutWelcomeTests.cs index 33f558d92..620bc9549 100644 --- a/ILSpy.Tests/AssemblyTree/StartupAboutWelcomeTests.cs +++ b/ILSpy.Tests/AssemblyTree/StartupAboutWelcomeTests.cs @@ -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; diff --git a/ILSpy.Tests/Commands/ClearAssemblyListCommandTests.cs b/ILSpy.Tests/Commands/ClearAssemblyListCommandTests.cs index 8b1a9e27d..fe512cc20 100644 --- a/ILSpy.Tests/Commands/ClearAssemblyListCommandTests.cs +++ b/ILSpy.Tests/Commands/ClearAssemblyListCommandTests.cs @@ -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; diff --git a/ILSpy.Tests/Commands/CommandLineArgumentsTests.cs b/ILSpy.Tests/Commands/CommandLineArgumentsTests.cs index c537942f1..adcc105ee 100644 --- a/ILSpy.Tests/Commands/CommandLineArgumentsTests.cs +++ b/ILSpy.Tests/Commands/CommandLineArgumentsTests.cs @@ -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; diff --git a/ILSpy.Tests/Commands/GeneratePdbCommandTests.cs b/ILSpy.Tests/Commands/GeneratePdbCommandTests.cs index d4ca7da8b..9f956d3df 100644 --- a/ILSpy.Tests/Commands/GeneratePdbCommandTests.cs +++ b/ILSpy.Tests/Commands/GeneratePdbCommandTests.cs @@ -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; diff --git a/ILSpy.Tests/Commands/HelpCommandTests.cs b/ILSpy.Tests/Commands/HelpCommandTests.cs index fe0f571e6..69766e193 100644 --- a/ILSpy.Tests/Commands/HelpCommandTests.cs +++ b/ILSpy.Tests/Commands/HelpCommandTests.cs @@ -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; diff --git a/ILSpy.Tests/Commands/SaveCodeFallbackTests.cs b/ILSpy.Tests/Commands/SaveCodeFallbackTests.cs index 2274af9c8..a9246c956 100644 --- a/ILSpy.Tests/Commands/SaveCodeFallbackTests.cs +++ b/ILSpy.Tests/Commands/SaveCodeFallbackTests.cs @@ -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; diff --git a/ILSpy.Tests/Commands/SaveCommandEnablementTests.cs b/ILSpy.Tests/Commands/SaveCommandEnablementTests.cs index e4c46c8ec..d1c0aea2f 100644 --- a/ILSpy.Tests/Commands/SaveCommandEnablementTests.cs +++ b/ILSpy.Tests/Commands/SaveCommandEnablementTests.cs @@ -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; diff --git a/ILSpy.Tests/Commands/SuggestedFileNameTests.cs b/ILSpy.Tests/Commands/SuggestedFileNameTests.cs index 69d72da6d..26b68c046 100644 --- a/ILSpy.Tests/Commands/SuggestedFileNameTests.cs +++ b/ILSpy.Tests/Commands/SuggestedFileNameTests.cs @@ -18,7 +18,7 @@ using AwesomeAssertions; -using ILSpy.Commands; +using ICSharpCode.ILSpy.Commands; using NUnit.Framework; diff --git a/ILSpy.Tests/Compare/CompareContextMenuTests.cs b/ILSpy.Tests/Compare/CompareContextMenuTests.cs index c2cf5aa1a..6fcf043d2 100644 --- a/ILSpy.Tests/Compare/CompareContextMenuTests.cs +++ b/ILSpy.Tests/Compare/CompareContextMenuTests.cs @@ -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() + var entry = AppComposition.Current.GetExport() .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() + var entry = AppComposition.Current.GetExport() .Entries.Single(e => e.Metadata.Header == "Compare...").Value; var coreLibName = typeof(object).Assembly.GetName().Name!; var node = vm.AssemblyTreeModel.FindNode(coreLibName); @@ -91,9 +91,9 @@ public class CompareContextMenuTests var vm = (MainWindowViewModel)window.DataContext!; await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 2); - var entry = AppComposition.Current.GetExport() + var entry = AppComposition.Current.GetExport() .Entries.Single(e => e.Metadata.Header == "Compare...").Value; - var dockWorkspace = AppComposition.Current.GetExport(); + var dockWorkspace = AppComposition.Current.GetExport(); var assemblies = vm.AssemblyTreeModel.AssemblyList!.GetAssemblies() .Where(a => a.IsLoadedAsValidAssembly).Take(2).ToList(); var nodes = assemblies.Select(a => diff --git a/ILSpy.Tests/Compare/CompareEngineTests.cs b/ILSpy.Tests/Compare/CompareEngineTests.cs index 2e847bd7c..1663ba478 100644 --- a/ILSpy.Tests/Compare/CompareEngineTests.cs +++ b/ILSpy.Tests/Compare/CompareEngineTests.cs @@ -23,7 +23,7 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.TypeSystem; -using ILSpy.Compare; +using ICSharpCode.ILSpy.Compare; using NUnit.Framework; diff --git a/ILSpy.Tests/Compare/CompareViewRenderTests.cs b/ILSpy.Tests/Compare/CompareViewRenderTests.cs index 884264eb5..323282644 100644 --- a/ILSpy.Tests/Compare/CompareViewRenderTests.cs +++ b/ILSpy.Tests/Compare/CompareViewRenderTests.cs @@ -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() + var entry = AppComposition.Current.GetExport() .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() + var entry = AppComposition.Current.GetExport() .Entries.Single(e => e.Metadata.Header == "Compare...").Value; var assemblies = new[] { await vm.OpenFixtureAsync("FixtureA"), diff --git a/ILSpy.Tests/ContextMenus/ContextMenuFrameworkTests.cs b/ILSpy.Tests/ContextMenus/ContextMenuFrameworkTests.cs index 41341d616..b1ef9bf68 100644 --- a/ILSpy.Tests/ContextMenus/ContextMenuFrameworkTests.cs +++ b/ILSpy.Tests/ContextMenus/ContextMenuFrameworkTests.cs @@ -25,7 +25,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; +using ICSharpCode.ILSpy; using NUnit.Framework; diff --git a/ILSpy.Tests/ContextMenus/CopyFullyQualifiedNameTests.cs b/ILSpy.Tests/ContextMenus/CopyFullyQualifiedNameTests.cs index 9356cd2df..342b14589 100644 --- a/ILSpy.Tests/ContextMenus/CopyFullyQualifiedNameTests.cs +++ b/ILSpy.Tests/ContextMenus/CopyFullyQualifiedNameTests.cs @@ -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; diff --git a/ILSpy.Tests/ContextMenus/CreateDiagramContextMenuTests.cs b/ILSpy.Tests/ContextMenus/CreateDiagramContextMenuTests.cs index a89c50afa..382fb0664 100644 --- a/ILSpy.Tests/ContextMenus/CreateDiagramContextMenuTests.cs +++ b/ILSpy.Tests/ContextMenus/CreateDiagramContextMenuTests.cs @@ -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; diff --git a/ILSpy.Tests/ContextMenus/DecompileInNewViewTests.cs b/ILSpy.Tests/ContextMenus/DecompileInNewViewTests.cs index f813ae4b4..c9774969f 100644 --- a/ILSpy.Tests/ContextMenus/DecompileInNewViewTests.cs +++ b/ILSpy.Tests/ContextMenus/DecompileInNewViewTests.cs @@ -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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var nodeA = vm.AssemblyTreeModel.FindNode("System.Linq"); var nodeB = vm.AssemblyTreeModel.FindNode(TreeNavigation.CoreLibName); @@ -188,7 +188,7 @@ public class DecompileInNewViewTests await Task.Delay(25); } - var rowB = grid.GetVisualDescendants().OfType() + var rowB = grid.GetVisualDescendants().OfType() .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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var assemblies = vm.AssemblyTreeModel.Root!.Children.OfType().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::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem Row(SharpTreeNode node) => grid.GetVisualDescendants() + .OfType() .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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var nodeA = vm.AssemblyTreeModel.FindNode("System.Linq"); var nodeB = vm.AssemblyTreeModel.FindNode(TreeNavigation.CoreLibName); @@ -308,7 +308,7 @@ public class DecompileInNewViewTests await Task.Delay(25); } - var rowB = grid.GetVisualDescendants().OfType() + var rowB = grid.GetVisualDescendants().OfType() .First(r => RowNodeEquals(r, nodeB)); int tabsBefore = vm.DockWorkspace.Documents!.VisibleDockables!.OfType().Count(); @@ -342,7 +342,7 @@ public class DecompileInNewViewTests var vm = (MainWindowViewModel)window.DataContext!; await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3); var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var nodeA = vm.AssemblyTreeModel.FindNode("System.Linq"); var nodeB = vm.AssemblyTreeModel.FindNode(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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var assemblies = vm.AssemblyTreeModel.Root!.Children.OfType().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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var documents = ((ILSpyDockFactory)vm.DockWorkspace.Factory).Documents!; var assemblies = vm.AssemblyTreeModel.Root!.Children.OfType().Take(3).ToArray(); @@ -498,9 +498,9 @@ public class DecompileInNewViewTests var registry = AppComposition.Current.GetExport(); var tableNode = vm.AssemblyTreeModel.FindCoreLib() - .GetChild() - .GetChild() - .GetChild(); + .GetChild() + .GetChild() + .GetChild(); var documents = ((ILSpyDockFactory)vm.DockWorkspace.Factory).Documents!; int before = documents.VisibleDockables?.OfType().Count() ?? 0; @@ -511,23 +511,23 @@ public class DecompileInNewViewTests await Waiters.WaitForAsync( () => documents.VisibleDockables!.OfType() - .Any(t => t.Content is global::ILSpy.ViewModels.MetadataTablePageModel)); + .Any(t => t.Content is global::ICSharpCode.ILSpy.ViewModels.MetadataTablePageModel)); documents.VisibleDockables!.OfType().Count() .Should().BeGreaterThan(before, "a new tab must open"); var newTab = documents.VisibleDockables!.OfType() - .First(t => t.Content is global::ILSpy.ViewModels.MetadataTablePageModel); - newTab.Content.Should().BeOfType( + .First(t => t.Content is global::ICSharpCode.ILSpy.ViewModels.MetadataTablePageModel); + newTab.Content.Should().BeOfType( "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(global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem row, SharpTreeNode node) => ReferenceEquals(row.DataContext, node); - static SharpTreeNode? GridSelectedNode(global::ILSpy.Controls.TreeView.SharpTreeView grid) + static SharpTreeNode? GridSelectedNode(global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView grid) => grid.SelectedItem as SharpTreeNode; - static System.Collections.Generic.List GridSelectedNodes(global::ILSpy.Controls.TreeView.SharpTreeView grid) + static System.Collections.Generic.List GridSelectedNodes(global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView grid) => grid.SelectedItems!.Cast() .OfType() .ToList(); diff --git a/ILSpy.Tests/ContextMenus/DecompileReferenceContextMenuTests.cs b/ILSpy.Tests/ContextMenus/DecompileReferenceContextMenuTests.cs index 0a4e73496..c234caf8d 100644 --- a/ILSpy.Tests/ContextMenus/DecompileReferenceContextMenuTests.cs +++ b/ILSpy.Tests/ContextMenus/DecompileReferenceContextMenuTests.cs @@ -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; diff --git a/ILSpy.Tests/ContextMenus/ExportProjectEntryTests.cs b/ILSpy.Tests/ContextMenus/ExportProjectEntryTests.cs index 85efbf406..5bf85355d 100644 --- a/ILSpy.Tests/ContextMenus/ExportProjectEntryTests.cs +++ b/ILSpy.Tests/ContextMenus/ExportProjectEntryTests.cs @@ -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; diff --git a/ILSpy.Tests/ContextMenus/KeyboardContextMenuFocusTests.cs b/ILSpy.Tests/ContextMenus/KeyboardContextMenuFocusTests.cs index 48c838f62..ac8ae92f6 100644 --- a/ILSpy.Tests/ContextMenus/KeyboardContextMenuFocusTests.cs +++ b/ILSpy.Tests/ContextMenus/KeyboardContextMenuFocusTests.cs @@ -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(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); var node = vm.AssemblyTreeModel.Root!.Children.OfType().First(); vm.AssemblyTreeModel.SelectNode(node); @@ -68,7 +68,7 @@ public class KeyboardContextMenuFocusTests } var row = grid.GetVisualDescendants() - .OfType().First(); + .OfType().First(); row.Focus(NavigationMethod.Tab); Dispatcher.UIThread.RunJobs(); diff --git a/ILSpy.Tests/ContextMenus/OpenContainingFolderTests.cs b/ILSpy.Tests/ContextMenus/OpenContainingFolderTests.cs index 27dd16882..f68631c77 100644 --- a/ILSpy.Tests/ContextMenus/OpenContainingFolderTests.cs +++ b/ILSpy.Tests/ContextMenus/OpenContainingFolderTests.cs @@ -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; diff --git a/ILSpy.Tests/ContextMenus/ReferenceScopeAndNewTabTests.cs b/ILSpy.Tests/ContextMenus/ReferenceScopeAndNewTabTests.cs index 4fe363bd1..cc571ad23 100644 --- a/ILSpy.Tests/ContextMenus/ReferenceScopeAndNewTabTests.cs +++ b/ILSpy.Tests/ContextMenus/ReferenceScopeAndNewTabTests.cs @@ -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; diff --git a/ILSpy.Tests/ContextMenus/SaveCodeSolutionContextMenuTests.cs b/ILSpy.Tests/ContextMenus/SaveCodeSolutionContextMenuTests.cs index f0e8cde30..a9040c3a1 100644 --- a/ILSpy.Tests/ContextMenus/SaveCodeSolutionContextMenuTests.cs +++ b/ILSpy.Tests/ContextMenus/SaveCodeSolutionContextMenuTests.cs @@ -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; diff --git a/ILSpy.Tests/ContextMenus/SearchMsdnTests.cs b/ILSpy.Tests/ContextMenus/SearchMsdnTests.cs index 5f91d2eb9..905317958 100644 --- a/ILSpy.Tests/ContextMenus/SearchMsdnTests.cs +++ b/ILSpy.Tests/ContextMenus/SearchMsdnTests.cs @@ -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; diff --git a/ILSpy.Tests/Controls/SharpTreeViewEmptySpaceDropTests.cs b/ILSpy.Tests/Controls/SharpTreeViewEmptySpaceDropTests.cs index f41740226..f7cfe8983 100644 --- a/ILSpy.Tests/Controls/SharpTreeViewEmptySpaceDropTests.cs +++ b/ILSpy.Tests/Controls/SharpTreeViewEmptySpaceDropTests.cs @@ -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; diff --git a/ILSpy.Tests/Controls/SharpTreeViewTests.cs b/ILSpy.Tests/Controls/SharpTreeViewTests.cs index 997c1eb8b..80c860eb7 100644 --- a/ILSpy.Tests/Controls/SharpTreeViewTests.cs +++ b/ILSpy.Tests/Controls/SharpTreeViewTests.cs @@ -28,7 +28,7 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.TreeView; -using ILSpy.Controls.TreeView; +using ICSharpCode.ILSpy.Controls.TreeView; using NUnit.Framework; diff --git a/ILSpy.Tests/Diagnostics/GraphVizGraphTests.cs b/ILSpy.Tests/Diagnostics/GraphVizGraphTests.cs index 2ddd3ada2..3f488f0f4 100644 --- a/ILSpy.Tests/Diagnostics/GraphVizGraphTests.cs +++ b/ILSpy.Tests/Diagnostics/GraphVizGraphTests.cs @@ -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 global::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 ` [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 global::ICSharpCode.ILSpy.Util.GraphVizGraph(); + g.AddNode(new global::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 global::ICSharpCode.ILSpy.Util.GraphVizGraph(); + g.AddEdge(new global::ICSharpCode.ILSpy.Util.GraphVizEdge(1, 2)); + g.AddEdge(new global::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 global::ICSharpCode.ILSpy.Util.GraphVizGraph(); + g.AddNode(new global::ICSharpCode.ILSpy.Util.GraphVizNode(0) { label = "a \"quoted\" label" }); var sw = new StringWriter(); g.Save(sw); sw.ToString().Should().Contain("\"a \\\"quoted\\\" label\""); diff --git a/ILSpy.Tests/Diagnostics/InputDiagnosticsTests.cs b/ILSpy.Tests/Diagnostics/InputDiagnosticsTests.cs index 4a8b98947..5641f41f5 100644 --- a/ILSpy.Tests/Diagnostics/InputDiagnosticsTests.cs +++ b/ILSpy.Tests/Diagnostics/InputDiagnosticsTests.cs @@ -26,7 +26,7 @@ using Avalonia.Threading; using AwesomeAssertions; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; using NUnit.Framework; diff --git a/ILSpy.Tests/Diagnostics/StartupPerfTests.cs b/ILSpy.Tests/Diagnostics/StartupPerfTests.cs index 6d114d855..abb78832e 100644 --- a/ILSpy.Tests/Diagnostics/StartupPerfTests.cs +++ b/ILSpy.Tests/Diagnostics/StartupPerfTests.cs @@ -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(); var swGrid = Stopwatch.StartNew(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); swGrid.Stop(); TestContext.Out.WriteLine($"SharpTreeView descendant available: {swGrid.ElapsedMilliseconds} ms"); diff --git a/ILSpy.Tests/Docking/ContentPageHierarchyTests.cs b/ILSpy.Tests/Docking/ContentPageHierarchyTests.cs index e66aeff8a..7805296b7 100644 --- a/ILSpy.Tests/Docking/ContentPageHierarchyTests.cs +++ b/ILSpy.Tests/Docking/ContentPageHierarchyTests.cs @@ -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(); + typeof(global::ICSharpCode.ILSpy.TextView.DecompilerTabPageModel).Should().BeAssignableTo(); typeof(MetadataTablePageModel).Should().BeAssignableTo(); - typeof(global::ILSpy.Compare.CompareTabPageModel).Should().BeAssignableTo(); - typeof(global::ILSpy.Options.OptionsPageModel).Should().BeAssignableTo( + typeof(global::ICSharpCode.ILSpy.Compare.CompareTabPageModel).Should().BeAssignableTo(); + typeof(global::ICSharpCode.ILSpy.Options.OptionsPageModel).Should().BeAssignableTo( "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(global::ICSharpCode.ILSpy.Options.OptionsPageModel).GetProperty("IsStaticContent")!.DeclaringType .Should().Be(typeof(ContentPageModel), "OptionsPageModel must inherit IsStaticContent, not redeclare it"); } } diff --git a/ILSpy.Tests/Docking/DockWorkspaceTests.cs b/ILSpy.Tests/Docking/DockWorkspaceTests.cs index 17058d688..a8ce81906 100644 --- a/ILSpy.Tests/Docking/DockWorkspaceTests.cs +++ b/ILSpy.Tests/Docking/DockWorkspaceTests.cs @@ -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(); - 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(); diff --git a/ILSpy.Tests/Docking/DockableViewOwnershipTests.cs b/ILSpy.Tests/Docking/DockableViewOwnershipTests.cs index 884ed543f..8eaf43e33 100644 --- a/ILSpy.Tests/Docking/DockableViewOwnershipTests.cs +++ b/ILSpy.Tests/Docking/DockableViewOwnershipTests.cs @@ -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; diff --git a/ILSpy.Tests/Docking/DocumentTabContextMenuTests.cs b/ILSpy.Tests/Docking/DocumentTabContextMenuTests.cs index 944ce4e5e..36bda6c0f 100644 --- a/ILSpy.Tests/Docking/DocumentTabContextMenuTests.cs +++ b/ILSpy.Tests/Docking/DocumentTabContextMenuTests.cs @@ -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 = global::ICSharpCode.ILSpy.Themes.PreviewTabContextMenuBehavior.BuildDocumentContextMenu(a); var items = menu.ItemsSource!.OfType().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 = global::ICSharpCode.ILSpy.Themes.PreviewTabContextMenuBehavior.BuildDocumentContextMenu(a); var close = menu.ItemsSource!.OfType() .Single(m => Equals(m.Header, ICSharpCode.ILSpy.Properties.Resources.Close)); diff --git a/ILSpy.Tests/Docking/DocumentTabStripModeTests.cs b/ILSpy.Tests/Docking/DocumentTabStripModeTests.cs index 6af21efc1..cf2b52792 100644 --- a/ILSpy.Tests/Docking/DocumentTabStripModeTests.cs +++ b/ILSpy.Tests/Docking/DocumentTabStripModeTests.cs @@ -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; diff --git a/ILSpy.Tests/Docking/FrozenTabRefreshTests.cs b/ILSpy.Tests/Docking/FrozenTabRefreshTests.cs index 5387f1810..57e316218 100644 --- a/ILSpy.Tests/Docking/FrozenTabRefreshTests.cs +++ b/ILSpy.Tests/Docking/FrozenTabRefreshTests.cs @@ -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; diff --git a/ILSpy.Tests/Docking/LayoutPersistenceTests.cs b/ILSpy.Tests/Docking/LayoutPersistenceTests.cs index ebf0951b8..36f72d80d 100644 --- a/ILSpy.Tests/Docking/LayoutPersistenceTests.cs +++ b/ILSpy.Tests/Docking/LayoutPersistenceTests.cs @@ -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(); // 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(global::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(); + var registryForRoundTrip = AppComposition.Current.GetExport(); 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(); - var liveSearch = AppComposition.Current.GetExport(); + var liveAssemblyTree = AppComposition.Current.GetExport(); + var liveSearch = AppComposition.Current.GetExport(); var allLoaded = Flatten(roundTrip).ToList(); - allLoaded.OfType().Should().Contain(liveAssemblyTree, + allLoaded.OfType().Should().Contain(liveAssemblyTree, "loaded AssemblyTreeModel must be the live MEF singleton, not a fresh instance"); - allLoaded.OfType().Should().Contain(liveSearch, + allLoaded.OfType().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(); + var registry = AppComposition.Current.GetExport(); 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 global::ICSharpCode.ILSpy.TextView.DecompilerTabPageModel()); + dockWorkspace.OpenNewTab(new global::ICSharpCode.ILSpy.TextView.DecompilerTabPageModel()); TestCapture.Step("three-document-tabs-open"); var sourceDocs = dockWorkspace.Documents!.VisibleDockables! .OfType().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(); + var registry = AppComposition.Current.GetExport(); 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(); + var registry = AppComposition.Current.GetExport(); 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(); + var registry = AppComposition.Current.GetExport(); 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"); diff --git a/ILSpy.Tests/Docking/MultiRowTabStripTests.cs b/ILSpy.Tests/Docking/MultiRowTabStripTests.cs index b3cc80deb..f251c0145 100644 --- a/ILSpy.Tests/Docking/MultiRowTabStripTests.cs +++ b/ILSpy.Tests/Docking/MultiRowTabStripTests.cs @@ -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; diff --git a/ILSpy.Tests/Docking/PreviewTabPromotionTests.cs b/ILSpy.Tests/Docking/PreviewTabPromotionTests.cs index 6f0730b15..cfcc642ee 100644 --- a/ILSpy.Tests/Docking/PreviewTabPromotionTests.cs +++ b/ILSpy.Tests/Docking/PreviewTabPromotionTests.cs @@ -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 = global::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 diff --git a/ILSpy.Tests/Docking/RunInNewTabTests.cs b/ILSpy.Tests/Docking/RunInNewTabTests.cs index e821277fb..28ba18c2d 100644 --- a/ILSpy.Tests/Docking/RunInNewTabTests.cs +++ b/ILSpy.Tests/Docking/RunInNewTabTests.cs @@ -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; diff --git a/ILSpy.Tests/Docking/SingletonDocumentTabTests.cs b/ILSpy.Tests/Docking/SingletonDocumentTabTests.cs index 069c2f8bc..b56918239 100644 --- a/ILSpy.Tests/Docking/SingletonDocumentTabTests.cs +++ b/ILSpy.Tests/Docking/SingletonDocumentTabTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/CaretHighlightAdornerTests.cs b/ILSpy.Tests/Editor/CaretHighlightAdornerTests.cs index 1ad45a1d9..c74dcee4f 100644 --- a/ILSpy.Tests/Editor/CaretHighlightAdornerTests.cs +++ b/ILSpy.Tests/Editor/CaretHighlightAdornerTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/DecompilerViewTests.cs b/ILSpy.Tests/Editor/DecompilerViewTests.cs index 70e146ef5..09d1ed96f 100644 --- a/ILSpy.Tests/Editor/DecompilerViewTests.cs +++ b/ILSpy.Tests/Editor/DecompilerViewTests.cs @@ -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(); + var settings = AppComposition.Current.GetExport(); settings.DisplaySettings.ExpandMemberDefinitions = true; settings.DisplaySettings.ExpandUsingDeclarations = true; diff --git a/ILSpy.Tests/Editor/DocumentationLinkTests.cs b/ILSpy.Tests/Editor/DocumentationLinkTests.cs index caa73e548..9b2ee394e 100644 --- a/ILSpy.Tests/Editor/DocumentationLinkTests.cs +++ b/ILSpy.Tests/Editor/DocumentationLinkTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs b/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs index 1906006dd..62b531ef7 100644 --- a/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs +++ b/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs @@ -30,7 +30,7 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.CSharp.OutputVisitor; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; diff --git a/ILSpy.Tests/Editor/EditorCommandsTests.cs b/ILSpy.Tests/Editor/EditorCommandsTests.cs index f089bb391..44ec844ab 100644 --- a/ILSpy.Tests/Editor/EditorCommandsTests.cs +++ b/ILSpy.Tests/Editor/EditorCommandsTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/EditorZoomTests.cs b/ILSpy.Tests/Editor/EditorZoomTests.cs index 5418a0daf..04f7c6426 100644 --- a/ILSpy.Tests/Editor/EditorZoomTests.cs +++ b/ILSpy.Tests/Editor/EditorZoomTests.cs @@ -18,7 +18,7 @@ using AwesomeAssertions; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; diff --git a/ILSpy.Tests/Editor/FoldingContextMenuTests.cs b/ILSpy.Tests/Editor/FoldingContextMenuTests.cs index b8d19a159..1371d114c 100644 --- a/ILSpy.Tests/Editor/FoldingContextMenuTests.cs +++ b/ILSpy.Tests/Editor/FoldingContextMenuTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/FoldingsViewStateTests.cs b/ILSpy.Tests/Editor/FoldingsViewStateTests.cs index 70b76f38a..b8149f306 100644 --- a/ILSpy.Tests/Editor/FoldingsViewStateTests.cs +++ b/ILSpy.Tests/Editor/FoldingsViewStateTests.cs @@ -23,7 +23,7 @@ using AvaloniaEdit.Folding; using AwesomeAssertions; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; diff --git a/ILSpy.Tests/Editor/HtmlClipboardCopyTests.cs b/ILSpy.Tests/Editor/HtmlClipboardCopyTests.cs index 5e315a584..bd6f683cd 100644 --- a/ILSpy.Tests/Editor/HtmlClipboardCopyTests.cs +++ b/ILSpy.Tests/Editor/HtmlClipboardCopyTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/ILLanguageTooltipTests.cs b/ILSpy.Tests/Editor/ILLanguageTooltipTests.cs index 735ff0cee..555f66b6e 100644 --- a/ILSpy.Tests/Editor/ILLanguageTooltipTests.cs +++ b/ILSpy.Tests/Editor/ILLanguageTooltipTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/ReferenceClickTests.cs b/ILSpy.Tests/Editor/ReferenceClickTests.cs index 58a695e88..0f5f1111a 100644 --- a/ILSpy.Tests/Editor/ReferenceClickTests.cs +++ b/ILSpy.Tests/Editor/ReferenceClickTests.cs @@ -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; diff --git a/ILSpy.Tests/Editor/XmlDocumentationTests.cs b/ILSpy.Tests/Editor/XmlDocumentationTests.cs index e209adedd..d062675bc 100644 --- a/ILSpy.Tests/Editor/XmlDocumentationTests.cs +++ b/ILSpy.Tests/Editor/XmlDocumentationTests.cs @@ -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; diff --git a/ILSpy.Tests/EntityReferenceResolveTests.cs b/ILSpy.Tests/EntityReferenceResolveTests.cs index b5af5d67b..e49b76ddb 100644 --- a/ILSpy.Tests/EntityReferenceResolveTests.cs +++ b/ILSpy.Tests/EntityReferenceResolveTests.cs @@ -24,8 +24,8 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.TypeSystem; -using ILSpy; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/FixtureAssembly.cs b/ILSpy.Tests/FixtureAssembly.cs index 3c47c2403..87eaa369a 100644 --- a/ILSpy.Tests/FixtureAssembly.cs +++ b/ILSpy.Tests/FixtureAssembly.cs @@ -24,7 +24,7 @@ using System.Threading.Tasks; using ICSharpCode.ILSpyX; -using global::ILSpy.ViewModels; +using global::ICSharpCode.ILSpy.ViewModels; namespace ICSharpCode.ILSpy.Tests; diff --git a/ILSpy.Tests/Input/HeadlessMmbPointerTests.cs b/ILSpy.Tests/Input/HeadlessMmbPointerTests.cs index 11e2fe151..db9dc184c 100644 --- a/ILSpy.Tests/Input/HeadlessMmbPointerTests.cs +++ b/ILSpy.Tests/Input/HeadlessMmbPointerTests.cs @@ -28,12 +28,12 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.Docking; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -59,13 +59,13 @@ public class HeadlessMmbPointerTests await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1); var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); // Any realised SharpTreeViewItem whose DataContext is an ILSpyTreeNode is a valid click // target — the exact node doesn't matter, only that the gesture pipeline fires. - await Waiters.WaitForAsync(() => grid.GetVisualDescendants().OfType() + await Waiters.WaitForAsync(() => grid.GetVisualDescendants().OfType() .Any(r => r.DataContext is ILSpyTreeNode)); - var row = grid.GetVisualDescendants().OfType() + var row = grid.GetVisualDescendants().OfType() .First(r => r.DataContext is ILSpyTreeNode); // Snapshot the tab count BEFORE the gesture so we can assert a strict +1 after. @@ -108,11 +108,11 @@ public class HeadlessMmbPointerTests await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1); var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); - await Waiters.WaitForAsync(() => grid.GetVisualDescendants().OfType() + await Waiters.WaitForAsync(() => grid.GetVisualDescendants().OfType() .Any(r => r.DataContext is ILSpyTreeNode)); - var row = grid.GetVisualDescendants().OfType() + var row = grid.GetVisualDescendants().OfType() .First(r => r.DataContext is ILSpyTreeNode); var documents = ((ILSpyDockFactory)vm.DockWorkspace.Factory).Documents!; @@ -152,14 +152,14 @@ public class HeadlessMmbPointerTests await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1); var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); // Any realised SharpTreeViewItem whose data is an ILSpyTreeNode is a fine target; the // non-leaf assembly node row (depth 0) is always present and never confused with a // method row whose tree-toggle area is null. - await Waiters.WaitForAsync(() => grid.GetVisualDescendants().OfType() + await Waiters.WaitForAsync(() => grid.GetVisualDescendants().OfType() .Any(r => r.DataContext is ILSpyTreeNode)); - var row = grid.GetVisualDescendants().OfType() + var row = grid.GetVisualDescendants().OfType() .First(r => r.DataContext is ILSpyTreeNode); var documents = ((ILSpyDockFactory)vm.DockWorkspace.Factory).Documents!; diff --git a/ILSpy.Tests/Languages/CSharpBracketSearcherTests.cs b/ILSpy.Tests/Languages/CSharpBracketSearcherTests.cs index 54f9b71d7..7df7300f9 100644 --- a/ILSpy.Tests/Languages/CSharpBracketSearcherTests.cs +++ b/ILSpy.Tests/Languages/CSharpBracketSearcherTests.cs @@ -20,7 +20,7 @@ using AvaloniaEdit.Document; using AwesomeAssertions; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; @@ -38,7 +38,7 @@ public class CSharpBracketSearcherTests { // CSharpBracketSearcher is internal; the easiest way to get an instance without // making it public is through CSharpLanguage.BracketSearcher (its public-API path). - static IBracketSearcher Searcher() => new global::ILSpy.Languages.CSharpLanguage().BracketSearcher; + static IBracketSearcher Searcher() => new global::ICSharpCode.ILSpy.Languages.CSharpLanguage().BracketSearcher; static TextDocument Doc(string text) => new(text); diff --git a/ILSpy.Tests/Languages/CSharpILMixedLanguageTests.cs b/ILSpy.Tests/Languages/CSharpILMixedLanguageTests.cs index fcae5e7a1..f82fb397b 100644 --- a/ILSpy.Tests/Languages/CSharpILMixedLanguageTests.cs +++ b/ILSpy.Tests/Languages/CSharpILMixedLanguageTests.cs @@ -23,11 +23,11 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Languages; -using ILSpy.TextView; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/Languages/ExportPreviewRowTests.cs b/ILSpy.Tests/Languages/ExportPreviewRowTests.cs index 034492fc8..42652d78c 100644 --- a/ILSpy.Tests/Languages/ExportPreviewRowTests.cs +++ b/ILSpy.Tests/Languages/ExportPreviewRowTests.cs @@ -23,7 +23,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Views; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Languages/LanguageServiceTests.cs b/ILSpy.Tests/Languages/LanguageServiceTests.cs index b3e6a0882..e4e8aa292 100644 --- a/ILSpy.Tests/Languages/LanguageServiceTests.cs +++ b/ILSpy.Tests/Languages/LanguageServiceTests.cs @@ -22,8 +22,8 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.Languages; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Languages; using NUnit.Framework; @@ -43,7 +43,7 @@ public class LanguageServiceTests var svc = AppComposition.Current.GetExport(); svc.Languages.Select(l => l.Name).Should().Contain(["C#", "IL"], - "CSharpLanguage and ILLanguage are [Export(typeof(Language))] in ILSpy.Languages."); + "CSharpLanguage and ILLanguage are [Export(typeof(Language))] in ICSharpCode.ILSpy.Languages."); svc.CurrentLanguage.Name.Should().Be("C#", "LanguageService picks 'C#' over the alphabetical-first language when no SessionSettings preference exists."); } diff --git a/ILSpy.Tests/Languages/LanguageVersionAffectsDecompilerOutputTests.cs b/ILSpy.Tests/Languages/LanguageVersionAffectsDecompilerOutputTests.cs index eabef6cf1..1714e2cac 100644 --- a/ILSpy.Tests/Languages/LanguageVersionAffectsDecompilerOutputTests.cs +++ b/ILSpy.Tests/Languages/LanguageVersionAffectsDecompilerOutputTests.cs @@ -24,11 +24,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; diff --git a/ILSpy.Tests/Languages/LanguageVersionDropdownTests.cs b/ILSpy.Tests/Languages/LanguageVersionDropdownTests.cs index 6ac640c64..d000db51f 100644 --- a/ILSpy.Tests/Languages/LanguageVersionDropdownTests.cs +++ b/ILSpy.Tests/Languages/LanguageVersionDropdownTests.cs @@ -27,11 +27,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Languages; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Languages/ProjectExportRunnerTests.cs b/ILSpy.Tests/Languages/ProjectExportRunnerTests.cs index b7e23f5b1..c135c614b 100644 --- a/ILSpy.Tests/Languages/ProjectExportRunnerTests.cs +++ b/ILSpy.Tests/Languages/ProjectExportRunnerTests.cs @@ -29,11 +29,11 @@ using AwesomeAssertions; using ICSharpCode.Decompiler; using ICSharpCode.ILSpyX; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Languages; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Languages/ProjectExportTests.cs b/ILSpy.Tests/Languages/ProjectExportTests.cs index c5fd3a2fd..8fdf1f080 100644 --- a/ILSpy.Tests/Languages/ProjectExportTests.cs +++ b/ILSpy.Tests/Languages/ProjectExportTests.cs @@ -26,11 +26,11 @@ using AwesomeAssertions; using ICSharpCode.Decompiler; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.Languages; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -79,7 +79,7 @@ public class ProjectExportTests Directory.CreateDirectory(tempDir); try { - var options = new global::ILSpy.DecompilationOptions { + var options = new global::ICSharpCode.ILSpy.DecompilationOptions { FullDecompilation = true, SaveAsProjectDirectory = tempDir, }; diff --git a/ILSpy.Tests/Languages/SolutionExportTests.cs b/ILSpy.Tests/Languages/SolutionExportTests.cs index cdb6bb8ed..90fdb87d6 100644 --- a/ILSpy.Tests/Languages/SolutionExportTests.cs +++ b/ILSpy.Tests/Languages/SolutionExportTests.cs @@ -24,8 +24,8 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.Languages; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Languages; using NUnit.Framework; @@ -34,7 +34,7 @@ namespace ICSharpCode.ILSpy.Tests.Languages; /// /// End-to-end smoke test of the multi-assembly solution (.sln) export path that backs the /// "Save Code" entry when several assemblies are selected. Drives -/// directly (no file picker) +/// directly (no file picker) /// and asserts a solution file plus one project per assembly is produced. /// [TestFixture] @@ -60,7 +60,7 @@ public class SolutionExportTests var slnPath = Path.Combine(tempDir, "Solution.sln"); try { - var result = await global::ILSpy.SolutionWriter.CreateSolutionAsync(slnPath, language, assemblies); + var result = await global::ICSharpCode.ILSpy.SolutionWriter.CreateSolutionAsync(slnPath, language, assemblies); result.Success.Should().BeTrue( "the solution export should succeed for valid assemblies. Status:\n" + result.StatusText); @@ -105,7 +105,7 @@ public class SolutionExportTests { // The same assembly twice collides on ShortName: the writer must refuse rather than // clobber one project directory with another. - var result = await global::ILSpy.SolutionWriter.CreateSolutionAsync( + var result = await global::ICSharpCode.ILSpy.SolutionWriter.CreateSolutionAsync( slnPath, language, new[] { assembly, assembly }); result.Success.Should().BeFalse("duplicate assembly names cannot produce a valid solution"); diff --git a/ILSpy.Tests/MainWindow/AboutPageUpdateSectionTests.cs b/ILSpy.Tests/MainWindow/AboutPageUpdateSectionTests.cs index 2b4e631b6..4d0a90418 100644 --- a/ILSpy.Tests/MainWindow/AboutPageUpdateSectionTests.cs +++ b/ILSpy.Tests/MainWindow/AboutPageUpdateSectionTests.cs @@ -28,11 +28,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Docking; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/MainWindow/LanguageVersionPersistenceTests.cs b/ILSpy.Tests/MainWindow/LanguageVersionPersistenceTests.cs index c664865ec..b26644218 100644 --- a/ILSpy.Tests/MainWindow/LanguageVersionPersistenceTests.cs +++ b/ILSpy.Tests/MainWindow/LanguageVersionPersistenceTests.cs @@ -26,9 +26,9 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Languages; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Languages; using NUnit.Framework; diff --git a/ILSpy.Tests/MainWindow/MainMenuTests.cs b/ILSpy.Tests/MainWindow/MainMenuTests.cs index a10e59699..379bd439c 100644 --- a/ILSpy.Tests/MainWindow/MainMenuTests.cs +++ b/ILSpy.Tests/MainWindow/MainMenuTests.cs @@ -27,8 +27,8 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.AppEnv; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/MainWindow/MainToolBarLayoutTests.cs b/ILSpy.Tests/MainWindow/MainToolBarLayoutTests.cs index b97b148f9..228656dc6 100644 --- a/ILSpy.Tests/MainWindow/MainToolBarLayoutTests.cs +++ b/ILSpy.Tests/MainWindow/MainToolBarLayoutTests.cs @@ -28,11 +28,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Search; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -133,11 +133,11 @@ public class MainToolBarLayoutTests // Icons may be declared as either static-readonly fields (eager) or static // properties with a lazy backing field (post-perf-pass). Look up either shape. var bindingFlags = System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static; - var imagesType = typeof(global::ILSpy.Images.Images); + var imagesType = typeof(global::ICSharpCode.ILSpy.Images); var field = imagesType.GetField(name, bindingFlags); var property = field is null ? imagesType.GetProperty(name, bindingFlags) : null; (field is not null || property is not null).Should().BeTrue( - $"toolbar command with ToolTip='{entry.Metadata.ToolTip}' references Images/{name} but no static member with that name exists in ILSpy.Images.Images"); + $"toolbar command with ToolTip='{entry.Metadata.ToolTip}' references Images/{name} but no static member with that name exists in ICSharpCode.ILSpy.Images"); var value = field is not null ? field.GetValue(null) : property!.GetValue(null); value.Should().NotBeNull( $"the Images.{name} member is declared but null at runtime"); diff --git a/ILSpy.Tests/MainWindow/MainWindowTests.cs b/ILSpy.Tests/MainWindow/MainWindowTests.cs index bd382f96b..8510b2de9 100644 --- a/ILSpy.Tests/MainWindow/MainWindowTests.cs +++ b/ILSpy.Tests/MainWindow/MainWindowTests.cs @@ -26,13 +26,13 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; -using ILSpy.Views.Controls; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; +using ICSharpCode.ILSpy.Views.Controls; using NUnit.Framework; diff --git a/ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs b/ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs index 13c4fbd72..b883ef64e 100644 --- a/ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs +++ b/ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs @@ -27,8 +27,8 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.AppEnv; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs b/ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs index 484f99929..8ccebdd3e 100644 --- a/ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs +++ b/ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs @@ -20,7 +20,7 @@ using AwesomeAssertions; using Dock.Controls.DeferredContentControl; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/MainWindow/ToolPaneRegistryTests.cs b/ILSpy.Tests/MainWindow/ToolPaneRegistryTests.cs index d5a7bb85d..162215f5e 100644 --- a/ILSpy.Tests/MainWindow/ToolPaneRegistryTests.cs +++ b/ILSpy.Tests/MainWindow/ToolPaneRegistryTests.cs @@ -24,12 +24,12 @@ using AwesomeAssertions; using Dock.Model.Controls; -using ILSpy.Analyzers; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.Commands; -using ILSpy.Docking; -using ILSpy.Search; +using ICSharpCode.ILSpy.Analyzers; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Search; using NUnit.Framework; diff --git a/ILSpy.Tests/MainWindow/WindowMenuOpenDocumentsTests.cs b/ILSpy.Tests/MainWindow/WindowMenuOpenDocumentsTests.cs index bf7bb2643..4fc3e1ee2 100644 --- a/ILSpy.Tests/MainWindow/WindowMenuOpenDocumentsTests.cs +++ b/ILSpy.Tests/MainWindow/WindowMenuOpenDocumentsTests.cs @@ -27,9 +27,9 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.Docking; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/CompiledFilterTests.cs b/ILSpy.Tests/Metadata/CompiledFilterTests.cs index 069569586..68605d262 100644 --- a/ILSpy.Tests/Metadata/CompiledFilterTests.cs +++ b/ILSpy.Tests/Metadata/CompiledFilterTests.cs @@ -21,7 +21,7 @@ using System.Reflection; using AwesomeAssertions; -using ILSpy.Metadata.Filters; +using ICSharpCode.ILSpy.Metadata.Filters; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/CustomDebugInformationRowDetailsTests.cs b/ILSpy.Tests/Metadata/CustomDebugInformationRowDetailsTests.cs index 6f7f0fa4c..22bad80fd 100644 --- a/ILSpy.Tests/Metadata/CustomDebugInformationRowDetailsTests.cs +++ b/ILSpy.Tests/Metadata/CustomDebugInformationRowDetailsTests.cs @@ -35,13 +35,13 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.DebugInfo; using ICSharpCode.Decompiler.Metadata; -using ILSpy.Metadata; -using ILSpy.Metadata.DebugTables; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.DebugTables; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; -using CustomDebugInformationEntry = ILSpy.Metadata.DebugTables.CustomDebugInformationTableTreeNode.CustomDebugInformationEntry; +using CustomDebugInformationEntry = ICSharpCode.ILSpy.Metadata.DebugTables.CustomDebugInformationTableTreeNode.CustomDebugInformationEntry; namespace ICSharpCode.ILSpy.Tests.Metadata; diff --git a/ILSpy.Tests/Metadata/DebugDirectoryChildNodesTests.cs b/ILSpy.Tests/Metadata/DebugDirectoryChildNodesTests.cs index 6d51dd49d..87705fdcd 100644 --- a/ILSpy.Tests/Metadata/DebugDirectoryChildNodesTests.cs +++ b/ILSpy.Tests/Metadata/DebugDirectoryChildNodesTests.cs @@ -23,7 +23,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/EmbeddedPdbTreeTests.cs b/ILSpy.Tests/Metadata/EmbeddedPdbTreeTests.cs index c43f6cd54..a3336dfc5 100644 --- a/ILSpy.Tests/Metadata/EmbeddedPdbTreeTests.cs +++ b/ILSpy.Tests/Metadata/EmbeddedPdbTreeTests.cs @@ -25,9 +25,9 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.Metadata; -using ILSpy.Metadata.DebugTables; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.DebugTables; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/FilterStatePresenterTests.cs b/ILSpy.Tests/Metadata/FilterStatePresenterTests.cs index 406566cd7..6c71ba9d3 100644 --- a/ILSpy.Tests/Metadata/FilterStatePresenterTests.cs +++ b/ILSpy.Tests/Metadata/FilterStatePresenterTests.cs @@ -21,7 +21,7 @@ using System.Reflection; using AwesomeAssertions; -using ILSpy.Metadata.Filters; +using ICSharpCode.ILSpy.Metadata.Filters; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/FilterStateSerializerTests.cs b/ILSpy.Tests/Metadata/FilterStateSerializerTests.cs index 438d5c840..e296afd9b 100644 --- a/ILSpy.Tests/Metadata/FilterStateSerializerTests.cs +++ b/ILSpy.Tests/Metadata/FilterStateSerializerTests.cs @@ -23,7 +23,7 @@ using System.Reflection; using AwesomeAssertions; -using ILSpy.Metadata.Filters; +using ICSharpCode.ILSpy.Metadata.Filters; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/FlagsFilterPopupTests.cs b/ILSpy.Tests/Metadata/FlagsFilterPopupTests.cs index 42b2c659d..2e029aee6 100644 --- a/ILSpy.Tests/Metadata/FlagsFilterPopupTests.cs +++ b/ILSpy.Tests/Metadata/FlagsFilterPopupTests.cs @@ -27,8 +27,8 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy.Metadata.Filters; -using ILSpy.Views.Filters; +using ICSharpCode.ILSpy.Metadata.Filters; +using ICSharpCode.ILSpy.Views.Filters; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/FlagsSchemaInfererTests.cs b/ILSpy.Tests/Metadata/FlagsSchemaInfererTests.cs index ee07d8e1a..f7c80a71c 100644 --- a/ILSpy.Tests/Metadata/FlagsSchemaInfererTests.cs +++ b/ILSpy.Tests/Metadata/FlagsSchemaInfererTests.cs @@ -22,7 +22,7 @@ using System.Reflection; using AwesomeAssertions; -using ILSpy.Metadata.Filters; +using ICSharpCode.ILSpy.Metadata.Filters; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/FlagsTooltipTests.cs b/ILSpy.Tests/Metadata/FlagsTooltipTests.cs index 5c5bcd0be..2b9f25a48 100644 --- a/ILSpy.Tests/Metadata/FlagsTooltipTests.cs +++ b/ILSpy.Tests/Metadata/FlagsTooltipTests.cs @@ -24,7 +24,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/GoToTokenContextMenuTests.cs b/ILSpy.Tests/Metadata/GoToTokenContextMenuTests.cs index 34926f5c4..c950b782f 100644 --- a/ILSpy.Tests/Metadata/GoToTokenContextMenuTests.cs +++ b/ILSpy.Tests/Metadata/GoToTokenContextMenuTests.cs @@ -21,10 +21,10 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.Commands; -using ILSpy.Metadata; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/GoToTokenHistoryTests.cs b/ILSpy.Tests/Metadata/GoToTokenHistoryTests.cs index 202635c46..47b1c7962 100644 --- a/ILSpy.Tests/Metadata/GoToTokenHistoryTests.cs +++ b/ILSpy.Tests/Metadata/GoToTokenHistoryTests.cs @@ -25,8 +25,8 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.Metadata; -using ILSpy.Metadata; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/HeapTreeTests.cs b/ILSpy.Tests/Metadata/HeapTreeTests.cs index 3c66792c1..ca04bdeeb 100644 --- a/ILSpy.Tests/Metadata/HeapTreeTests.cs +++ b/ILSpy.Tests/Metadata/HeapTreeTests.cs @@ -23,7 +23,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/HideEmptyMetadataTablesTests.cs b/ILSpy.Tests/Metadata/HideEmptyMetadataTablesTests.cs index 515374076..2b6fed78c 100644 --- a/ILSpy.Tests/Metadata/HideEmptyMetadataTablesTests.cs +++ b/ILSpy.Tests/Metadata/HideEmptyMetadataTablesTests.cs @@ -24,11 +24,11 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/HideEmptyMetadataTablesUiBindingTests.cs b/ILSpy.Tests/Metadata/HideEmptyMetadataTablesUiBindingTests.cs index 1dbd21211..a6d703458 100644 --- a/ILSpy.Tests/Metadata/HideEmptyMetadataTablesUiBindingTests.cs +++ b/ILSpy.Tests/Metadata/HideEmptyMetadataTablesUiBindingTests.cs @@ -23,11 +23,11 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataCellTooltipTests.cs b/ILSpy.Tests/Metadata/MetadataCellTooltipTests.cs index ccca5724c..0e94378e0 100644 --- a/ILSpy.Tests/Metadata/MetadataCellTooltipTests.cs +++ b/ILSpy.Tests/Metadata/MetadataCellTooltipTests.cs @@ -18,7 +18,7 @@ using AwesomeAssertions; -using ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataColumnBuilderTests.cs b/ILSpy.Tests/Metadata/MetadataColumnBuilderTests.cs index c6d43af39..6dd88f103 100644 --- a/ILSpy.Tests/Metadata/MetadataColumnBuilderTests.cs +++ b/ILSpy.Tests/Metadata/MetadataColumnBuilderTests.cs @@ -23,8 +23,8 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataDisablesLanguageSwitchingTests.cs b/ILSpy.Tests/Metadata/MetadataDisablesLanguageSwitchingTests.cs index d6a4a4364..e1b5946e5 100644 --- a/ILSpy.Tests/Metadata/MetadataDisablesLanguageSwitchingTests.cs +++ b/ILSpy.Tests/Metadata/MetadataDisablesLanguageSwitchingTests.cs @@ -25,10 +25,10 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy; -using ILSpy.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; @@ -53,7 +53,7 @@ public class MetadataDisablesLanguageSwitchingTests { // Decompiler tabs ARE the place where Language / Language-Version matter. The // default-true is what enables the toolbar pickers on a fresh decompile tab. - var model = new global::ILSpy.TextView.DecompilerTabPageModel(); + var model = new global::ICSharpCode.ILSpy.TextView.DecompilerTabPageModel(); model.SupportsLanguageSwitching.Should().BeTrue(); } @@ -72,7 +72,7 @@ public class MetadataDisablesLanguageSwitchingTests tab.SupportsLanguageSwitching.Should().BeFalse( "swapping in a MetadataTablePageModel must propagate its false flag up to the wrapper"); - var dec = new global::ILSpy.TextView.DecompilerTabPageModel(); + var dec = new global::ICSharpCode.ILSpy.TextView.DecompilerTabPageModel(); tab.Content = dec; tab.SupportsLanguageSwitching.Should().BeTrue( "swapping back to a decompiler tab must restore the true flag"); diff --git a/ILSpy.Tests/Metadata/MetadataFilterRowEndToEndTests.cs b/ILSpy.Tests/Metadata/MetadataFilterRowEndToEndTests.cs index b11a6270e..72a20b044 100644 --- a/ILSpy.Tests/Metadata/MetadataFilterRowEndToEndTests.cs +++ b/ILSpy.Tests/Metadata/MetadataFilterRowEndToEndTests.cs @@ -32,8 +32,8 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataFilterTests.cs b/ILSpy.Tests/Metadata/MetadataFilterTests.cs index 2dd354210..c698cfb78 100644 --- a/ILSpy.Tests/Metadata/MetadataFilterTests.cs +++ b/ILSpy.Tests/Metadata/MetadataFilterTests.cs @@ -28,10 +28,10 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.Metadata.CorTables; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -168,8 +168,8 @@ public class MetadataFilterTests public SampleFlags Attributes { get; set; } } - static global::ILSpy.Metadata.Filters.FilterState NewFlagsState() => - new(global::ILSpy.Metadata.Filters.FlagsSchemaInferer.For(typeof(SampleFlags))); + static global::ICSharpCode.ILSpy.Metadata.Filters.FilterState NewFlagsState() => + new(global::ICSharpCode.ILSpy.Metadata.Filters.FlagsSchemaInferer.For(typeof(SampleFlags))); [Test] public void Empty_FlagsState_Matches_Every_Row() @@ -187,7 +187,7 @@ public class MetadataFilterTests public void Required_Independent_Flag_Narrows_To_Rows_With_That_Bit_Set() { var state = NewFlagsState(); - state.SetFlagState(nameof(SampleFlags.Public), global::ILSpy.Metadata.Filters.TriState.Required); + state.SetFlagState(nameof(SampleFlags.Public), global::ICSharpCode.ILSpy.Metadata.Filters.TriState.Required); MetadataTablePageModel.MatchesFilters( new FlagsEntry { Attributes = SampleFlags.Public | SampleFlags.Static }, new[] { new ColumnFilter("Attributes") { FlagsState = state } }).Should().BeTrue(); @@ -202,8 +202,8 @@ public class MetadataFilterTests // Without an explicit mode the schema starts in MatchMode.All — every required // flag must be set. Public | Static row passes; Public alone doesn't. var state = NewFlagsState(); - state.SetFlagState(nameof(SampleFlags.Public), global::ILSpy.Metadata.Filters.TriState.Required); - state.SetFlagState(nameof(SampleFlags.Static), global::ILSpy.Metadata.Filters.TriState.Required); + state.SetFlagState(nameof(SampleFlags.Public), global::ICSharpCode.ILSpy.Metadata.Filters.TriState.Required); + state.SetFlagState(nameof(SampleFlags.Static), global::ICSharpCode.ILSpy.Metadata.Filters.TriState.Required); MetadataTablePageModel.MatchesFilters( new FlagsEntry { Attributes = SampleFlags.Public | SampleFlags.Static }, new[] { new ColumnFilter("Attributes") { FlagsState = state } }).Should().BeTrue(); @@ -216,7 +216,7 @@ public class MetadataFilterTests public void Excluded_Flag_Hides_Rows_With_That_Bit_Set() { var state = NewFlagsState(); - state.SetFlagState(nameof(SampleFlags.Static), global::ILSpy.Metadata.Filters.TriState.Excluded); + state.SetFlagState(nameof(SampleFlags.Static), global::ICSharpCode.ILSpy.Metadata.Filters.TriState.Excluded); MetadataTablePageModel.MatchesFilters( new FlagsEntry { Attributes = SampleFlags.Public }, new[] { new ColumnFilter("Attributes") { FlagsState = state } }).Should().BeTrue(); @@ -229,7 +229,7 @@ public class MetadataFilterTests public void FlagsState_And_Text_Filter_AND_Together_On_The_Same_Column() { var state = NewFlagsState(); - state.SetFlagState(nameof(SampleFlags.Public), global::ILSpy.Metadata.Filters.TriState.Required); + state.SetFlagState(nameof(SampleFlags.Public), global::ICSharpCode.ILSpy.Metadata.Filters.TriState.Required); MetadataTablePageModel.MatchesFilters( new FlagsEntry { Attributes = SampleFlags.Public | SampleFlags.Static }, new[] { new ColumnFilter("Attributes") { FlagsState = state, Text = "Static" } }).Should().BeTrue(); diff --git a/ILSpy.Tests/Metadata/MetadataNodeIconParityTests.cs b/ILSpy.Tests/Metadata/MetadataNodeIconParityTests.cs index 7f11ca0fd..34373b2b2 100644 --- a/ILSpy.Tests/Metadata/MetadataNodeIconParityTests.cs +++ b/ILSpy.Tests/Metadata/MetadataNodeIconParityTests.cs @@ -24,7 +24,7 @@ using Avalonia.Media; using AwesomeAssertions; -using ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata; using NUnit.Framework; @@ -51,39 +51,39 @@ public class MetadataNodeIconParityTests var children = metadataNode.Children; // Assert — root + PE header nodes. - metadataNode.Icon.Should().BeSameAs(global::ILSpy.Images.Images.Metadata, "the Metadata root uses the Metadata glyph"); - children.OfType().Single().Icon.Should().BeSameAs(global::ILSpy.Images.Images.Header); - children.OfType().Single().Icon.Should().BeSameAs(global::ILSpy.Images.Images.Header); - children.OfType().Single().Icon.Should().BeSameAs(global::ILSpy.Images.Images.Header); + metadataNode.Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.Metadata, "the Metadata root uses the Metadata glyph"); + children.OfType().Single().Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.Header); + children.OfType().Single().Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.Header); + children.OfType().Single().Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.Header); // Assert — the directory-container nodes use the list-folder glyphs (closed + open on // expand), as WPF shipped. These are the folder-with-list-lines glyph, distinct from the // generic empty folder; the port had collapsed them onto the plain folder icon. var dataDirs = children.OfType().Single(); - dataDirs.Icon.Should().BeSameAs(global::ILSpy.Images.Images.ListFolder); - dataDirs.ExpandedIcon.Should().BeSameAs(global::ILSpy.Images.Images.ListFolderOpen); + dataDirs.Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.ListFolder); + dataDirs.ExpandedIcon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.ListFolderOpen); var debugDir = children.OfType().Single(); - debugDir.Icon.Should().BeSameAs(global::ILSpy.Images.Images.ListFolder); - debugDir.ExpandedIcon.Should().BeSameAs(global::ILSpy.Images.Images.ListFolderOpen); + debugDir.Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.ListFolder); + debugDir.ExpandedIcon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.ListFolderOpen); // Assert — "Tables" uses the table-group glyph, distinct from a single table. var tables = children.OfType().Single(); - tables.Icon.Should().BeSameAs(global::ILSpy.Images.Images.MetadataTableGroup); - tables.Icon.Should().NotBeSameAs(global::ILSpy.Images.Images.MetadataTable); + tables.Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.MetadataTableGroup); + tables.Icon.Should().NotBeSameAs(global::ICSharpCode.ILSpy.Images.MetadataTable); // Assert — every heap node (String/UserString/Guid/Blob) uses the Heap glyph. var heaps = children.OfType().ToList(); heaps.Should().NotBeEmpty("CoreLib exposes the String/UserString/Guid/Blob heaps"); - heaps.Should().OnlyContain(h => ReferenceEquals(h.Icon, global::ILSpy.Images.Images.Heap)); + heaps.Should().OnlyContain(h => ReferenceEquals(h.Icon, global::ICSharpCode.ILSpy.Images.Heap)); // Assert — the individual table nodes still use the single-table glyph (base unchanged). tables.EnsureLazyChildren(); var aTable = tables.Children.OfType().First(); - aTable.Icon.Should().BeSameAs(global::ILSpy.Images.Images.MetadataTable); + aTable.Icon.Should().BeSameAs(global::ICSharpCode.ILSpy.Images.MetadataTable); // Assert — the newly ported assets actually load (LoadSvg yields a usable image, not null). - foreach (var img in new IImage[] { global::ILSpy.Images.Images.Metadata, global::ILSpy.Images.Images.Header, global::ILSpy.Images.Images.Heap, global::ILSpy.Images.Images.MetadataTableGroup, global::ILSpy.Images.Images.ListFolder, global::ILSpy.Images.Images.ListFolderOpen }) + foreach (var img in new IImage[] { global::ICSharpCode.ILSpy.Images.Metadata, global::ICSharpCode.ILSpy.Images.Header, global::ICSharpCode.ILSpy.Images.Heap, global::ICSharpCode.ILSpy.Images.MetadataTableGroup, global::ICSharpCode.ILSpy.Images.ListFolder, global::ICSharpCode.ILSpy.Images.ListFolderOpen }) { ((object?)img).Should().NotBeNull(); img.Size.Width.Should().BeGreaterThan(0, "a ported SVG must decode to a non-zero-size image"); diff --git a/ILSpy.Tests/Metadata/MetadataProtocolHandlerDrillDownTests.cs b/ILSpy.Tests/Metadata/MetadataProtocolHandlerDrillDownTests.cs index cf813bc7c..95a65eff6 100644 --- a/ILSpy.Tests/Metadata/MetadataProtocolHandlerDrillDownTests.cs +++ b/ILSpy.Tests/Metadata/MetadataProtocolHandlerDrillDownTests.cs @@ -25,11 +25,11 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.Metadata; -using ILSpy.Metadata.CorTables; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -135,7 +135,7 @@ public class MetadataProtocolHandlerDrillDownTests // The handler is exported as IProtocolHandler, not as itself — fish out the // MetadataProtocolHandler concrete impl from the contract list. var handler = AppComposition.Current - .GetExports() + .GetExports() .OfType() .Single(); return (handler, module, metadataNode); diff --git a/ILSpy.Tests/Metadata/MetadataRowActivationTests.cs b/ILSpy.Tests/Metadata/MetadataRowActivationTests.cs index 567935cd1..182f16324 100644 --- a/ILSpy.Tests/Metadata/MetadataRowActivationTests.cs +++ b/ILSpy.Tests/Metadata/MetadataRowActivationTests.cs @@ -23,15 +23,15 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Docking; -using ILSpy.Metadata; -using ILSpy.Metadata.CorTables; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataRowDetailsTests.cs b/ILSpy.Tests/Metadata/MetadataRowDetailsTests.cs index e49263ad0..e21ae845d 100644 --- a/ILSpy.Tests/Metadata/MetadataRowDetailsTests.cs +++ b/ILSpy.Tests/Metadata/MetadataRowDetailsTests.cs @@ -27,9 +27,9 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataTabSessionRestoreTests.cs b/ILSpy.Tests/Metadata/MetadataTabSessionRestoreTests.cs index 71eea00b5..1e9d6254c 100644 --- a/ILSpy.Tests/Metadata/MetadataTabSessionRestoreTests.cs +++ b/ILSpy.Tests/Metadata/MetadataTabSessionRestoreTests.cs @@ -23,11 +23,11 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Metadata; -using ILSpy.Metadata.CorTables; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; @@ -88,7 +88,7 @@ public class MetadataTabSessionRestoreTests .GetChild() .GetChild() .GetChild() - .GetChild(); + .GetChild(); vm.AssemblyTreeModel.SelectNode(documentTable); TestCapture.Step("selected-document-table"); diff --git a/ILSpy.Tests/Metadata/MetadataTablesTreeTests.cs b/ILSpy.Tests/Metadata/MetadataTablesTreeTests.cs index 027b2d197..6f0eaebff 100644 --- a/ILSpy.Tests/Metadata/MetadataTablesTreeTests.cs +++ b/ILSpy.Tests/Metadata/MetadataTablesTreeTests.cs @@ -24,7 +24,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs b/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs index f8c5590b1..dbc7b62ff 100644 --- a/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs +++ b/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs @@ -24,10 +24,10 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.Metadata.CorTables; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -73,7 +73,7 @@ public class MetadataTokenNavigationTests // ApplyScrollTarget, which clears ScrollToRow synchronously after handling — so // we don't observe the row index here, just that the selection is the right table // and a fresh metadata page is showing. - var factory = (global::ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory; + var factory = (global::ICSharpCode.ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory; var landed = (MetadataTablePageModel)factory.MainTab!.Content!; landed.Title.Should().Contain(expectedTableIndex.ToString()); // title leads with the kind byte landed.Items.Should().HaveCountGreaterThan((int)(expectedRowNumber - 1), diff --git a/ILSpy.Tests/Metadata/MetadataTooltipParityTests.cs b/ILSpy.Tests/Metadata/MetadataTooltipParityTests.cs index eeda758e2..45fe4ec30 100644 --- a/ILSpy.Tests/Metadata/MetadataTooltipParityTests.cs +++ b/ILSpy.Tests/Metadata/MetadataTooltipParityTests.cs @@ -24,9 +24,9 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.Metadata.CorTables; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/MetadataTreeShapeTests.cs b/ILSpy.Tests/Metadata/MetadataTreeShapeTests.cs index e0e0079ba..dafd5b019 100644 --- a/ILSpy.Tests/Metadata/MetadataTreeShapeTests.cs +++ b/ILSpy.Tests/Metadata/MetadataTreeShapeTests.cs @@ -23,8 +23,8 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/PEHeaderTreeTests.cs b/ILSpy.Tests/Metadata/PEHeaderTreeTests.cs index 168979871..fdb0390ec 100644 --- a/ILSpy.Tests/Metadata/PEHeaderTreeTests.cs +++ b/ILSpy.Tests/Metadata/PEHeaderTreeTests.cs @@ -23,7 +23,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata; using NUnit.Framework; @@ -123,8 +123,8 @@ public class PEHeaderTreeTests TestCapture.Step("decompiler-tab-restored"); decompilerTab.Should().NotBeNull(); - var mainTab = ((global::ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory).MainTab!; - mainTab.Content.Should().BeOfType(); + var mainTab = ((global::ICSharpCode.ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory).MainTab!; + mainTab.Content.Should().BeOfType(); } [AvaloniaTest] @@ -150,8 +150,8 @@ public class PEHeaderTreeTests await vm.DockWorkspace.WaitForDecompiledTextAsync(); TestCapture.Step("decompiler-tab"); - var mainTab = ((global::ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory).MainTab!; - mainTab.Content.Should().BeOfType(); + var mainTab = ((global::ICSharpCode.ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory).MainTab!; + mainTab.Content.Should().BeOfType(); } [AvaloniaTest] @@ -170,7 +170,7 @@ public class PEHeaderTreeTests var metadataNode = assemblyNode.GetChild(); var dosNode = metadataNode.GetChild(); var coffNode = metadataNode.GetChild(); - var factoryFactory = (global::ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory; + var factoryFactory = (global::ICSharpCode.ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory; var documents = factoryFactory.Documents!; var mainTab = factoryFactory.MainTab!; @@ -178,24 +178,24 @@ public class PEHeaderTreeTests await vm.DockWorkspace.WaitForMetadataTabAsync(); TestCapture.Step("dos-header-grid"); documents.VisibleDockables!.Should().HaveCount(1).And.Contain(mainTab); - mainTab.Content.Should().BeOfType(); + mainTab.Content.Should().BeOfType(); vm.AssemblyTreeModel.SelectNode(assemblyNode); await vm.DockWorkspace.WaitForDecompiledTextAsync(); TestCapture.Step("decompiler-tab"); documents.VisibleDockables!.Should().HaveCount(1).And.Contain(mainTab); - mainTab.Content.Should().BeOfType(); + mainTab.Content.Should().BeOfType(); vm.AssemblyTreeModel.SelectNode(coffNode); await vm.DockWorkspace.WaitForMetadataTabAsync(); TestCapture.Step("coff-header-grid"); documents.VisibleDockables!.Should().HaveCount(1).And.Contain(mainTab); - mainTab.Content.Should().BeOfType(); + mainTab.Content.Should().BeOfType(); vm.AssemblyTreeModel.SelectNode(assemblyNode); await vm.DockWorkspace.WaitForDecompiledTextAsync(); documents.VisibleDockables!.Should().HaveCount(1).And.Contain(mainTab); - mainTab.Content.Should().BeOfType(); + mainTab.Content.Should().BeOfType(); } [AvaloniaTest] @@ -230,7 +230,7 @@ public class PEHeaderTreeTests thirdTab.Should().BeSameAs(firstTab); thirdTab.Title.Should().Be("DOS Header"); - var mainTab = ((global::ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory).MainTab!; + var mainTab = ((global::ICSharpCode.ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory).MainTab!; mainTab.Content.Should().BeSameAs(firstTab, "the inner metadata viewmodel is reused in place"); } diff --git a/ILSpy.Tests/Metadata/ShowInMetadataContextMenuTests.cs b/ILSpy.Tests/Metadata/ShowInMetadataContextMenuTests.cs index 340fa47d8..3b31db39a 100644 --- a/ILSpy.Tests/Metadata/ShowInMetadataContextMenuTests.cs +++ b/ILSpy.Tests/Metadata/ShowInMetadataContextMenuTests.cs @@ -26,10 +26,10 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.TypeSystem; -using ILSpy; -using ILSpy.Commands; -using ILSpy.Metadata; -using ILSpy.TextView; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; diff --git a/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs b/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs index c5d4ecdda..30a1dcb2a 100644 --- a/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs +++ b/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs @@ -24,9 +24,9 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Metadata; -using ILSpy.Metadata.CorTables; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Metadata; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/Navigation/BrowseBackForwardCommandTests.cs b/ILSpy.Tests/Navigation/BrowseBackForwardCommandTests.cs index cee572550..981cd9d67 100644 --- a/ILSpy.Tests/Navigation/BrowseBackForwardCommandTests.cs +++ b/ILSpy.Tests/Navigation/BrowseBackForwardCommandTests.cs @@ -28,12 +28,12 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Docking; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Navigation/NavigationTests.cs b/ILSpy.Tests/Navigation/NavigationTests.cs index 2dae4f85c..6500f21d4 100644 --- a/ILSpy.Tests/Navigation/NavigationTests.cs +++ b/ILSpy.Tests/Navigation/NavigationTests.cs @@ -25,7 +25,7 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; @@ -139,8 +139,8 @@ public class NavigationTests ((string)items[1].Header!).Should().Be((string)methodA.NavigationText); ((string)items[0].Header!).Should().Contain("Enumerable", "NavigationText must include the declaring type"); - items[1].CommandParameter.Should().BeOfType(); - var entry = (global::ILSpy.Navigation.TreeNodeEntry)items[1].CommandParameter!; + items[1].CommandParameter.Should().BeOfType(); + var entry = (global::ICSharpCode.ILSpy.Navigation.TreeNodeEntry)items[1].CommandParameter!; ReferenceEquals(entry.Node, methodA).Should().BeTrue(); // Act 3 — multi-step jump: clicking methodA pops two entries off the back stack in one go. diff --git a/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs b/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs index 8629596e6..ed7283394 100644 --- a/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs +++ b/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs @@ -23,14 +23,14 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AssemblyTree; -using ILSpy.Navigation; -using ILSpy.TextView; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Navigation; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; -using FoldingSnapshot = ILSpy.TextView.FoldingsViewState.Snapshot; +using FoldingSnapshot = ICSharpCode.ILSpy.TextView.FoldingsViewState.Snapshot; namespace ICSharpCode.ILSpy.Tests.Navigation; diff --git a/ILSpy.Tests/NuGetFeeds/FakeNuGetFeedClient.cs b/ILSpy.Tests/NuGetFeeds/FakeNuGetFeedClient.cs index 0035a17f5..449046de8 100644 --- a/ILSpy.Tests/NuGetFeeds/FakeNuGetFeedClient.cs +++ b/ILSpy.Tests/NuGetFeeds/FakeNuGetFeedClient.cs @@ -22,7 +22,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using ILSpy.NuGetFeeds; +using ICSharpCode.ILSpy.NuGetFeeds; namespace ICSharpCode.ILSpy.Tests.NuGetFeeds; diff --git a/ILSpy.Tests/NuGetFeeds/NuGetFeedSettingsTests.cs b/ILSpy.Tests/NuGetFeeds/NuGetFeedSettingsTests.cs index 053b4ec3c..16089917b 100644 --- a/ILSpy.Tests/NuGetFeeds/NuGetFeedSettingsTests.cs +++ b/ILSpy.Tests/NuGetFeeds/NuGetFeedSettingsTests.cs @@ -21,7 +21,7 @@ using System.Xml.Linq; using AwesomeAssertions; -using ILSpy.NuGetFeeds; +using ICSharpCode.ILSpy.NuGetFeeds; using NUnit.Framework; diff --git a/ILSpy.Tests/NuGetFeeds/OpenFromNuGetFeedViewModelTests.cs b/ILSpy.Tests/NuGetFeeds/OpenFromNuGetFeedViewModelTests.cs index 3bbe87ab9..321bfb6bc 100644 --- a/ILSpy.Tests/NuGetFeeds/OpenFromNuGetFeedViewModelTests.cs +++ b/ILSpy.Tests/NuGetFeeds/OpenFromNuGetFeedViewModelTests.cs @@ -25,8 +25,8 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.NuGetFeeds; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.NuGetFeeds; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Options/ApiVisibilityFilterTests.cs b/ILSpy.Tests/Options/ApiVisibilityFilterTests.cs index 54b0312e2..1ae793a3b 100644 --- a/ILSpy.Tests/Options/ApiVisibilityFilterTests.cs +++ b/ILSpy.Tests/Options/ApiVisibilityFilterTests.cs @@ -30,13 +30,13 @@ using AwesomeAssertions; using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.Languages; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -233,7 +233,7 @@ public class ApiVisibilityFilterTests await Waiters.WaitForAsync(() => window.GetVisualDescendants().OfType().Any()); var pane = await window.WaitForComponent(); - var grid = await pane.WaitForComponent(); + var grid = await pane.WaitForComponent(); // Selecting each node scrolls it into view; that's how the row's TextBlock realises. vm.AssemblyTreeModel.SelectNode(publicMethod); diff --git a/ILSpy.Tests/Options/DisplaySettingsReactionTests.cs b/ILSpy.Tests/Options/DisplaySettingsReactionTests.cs index 7646fb32e..0ffd566b6 100644 --- a/ILSpy.Tests/Options/DisplaySettingsReactionTests.cs +++ b/ILSpy.Tests/Options/DisplaySettingsReactionTests.cs @@ -27,11 +27,11 @@ using Avalonia.Threading; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Options; -using ILSpy.TextView; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Options; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.TreeNodes; using NUnit.Framework; diff --git a/ILSpy.Tests/Options/OptionsPageScrollReachTests.cs b/ILSpy.Tests/Options/OptionsPageScrollReachTests.cs index dcc4def44..3bcb3cb9e 100644 --- a/ILSpy.Tests/Options/OptionsPageScrollReachTests.cs +++ b/ILSpy.Tests/Options/OptionsPageScrollReachTests.cs @@ -28,12 +28,12 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Docking; -using ILSpy.Options; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Options; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Options/OptionsTabTests.cs b/ILSpy.Tests/Options/OptionsTabTests.cs index 5722fd809..26ddccf1c 100644 --- a/ILSpy.Tests/Options/OptionsTabTests.cs +++ b/ILSpy.Tests/Options/OptionsTabTests.cs @@ -26,15 +26,15 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Docking; -using ILSpy.Options; -using ILSpy.TextView; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Options; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Options/SessionSettingsFilterStatesTests.cs b/ILSpy.Tests/Options/SessionSettingsFilterStatesTests.cs index f86f47051..4ac0aa90e 100644 --- a/ILSpy.Tests/Options/SessionSettingsFilterStatesTests.cs +++ b/ILSpy.Tests/Options/SessionSettingsFilterStatesTests.cs @@ -20,7 +20,7 @@ using System.Xml.Linq; using AwesomeAssertions; -using ILSpy; +using ICSharpCode.ILSpy; using NUnit.Framework; @@ -42,12 +42,12 @@ public class SessionSettingsFilterStatesTests // outer // nesting AND that the inner FilterState // payload (an opaque XElement to SessionSettings) survives unmolested. var original = new SessionSettings(); - original.FilterStates[("ILSpy.Metadata.CorTables.TypeDefEntry", "Attributes")] = + original.FilterStates[("ICSharpCode.ILSpy.Metadata.CorTables.TypeDefEntry", "Attributes")] = new XElement("FilterState", new XElement("Flag", new XAttribute("name", "Sealed"), new XAttribute("state", "Required"))); - original.FilterStates[("ILSpy.Metadata.CorTables.MethodDefEntry", "Attributes")] = + original.FilterStates[("ICSharpCode.ILSpy.Metadata.CorTables.MethodDefEntry", "Attributes")] = new XElement("FilterState", new XElement("Mutex", new XAttribute("group", "MemberAccess"), @@ -58,9 +58,9 @@ public class SessionSettingsFilterStatesTests restored.LoadFromXml(xml); restored.FilterStates.Should().HaveCount(2); - restored.FilterStates[("ILSpy.Metadata.CorTables.TypeDefEntry", "Attributes")] + restored.FilterStates[("ICSharpCode.ILSpy.Metadata.CorTables.TypeDefEntry", "Attributes")] .Element("Flag")!.Attribute("name")!.Value.Should().Be("Sealed"); - restored.FilterStates[("ILSpy.Metadata.CorTables.MethodDefEntry", "Attributes")] + restored.FilterStates[("ICSharpCode.ILSpy.Metadata.CorTables.MethodDefEntry", "Attributes")] .Element("Mutex")!.Element("Value")!.Value.Should().Be("6"); } diff --git a/ILSpy.Tests/Options/TabOptionsGroupTests.cs b/ILSpy.Tests/Options/TabOptionsGroupTests.cs index 91e260b04..0985f8c7f 100644 --- a/ILSpy.Tests/Options/TabOptionsGroupTests.cs +++ b/ILSpy.Tests/Options/TabOptionsGroupTests.cs @@ -27,11 +27,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.AppEnv; -using ILSpy.Commands; -using ILSpy.Options; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Options; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Options/ThemePickerTests.cs b/ILSpy.Tests/Options/ThemePickerTests.cs index 4d405ceac..7c60505ae 100644 --- a/ILSpy.Tests/Options/ThemePickerTests.cs +++ b/ILSpy.Tests/Options/ThemePickerTests.cs @@ -22,10 +22,10 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Options; -using ILSpy.Themes; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Options; +using ICSharpCode.ILSpy.Themes; using NUnit.Framework; diff --git a/ILSpy.Tests/Plugins/TestPluginCompositionTests.cs b/ILSpy.Tests/Plugins/TestPluginCompositionTests.cs index f9abd511e..fbaafedad 100644 --- a/ILSpy.Tests/Plugins/TestPluginCompositionTests.cs +++ b/ILSpy.Tests/Plugins/TestPluginCompositionTests.cs @@ -24,9 +24,9 @@ using System.Reflection; using AwesomeAssertions; -using ILSpy.Commands; -using ILSpy.Languages; -using ILSpy.Options; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.Options; using NUnit.Framework; diff --git a/ILSpy.Tests/ResetAppStateAttribute.cs b/ILSpy.Tests/ResetAppStateAttribute.cs index 60305b4f4..873539c88 100644 --- a/ILSpy.Tests/ResetAppStateAttribute.cs +++ b/ILSpy.Tests/ResetAppStateAttribute.cs @@ -28,7 +28,7 @@ using Avalonia.Threading; using ICSharpCode.ILSpyX.Settings; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; using NUnit.Framework; using NUnit.Framework.Interfaces; @@ -114,7 +114,7 @@ public sealed class ResetAppStateAttribute : Attribute, ITestAction Task quiesce; try { - quiesce = AppComposition.Current.GetExport().CancelPendingOperationsAsync(); + quiesce = AppComposition.Current.GetExport().CancelPendingOperationsAsync(); } catch { diff --git a/ILSpy.Tests/Resources/BamlResourceTests.cs b/ILSpy.Tests/Resources/BamlResourceTests.cs index 821b11922..8a809eaaf 100644 --- a/ILSpy.Tests/Resources/BamlResourceTests.cs +++ b/ILSpy.Tests/Resources/BamlResourceTests.cs @@ -26,17 +26,17 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Metadata; using ICSharpCode.ILSpyX.Abstractions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Baml; -using ILSpy.Languages; -using ILSpy.TreeNodes; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Baml; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; -using IResourceFileHandler = ILSpy.Languages.IResourceFileHandler; -using ResourceFileHandlerContext = ILSpy.Languages.ResourceFileHandlerContext; +using IResourceFileHandler = ICSharpCode.ILSpy.Languages.IResourceFileHandler; +using ResourceFileHandlerContext = ICSharpCode.ILSpy.Languages.ResourceFileHandlerContext; namespace ICSharpCode.ILSpy.Tests; diff --git a/ILSpy.Tests/Resources/IconCompositionTests.cs b/ILSpy.Tests/Resources/IconCompositionTests.cs index 04fd32202..19f70cdbb 100644 --- a/ILSpy.Tests/Resources/IconCompositionTests.cs +++ b/ILSpy.Tests/Resources/IconCompositionTests.cs @@ -20,7 +20,6 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.Images; using NUnit.Framework; diff --git a/ILSpy.Tests/Resources/ResourceFactoryTests.cs b/ILSpy.Tests/Resources/ResourceFactoryTests.cs index ac9ba594f..5b252eb5d 100644 --- a/ILSpy.Tests/Resources/ResourceFactoryTests.cs +++ b/ILSpy.Tests/Resources/ResourceFactoryTests.cs @@ -30,12 +30,12 @@ using AwesomeAssertions; using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Metadata; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Languages; -using ILSpy.TextView; -using ILSpy.TreeNodes; -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.Views; using NUnit.Framework; @@ -173,7 +173,7 @@ public class ResourceFactoryTests // up display name with the matching glob pattern correctly. // Arrange + Act — feed a two-format filter string through the parser. - var types = global::ILSpy.Commands.FilePickers.ParseFilter( + var types = global::ICSharpCode.ILSpy.Commands.FilePickers.ParseFilter( "Resources file (*.resources)|*.resources|Resource XML (*.resx)|*.resx"); // Assert — two file types come back, each with the right display name and pattern. diff --git a/ILSpy.Tests/Search/ScopeSearchToTests.cs b/ILSpy.Tests/Search/ScopeSearchToTests.cs index c5375f25e..41fad4f80 100644 --- a/ILSpy.Tests/Search/ScopeSearchToTests.cs +++ b/ILSpy.Tests/Search/ScopeSearchToTests.cs @@ -26,12 +26,12 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpyX.TreeView; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/SearchInputFocusTests.cs b/ILSpy.Tests/Search/SearchInputFocusTests.cs index 4bd86a72a..ed54c721c 100644 --- a/ILSpy.Tests/Search/SearchInputFocusTests.cs +++ b/ILSpy.Tests/Search/SearchInputFocusTests.cs @@ -24,11 +24,11 @@ using Avalonia.Threading; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.Docking; -using ILSpy.Search; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -66,7 +66,7 @@ public class SearchInputFocusTests var dockWorkspace = AppComposition.Current.GetExport(); // Search is hidden by default; surface it so its view realises. - dockWorkspace.ShowToolPane(global::ILSpy.Search.SearchPaneModel.PaneContentId); + dockWorkspace.ShowToolPane(global::ICSharpCode.ILSpy.Search.SearchPaneModel.PaneContentId); var pane = await window.WaitForComponent(); dockWorkspace.ShowSearchCommand.Execute(null); diff --git a/ILSpy.Tests/Search/SearchPaneAssemblyListChangedTests.cs b/ILSpy.Tests/Search/SearchPaneAssemblyListChangedTests.cs index 61a5a974d..90d676211 100644 --- a/ILSpy.Tests/Search/SearchPaneAssemblyListChangedTests.cs +++ b/ILSpy.Tests/Search/SearchPaneAssemblyListChangedTests.cs @@ -25,11 +25,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.Util; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.Util; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/SearchPaneModelTests.cs b/ILSpy.Tests/Search/SearchPaneModelTests.cs index 907831f48..e13f8a362 100644 --- a/ILSpy.Tests/Search/SearchPaneModelTests.cs +++ b/ILSpy.Tests/Search/SearchPaneModelTests.cs @@ -26,8 +26,8 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.Search; -using ILSpy.AppEnv; -using ILSpy.Search; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/SearchPaneNicetiesTests.cs b/ILSpy.Tests/Search/SearchPaneNicetiesTests.cs index 1ca3f6f6f..eb430a043 100644 --- a/ILSpy.Tests/Search/SearchPaneNicetiesTests.cs +++ b/ILSpy.Tests/Search/SearchPaneNicetiesTests.cs @@ -29,11 +29,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.Search; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.TextView; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -59,7 +59,7 @@ public class SearchPaneNicetiesTests static async Task<(MainWindow window, SearchPane pane, SearchPaneModel vm)> ShowPaneAsync() { var (window, _) = await TestHarness.BootAsync(); - var dockWorkspace = AppComposition.Current.GetExport(); + var dockWorkspace = AppComposition.Current.GetExport(); dockWorkspace.ShowToolPane(SearchPaneModel.PaneContentId); var pane = await window.WaitForComponent(); var vm = (SearchPaneModel)pane.DataContext!; @@ -144,7 +144,7 @@ public class SearchPaneNicetiesTests public async Task Ctrl_Enter_On_A_Result_Opens_It_In_A_New_Tab() { var (_, pane, vm) = await ShowPaneAsync(); - var workspace = AppComposition.Current.GetExport(); + var workspace = AppComposition.Current.GetExport(); vm.SelectedSearchMode = vm.SearchModes.First(m => m.Mode == SearchMode.Type); vm.SearchTerm = "Enumerable"; @@ -172,7 +172,7 @@ public class SearchPaneNicetiesTests public async Task Activate_With_NewTab_Opens_A_New_Document_Tab() { var (_, _, vm) = await ShowPaneAsync(); - var workspace = AppComposition.Current.GetExport(); + var workspace = AppComposition.Current.GetExport(); vm.SelectedSearchMode = vm.SearchModes.First(m => m.Mode == SearchMode.Type); vm.SearchTerm = "Enumerable"; diff --git a/ILSpy.Tests/Search/SearchPaneSortableColumnsTests.cs b/ILSpy.Tests/Search/SearchPaneSortableColumnsTests.cs index d410fcde5..7d2414226 100644 --- a/ILSpy.Tests/Search/SearchPaneSortableColumnsTests.cs +++ b/ILSpy.Tests/Search/SearchPaneSortableColumnsTests.cs @@ -27,9 +27,9 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpyX.Search; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -50,7 +50,7 @@ public class SearchPaneSortableColumnsTests { var window = AppComposition.Current.GetExport(); window.Show(); - AppComposition.Current.GetExport() + AppComposition.Current.GetExport() .ShowToolPane(SearchPaneModel.PaneContentId); var pane = await window.WaitForComponent(); diff --git a/ILSpy.Tests/Search/SearchPaneStreamingTests.cs b/ILSpy.Tests/Search/SearchPaneStreamingTests.cs index 26b056926..24d60835f 100644 --- a/ILSpy.Tests/Search/SearchPaneStreamingTests.cs +++ b/ILSpy.Tests/Search/SearchPaneStreamingTests.cs @@ -26,10 +26,10 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.Search; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -51,11 +51,11 @@ public class SearchPaneStreamingTests var module = await assemblyNode.LoadedAssembly.GetMetadataFileAsync(); var queue = new System.Collections.Concurrent.ConcurrentQueue(); - var language = AppComposition.Current.GetExport().CurrentLanguage; + var language = AppComposition.Current.GetExport().CurrentLanguage; var request = new ICSharpCode.ILSpyX.Search.SearchRequest { Mode = SearchMode.Type, Keywords = new[] { "Enumerable" }, - SearchResultFactory = new global::ILSpy.Search.AvaloniaSearchResultFactory(language), + SearchResultFactory = new global::ICSharpCode.ILSpy.Search.AvaloniaSearchResultFactory(language), DecompilerSettings = new ICSharpCode.Decompiler.DecompilerSettings(), FullNameSearch = false, OmitGenerics = false, diff --git a/ILSpy.Tests/Search/SearchPaneViewTests.cs b/ILSpy.Tests/Search/SearchPaneViewTests.cs index a5fa59f21..d03046811 100644 --- a/ILSpy.Tests/Search/SearchPaneViewTests.cs +++ b/ILSpy.Tests/Search/SearchPaneViewTests.cs @@ -24,9 +24,9 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -46,7 +46,7 @@ public class SearchPaneViewTests var window = AppComposition.Current.GetExport(); window.Show(); // Search is hidden by default; surface it so its view realises. - AppComposition.Current.GetExport() + AppComposition.Current.GetExport() .ShowToolPane(SearchPaneModel.PaneContentId); var pane = await window.WaitForComponent(); TestCapture.Step("booted"); @@ -69,7 +69,7 @@ public class SearchPaneViewTests var window = AppComposition.Current.GetExport(); window.Show(); // Search is hidden by default; surface it so its view realises. - AppComposition.Current.GetExport() + AppComposition.Current.GetExport() .ShowToolPane(SearchPaneModel.PaneContentId); var pane = await window.WaitForComponent(); TestCapture.Step("booted"); @@ -94,7 +94,7 @@ public class SearchPaneViewTests var window = AppComposition.Current.GetExport(); window.Show(); // Search is hidden by default; surface it so its view realises. - AppComposition.Current.GetExport() + AppComposition.Current.GetExport() .ShowToolPane(SearchPaneModel.PaneContentId); var pane = await window.WaitForComponent(); TestCapture.Step("booted"); diff --git a/ILSpy.Tests/Search/SearchPrefixParsingTests.cs b/ILSpy.Tests/Search/SearchPrefixParsingTests.cs index 0d4f29b83..fc6980dcc 100644 --- a/ILSpy.Tests/Search/SearchPrefixParsingTests.cs +++ b/ILSpy.Tests/Search/SearchPrefixParsingTests.cs @@ -20,7 +20,7 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.Search; -using ILSpy.Search; +using ICSharpCode.ILSpy.Search; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/SearchProgressTests.cs b/ILSpy.Tests/Search/SearchProgressTests.cs index 137763d40..de20b6f75 100644 --- a/ILSpy.Tests/Search/SearchProgressTests.cs +++ b/ILSpy.Tests/Search/SearchProgressTests.cs @@ -29,10 +29,10 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.Search; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; @@ -107,8 +107,8 @@ public class SearchProgressTests var window = AppComposition.Current.GetExport(); window.Show(); // Search is hidden by default; surface it so its view realises. - AppComposition.Current.GetExport() - .ShowToolPane(global::ILSpy.Search.SearchPaneModel.PaneContentId); + AppComposition.Current.GetExport() + .ShowToolPane(global::ICSharpCode.ILSpy.Search.SearchPaneModel.PaneContentId); var pane = await window.WaitForComponent(); TestCapture.Step("booted"); diff --git a/ILSpy.Tests/Search/SearchResultContextMenuTests.cs b/ILSpy.Tests/Search/SearchResultContextMenuTests.cs index 98e8e1093..8831449fc 100644 --- a/ILSpy.Tests/Search/SearchResultContextMenuTests.cs +++ b/ILSpy.Tests/Search/SearchResultContextMenuTests.cs @@ -28,12 +28,12 @@ using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpyX.Search; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Docking; -using ILSpy.Search; -using ILSpy.TreeNodes; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/SearchResultNavigationTests.cs b/ILSpy.Tests/Search/SearchResultNavigationTests.cs index 4f5375562..b1ee71e68 100644 --- a/ILSpy.Tests/Search/SearchResultNavigationTests.cs +++ b/ILSpy.Tests/Search/SearchResultNavigationTests.cs @@ -26,11 +26,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.Search; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/SearchResultSortOrderTests.cs b/ILSpy.Tests/Search/SearchResultSortOrderTests.cs index da056567d..3923b0562 100644 --- a/ILSpy.Tests/Search/SearchResultSortOrderTests.cs +++ b/ILSpy.Tests/Search/SearchResultSortOrderTests.cs @@ -26,11 +26,11 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.Search; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Search; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/SearchTermFilterTests.cs b/ILSpy.Tests/Search/SearchTermFilterTests.cs index d668087a1..7c0850d48 100644 --- a/ILSpy.Tests/Search/SearchTermFilterTests.cs +++ b/ILSpy.Tests/Search/SearchTermFilterTests.cs @@ -22,9 +22,9 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Search; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Search; using NUnit.Framework; diff --git a/ILSpy.Tests/Search/ShowSearchCommandTests.cs b/ILSpy.Tests/Search/ShowSearchCommandTests.cs index 7bc0d4b1d..bff27ded2 100644 --- a/ILSpy.Tests/Search/ShowSearchCommandTests.cs +++ b/ILSpy.Tests/Search/ShowSearchCommandTests.cs @@ -22,11 +22,11 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.Docking; -using ILSpy.Search; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Search; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/SessionSettingsTests.cs b/ILSpy.Tests/SessionSettingsTests.cs index d1fc5bea9..69b82553d 100644 --- a/ILSpy.Tests/SessionSettingsTests.cs +++ b/ILSpy.Tests/SessionSettingsTests.cs @@ -24,7 +24,7 @@ using Avalonia.Controls; using AwesomeAssertions; -using ILSpy; +using ICSharpCode.ILSpy; using NUnit.Framework; diff --git a/ILSpy.Tests/Settings/SessionSettingsMultiLineTabsTests.cs b/ILSpy.Tests/Settings/SessionSettingsMultiLineTabsTests.cs index 2c87f4df8..dd8dd6718 100644 --- a/ILSpy.Tests/Settings/SessionSettingsMultiLineTabsTests.cs +++ b/ILSpy.Tests/Settings/SessionSettingsMultiLineTabsTests.cs @@ -20,7 +20,7 @@ using System.Xml.Linq; using AwesomeAssertions; -using ILSpy; +using ICSharpCode.ILSpy; using NUnit.Framework; diff --git a/ILSpy.Tests/TestApp.axaml.cs b/ILSpy.Tests/TestApp.axaml.cs index 89e1447aa..e7c9ce18a 100644 --- a/ILSpy.Tests/TestApp.axaml.cs +++ b/ILSpy.Tests/TestApp.axaml.cs @@ -21,10 +21,10 @@ using System.IO; using ICSharpCode.ILSpyX.Settings; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; -using ProductionApp = ILSpy.App; -using SettingsService = ILSpy.SettingsService; +using ProductionApp = ICSharpCode.ILSpy.App; +using SettingsService = ICSharpCode.ILSpy.SettingsService; namespace ICSharpCode.ILSpy.Tests; diff --git a/ILSpy.Tests/TestCaptureExtensions.cs b/ILSpy.Tests/TestCaptureExtensions.cs index a80dd5761..0f96b3ee3 100644 --- a/ILSpy.Tests/TestCaptureExtensions.cs +++ b/ILSpy.Tests/TestCaptureExtensions.cs @@ -25,8 +25,8 @@ using Avalonia.Controls; using Avalonia.Headless; using Avalonia.Threading; -using global::ILSpy.AppEnv; -using global::ILSpy.Views; +using global::ICSharpCode.ILSpy.AppEnv; +using global::ICSharpCode.ILSpy.Views; namespace ICSharpCode.ILSpy.Tests; diff --git a/ILSpy.Tests/TestHarness.cs b/ILSpy.Tests/TestHarness.cs index 39671d189..657cebe3f 100644 --- a/ILSpy.Tests/TestHarness.cs +++ b/ILSpy.Tests/TestHarness.cs @@ -27,11 +27,11 @@ using Avalonia.Interactivity; using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpyX; -using global::ILSpy; -using global::ILSpy.AppEnv; -using global::ILSpy.Commands; -using global::ILSpy.ViewModels; -using global::ILSpy.Views; +using global::ICSharpCode.ILSpy; +using global::ICSharpCode.ILSpy.AppEnv; +using global::ICSharpCode.ILSpy.Commands; +using global::ICSharpCode.ILSpy.ViewModels; +using global::ICSharpCode.ILSpy.Views; namespace ICSharpCode.ILSpy.Tests; diff --git a/ILSpy.Tests/TextView/DisplaySettingsBridgeTests.cs b/ILSpy.Tests/TextView/DisplaySettingsBridgeTests.cs index 76bdf39b4..77a26598b 100644 --- a/ILSpy.Tests/TextView/DisplaySettingsBridgeTests.cs +++ b/ILSpy.Tests/TextView/DisplaySettingsBridgeTests.cs @@ -20,8 +20,8 @@ using AwesomeAssertions; using ICSharpCode.Decompiler; -using ILSpy.Options; -using ILSpy.TextView; +using ICSharpCode.ILSpy.Options; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; diff --git a/ILSpy.Tests/TextView/OutputLengthLimitTests.cs b/ILSpy.Tests/TextView/OutputLengthLimitTests.cs index 62a33ded8..70642de2f 100644 --- a/ILSpy.Tests/TextView/OutputLengthLimitTests.cs +++ b/ILSpy.Tests/TextView/OutputLengthLimitTests.cs @@ -20,7 +20,7 @@ using System; using AwesomeAssertions; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; diff --git a/ILSpy.Tests/Themes/ThemeAwareHighlightingColorizerTests.cs b/ILSpy.Tests/Themes/ThemeAwareHighlightingColorizerTests.cs index 8b7db112a..f07e60198 100644 --- a/ILSpy.Tests/Themes/ThemeAwareHighlightingColorizerTests.cs +++ b/ILSpy.Tests/Themes/ThemeAwareHighlightingColorizerTests.cs @@ -22,7 +22,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; using NUnit.Framework; diff --git a/ILSpy.Tests/Themes/ThemeManagerTests.cs b/ILSpy.Tests/Themes/ThemeManagerTests.cs index c73e01911..1e9e502a0 100644 --- a/ILSpy.Tests/Themes/ThemeManagerTests.cs +++ b/ILSpy.Tests/Themes/ThemeManagerTests.cs @@ -23,7 +23,7 @@ using AvaloniaEdit.Highlighting; using AwesomeAssertions; -using ILSpy.Themes; +using ICSharpCode.ILSpy.Themes; using NSubstitute; diff --git a/ILSpy.Tests/TreeNavigation.cs b/ILSpy.Tests/TreeNavigation.cs index 50b54f63e..9d3959150 100644 --- a/ILSpy.Tests/TreeNavigation.cs +++ b/ILSpy.Tests/TreeNavigation.cs @@ -21,8 +21,8 @@ using System.Linq; using ICSharpCode.ILSpyX.TreeView; -using global::ILSpy.AssemblyTree; -using global::ILSpy.TreeNodes; +using global::ICSharpCode.ILSpy.AssemblyTree; +using global::ICSharpCode.ILSpy.TreeNodes; namespace ICSharpCode.ILSpy.Tests; diff --git a/ILSpy.Tests/TreeNodeAssertions.cs b/ILSpy.Tests/TreeNodeAssertions.cs index ba24eaa08..e575a4af2 100644 --- a/ILSpy.Tests/TreeNodeAssertions.cs +++ b/ILSpy.Tests/TreeNodeAssertions.cs @@ -28,9 +28,9 @@ using AwesomeAssertions; using ICSharpCode.ILSpyX.TreeView; -using global::ILSpy.AppEnv; -using global::ILSpy.AssemblyTree; -using global::ILSpy.Views; +using global::ICSharpCode.ILSpy.AppEnv; +using global::ICSharpCode.ILSpy.AssemblyTree; +using global::ICSharpCode.ILSpy.Views; namespace ICSharpCode.ILSpy.Tests; @@ -83,7 +83,7 @@ public class TreeNodeBeAssertions // ScrollIntoView is posted at Background priority — give it time to realise the row. var deadline = DateTime.UtcNow + ScrollPollTimeout; - global::ILSpy.Controls.TreeView.SharpTreeViewItem? row = null; + global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem? row = null; bool ok = false; while (DateTime.UtcNow < deadline) { @@ -104,7 +104,7 @@ public class TreeNodeBeAssertions return new AndConstraint(this); } - static global::ILSpy.Controls.TreeView.SharpTreeView? TryFindGrid(out string? failure) + static global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView? TryFindGrid(out string? failure) { var window = FindActiveWindow(); if (window is null) @@ -120,7 +120,7 @@ public class TreeNodeBeAssertions return null; } - var grid = pane.GetVisualDescendants().OfType().FirstOrDefault(); + var grid = pane.GetVisualDescendants().OfType().FirstOrDefault(); if (grid is null) { failure = "SharpTreeView not found inside AssemblyListPane"; @@ -145,9 +145,9 @@ public class TreeNodeBeAssertions } } - static global::ILSpy.Controls.TreeView.SharpTreeViewItem? FindRow(global::ILSpy.Controls.TreeView.SharpTreeView grid, SharpTreeNode target) + static global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem? FindRow(global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView grid, SharpTreeNode target) { - foreach (var row in grid.GetVisualDescendants().OfType()) + foreach (var row in grid.GetVisualDescendants().OfType()) { if (ReferenceEquals(row.DataContext, target)) return row; @@ -155,7 +155,7 @@ public class TreeNodeBeAssertions return null; } - static bool IsInViewport(global::ILSpy.Controls.TreeView.SharpTreeViewItem row, ScrollViewer scrollViewer) + static bool IsInViewport(global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem row, ScrollViewer scrollViewer) { var topLeft = row.TranslatePoint(new Point(0, 0), scrollViewer); if (topLeft is null) @@ -165,7 +165,7 @@ public class TreeNodeBeAssertions return top >= 0 && bottom <= scrollViewer.Viewport.Height + 0.5; } - static bool IsRoughlyCentered(global::ILSpy.Controls.TreeView.SharpTreeViewItem row, ScrollViewer scrollViewer) + static bool IsRoughlyCentered(global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem row, ScrollViewer scrollViewer) { var topLeft = row.TranslatePoint(new Point(0, 0), scrollViewer); if (topLeft is null) @@ -178,7 +178,7 @@ public class TreeNodeBeAssertions return Math.Abs(rowMid - viewportMid) <= row.Bounds.Height || nearTopClamp || nearBottomClamp; } - string BuildState(ScrollViewer scrollViewer, global::ILSpy.Controls.TreeView.SharpTreeViewItem? row) + string BuildState(ScrollViewer scrollViewer, global::ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem? row) { if (row is null) return $"but no SharpTreeViewItem has been realised for it (offset={scrollViewer.Offset}, viewport={scrollViewer.Viewport}, extent={scrollViewer.Extent})"; diff --git a/ILSpy.Tests/Updates/UpdatePanelViewModelTests.cs b/ILSpy.Tests/Updates/UpdatePanelViewModelTests.cs index 5c67da42c..d81190d8f 100644 --- a/ILSpy.Tests/Updates/UpdatePanelViewModelTests.cs +++ b/ILSpy.Tests/Updates/UpdatePanelViewModelTests.cs @@ -23,8 +23,8 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy.AppEnv; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.ViewModels; using NUnit.Framework; diff --git a/ILSpy.Tests/Util/MessageBusTests.cs b/ILSpy.Tests/Util/MessageBusTests.cs index c54fa7332..7e922356b 100644 --- a/ILSpy.Tests/Util/MessageBusTests.cs +++ b/ILSpy.Tests/Util/MessageBusTests.cs @@ -24,7 +24,7 @@ using System.Threading; using AwesomeAssertions; -using ILSpy.Util; +using ICSharpCode.ILSpy.Util; using NUnit.Framework; diff --git a/ILSpy.Tests/Views/DebugStepsTests.cs b/ILSpy.Tests/Views/DebugStepsTests.cs index 0b1c4fc5a..6f719e10a 100644 --- a/ILSpy.Tests/Views/DebugStepsTests.cs +++ b/ILSpy.Tests/Views/DebugStepsTests.cs @@ -27,13 +27,13 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy; -using ILSpy.AppEnv; -using ILSpy.Docking; -using ILSpy.Languages; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Views/FlagsFilterPopupKeyboardTests.cs b/ILSpy.Tests/Views/FlagsFilterPopupKeyboardTests.cs index 029477933..ceee23778 100644 --- a/ILSpy.Tests/Views/FlagsFilterPopupKeyboardTests.cs +++ b/ILSpy.Tests/Views/FlagsFilterPopupKeyboardTests.cs @@ -27,8 +27,8 @@ using Avalonia.VisualTree; using AwesomeAssertions; -using ILSpy.Metadata.Filters; -using ILSpy.Views.Filters; +using ICSharpCode.ILSpy.Metadata.Filters; +using ICSharpCode.ILSpy.Views.Filters; using NUnit.Framework; diff --git a/ILSpy.Tests/Views/MainMenuTests.cs b/ILSpy.Tests/Views/MainMenuTests.cs index 87884c7e4..c99f1538f 100644 --- a/ILSpy.Tests/Views/MainMenuTests.cs +++ b/ILSpy.Tests/Views/MainMenuTests.cs @@ -24,7 +24,7 @@ using Avalonia.Headless.NUnit; using AwesomeAssertions; -using ILSpy; +using ICSharpCode.ILSpy; using NUnit.Framework; diff --git a/ILSpy.Tests/Views/OpenFromGacDialogStructureTests.cs b/ILSpy.Tests/Views/OpenFromGacDialogStructureTests.cs index b640b034c..30e2493a3 100644 --- a/ILSpy.Tests/Views/OpenFromGacDialogStructureTests.cs +++ b/ILSpy.Tests/Views/OpenFromGacDialogStructureTests.cs @@ -26,7 +26,7 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; -using ILSpy.Views; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Views/OpenFromNuGetFeedDialogStructureTests.cs b/ILSpy.Tests/Views/OpenFromNuGetFeedDialogStructureTests.cs index 9400e69c7..ed3851641 100644 --- a/ILSpy.Tests/Views/OpenFromNuGetFeedDialogStructureTests.cs +++ b/ILSpy.Tests/Views/OpenFromNuGetFeedDialogStructureTests.cs @@ -29,8 +29,8 @@ using AwesomeAssertions; using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpy.Tests.NuGetFeeds; -using ILSpy.ViewModels; -using ILSpy.Views; +using ICSharpCode.ILSpy.ViewModels; +using ICSharpCode.ILSpy.Views; using NUnit.Framework; diff --git a/ILSpy.Tests/Waiters.cs b/ILSpy.Tests/Waiters.cs index e8c396826..6657110a7 100644 --- a/ILSpy.Tests/Waiters.cs +++ b/ILSpy.Tests/Waiters.cs @@ -25,10 +25,10 @@ using Avalonia; using Avalonia.Threading; using Avalonia.VisualTree; -using global::ILSpy.AssemblyTree; -using global::ILSpy.Docking; -using global::ILSpy.TextView; -using global::ILSpy.ViewModels; +using global::ICSharpCode.ILSpy.AssemblyTree; +using global::ICSharpCode.ILSpy.Docking; +using global::ICSharpCode.ILSpy.TextView; +using global::ICSharpCode.ILSpy.ViewModels; namespace ICSharpCode.ILSpy.Tests; diff --git a/ILSpy/Analyzers/AnalyzeContextMenuEntry.cs b/ILSpy/Analyzers/AnalyzeContextMenuEntry.cs index adf41aaa5..f1193965e 100644 --- a/ILSpy/Analyzers/AnalyzeContextMenuEntry.cs +++ b/ILSpy/Analyzers/AnalyzeContextMenuEntry.cs @@ -22,10 +22,10 @@ using System.Linq; using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpy.Properties; -using ILSpy.Docking; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.TreeNodes; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Right-click → "Analyze" — pushes every selected member (type, method, field, property, diff --git a/ILSpy/Analyzers/AnalyzedAccessorTreeNode.cs b/ILSpy/Analyzers/AnalyzedAccessorTreeNode.cs index 882ad13c7..f64c363cb 100644 --- a/ILSpy/Analyzers/AnalyzedAccessorTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzedAccessorTreeNode.cs @@ -20,7 +20,7 @@ using System; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.Analyzers.TreeNodes +namespace ICSharpCode.ILSpy.Analyzers.TreeNodes { /// /// Renders a property getter / setter or event add / remove / invoke as a short diff --git a/ILSpy/Analyzers/AnalyzedEventTreeNode.cs b/ILSpy/Analyzers/AnalyzedEventTreeNode.cs index d628bb5a1..0471921bc 100644 --- a/ILSpy/Analyzers/AnalyzedEventTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzedEventTreeNode.cs @@ -22,7 +22,7 @@ using System.Diagnostics.CodeAnalysis; using ICSharpCode.Decompiler.Output; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.Analyzers.TreeNodes +namespace ICSharpCode.ILSpy.Analyzers.TreeNodes { internal sealed class AnalyzedEventTreeNode : AnalyzerEntityTreeNode { @@ -42,8 +42,8 @@ namespace ILSpy.Analyzers.TreeNodes public override object Text => prefix + Language.EntityToString(analyzedEvent, ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedEntityNames); - public override object Icon => Images.Images.GetIcon(Images.Images.Event, - Images.Images.GetOverlay(analyzedEvent.Accessibility), analyzedEvent.IsStatic); + public override object Icon => Images.GetIcon(Images.Event, + Images.GetOverlay(analyzedEvent.Accessibility), analyzedEvent.IsStatic); protected override void LoadChildren() { diff --git a/ILSpy/Analyzers/AnalyzedFieldTreeNode.cs b/ILSpy/Analyzers/AnalyzedFieldTreeNode.cs index 462420f5c..4538ad9be 100644 --- a/ILSpy/Analyzers/AnalyzedFieldTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzedFieldTreeNode.cs @@ -21,7 +21,7 @@ using System; using ICSharpCode.Decompiler.Output; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.Analyzers.TreeNodes +namespace ICSharpCode.ILSpy.Analyzers.TreeNodes { internal sealed class AnalyzedFieldTreeNode : AnalyzerEntityTreeNode { @@ -39,8 +39,8 @@ namespace ILSpy.Analyzers.TreeNodes public override object Text => Language.EntityToString(analyzedField, ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedEntityNames); - public override object Icon => Images.Images.GetIcon(Images.Images.Field, - Images.Images.GetOverlay(analyzedField.Accessibility), analyzedField.IsStatic); + public override object Icon => Images.GetIcon(Images.Field, + Images.GetOverlay(analyzedField.Accessibility), analyzedField.IsStatic); protected override void LoadChildren() => AddAnalyzerChildren(analyzedField); } diff --git a/ILSpy/Analyzers/AnalyzedMethodTreeNode.cs b/ILSpy/Analyzers/AnalyzedMethodTreeNode.cs index 927917d7c..6f6685960 100644 --- a/ILSpy/Analyzers/AnalyzedMethodTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzedMethodTreeNode.cs @@ -21,7 +21,7 @@ using System; using ICSharpCode.Decompiler.Output; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.Analyzers.TreeNodes +namespace ICSharpCode.ILSpy.Analyzers.TreeNodes { internal class AnalyzedMethodTreeNode : AnalyzerEntityTreeNode { @@ -47,12 +47,12 @@ namespace ILSpy.Analyzers.TreeNodes internal static object ResolveIcon(IMethod method) { var baseImage = method.IsConstructor - ? Images.Images.Constructor + ? Images.Constructor : method.IsOperator - ? Images.Images.Operator - : Images.Images.Method; - return Images.Images.GetIcon(baseImage, - Images.Images.GetOverlay(method.Accessibility), + ? Images.Operator + : Images.Method; + return Images.GetIcon(baseImage, + Images.GetOverlay(method.Accessibility), method.IsStatic, method.IsExtensionMethod); } diff --git a/ILSpy/Analyzers/AnalyzedModuleTreeNode.cs b/ILSpy/Analyzers/AnalyzedModuleTreeNode.cs index e1aa6efa1..aabb7bd15 100644 --- a/ILSpy/Analyzers/AnalyzedModuleTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzedModuleTreeNode.cs @@ -24,11 +24,11 @@ using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.TreeNodes; -namespace ILSpy.Analyzers.TreeNodes +namespace ICSharpCode.ILSpy.Analyzers.TreeNodes { /// /// Wraps an entire module as an analysable entry. is @@ -50,7 +50,7 @@ namespace ILSpy.Analyzers.TreeNodes public override object Text => analyzedModule.AssemblyName; - public override object Icon => Images.Images.Assembly; + public override object Icon => Images.Assembly; public override object? ToolTip => analyzedModule.MetadataFile?.FileName; diff --git a/ILSpy/Analyzers/AnalyzedPropertyTreeNode.cs b/ILSpy/Analyzers/AnalyzedPropertyTreeNode.cs index c2b600572..9071a1fca 100644 --- a/ILSpy/Analyzers/AnalyzedPropertyTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzedPropertyTreeNode.cs @@ -21,7 +21,7 @@ using System; using ICSharpCode.Decompiler.Output; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.Analyzers.TreeNodes +namespace ICSharpCode.ILSpy.Analyzers.TreeNodes { internal sealed class AnalyzedPropertyTreeNode : AnalyzerEntityTreeNode { @@ -41,8 +41,8 @@ namespace ILSpy.Analyzers.TreeNodes public override object Text => prefix + Language.EntityToString(analyzedProperty, ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedEntityNames); - public override object Icon => Images.Images.GetIcon(Images.Images.Property, - Images.Images.GetOverlay(analyzedProperty.Accessibility), analyzedProperty.IsStatic); + public override object Icon => Images.GetIcon(Images.Property, + Images.GetOverlay(analyzedProperty.Accessibility), analyzedProperty.IsStatic); protected override void LoadChildren() { diff --git a/ILSpy/Analyzers/AnalyzedTypeTreeNode.cs b/ILSpy/Analyzers/AnalyzedTypeTreeNode.cs index de73b48dc..2588a1ce1 100644 --- a/ILSpy/Analyzers/AnalyzedTypeTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzedTypeTreeNode.cs @@ -20,7 +20,7 @@ using System; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.Analyzers.TreeNodes +namespace ICSharpCode.ILSpy.Analyzers.TreeNodes { internal sealed class AnalyzedTypeTreeNode : AnalyzerEntityTreeNode { @@ -42,14 +42,14 @@ namespace ILSpy.Analyzers.TreeNodes static object ResolveIcon(ITypeDefinition type) { var baseImage = type.Kind switch { - TypeKind.Interface => Images.Images.Interface, - TypeKind.Struct or TypeKind.Void => Images.Images.Struct, - TypeKind.Delegate => Images.Images.Delegate, - TypeKind.Enum => Images.Images.Enum, - _ => Images.Images.Class, + TypeKind.Interface => Images.Interface, + TypeKind.Struct or TypeKind.Void => Images.Struct, + TypeKind.Delegate => Images.Delegate, + TypeKind.Enum => Images.Enum, + _ => Images.Class, }; - return Images.Images.GetIcon(baseImage, - Images.Images.GetOverlay(type.Accessibility), type.IsStatic); + return Images.GetIcon(baseImage, + Images.GetOverlay(type.Accessibility), type.IsStatic); } protected override void LoadChildren() => AddAnalyzerChildren(analyzedType); diff --git a/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs b/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs index 8a5f07881..3984a1a97 100644 --- a/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs @@ -23,11 +23,11 @@ using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.TreeView; using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.Util; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Util; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Base for nodes that wrap an in the analyzer pane (the @@ -54,7 +54,7 @@ namespace ILSpy.Analyzers /// /// The entity this row analyses (or represents as an analyser result). Subclasses /// return only for non-entity rows such as - /// . + /// . /// public abstract IEntity? Member { get; } diff --git a/ILSpy/Analyzers/AnalyzerErrorNode.cs b/ILSpy/Analyzers/AnalyzerErrorNode.cs index af1e72938..a25a5868e 100644 --- a/ILSpy/Analyzers/AnalyzerErrorNode.cs +++ b/ILSpy/Analyzers/AnalyzerErrorNode.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using ICSharpCode.ILSpyX; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Sentinel row shown under an when the analyser @@ -49,7 +49,7 @@ namespace ILSpy.Analyzers public override object Text => summary; - public override object Icon => Images.Images.AssemblyWarning; + public override object Icon => Images.AssemblyWarning; public override object? ToolTip => Details; diff --git a/ILSpy/Analyzers/AnalyzerMetadata.cs b/ILSpy/Analyzers/AnalyzerMetadata.cs index 4c236bc78..328c42852 100644 --- a/ILSpy/Analyzers/AnalyzerMetadata.cs +++ b/ILSpy/Analyzers/AnalyzerMetadata.cs @@ -16,7 +16,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Concrete metadata view consumed by . System.Composition diff --git a/ILSpy/Analyzers/AnalyzerRegistry.cs b/ILSpy/Analyzers/AnalyzerRegistry.cs index 834d68d80..57bc377a6 100644 --- a/ILSpy/Analyzers/AnalyzerRegistry.cs +++ b/ILSpy/Analyzers/AnalyzerRegistry.cs @@ -22,7 +22,7 @@ using System.Linq; using ICSharpCode.ILSpyX.Analyzers; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// MEF aggregator for -tagged analyzers. System.Composition diff --git a/ILSpy/Analyzers/AnalyzerRootNode.cs b/ILSpy/Analyzers/AnalyzerRootNode.cs index c07c64ea1..f75b5b6a5 100644 --- a/ILSpy/Analyzers/AnalyzerRootNode.cs +++ b/ILSpy/Analyzers/AnalyzerRootNode.cs @@ -24,10 +24,10 @@ using System.Linq; using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.TreeView; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Root of the analyzer pane's tree. Holds one diff --git a/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs b/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs index f4c3d1360..58cc60372 100644 --- a/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs @@ -30,9 +30,9 @@ using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.Analyzers; using ICSharpCode.ILSpyX.TreeView; -using ILSpy.Analyzers.TreeNodes; +using ICSharpCode.ILSpy.Analyzers.TreeNodes; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Row that runs a single against an analysed symbol and shows @@ -78,7 +78,7 @@ namespace ILSpy.Analyzers /// and renders an empty icon slot next to the header text — visually mismatched with /// the result rows underneath, which all carry entity-kind icons. /// - public override object Icon => Images.Images.Search; + public override object Icon => Images.Search; protected override void LoadChildren() { diff --git a/ILSpy/Analyzers/AnalyzerTreeNode.cs b/ILSpy/Analyzers/AnalyzerTreeNode.cs index 6f9556c9d..7c30fb6a2 100644 --- a/ILSpy/Analyzers/AnalyzerTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzerTreeNode.cs @@ -23,11 +23,11 @@ using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.Analyzers; using ICSharpCode.ILSpyX.TreeView; -using ILSpy.AppEnv; -using ILSpy.AssemblyTree; -using ILSpy.Languages; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Languages; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Base for every node in the analyzer pane. The pane root, the per-entity wrappers diff --git a/ILSpy/Analyzers/AnalyzerTreeView.axaml b/ILSpy/Analyzers/AnalyzerTreeView.axaml index e8cc18b85..8969145d5 100644 --- a/ILSpy/Analyzers/AnalyzerTreeView.axaml +++ b/ILSpy/Analyzers/AnalyzerTreeView.axaml @@ -2,10 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:analyzers="using:ILSpy.Analyzers" - xmlns:tv="using:ILSpy.Controls.TreeView" + xmlns:analyzers="using:ICSharpCode.ILSpy.Analyzers" + xmlns:tv="using:ICSharpCode.ILSpy.Controls.TreeView" mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="200" - x:Class="ILSpy.Analyzers.AnalyzerTreeView" + x:Class="ICSharpCode.ILSpy.Analyzers.AnalyzerTreeView" x:DataType="analyzers:AnalyzerTreeViewModel"> diff --git a/ILSpy/Analyzers/AnalyzerTreeView.axaml.cs b/ILSpy/Analyzers/AnalyzerTreeView.axaml.cs index e0676d2c5..36c9c395b 100644 --- a/ILSpy/Analyzers/AnalyzerTreeView.axaml.cs +++ b/ILSpy/Analyzers/AnalyzerTreeView.axaml.cs @@ -25,14 +25,14 @@ using Avalonia.Controls; using ICSharpCode.ILSpyX.TreeView; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { public partial class AnalyzerTreeView : UserControl { AnalyzerTreeViewModel? boundModel; - ILSpy.Controls.TreeView.TreeSelectionBinder? selectionBinder; + ICSharpCode.ILSpy.Controls.TreeView.TreeSelectionBinder? selectionBinder; IReadOnlyList contextMenuEntries = Array.Empty(); public AnalyzerTreeView() @@ -93,7 +93,7 @@ namespace ILSpy.Analyzers { boundModel = model; Tree.Root = model.Root; - selectionBinder = new ILSpy.Controls.TreeView.TreeSelectionBinder(Tree, model.SelectedItems); + selectionBinder = new ICSharpCode.ILSpy.Controls.TreeView.TreeSelectionBinder(Tree, model.SelectedItems); } void DetachFromModel() diff --git a/ILSpy/Analyzers/AnalyzerTreeViewModel.cs b/ILSpy/Analyzers/AnalyzerTreeViewModel.cs index f567768c1..3a46f8035 100644 --- a/ILSpy/Analyzers/AnalyzerTreeViewModel.cs +++ b/ILSpy/Analyzers/AnalyzerTreeViewModel.cs @@ -24,11 +24,11 @@ using System.Linq; using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX.TreeView; -using ILSpy.Analyzers.TreeNodes; -using ILSpy.Commands; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.Analyzers.TreeNodes; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { [Export] [ExportToolPane(ContentId = PaneContentId, Alignment = ToolPaneAlignment.Bottom, Order = 0, IsVisibleByDefault = false)] diff --git a/ILSpy/Analyzers/CopyAnalysisResultsContextMenuEntry.cs b/ILSpy/Analyzers/CopyAnalysisResultsContextMenuEntry.cs index c339a1432..8d528f999 100644 --- a/ILSpy/Analyzers/CopyAnalysisResultsContextMenuEntry.cs +++ b/ILSpy/Analyzers/CopyAnalysisResultsContextMenuEntry.cs @@ -24,9 +24,9 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Input.Platform; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Right-click on an analyser-result row → "Copy results" — puts each child node's diff --git a/ILSpy/Analyzers/CopyAnalyzerErrorContextMenuEntry.cs b/ILSpy/Analyzers/CopyAnalyzerErrorContextMenuEntry.cs index 86eb2040f..966fca60b 100644 --- a/ILSpy/Analyzers/CopyAnalyzerErrorContextMenuEntry.cs +++ b/ILSpy/Analyzers/CopyAnalyzerErrorContextMenuEntry.cs @@ -26,9 +26,9 @@ using Avalonia.Input.Platform; using ICSharpCode.ILSpy.Properties; -using ILSpy.AppEnv; +using ICSharpCode.ILSpy.AppEnv; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Right-click on an analyser-error row → "Copy error message" — puts the full diff --git a/ILSpy/Analyzers/RemoveAnalyzeContextMenuEntry.cs b/ILSpy/Analyzers/RemoveAnalyzeContextMenuEntry.cs index 78c843df7..e4eea336f 100644 --- a/ILSpy/Analyzers/RemoveAnalyzeContextMenuEntry.cs +++ b/ILSpy/Analyzers/RemoveAnalyzeContextMenuEntry.cs @@ -21,7 +21,7 @@ using System.Linq; using ICSharpCode.ILSpyX.TreeView; -namespace ILSpy.Analyzers +namespace ICSharpCode.ILSpy.Analyzers { /// /// Right-click on a top-level analysed entity → "Remove" — drops the row from the diff --git a/ILSpy/App.axaml b/ILSpy/App.axaml index 94f1e7f02..b89594b1f 100644 --- a/ILSpy/App.axaml +++ b/ILSpy/App.axaml @@ -1,21 +1,21 @@ diff --git a/ILSpy/App.axaml.cs b/ILSpy/App.axaml.cs index 0ae451cff..bbe7ea8cb 100644 --- a/ILSpy/App.axaml.cs +++ b/ILSpy/App.axaml.cs @@ -27,11 +27,11 @@ using Avalonia.Markup.Xaml; using ICSharpCode.ILSpyX.Settings; -using ILSpy.AppEnv; -using ILSpy.Themes; -using ILSpy.Views; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Themes; +using ICSharpCode.ILSpy.Views; -namespace ILSpy +namespace ICSharpCode.ILSpy { public partial class App : Application { diff --git a/ILSpy/AppEnv/AppComposition.cs b/ILSpy/AppEnv/AppComposition.cs index cee63a84c..e5c8742a7 100644 --- a/ILSpy/AppEnv/AppComposition.cs +++ b/ILSpy/AppEnv/AppComposition.cs @@ -27,7 +27,7 @@ using System.Runtime.Loader; using ICSharpCode.ILSpyX.Analyzers; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// /// Builds the MEF composition host: ILSpyX + this assembly + every *.Plugin.dll next to us. diff --git a/ILSpy/AppEnv/AppLog.cs b/ILSpy/AppEnv/AppLog.cs index ca9ce3dea..a71be362d 100644 --- a/ILSpy/AppEnv/AppLog.cs +++ b/ILSpy/AppEnv/AppLog.cs @@ -21,7 +21,7 @@ using System.Collections.Concurrent; using System.Diagnostics; using System.IO; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// /// Categorized diagnostic log. All categories are off by default; production runs diff --git a/ILSpy/AppEnv/AssertionFailedDialog.cs b/ILSpy/AppEnv/AssertionFailedDialog.cs index aa8345a4e..63cd2599b 100644 --- a/ILSpy/AppEnv/AssertionFailedDialog.cs +++ b/ILSpy/AppEnv/AssertionFailedDialog.cs @@ -26,7 +26,7 @@ using Avalonia.Layout; using Avalonia.Media; using Avalonia.Threading; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// /// The choice a developer makes when a Debug.Assert fires (see ). diff --git a/ILSpy/AppEnv/CommandLineArguments.cs b/ILSpy/AppEnv/CommandLineArguments.cs index cdc35e63d..491fe55a4 100644 --- a/ILSpy/AppEnv/CommandLineArguments.cs +++ b/ILSpy/AppEnv/CommandLineArguments.cs @@ -24,7 +24,7 @@ using System.Linq; using McMaster.Extensions.CommandLineUtils; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { public sealed class CommandLineArguments { diff --git a/ILSpy/AppEnv/CompositionErrors.cs b/ILSpy/AppEnv/CompositionErrors.cs index 6f505a972..cd33b8ec9 100644 --- a/ILSpy/AppEnv/CompositionErrors.cs +++ b/ILSpy/AppEnv/CompositionErrors.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using ICSharpCode.Decompiler; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// A single non-fatal composition failure: which part failed, and why. public sealed record CompositionError(string Source, Exception Exception); diff --git a/ILSpy/AppEnv/GlobalExceptionHandler.cs b/ILSpy/AppEnv/GlobalExceptionHandler.cs index b686c5edf..f33fb566c 100644 --- a/ILSpy/AppEnv/GlobalExceptionHandler.cs +++ b/ILSpy/AppEnv/GlobalExceptionHandler.cs @@ -33,7 +33,7 @@ using Avalonia.VisualTree; using CommunityToolkit.Mvvm.Input; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { public static class GlobalExceptionHandler { diff --git a/ILSpy/AppEnv/ILSpyTraceListener.cs b/ILSpy/AppEnv/ILSpyTraceListener.cs index 410d4c7a4..f0b54d747 100644 --- a/ILSpy/AppEnv/ILSpyTraceListener.cs +++ b/ILSpy/AppEnv/ILSpyTraceListener.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// /// Trace listener that intercepts Debug.Assert failures and shows a developer dialog diff --git a/ILSpy/AppEnv/InputDiagnostics.cs b/ILSpy/AppEnv/InputDiagnostics.cs index 1605b1049..20d77699a 100644 --- a/ILSpy/AppEnv/InputDiagnostics.cs +++ b/ILSpy/AppEnv/InputDiagnostics.cs @@ -25,7 +25,7 @@ using Avalonia; using Avalonia.Input; using Avalonia.Interactivity; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// /// Diagnostics for chasing the asynchronous DBus failure on Linux: an unobserved diff --git a/ILSpy/AppEnv/ResourceHelper.cs b/ILSpy/AppEnv/ResourceHelper.cs index 89c429642..c441bcc44 100644 --- a/ILSpy/AppEnv/ResourceHelper.cs +++ b/ILSpy/AppEnv/ResourceHelper.cs @@ -18,7 +18,7 @@ using ICSharpCode.ILSpy.Properties; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { internal static class ResourceHelper { diff --git a/ILSpy/AppEnv/StartupErrorWindow.cs b/ILSpy/AppEnv/StartupErrorWindow.cs index 07ff581a4..eb480c76a 100644 --- a/ILSpy/AppEnv/StartupErrorWindow.cs +++ b/ILSpy/AppEnv/StartupErrorWindow.cs @@ -27,7 +27,7 @@ using global::Avalonia.Media; using CommunityToolkit.Mvvm.Input; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// /// Shown in place of the main window when startup fails before the dispatcher pump begins. diff --git a/ILSpy/AppEnv/StartupExceptions.cs b/ILSpy/AppEnv/StartupExceptions.cs index 43bd52b0f..e1b3c5477 100644 --- a/ILSpy/AppEnv/StartupExceptions.cs +++ b/ILSpy/AppEnv/StartupExceptions.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { public sealed record ExceptionData(Exception Exception) { diff --git a/ILSpy/AppEnv/UiContext.cs b/ILSpy/AppEnv/UiContext.cs index d520c34be..b0997d390 100644 --- a/ILSpy/AppEnv/UiContext.cs +++ b/ILSpy/AppEnv/UiContext.cs @@ -21,7 +21,7 @@ using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Input.Platform; -namespace ILSpy.AppEnv +namespace ICSharpCode.ILSpy.AppEnv { /// /// Accessors for the desktop UI context. The classic-desktop lifetime cast was repeated at every diff --git a/ILSpy/AssemblyTree/AssemblyListPane.axaml b/ILSpy/AssemblyTree/AssemblyListPane.axaml index 9f14ceb44..590bbf887 100644 --- a/ILSpy/AssemblyTree/AssemblyListPane.axaml +++ b/ILSpy/AssemblyTree/AssemblyListPane.axaml @@ -2,10 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:tree="using:ILSpy.AssemblyTree" - xmlns:tv="using:ILSpy.Controls.TreeView" + xmlns:tree="using:ICSharpCode.ILSpy.AssemblyTree" + xmlns:tv="using:ICSharpCode.ILSpy.Controls.TreeView" mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="450" - x:Class="ILSpy.AssemblyTree.AssemblyListPane" + x:Class="ICSharpCode.ILSpy.AssemblyTree.AssemblyListPane" x:DataType="tree:AssemblyTreeModel"> diff --git a/ILSpy/Images.cs b/ILSpy/Images.cs index 974a2c8d3..7abd58597 100644 --- a/ILSpy/Images.cs +++ b/ILSpy/Images.cs @@ -28,7 +28,7 @@ using Avalonia.Svg.Skia; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.Images +namespace ICSharpCode.ILSpy { public enum AccessOverlayIcon { diff --git a/ILSpy/LanguageSettings.cs b/ILSpy/LanguageSettings.cs index a058d6e6d..9ca8e5200 100644 --- a/ILSpy/LanguageSettings.cs +++ b/ILSpy/LanguageSettings.cs @@ -23,7 +23,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.Settings; -namespace ILSpy +namespace ICSharpCode.ILSpy { /// /// Holds the API visibility filter and the active output language id. The View menu diff --git a/ILSpy/Languages/CSharpBracketSearcher.cs b/ILSpy/Languages/CSharpBracketSearcher.cs index 257527c75..04f4e69e9 100644 --- a/ILSpy/Languages/CSharpBracketSearcher.cs +++ b/ILSpy/Languages/CSharpBracketSearcher.cs @@ -22,9 +22,9 @@ using System.Diagnostics; using AvaloniaEdit.Document; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { /// /// Matches (...), [...], and {...} in a C# document, skipping diff --git a/ILSpy/Languages/CSharpHighlightingTokenWriter.cs b/ILSpy/Languages/CSharpHighlightingTokenWriter.cs index 1bfc64de1..cd6655c5b 100644 --- a/ILSpy/Languages/CSharpHighlightingTokenWriter.cs +++ b/ILSpy/Languages/CSharpHighlightingTokenWriter.cs @@ -29,9 +29,9 @@ using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX.Extensions; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { class CSharpHighlightingTokenWriter : DecoratingTokenWriter { diff --git a/ILSpy/Languages/CSharpILMixedLanguage.cs b/ILSpy/Languages/CSharpILMixedLanguage.cs index ff5944723..1aec1b9a3 100644 --- a/ILSpy/Languages/CSharpILMixedLanguage.cs +++ b/ILSpy/Languages/CSharpILMixedLanguage.cs @@ -39,9 +39,9 @@ using ICSharpCode.Decompiler.Util; using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.Extensions; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { using SequencePoint = ICSharpCode.Decompiler.DebugInfo.SequencePoint; diff --git a/ILSpy/Languages/CSharpLanguage.DebugSteps.cs b/ILSpy/Languages/CSharpLanguage.DebugSteps.cs index 2198f68b4..a852d6d8a 100644 --- a/ILSpy/Languages/CSharpLanguage.DebugSteps.cs +++ b/ILSpy/Languages/CSharpLanguage.DebugSteps.cs @@ -24,12 +24,12 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.IL.Transforms; -using ILSpy.AppEnv; -using ILSpy.Docking; -using ILSpy.TextView; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { /// /// Debug Steps support for the C# language: coarse, one step per AST transform, shown in the @@ -67,7 +67,7 @@ namespace ILSpy.Languages // The button always shows so the pane is one click away; mirrors the ILAst language. // DockWorkspace is resolved lazily (an ImportingConstructor import would form a MEF // cycle via LanguageService -> Languages). - (output as ISmartTextOutput)?.AddButton(Images.Images.ViewCode, "Show Steps", delegate { + (output as ISmartTextOutput)?.AddButton(Images.ViewCode, "Show Steps", delegate { AppComposition.TryGetExport()?.ShowToolPane(DebugStepsPaneModel.PaneContentId); }); // Only a full run refreshes the step list; a step-limited re-decompile (triggered by the diff --git a/ILSpy/Languages/CSharpLanguage.cs b/ILSpy/Languages/CSharpLanguage.cs index 8feb0ce87..342358cb7 100644 --- a/ILSpy/Languages/CSharpLanguage.cs +++ b/ILSpy/Languages/CSharpLanguage.cs @@ -47,7 +47,7 @@ using ConversionFlags = ICSharpCode.Decompiler.Output.ConversionFlags; using CSharpLanguageVersion = ICSharpCode.Decompiler.CSharp.LanguageVersion; using LanguageVersionDto = ICSharpCode.ILSpyX.LanguageVersion; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { [Export(typeof(Language))] [Shared] @@ -59,7 +59,7 @@ namespace ILSpy.Languages public override string ProjectFileExtension => ".csproj"; - public override ILSpy.TextView.IBracketSearcher BracketSearcher { get; } = new CSharpBracketSearcher(); + public override ICSharpCode.ILSpy.TextView.IBracketSearcher BracketSearcher { get; } = new CSharpBracketSearcher(); static IReadOnlyList? cachedVersions; @@ -702,7 +702,7 @@ namespace ILSpy.Languages new global::Avalonia.Controls.Image { Width = 32, Height = 32, - Source = Images.Images.Warning, + Source = Images.Warning, }, new global::Avalonia.Controls.TextBlock { Margin = new global::Avalonia.Thickness(5, 0, 0, 0), diff --git a/ILSpy/Languages/IDebugStepProvider.cs b/ILSpy/Languages/IDebugStepProvider.cs index 156011a1c..8316f5562 100644 --- a/ILSpy/Languages/IDebugStepProvider.cs +++ b/ILSpy/Languages/IDebugStepProvider.cs @@ -22,7 +22,7 @@ using System; using ICSharpCode.Decompiler.IL.Transforms; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { /// /// A language that surfaces a of decompiler-pipeline steps for the diff --git a/ILSpy/Languages/ILAstLanguage.cs b/ILSpy/Languages/ILAstLanguage.cs index d509fa85b..ff11e669c 100644 --- a/ILSpy/Languages/ILAstLanguage.cs +++ b/ILSpy/Languages/ILAstLanguage.cs @@ -31,14 +31,14 @@ using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX; -using ILSpy.AppEnv; -using ILSpy.Docking; -using ILSpy.TextView; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Docking; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.ViewModels; using SRM = System.Reflection.Metadata; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { /// /// Debug-only language that surfaces the decompiler pipeline's intermediate state. @@ -60,7 +60,7 @@ namespace ILSpy.Languages // ILAst output uses the same `{}/()/[]` bracket conventions as C#, plus C#-style // `//` comments and `"..."` strings. Reusing CSharpBracketSearcher gives the // language correct bracket highlighting without a per-grammar implementation. - public override ILSpy.TextView.IBracketSearcher BracketSearcher { get; } = new CSharpBracketSearcher(); + public override ICSharpCode.ILSpy.TextView.IBracketSearcher BracketSearcher { get; } = new CSharpBracketSearcher(); /// /// Fires after a run installs a fresh . @@ -183,7 +183,7 @@ namespace ILSpy.Languages // DockWorkspace is resolved lazily here, not via [ImportingConstructor]: it imports // LanguageService, which imports the registered Languages, so a constructor import would // form a composition cycle. The lazy lookup costs one MEF resolve per "Show Steps" click. - (output as ISmartTextOutput)?.AddButton(Images.Images.ViewCode, "Show Steps", delegate { + (output as ISmartTextOutput)?.AddButton(Images.ViewCode, "Show Steps", delegate { AppComposition.TryGetExport()?.ShowToolPane(DebugStepsPaneModel.PaneContentId); }); output.WriteLine(); diff --git a/ILSpy/Languages/ILLanguage.cs b/ILSpy/Languages/ILLanguage.cs index 502700b81..60b081652 100644 --- a/ILSpy/Languages/ILLanguage.cs +++ b/ILSpy/Languages/ILLanguage.cs @@ -33,9 +33,9 @@ using ICSharpCode.Decompiler.Solution; using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX; -using ILSpy.TextView; +using ICSharpCode.ILSpy.TextView; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { [Export(typeof(Language))] [Shared] @@ -49,7 +49,7 @@ namespace ILSpy.Languages // Disassembled IL uses the same `{}/()/[]` bracket conventions plus C#-style // `//` comments and `"..."` strings — reuse CSharpBracketSearcher's logic. - public override ILSpy.TextView.IBracketSearcher BracketSearcher { get; } = new CSharpBracketSearcher(); + public override ICSharpCode.ILSpy.TextView.IBracketSearcher BracketSearcher { get; } = new CSharpBracketSearcher(); // DisplaySettings (ShowMetadataTokens / ShowRawRVAOffsetAndBytes / // DecodeCustomAttributeBlobs / ShowMetadataTokensInBase10) aren't wired yet — once diff --git a/ILSpy/Languages/IResourceFileHandler.cs b/ILSpy/Languages/IResourceFileHandler.cs index 3c7fced83..98ebddd1b 100644 --- a/ILSpy/Languages/IResourceFileHandler.cs +++ b/ILSpy/Languages/IResourceFileHandler.cs @@ -22,7 +22,7 @@ using System.IO; using ICSharpCode.Decompiler; using ICSharpCode.ILSpyX; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { /// /// Plug-in contract for converting a resource entry from its raw byte form into a diff --git a/ILSpy/Languages/Language.cs b/ILSpy/Languages/Language.cs index 2bfa06e66..5572f895e 100644 --- a/ILSpy/Languages/Language.cs +++ b/ILSpy/Languages/Language.cs @@ -33,7 +33,7 @@ using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.Abstractions; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { /// /// Output language for tree-node labels and decompiled views. @@ -60,8 +60,8 @@ namespace ILSpy.Languages /// Languages without a matching-bracket concept (IL, IL-AST) return the no-op /// default; overrides to . /// - public virtual ILSpy.TextView.IBracketSearcher BracketSearcher - => ILSpy.TextView.DefaultBracketSearcher.DefaultInstance; + public virtual ICSharpCode.ILSpy.TextView.IBracketSearcher BracketSearcher + => ICSharpCode.ILSpy.TextView.DefaultBracketSearcher.DefaultInstance; /// /// Versions selectable for this language (e.g. C# 1.0 → C# 14). Default is empty; diff --git a/ILSpy/Languages/LanguageService.cs b/ILSpy/Languages/LanguageService.cs index 8eb50ba67..2cfe2b8d6 100644 --- a/ILSpy/Languages/LanguageService.cs +++ b/ILSpy/Languages/LanguageService.cs @@ -24,7 +24,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using ICSharpCode.ILSpyX; -namespace ILSpy.Languages +namespace ICSharpCode.ILSpy.Languages { /// /// MEF-aggregated registry of exports plus the active selection. @@ -51,12 +51,12 @@ namespace ILSpy.Languages [ImportingConstructor] public LanguageService([ImportMany] IEnumerable languages, SettingsService settingsService) { - using var _ = ILSpy.AppEnv.AppLog.Phase("LanguageService ctor (enumerate [ImportMany] Language exports)"); + using var _ = ICSharpCode.ILSpy.AppEnv.AppLog.Phase("LanguageService ctor (enumerate [ImportMany] Language exports)"); this.settingsService = settingsService; List ordered; - using (ILSpy.AppEnv.AppLog.Phase("LanguageService: materialise languages.OrderBy")) + using (ICSharpCode.ILSpy.AppEnv.AppLog.Phase("LanguageService: materialise languages.OrderBy")) ordered = languages.OrderBy(l => l.Name).ToList(); - ILSpy.AppEnv.AppLog.Mark($"LanguageService: {ordered.Count} languages resolved"); + ICSharpCode.ILSpy.AppEnv.AppLog.Mark($"LanguageService: {ordered.Count} languages resolved"); Languages = ordered; var saved = settingsService.SessionSettings.ActiveLanguageName; currentLanguage = Languages.FirstOrDefault(l => l.Name == saved) diff --git a/ILSpy/Metadata/BlobHeapTreeNode.cs b/ILSpy/Metadata/BlobHeapTreeNode.cs index f6aa0e7d3..7b241d947 100644 --- a/ILSpy/Metadata/BlobHeapTreeNode.cs +++ b/ILSpy/Metadata/BlobHeapTreeNode.cs @@ -22,9 +22,9 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// View of #Blob — variable-length byte payloads holding signatures, marshalling info, diff --git a/ILSpy/Metadata/CoffHeaderTreeNode.cs b/ILSpy/Metadata/CoffHeaderTreeNode.cs index 917ff0ff1..d5a211c29 100644 --- a/ILSpy/Metadata/CoffHeaderTreeNode.cs +++ b/ILSpy/Metadata/CoffHeaderTreeNode.cs @@ -22,10 +22,10 @@ using System.Linq; using ICSharpCode.Decompiler.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// COFF (Common Object File Format) header — 20 bytes describing target machine, section @@ -42,7 +42,7 @@ namespace ILSpy.Metadata } public override object Text => "COFF Header"; - public override object Icon => Images.Images.Header; + public override object Icon => Images.Header; public override string ToString() => "COFF Header"; public override ContentPageModel CreateTab() diff --git a/ILSpy/Metadata/CompiledFilter.cs b/ILSpy/Metadata/CompiledFilter.cs index 9a006b93a..475a78202 100644 --- a/ILSpy/Metadata/CompiledFilter.cs +++ b/ILSpy/Metadata/CompiledFilter.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Numerics; -namespace ILSpy.Metadata.Filters +namespace ICSharpCode.ILSpy.Metadata.Filters { /// /// Evaluation-friendly snapshot of a . Compile once per state diff --git a/ILSpy/Metadata/CorTables/AssemblyRefTableTreeNode.cs b/ILSpy/Metadata/CorTables/AssemblyRefTableTreeNode.cs index 2886777ae..f45ebe560 100644 --- a/ILSpy/Metadata/CorTables/AssemblyRefTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/AssemblyRefTableTreeNode.cs @@ -24,7 +24,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the AssemblyRef table — every external assembly the module imports. Each row diff --git a/ILSpy/Metadata/CorTables/AssemblyTableTreeNode.cs b/ILSpy/Metadata/CorTables/AssemblyTableTreeNode.cs index 87bcc0981..823f3a493 100644 --- a/ILSpy/Metadata/CorTables/AssemblyTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/AssemblyTableTreeNode.cs @@ -24,7 +24,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the Assembly table — at most one row, present only when the metadata file is diff --git a/ILSpy/Metadata/CorTables/ClassLayoutTableTreeNode.cs b/ILSpy/Metadata/CorTables/ClassLayoutTableTreeNode.cs index 16172be03..ad0de1ee0 100644 --- a/ILSpy/Metadata/CorTables/ClassLayoutTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ClassLayoutTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the ClassLayout table — explicit field-layout overrides on TypeDefs marked diff --git a/ILSpy/Metadata/CorTables/ConstantTableTreeNode.cs b/ILSpy/Metadata/CorTables/ConstantTableTreeNode.cs index 62aa4593b..1d6c52136 100644 --- a/ILSpy/Metadata/CorTables/ConstantTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ConstantTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the Constant table — compile-time constants attached to fields, parameters, diff --git a/ILSpy/Metadata/CorTables/CustomAttributeTableTreeNode.cs b/ILSpy/Metadata/CorTables/CustomAttributeTableTreeNode.cs index 380d9da3b..c66b064d6 100644 --- a/ILSpy/Metadata/CorTables/CustomAttributeTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/CustomAttributeTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the CustomAttribute table — every [Attr(...)] annotation attached to diff --git a/ILSpy/Metadata/CorTables/DeclSecurityTableTreeNode.cs b/ILSpy/Metadata/CorTables/DeclSecurityTableTreeNode.cs index 0d6cd0038..e8d02b621 100644 --- a/ILSpy/Metadata/CorTables/DeclSecurityTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/DeclSecurityTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the DeclSecurity table — declarative security attributes (CAS-era diff --git a/ILSpy/Metadata/CorTables/EventMapTableTreeNode.cs b/ILSpy/Metadata/CorTables/EventMapTableTreeNode.cs index 7440051e1..1d7018f12 100644 --- a/ILSpy/Metadata/CorTables/EventMapTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/EventMapTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the EventMap table — pairs each TypeDef that declares events with the first diff --git a/ILSpy/Metadata/CorTables/EventTableTreeNode.cs b/ILSpy/Metadata/CorTables/EventTableTreeNode.cs index 47fbb2bf7..cda3a6e7c 100644 --- a/ILSpy/Metadata/CorTables/EventTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/EventTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the Event table — every CLR event the module's types declare. Each row diff --git a/ILSpy/Metadata/CorTables/ExportedTypeTableTreeNode.cs b/ILSpy/Metadata/CorTables/ExportedTypeTableTreeNode.cs index f33cb6377..0d904ec70 100644 --- a/ILSpy/Metadata/CorTables/ExportedTypeTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ExportedTypeTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the ExportedType table — types this assembly forwards to (or re-exports diff --git a/ILSpy/Metadata/CorTables/FieldLayoutTableTreeNode.cs b/ILSpy/Metadata/CorTables/FieldLayoutTableTreeNode.cs index 93ad7514a..9edd3281b 100644 --- a/ILSpy/Metadata/CorTables/FieldLayoutTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/FieldLayoutTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the FieldLayout table — explicit per-field byte offsets for fields whose diff --git a/ILSpy/Metadata/CorTables/FieldMarshalTableTreeNode.cs b/ILSpy/Metadata/CorTables/FieldMarshalTableTreeNode.cs index 562a85abb..1a41667ae 100644 --- a/ILSpy/Metadata/CorTables/FieldMarshalTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/FieldMarshalTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the FieldMarshal table — native-marshalling descriptors attached to fields diff --git a/ILSpy/Metadata/CorTables/FieldRVATableTreeNode.cs b/ILSpy/Metadata/CorTables/FieldRVATableTreeNode.cs index 7f5569533..2ed5d5a50 100644 --- a/ILSpy/Metadata/CorTables/FieldRVATableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/FieldRVATableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the FieldRVA table — for static fields backed by a fixed PE-image RVA, the diff --git a/ILSpy/Metadata/CorTables/FieldTableTreeNode.cs b/ILSpy/Metadata/CorTables/FieldTableTreeNode.cs index 9a026792c..861f446ba 100644 --- a/ILSpy/Metadata/CorTables/FieldTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/FieldTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the Field table — every field defined by the module's types. Each row carries diff --git a/ILSpy/Metadata/CorTables/FileTableTreeNode.cs b/ILSpy/Metadata/CorTables/FileTableTreeNode.cs index d4ec3225e..a9f84ee10 100644 --- a/ILSpy/Metadata/CorTables/FileTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/FileTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the File table — multi-module assemblies list their constituent .netmodule diff --git a/ILSpy/Metadata/CorTables/GenericParamConstraintTableTreeNode.cs b/ILSpy/Metadata/CorTables/GenericParamConstraintTableTreeNode.cs index 8ce3e046c..8a83ed549 100644 --- a/ILSpy/Metadata/CorTables/GenericParamConstraintTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/GenericParamConstraintTableTreeNode.cs @@ -24,7 +24,7 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the GenericParamConstraint table — bounds applied to generic parameters diff --git a/ILSpy/Metadata/CorTables/GenericParamTableTreeNode.cs b/ILSpy/Metadata/CorTables/GenericParamTableTreeNode.cs index e91406b74..5bc8e3e5c 100644 --- a/ILSpy/Metadata/CorTables/GenericParamTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/GenericParamTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the GenericParam table — every type or method generic-parameter slot. Owner diff --git a/ILSpy/Metadata/CorTables/ImplMapTableTreeNode.cs b/ILSpy/Metadata/CorTables/ImplMapTableTreeNode.cs index 2f7ccd27e..61f31bcfb 100644 --- a/ILSpy/Metadata/CorTables/ImplMapTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ImplMapTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the ImplMap table — P/Invoke linkage. Each row maps a managed MethodDef (or diff --git a/ILSpy/Metadata/CorTables/InterfaceImplTableTreeNode.cs b/ILSpy/Metadata/CorTables/InterfaceImplTableTreeNode.cs index bb4e2c388..76b6d3754 100644 --- a/ILSpy/Metadata/CorTables/InterfaceImplTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/InterfaceImplTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the InterfaceImpl table — every type/interface implementation pair. Class is diff --git a/ILSpy/Metadata/CorTables/ManifestResourceTableTreeNode.cs b/ILSpy/Metadata/CorTables/ManifestResourceTableTreeNode.cs index d3203709d..0e9098594 100644 --- a/ILSpy/Metadata/CorTables/ManifestResourceTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ManifestResourceTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the ManifestResource table — every embedded or linked resource the assembly diff --git a/ILSpy/Metadata/CorTables/MemberRefTableTreeNode.cs b/ILSpy/Metadata/CorTables/MemberRefTableTreeNode.cs index d4e87e33b..2a091e9e8 100644 --- a/ILSpy/Metadata/CorTables/MemberRefTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/MemberRefTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the MemberRef table — every external method or field the module references. diff --git a/ILSpy/Metadata/CorTables/MethodImplTableTreeNode.cs b/ILSpy/Metadata/CorTables/MethodImplTableTreeNode.cs index df344ed16..d9bdf2c62 100644 --- a/ILSpy/Metadata/CorTables/MethodImplTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/MethodImplTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the MethodImpl table — explicit interface implementations and method-body diff --git a/ILSpy/Metadata/CorTables/MethodSemanticsTableTreeNode.cs b/ILSpy/Metadata/CorTables/MethodSemanticsTableTreeNode.cs index 5aa520390..e85210c4a 100644 --- a/ILSpy/Metadata/CorTables/MethodSemanticsTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/MethodSemanticsTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the MethodSemantics table — links accessor methods (get/set/add/remove/raise) diff --git a/ILSpy/Metadata/CorTables/MethodSpecTableTreeNode.cs b/ILSpy/Metadata/CorTables/MethodSpecTableTreeNode.cs index 7ff16b327..f4d858059 100644 --- a/ILSpy/Metadata/CorTables/MethodSpecTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/MethodSpecTableTreeNode.cs @@ -24,7 +24,7 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Disassembler; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the MethodSpec table — concrete instantiations of generic methods like diff --git a/ILSpy/Metadata/CorTables/MethodTableTreeNode.cs b/ILSpy/Metadata/CorTables/MethodTableTreeNode.cs index 51501f448..3ce4c9904 100644 --- a/ILSpy/Metadata/CorTables/MethodTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/MethodTableTreeNode.cs @@ -24,7 +24,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the MethodDef table — every method body the module ships. The RVA points diff --git a/ILSpy/Metadata/CorTables/ModuleRefTableTreeNode.cs b/ILSpy/Metadata/CorTables/ModuleRefTableTreeNode.cs index c41e51841..0956f0561 100644 --- a/ILSpy/Metadata/CorTables/ModuleRefTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ModuleRefTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the ModuleRef table — every external .netmodule the assembly P/Invokes into diff --git a/ILSpy/Metadata/CorTables/ModuleTableTreeNode.cs b/ILSpy/Metadata/CorTables/ModuleTableTreeNode.cs index 6ad8f2b5f..ec38a7306 100644 --- a/ILSpy/Metadata/CorTables/ModuleTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ModuleTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the Module table — always exactly one row carrying the module name and the diff --git a/ILSpy/Metadata/CorTables/NestedClassTableTreeNode.cs b/ILSpy/Metadata/CorTables/NestedClassTableTreeNode.cs index 0918fe144..f490e2315 100644 --- a/ILSpy/Metadata/CorTables/NestedClassTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/NestedClassTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the NestedClass table — pairs each nested type with its enclosing type. Walked diff --git a/ILSpy/Metadata/CorTables/ParamTableTreeNode.cs b/ILSpy/Metadata/CorTables/ParamTableTreeNode.cs index 377b7b972..41e2ae8d3 100644 --- a/ILSpy/Metadata/CorTables/ParamTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/ParamTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the Param table — every formal parameter declared on every method body. Walked diff --git a/ILSpy/Metadata/CorTables/PropertyMapTableTreeNode.cs b/ILSpy/Metadata/CorTables/PropertyMapTableTreeNode.cs index 50c71af0d..fda5d7cd5 100644 --- a/ILSpy/Metadata/CorTables/PropertyMapTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/PropertyMapTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the PropertyMap table — pairs each TypeDef that declares properties with the diff --git a/ILSpy/Metadata/CorTables/PropertyTableTreeNode.cs b/ILSpy/Metadata/CorTables/PropertyTableTreeNode.cs index 1b2edd6ef..30f055f7c 100644 --- a/ILSpy/Metadata/CorTables/PropertyTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/PropertyTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the Property table — every property the module's types declare. Method-level diff --git a/ILSpy/Metadata/CorTables/PtrTableTreeNode.cs b/ILSpy/Metadata/CorTables/PtrTableTreeNode.cs index 7fe815a8b..6c7aaa3d8 100644 --- a/ILSpy/Metadata/CorTables/PtrTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/PtrTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the five Ptr tables (FieldPtr / MethodPtr / ParamPtr / EventPtr / PropertyPtr). diff --git a/ILSpy/Metadata/CorTables/StandAloneSigTableTreeNode.cs b/ILSpy/Metadata/CorTables/StandAloneSigTableTreeNode.cs index 468f5e9bb..47aa90542 100644 --- a/ILSpy/Metadata/CorTables/StandAloneSigTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/StandAloneSigTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the StandAloneSig table — signatures referenced from outside their natural diff --git a/ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs b/ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs index ce02a13a7..6695c6584 100644 --- a/ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs @@ -26,7 +26,7 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Disassembler; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the TypeDef table — every type the module defines. The first row is the diff --git a/ILSpy/Metadata/CorTables/TypeRefTableTreeNode.cs b/ILSpy/Metadata/CorTables/TypeRefTableTreeNode.cs index 203e7fc5f..374552bbd 100644 --- a/ILSpy/Metadata/CorTables/TypeRefTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/TypeRefTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the TypeRef table — every external type the module mentions. Each row points diff --git a/ILSpy/Metadata/CorTables/TypeSpecTableTreeNode.cs b/ILSpy/Metadata/CorTables/TypeSpecTableTreeNode.cs index c66a5b822..bdbe52349 100644 --- a/ILSpy/Metadata/CorTables/TypeSpecTableTreeNode.cs +++ b/ILSpy/Metadata/CorTables/TypeSpecTableTreeNode.cs @@ -24,7 +24,7 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Disassembler; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.CorTables +namespace ICSharpCode.ILSpy.Metadata.CorTables { /// /// View of the TypeSpec table — instantiated generic types and other constructed type diff --git a/ILSpy/Metadata/DataDirectoriesTreeNode.cs b/ILSpy/Metadata/DataDirectoriesTreeNode.cs index cdb27f071..b3da71285 100644 --- a/ILSpy/Metadata/DataDirectoriesTreeNode.cs +++ b/ILSpy/Metadata/DataDirectoriesTreeNode.cs @@ -23,10 +23,10 @@ using System.Reflection.PortableExecutable; using ICSharpCode.Decompiler.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// 15-row table of (RVA, Size, Containing-Section) triples that lives at the tail of the @@ -43,8 +43,8 @@ namespace ILSpy.Metadata } public override object Text => "Data Directories"; - public override object Icon => Images.Images.ListFolder; - public override object ExpandedIcon => Images.Images.ListFolderOpen; + public override object Icon => Images.ListFolder; + public override object ExpandedIcon => Images.ListFolderOpen; public override string ToString() => "Data Directories"; public override ContentPageModel CreateTab() diff --git a/ILSpy/Metadata/DebugDirectoryChildNodes.cs b/ILSpy/Metadata/DebugDirectoryChildNodes.cs index f24025e0b..f2760819b 100644 --- a/ILSpy/Metadata/DebugDirectoryChildNodes.cs +++ b/ILSpy/Metadata/DebugDirectoryChildNodes.cs @@ -22,10 +22,10 @@ using System.Reflection.PortableExecutable; using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Metadata; -using ILSpy.Languages; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.TreeNodes; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Per-entry tree node under . Specialised typed @@ -45,7 +45,7 @@ namespace ILSpy.Metadata } public override object Text => entry.Type.ToString(); - public override object Icon => Images.Images.MetadataTable; + public override object Icon => Images.MetadataTable; public override string ToString() => entry.Type.ToString(); protected DebugDirectoryEntry Entry => entry; diff --git a/ILSpy/Metadata/DebugDirectoryTreeNode.cs b/ILSpy/Metadata/DebugDirectoryTreeNode.cs index 61b867212..3e802b330 100644 --- a/ILSpy/Metadata/DebugDirectoryTreeNode.cs +++ b/ILSpy/Metadata/DebugDirectoryTreeNode.cs @@ -23,10 +23,10 @@ using System.Reflection.PortableExecutable; using ICSharpCode.Decompiler.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Lists each entry of the PE debug directory: timestamp, version, type, and the size / @@ -47,8 +47,8 @@ namespace ILSpy.Metadata } public override object Text => "Debug Directory"; - public override object Icon => Images.Images.ListFolder; - public override object ExpandedIcon => Images.Images.ListFolderOpen; + public override object Icon => Images.ListFolder; + public override object ExpandedIcon => Images.ListFolderOpen; public override string ToString() => "Debug Directory"; public override ContentPageModel CreateTab() diff --git a/ILSpy/Metadata/DebugTables/CustomDebugInformationTableTreeNode.cs b/ILSpy/Metadata/DebugTables/CustomDebugInformationTableTreeNode.cs index 92256fa5d..e7cc6cff2 100644 --- a/ILSpy/Metadata/DebugTables/CustomDebugInformationTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/CustomDebugInformationTableTreeNode.cs @@ -27,9 +27,9 @@ using Avalonia.Controls; using ICSharpCode.Decompiler.DebugInfo; using ICSharpCode.Decompiler.Metadata; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// One hoisted-local scope (IL offset range) of a state-machine method. public sealed record HoistedLocalScopeDetail(uint StartOffset, uint Length); diff --git a/ILSpy/Metadata/DebugTables/DocumentTableTreeNode.cs b/ILSpy/Metadata/DebugTables/DocumentTableTreeNode.cs index 129fac453..9c29c26e4 100644 --- a/ILSpy/Metadata/DebugTables/DocumentTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/DocumentTableTreeNode.cs @@ -24,7 +24,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.DebugInfo; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// /// View of the Document table — every source file referenced by debug info. Each row diff --git a/ILSpy/Metadata/DebugTables/ImportScopeTableTreeNode.cs b/ILSpy/Metadata/DebugTables/ImportScopeTableTreeNode.cs index 2ac63dd37..6ca5156a1 100644 --- a/ILSpy/Metadata/DebugTables/ImportScopeTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/ImportScopeTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// /// View of the ImportScope table — chains of using / using static / alias diff --git a/ILSpy/Metadata/DebugTables/LocalConstantTableTreeNode.cs b/ILSpy/Metadata/DebugTables/LocalConstantTableTreeNode.cs index dfafaa78f..0c63826fe 100644 --- a/ILSpy/Metadata/DebugTables/LocalConstantTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/LocalConstantTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// /// View of the LocalConstant table — named compile-time constants visible inside a diff --git a/ILSpy/Metadata/DebugTables/LocalScopeTableTreeNode.cs b/ILSpy/Metadata/DebugTables/LocalScopeTableTreeNode.cs index 26ad79333..a6fbbac16 100644 --- a/ILSpy/Metadata/DebugTables/LocalScopeTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/LocalScopeTableTreeNode.cs @@ -23,7 +23,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// /// View of the LocalScope table — every lexical scope inside every method body's diff --git a/ILSpy/Metadata/DebugTables/LocalVariableTableTreeNode.cs b/ILSpy/Metadata/DebugTables/LocalVariableTableTreeNode.cs index e343044a3..ca22c6662 100644 --- a/ILSpy/Metadata/DebugTables/LocalVariableTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/LocalVariableTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// /// View of the LocalVariable table — debug-info for named local slots inside method diff --git a/ILSpy/Metadata/DebugTables/MethodDebugInformationTableTreeNode.cs b/ILSpy/Metadata/DebugTables/MethodDebugInformationTableTreeNode.cs index 1dbfb9112..7469663a7 100644 --- a/ILSpy/Metadata/DebugTables/MethodDebugInformationTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/MethodDebugInformationTableTreeNode.cs @@ -25,7 +25,7 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Disassembler; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// /// View of the MethodDebugInformation table — sequence-point and local-signature data diff --git a/ILSpy/Metadata/DebugTables/StateMachineMethodTableTreeNode.cs b/ILSpy/Metadata/DebugTables/StateMachineMethodTableTreeNode.cs index 0dca42ffc..c18d660c0 100644 --- a/ILSpy/Metadata/DebugTables/StateMachineMethodTableTreeNode.cs +++ b/ILSpy/Metadata/DebugTables/StateMachineMethodTableTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata.DebugTables +namespace ICSharpCode.ILSpy.Metadata.DebugTables { /// /// View of the StateMachineMethod table — pairs each compiler-generated state-machine diff --git a/ILSpy/Metadata/DosHeaderTreeNode.cs b/ILSpy/Metadata/DosHeaderTreeNode.cs index 33ad6f1d7..c2dbbd822 100644 --- a/ILSpy/Metadata/DosHeaderTreeNode.cs +++ b/ILSpy/Metadata/DosHeaderTreeNode.cs @@ -22,10 +22,10 @@ using System.Linq; using ICSharpCode.Decompiler.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Renders the 64-byte legacy DOS header sitting at offset 0 of every PE file. Phase 1 @@ -41,7 +41,7 @@ namespace ILSpy.Metadata } public override object Text => "DOS Header"; - public override object Icon => Images.Images.Header; + public override object Icon => Images.Header; public override string ToString() => "DOS Header"; public override ContentPageModel CreateTab() diff --git a/ILSpy/Metadata/FilterState.cs b/ILSpy/Metadata/FilterState.cs index 21782e253..be3a329e5 100644 --- a/ILSpy/Metadata/FilterState.cs +++ b/ILSpy/Metadata/FilterState.cs @@ -23,7 +23,7 @@ using System.Linq; using CommunityToolkit.Mvvm.ComponentModel; -namespace ILSpy.Metadata.Filters +namespace ICSharpCode.ILSpy.Metadata.Filters { public enum TriState { DontCare, Required, Excluded } diff --git a/ILSpy/Metadata/FilterStatePersistence.cs b/ILSpy/Metadata/FilterStatePersistence.cs index e6db51534..2f760be3b 100644 --- a/ILSpy/Metadata/FilterStatePersistence.cs +++ b/ILSpy/Metadata/FilterStatePersistence.cs @@ -22,7 +22,7 @@ using System.Globalization; using System.Linq; using System.Xml.Linq; -namespace ILSpy.Metadata.Filters +namespace ICSharpCode.ILSpy.Metadata.Filters { /// /// Round-trips a through an so the diff --git a/ILSpy/Metadata/FilterStatePresenter.cs b/ILSpy/Metadata/FilterStatePresenter.cs index 9574656b2..a896a49de 100644 --- a/ILSpy/Metadata/FilterStatePresenter.cs +++ b/ILSpy/Metadata/FilterStatePresenter.cs @@ -19,7 +19,7 @@ using System; using System.Linq; -namespace ILSpy.Metadata.Filters +namespace ICSharpCode.ILSpy.Metadata.Filters { /// /// Renders a as a one-line predicate summary diff --git a/ILSpy/Metadata/FlagsSchema.cs b/ILSpy/Metadata/FlagsSchema.cs index 76d93dd2b..d0c97f204 100644 --- a/ILSpy/Metadata/FlagsSchema.cs +++ b/ILSpy/Metadata/FlagsSchema.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ILSpy.Metadata.Filters +namespace ICSharpCode.ILSpy.Metadata.Filters { /// /// Static description of how a enum's bits decompose into diff --git a/ILSpy/Metadata/FlagsSchemaInferer.cs b/ILSpy/Metadata/FlagsSchemaInferer.cs index 55b3f58c9..44f3bb4ac 100644 --- a/ILSpy/Metadata/FlagsSchemaInferer.cs +++ b/ILSpy/Metadata/FlagsSchemaInferer.cs @@ -23,7 +23,7 @@ using System.Globalization; using System.Linq; using System.Reflection; -namespace ILSpy.Metadata.Filters +namespace ICSharpCode.ILSpy.Metadata.Filters { /// /// Builds a for a enum by diff --git a/ILSpy/Metadata/FlagsTooltip.cs b/ILSpy/Metadata/FlagsTooltip.cs index 079c34811..cf69c88b8 100644 --- a/ILSpy/Metadata/FlagsTooltip.cs +++ b/ILSpy/Metadata/FlagsTooltip.cs @@ -29,7 +29,7 @@ using Avalonia.Media; using ICSharpCode.Decompiler.Util; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Rich cell tooltip for an enum-valued metadata column: it breaks a flags value down into diff --git a/ILSpy/Metadata/GuidHeapTreeNode.cs b/ILSpy/Metadata/GuidHeapTreeNode.cs index 88a115651..b85ebf4bc 100644 --- a/ILSpy/Metadata/GuidHeapTreeNode.cs +++ b/ILSpy/Metadata/GuidHeapTreeNode.cs @@ -22,7 +22,7 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// View of #GUID — a contiguous array of 16-byte GUIDs indexed (1-based) by ModuleDef diff --git a/ILSpy/Metadata/Helpers.cs b/ILSpy/Metadata/Helpers.cs index 4bdc3df67..19637a098 100644 --- a/ILSpy/Metadata/Helpers.cs +++ b/ILSpy/Metadata/Helpers.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Reflection; using System.Reflection.Metadata; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Classifies a column for the DataGrid view (Phase 2+). Heap-offset cells render with a diff --git a/ILSpy/Metadata/MetadataCellTooltip.cs b/ILSpy/Metadata/MetadataCellTooltip.cs index e56cd0d64..e70fc190a 100644 --- a/ILSpy/Metadata/MetadataCellTooltip.cs +++ b/ILSpy/Metadata/MetadataCellTooltip.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Concurrent; using System.Reflection; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Resolves per-cell tooltips for a metadata-table row. Entry classes opt in by exposing diff --git a/ILSpy/Metadata/MetadataColumnBuilder.cs b/ILSpy/Metadata/MetadataColumnBuilder.cs index 818b6b229..5371a5400 100644 --- a/ILSpy/Metadata/MetadataColumnBuilder.cs +++ b/ILSpy/Metadata/MetadataColumnBuilder.cs @@ -33,9 +33,9 @@ using Avalonia.Layout; using Avalonia.Media; using Avalonia.VisualTree; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Builds DataGrid columns for a metadata-row type by reflecting over its public @@ -332,15 +332,15 @@ namespace ILSpy.Metadata // (multi-select chips) from independent flags (tri-state pills) and drives // ColumnFilter.FlagsState. A Flyout (not a raw Popup) supplies light dismiss, // Escape-to-close, focus handling, and theme-correct presenter chrome. - var schema = ILSpy.Metadata.Filters.FlagsSchemaInferer.For(enumType); + var schema = ICSharpCode.ILSpy.Metadata.Filters.FlagsSchemaInferer.For(enumType); bool freshlyCreated = filter.FlagsState is null; - filter.FlagsState ??= new ILSpy.Metadata.Filters.FilterState(schema); + filter.FlagsState ??= new ICSharpCode.ILSpy.Metadata.Filters.FilterState(schema); // On first build, restore any persisted state for this (table, column). // Subsequent opens already carry the live state in-memory. Then subscribe so // later mutations write back to SessionSettings. if (freshlyCreated && pageKey != null) ApplyPersistedFilterState(filter.FlagsState, pageKey, columnName); - var popupContent = new ILSpy.Views.Filters.FlagsFilterPopup(filter.FlagsState); + var popupContent = new ICSharpCode.ILSpy.Views.Filters.FlagsFilterPopup(filter.FlagsState); var flyoutContent = new ScrollViewer { MaxHeight = 400, @@ -384,7 +384,7 @@ namespace ILSpy.Metadata /// restore is strictly less bad than failing the popup build entirely. /// static void ApplyPersistedFilterState( - ILSpy.Metadata.Filters.FilterState state, + ICSharpCode.ILSpy.Metadata.Filters.FilterState state, string pageKey, string columnName) { @@ -402,13 +402,13 @@ namespace ILSpy.Metadata var key = (pageKey, columnName); if (settings.FilterStates.TryGetValue(key, out var savedXml)) { - ILSpy.Metadata.Filters.FilterStatePersistence.ApplyXml(state, savedXml); + ICSharpCode.ILSpy.Metadata.Filters.FilterStatePersistence.ApplyXml(state, savedXml); } state.PropertyChanged += (_, _) => { if (state.IsEmpty) settings.FilterStates.Remove(key); else - settings.FilterStates[key] = ILSpy.Metadata.Filters.FilterStatePersistence.ToXml(state); + settings.FilterStates[key] = ICSharpCode.ILSpy.Metadata.Filters.FilterStatePersistence.ToXml(state); }; } diff --git a/ILSpy/Metadata/MetadataHeapTreeNode.cs b/ILSpy/Metadata/MetadataHeapTreeNode.cs index d00ad85a8..33589317b 100644 --- a/ILSpy/Metadata/MetadataHeapTreeNode.cs +++ b/ILSpy/Metadata/MetadataHeapTreeNode.cs @@ -22,10 +22,10 @@ using System.Reflection.Metadata; using ICSharpCode.Decompiler.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Common parent for the four heap views (#Strings, #US, #GUID, #Blob). Holds the @@ -46,7 +46,7 @@ namespace ILSpy.Metadata this.metadataFile = metadataFile ?? throw new ArgumentNullException(nameof(metadataFile)); } - public override object Icon => Images.Images.Heap; + public override object Icon => Images.Heap; } /// diff --git a/ILSpy/Metadata/MetadataNavigator.cs b/ILSpy/Metadata/MetadataNavigator.cs index 03721ee3a..c58bc167f 100644 --- a/ILSpy/Metadata/MetadataNavigator.cs +++ b/ILSpy/Metadata/MetadataNavigator.cs @@ -26,10 +26,10 @@ using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.ILSpyX; -using ILSpy.AssemblyTree; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.TreeNodes; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Resolves metadata-grid interactions (a clicked token cell, a double-clicked row, a token diff --git a/ILSpy/Metadata/MetadataProtocolHandler.cs b/ILSpy/Metadata/MetadataProtocolHandler.cs index e9b6bddde..af1598e84 100644 --- a/ILSpy/Metadata/MetadataProtocolHandler.cs +++ b/ILSpy/Metadata/MetadataProtocolHandler.cs @@ -23,11 +23,11 @@ using System.Reflection.Metadata; using ICSharpCode.Decompiler.Metadata; -using ILSpy.AssemblyTree; -using ILSpy.Commands; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Commands; +using ICSharpCode.ILSpy.TreeNodes; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Resolves metadata:// hyperlinks in the decompiler output to a metadata-tree diff --git a/ILSpy/Metadata/MetadataRowDetails.cs b/ILSpy/Metadata/MetadataRowDetails.cs index 586b09e26..d90fb7d80 100644 --- a/ILSpy/Metadata/MetadataRowDetails.cs +++ b/ILSpy/Metadata/MetadataRowDetails.cs @@ -27,9 +27,9 @@ using Avalonia.Data; using Avalonia.Layout; using Avalonia.Media; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Hosts the per-row details content of a metadata DataGrid. The DataGrid builds its diff --git a/ILSpy/Metadata/MetadataTableTreeNode.cs b/ILSpy/Metadata/MetadataTableTreeNode.cs index 43394ef1f..6414ee726 100644 --- a/ILSpy/Metadata/MetadataTableTreeNode.cs +++ b/ILSpy/Metadata/MetadataTableTreeNode.cs @@ -26,10 +26,10 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Common parent for the per-table leaves under "Tables". Each subclass corresponds to @@ -51,7 +51,7 @@ namespace ILSpy.Metadata this.metadataFile = metadataFile ?? throw new ArgumentNullException(nameof(metadataFile)); } - public override object Icon => Images.Images.MetadataTable; + public override object Icon => Images.MetadataTable; /// /// Byte offset of row (1-based) in , relative to diff --git a/ILSpy/Metadata/MetadataTablesTreeNode.cs b/ILSpy/Metadata/MetadataTablesTreeNode.cs index 52116e4cf..980c3de46 100644 --- a/ILSpy/Metadata/MetadataTablesTreeNode.cs +++ b/ILSpy/Metadata/MetadataTablesTreeNode.cs @@ -23,13 +23,13 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Metadata; -using ILSpy.AppEnv; -using ILSpy.Languages; -using ILSpy.Metadata.CorTables; -using ILSpy.Metadata.DebugTables; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.Metadata.CorTables; +using ICSharpCode.ILSpy.Metadata.DebugTables; +using ICSharpCode.ILSpy.TreeNodes; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Synthetic "Tables" container nested under each MetadataTreeNode. Lazily expands into @@ -47,7 +47,7 @@ namespace ILSpy.Metadata } public override object Text => "Tables"; - public override object Icon => Images.Images.MetadataTableGroup; + public override object Icon => Images.MetadataTableGroup; public override string ToString() => "Tables"; public override void Decompile(Language language, ITextOutput output, DecompilationOptions options) diff --git a/ILSpy/Metadata/MetadataTextWriter.cs b/ILSpy/Metadata/MetadataTextWriter.cs index 86a917c5f..b53733290 100644 --- a/ILSpy/Metadata/MetadataTextWriter.cs +++ b/ILSpy/Metadata/MetadataTextWriter.cs @@ -25,9 +25,9 @@ using System.Text; using ICSharpCode.Decompiler; -using ILSpy.Languages; +using ICSharpCode.ILSpy.Languages; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Renders a list of row objects to as a fixed-width table — diff --git a/ILSpy/Metadata/MetadataTokenReference.cs b/ILSpy/Metadata/MetadataTokenReference.cs index f76509b1c..2dbcee355 100644 --- a/ILSpy/Metadata/MetadataTokenReference.cs +++ b/ILSpy/Metadata/MetadataTokenReference.cs @@ -20,7 +20,7 @@ using System.Reflection.Metadata; using ICSharpCode.Decompiler.Metadata; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// A click target carrying a metadata token within a specific module. Emitted when the diff --git a/ILSpy/Metadata/MetadataTreeNode.cs b/ILSpy/Metadata/MetadataTreeNode.cs index 81ff15f69..7da28200f 100644 --- a/ILSpy/Metadata/MetadataTreeNode.cs +++ b/ILSpy/Metadata/MetadataTreeNode.cs @@ -24,10 +24,10 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Metadata; -using ILSpy.Languages; -using ILSpy.TreeNodes; +using ICSharpCode.ILSpy.Languages; +using ICSharpCode.ILSpy.TreeNodes; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Synthetic container surfaced under each loaded assembly's tree node. Its children @@ -49,7 +49,7 @@ namespace ILSpy.Metadata public override object Text => title; - public override object Icon => Images.Images.Metadata; + public override object Icon => Images.Metadata; // Stable identity for SessionSettings.ActiveTreeViewPath. public override string ToString() => "Metadata: " + title; diff --git a/ILSpy/Metadata/OptionalHeaderTreeNode.cs b/ILSpy/Metadata/OptionalHeaderTreeNode.cs index ab8215699..89326dfbb 100644 --- a/ILSpy/Metadata/OptionalHeaderTreeNode.cs +++ b/ILSpy/Metadata/OptionalHeaderTreeNode.cs @@ -23,10 +23,10 @@ using System.Reflection.PortableExecutable; using ICSharpCode.Decompiler.Metadata; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// PE Optional Header — image base, sizes, alignments, subsystem. Field widths flex @@ -43,7 +43,7 @@ namespace ILSpy.Metadata } public override object Text => "Optional Header"; - public override object Icon => Images.Images.Header; + public override object Icon => Images.Header; public override string ToString() => "Optional Header"; public override ContentPageModel CreateTab() diff --git a/ILSpy/Metadata/StringHeapTreeNode.cs b/ILSpy/Metadata/StringHeapTreeNode.cs index fd06c836d..6ccb6a46e 100644 --- a/ILSpy/Metadata/StringHeapTreeNode.cs +++ b/ILSpy/Metadata/StringHeapTreeNode.cs @@ -22,9 +22,9 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// View of #Strings — the heap that holds every UTF-8 type/member/namespace name diff --git a/ILSpy/Metadata/UnsupportedMetadataTableTreeNode.cs b/ILSpy/Metadata/UnsupportedMetadataTableTreeNode.cs index c0263608b..f453be493 100644 --- a/ILSpy/Metadata/UnsupportedMetadataTableTreeNode.cs +++ b/ILSpy/Metadata/UnsupportedMetadataTableTreeNode.cs @@ -21,9 +21,9 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.Metadata; -using ILSpy.Languages; +using ICSharpCode.ILSpy.Languages; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// Universal placeholder used until a typed leaf is wired up for a given diff --git a/ILSpy/Metadata/UserStringHeapTreeNode.cs b/ILSpy/Metadata/UserStringHeapTreeNode.cs index 3c0e56091..f4123be66 100644 --- a/ILSpy/Metadata/UserStringHeapTreeNode.cs +++ b/ILSpy/Metadata/UserStringHeapTreeNode.cs @@ -22,9 +22,9 @@ using System.Reflection.Metadata.Ecma335; using ICSharpCode.Decompiler.Metadata; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Metadata +namespace ICSharpCode.ILSpy.Metadata { /// /// View of #US — the UTF-16 heap holding every literal string emitted by an ldstr diff --git a/ILSpy/NavigationEntry.cs b/ILSpy/NavigationEntry.cs index e19b4634d..7b12a743b 100644 --- a/ILSpy/NavigationEntry.cs +++ b/ILSpy/NavigationEntry.cs @@ -23,11 +23,11 @@ using Avalonia.Media; using ICSharpCode.ILSpyX.TreeView; -using ILSpy.TextView; -using ILSpy.TreeNodes; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.TextView; +using ICSharpCode.ILSpy.TreeNodes; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Navigation +namespace ICSharpCode.ILSpy.Navigation { /// /// One stop on the back/forward stack: a (tab, target) pair where the target is either a diff --git a/ILSpy/NavigationHistory.cs b/ILSpy/NavigationHistory.cs index 2139da574..01b16e159 100644 --- a/ILSpy/NavigationHistory.cs +++ b/ILSpy/NavigationHistory.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ILSpy.Navigation +namespace ICSharpCode.ILSpy.Navigation { /// /// Two-stack browser-style history. A rapid successive of the SAME entry diff --git a/ILSpy/NuGetFeeds/INuGetFeedClient.cs b/ILSpy/NuGetFeeds/INuGetFeedClient.cs index 03c7a1e3e..5763dfe0d 100644 --- a/ILSpy/NuGetFeeds/INuGetFeedClient.cs +++ b/ILSpy/NuGetFeeds/INuGetFeedClient.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -namespace ILSpy.NuGetFeeds +namespace ICSharpCode.ILSpy.NuGetFeeds { /// /// One search hit from a NuGet feed, reduced to what the package-chooser dialog diff --git a/ILSpy/NuGetFeeds/NuGetFeedClient.cs b/ILSpy/NuGetFeeds/NuGetFeedClient.cs index 7b9b50734..2ce145779 100644 --- a/ILSpy/NuGetFeeds/NuGetFeedClient.cs +++ b/ILSpy/NuGetFeeds/NuGetFeedClient.cs @@ -33,7 +33,7 @@ using NuGet.Protocol; using NuGet.Protocol.Core.Types; using NuGet.Versioning; -namespace ILSpy.NuGetFeeds +namespace ICSharpCode.ILSpy.NuGetFeeds { /// /// backed by the NuGet client libraries, talking to diff --git a/ILSpy/NuGetFeeds/NuGetFeedSettings.cs b/ILSpy/NuGetFeeds/NuGetFeedSettings.cs index b8b935f00..90529d381 100644 --- a/ILSpy/NuGetFeeds/NuGetFeedSettings.cs +++ b/ILSpy/NuGetFeeds/NuGetFeedSettings.cs @@ -25,7 +25,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using ICSharpCode.ILSpyX.Settings; -namespace ILSpy.NuGetFeeds +namespace ICSharpCode.ILSpy.NuGetFeeds { /// /// Persisted state of the "Open from NuGet feed" dialog: the MRU list of feed URLs the diff --git a/ILSpy/Options/DecompilerSettingsPanel.axaml b/ILSpy/Options/DecompilerSettingsPanel.axaml index 3bc05ce13..71e1ee4c8 100644 --- a/ILSpy/Options/DecompilerSettingsPanel.axaml +++ b/ILSpy/Options/DecompilerSettingsPanel.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:vm="using:ILSpy.Options" + xmlns:vm="using:ICSharpCode.ILSpy.Options" mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="500" - x:Class="ILSpy.Options.Panels.DecompilerSettingsPanel" + x:Class="ICSharpCode.ILSpy.Options.Panels.DecompilerSettingsPanel" x:DataType="vm:DecompilerSettingsViewModel"> diff --git a/ILSpy/Views/MainWindow.axaml.cs b/ILSpy/Views/MainWindow.axaml.cs index f35bb32a2..81988fa54 100644 --- a/ILSpy/Views/MainWindow.axaml.cs +++ b/ILSpy/Views/MainWindow.axaml.cs @@ -22,10 +22,10 @@ using System.Composition; using Avalonia; using Avalonia.Controls; -using ILSpy.AppEnv; -using ILSpy.ViewModels; +using ICSharpCode.ILSpy.AppEnv; +using ICSharpCode.ILSpy.ViewModels; -namespace ILSpy.Views +namespace ICSharpCode.ILSpy.Views { [Export] [Shared] @@ -59,7 +59,7 @@ namespace ILSpy.Views // DBus error (which surfaces later on the finalizer thread) can be traced back to the // gesture that triggered the DBus call. No-op unless that category is enabled. InputDiagnostics.Attach(this); - ILSpy.MainMenu.Attach(this); + ICSharpCode.ILSpy.MainMenu.Attach(this); ApplySessionSettings(settingsService.SessionSettings); Opened += async (_, _) => { AppLog.Mark("MainWindow.Opened fired"); @@ -86,7 +86,7 @@ namespace ILSpy.Views var output = new TextView.AvaloniaEditTextOutput { Title = "Composition Errors" }; AppEnv.CompositionErrors.WriteTo(output); AppEnv.AppComposition.Current - .GetExport() + .GetExport() .ShowTextInNewTab("Composition Errors", output); } catch (System.Exception ex) @@ -123,8 +123,8 @@ namespace ILSpy.Views // window doesn't need to be wired with a direct DockWorkspace reference. try { - ILSpy.AppEnv.AppComposition.Current - .GetExport() + ICSharpCode.ILSpy.AppEnv.AppComposition.Current + .GetExport() .SaveLayout(); } catch (System.Exception ex) diff --git a/ILSpy/Views/ManageAssemblyListsDialog.axaml b/ILSpy/Views/ManageAssemblyListsDialog.axaml index 34431543d..dc87f3c30 100644 --- a/ILSpy/Views/ManageAssemblyListsDialog.axaml +++ b/ILSpy/Views/ManageAssemblyListsDialog.axaml @@ -1,6 +1,6 @@ diff --git a/ILSpy/Views/ManageAssemblyListsDialog.axaml.cs b/ILSpy/Views/ManageAssemblyListsDialog.axaml.cs index 54946deb1..d24761216 100644 --- a/ILSpy/Views/ManageAssemblyListsDialog.axaml.cs +++ b/ILSpy/Views/ManageAssemblyListsDialog.axaml.cs @@ -31,7 +31,7 @@ using Avalonia.VisualTree; using ICSharpCode.Decompiler.Metadata; using ICSharpCode.ILSpyX; -namespace ILSpy.Views +namespace ICSharpCode.ILSpy.Views { /// /// Manage Assembly Lists dialog: list of saved assembly-list names with New / Clone / diff --git a/ILSpy/Views/MetadataTablePage.axaml b/ILSpy/Views/MetadataTablePage.axaml index cc190d1b0..769f40e7b 100644 --- a/ILSpy/Views/MetadataTablePage.axaml +++ b/ILSpy/Views/MetadataTablePage.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:vm="using:ILSpy.ViewModels" + xmlns:vm="using:ICSharpCode.ILSpy.ViewModels" mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="400" - x:Class="ILSpy.Views.MetadataTablePage" + x:Class="ICSharpCode.ILSpy.Views.MetadataTablePage" x:DataType="vm:MetadataTablePageModel">