Move a few types from core to engine assembly

nunit · Jan 2, 2025 · 3b44b6b · 3b44b6b
1 parent 74d4407
commit 3b44b6b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 8 deletions.
diff --git a/src/NUnitConsole/nunit4-netcore-console/SafeAttributeAccess.cs b/src/NUnitConsole/nunit4-netcore-console/SafeAttributeAccess.cs
@@ -4,12 +4,6 @@
 using System.Globalization;
 using System.Xml;
 
-namespace System.Runtime.CompilerServices
-{
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
-    sealed class ExtensionAttribute : Attribute { }
-}
-
 namespace NUnit.ConsoleRunner
 {
     /// <summary>

diff --git a/src/NUnitEngine/nunit.engine.core.tests/Extensibility/ExtensionSelectorTests.cs b/src/NUnitEngine/nunit.engine.core.tests/Extensibility/ExtensionSelectorTests.cs
@@ -113,7 +113,7 @@ private static IExtensionAssembly MockExtension(string assemblyName = "Extension
             sub.AssemblyName.Returns(assemblyName);
             sub.AssemblyVersion.Returns(assemblyVersion ?? new Version(1, 0));
             targetFramework = targetFramework ?? new Version(2, 0);
-            sub.FrameworkName.Returns(new FrameworkName(FrameworkIdentifiers.NetFramework, targetFramework));
+            sub.FrameworkName.Returns(new FrameworkName(".NETFramework", targetFramework));
             sub.FromWildCard.Returns(fromWildcard);
             return sub;
         }

diff --git a/src/NUnitEngine/nunit.engine.core/Extensibility/ExtensionManager.cs b/src/NUnitEngine/nunit.engine.core/Extensibility/ExtensionManager.cs
@@ -483,7 +483,7 @@ internal void FindExtensionsInAssembly(ExtensionAssembly extensionAssembly)
             Version currentVersion = RuntimeInformation.FrameworkVersion;
             var frameworkName = extensionAssembly.FrameworkName;
 
-            if (frameworkName.Identifier != FrameworkIdentifiers.NetFramework || frameworkName.Version > currentVersion)
+            if (frameworkName.Identifier != ".NETFramework" || frameworkName.Version > currentVersion)
             {
                 if (!extensionAssembly.FromWildCard)
                 {

diff --git a/src/NUnitEngine/nunit.engine.core/DotNet.cs → src/NUnitEngine/nunit.engine/DotNet.cs b/src/NUnitEngine/nunit.engine.core/DotNet.cs → src/NUnitEngine/nunit.engine/DotNet.cs
diff --git a/.../nunit.engine.core/FrameworkIdentifers.cs → ...ngine/nunit.engine/FrameworkIdentifers.cs b/.../nunit.engine.core/FrameworkIdentifers.cs → ...ngine/nunit.engine/FrameworkIdentifers.cs