Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Update nunit to properly run teests with dotnet7

Browse Source
This commit is contained in:
Wojciech Figat
2023-01-11 11:05:31 +01:00
parent 45a557f9c0
commit 9281db73a7
38 changed files with 72 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Platforms/DotNet/NUnit/DotnetToolSettings.xml
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<DotNetCliTool Version="1">
<Commands>
<Command Name="dotnet-nunit" EntryPoint="nunit3-netcore-console.dll" Runner="dotnet" />
</Commands>
</DotNetCliTool>
Source/Platforms/DotNet/NUnit/Microsoft.Extensions.DependencyModel.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/addins/nunit-project-loader.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/addins/nunit-v2-result-writer.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/addins/nunit.core.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/addins/nunit.core.interfaces.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/addins/nunit.v2.driver.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/addins/teamcity-event-listener.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/addins/vs-project-loader.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit-agent.deps.json
+9 -9
View File
@@ -6,10 +6,10 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v7.0": {
"nunit-agent/3.16.0": {
"nunit-agent/3.16.1": {
"dependencies": {
"nunit.engine.api": "1.0.0",
"nunit.engine.core": "1.0.0"
"nunit.engine.api": "3.16.1",
"nunit.engine.core": "3.16.1"
},
"runtime": {
"nunit-agent.dll": {}
@@ -141,17 +141,17 @@
}
}
},
"nunit.engine.api/1.0.0": {
"nunit.engine.api/3.16.1": {
"runtime": {
"nunit.engine.api.dll": {}
}
},
"nunit.engine.core/1.0.0": {
"nunit.engine.core/3.16.1": {
"dependencies": {
"Microsoft.Extensions.DependencyModel": "3.1.0",
"Microsoft.Win32.Registry": "4.3.0",
"TestCentric.Metadata": "1.7.1",
"nunit.engine.api": "1.0.0"
"nunit.engine.api": "3.16.1"
},
"runtime": {
"nunit.engine.core.dll": {}
@@ -160,7 +160,7 @@
}
},
"libraries": {
"nunit-agent/3.16.0": {
"nunit-agent/3.16.1": {
"type": "project",
"serviceable": false,
"sha512": ""
@@ -291,12 +291,12 @@
"path": "testcentric.metadata/1.7.1",
"hashPath": "testcentric.metadata.1.7.1.nupkg.sha512"
},
"nunit.engine.api/1.0.0": {
"nunit.engine.api/3.16.1": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"nunit.engine.core/1.0.0": {
"nunit.engine.core/3.16.1": {
"type": "project",
"serviceable": false,
"sha512": ""
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit-agent.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit-agent.exe
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit-agent.pdb
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit-agent.runtimeconfig.json
+4 -14
View File
@@ -1,20 +1,10 @@
{
"runtimeOptions": {
"tfm": "net7.0",
"frameworks": [
{
"name": "Microsoft.NETCore.App",
"version": "7.0.0"
},
{
"name": "Microsoft.WindowsDesktop.App",
"version": "7.0.0"
},
{
"name": "Microsoft.AspNetCore.App",
"version": "7.0.0"
}
],
"framework": {
"name": "Microsoft.NETCore.App",
"version": "7.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false
}
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
-1
View File
@@ -1 +0,0 @@
../../ # refer to the directory containing the engine and runner
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.engine.api.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.engine.api.pdb
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.engine.core.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.engine.core.pdb
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/build/NUnit.props
-7
View File
@@ -1,7 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ProjectCapability Include="TestContainer" />
</ItemGroup>
</Project>
Source/Platforms/DotNet/NUnit/build/nunit.framework.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit.bundle.addins
+5
View File
@@ -0,0 +1,5 @@
addins/nunit.v2.driver.dll
addins/nunit-v2-result-writer.dll
addins/nunit-project-loader.dll
addins/vs-project-loader.dll
addins/teamcity-event-listener.dll
Source/Platforms/DotNet/NUnit/nunit.console.nuget.addins
-6
View File
@@ -1,6 +0,0 @@
../../NUnit.Extension.*/**/tools/ # nuget v2 layout
../../../NUnit.Extension.*/**/tools/ # nuget v3 layout
../../../../NUnit.Extension.*/**/tools/
../../nunit.extension.*/**/tools/ # nuget v2 layout
../../../nunit.extension.*/**/tools/ # nuget v3 layout
../../../../nunit.extension.*/**/tools/
Source/Platforms/DotNet/NUnit/nunit.engine.addins
+5
View File
@@ -0,0 +1,5 @@
addins/nunit.v2.driver.dll
addins/nunit-v2-result-writer.dll
addins/nunit-project-loader.dll
addins/vs-project-loader.dll
addins/teamcity-event-listener.dll
Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit.engine.api.pdb
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit.engine.api.xml
-1161
View File
File diff suppressed because it is too large Load Diff
Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit.engine.core.pdb
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit.engine.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit.engine.pdb
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit3-console.exe
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit3-netcore-console.dll.config → Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
+1 -7
View File
@@ -10,12 +10,9 @@
<supportedRuntime version="v4.0.30319" />
<supportedRuntime version="v2.0.50727" />
</startup>
<runtime>
<!-- Ensure that test exceptions don't crash NUnit -->
<legacyUnhandledExceptionPolicy enabled="1" />
<!--
Since legacyUnhandledExceptionPolicy keeps the console from being killed even though an NUnit framework
test worker thread is killed, this is needed to prevent a hang. NUnit framework can only handle these
@@ -23,13 +20,10 @@
for partial trust which would enable it to use [HandleProcessCorruptedStateExceptions].)
-->
<legacyCorruptedStateExceptionsPolicy enabled="true" />
<!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
<loadFromRemoteSources enabled="true" />
<!-- Enable reading source information from Portable and Embedded PDBs when running applications -->
<!-- built against previous .NET Framework versions on .NET Framework 4.7.2 -->
<AppContextSwitchOverrides value="Switch.System.Diagnostics.IgnorePortablePDBsInStackTraces=false" />
</runtime>
</configuration>
</configuration>
Source/Platforms/DotNet/NUnit/nunit3-netcore-console.deps.json
-319
View File
@@ -1,319 +0,0 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v6.0",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
"nunit3-netcore-console/3.16.1": {
"dependencies": {
"nunit.engine": "3.16.1",
"nunit.engine.api": "3.16.1"
},
"runtime": {
"nunit3-netcore-console.dll": {}
}
},
"Microsoft.Extensions.DependencyModel/3.1.0": {
"dependencies": {
"System.Text.Json": "4.7.0"
},
"runtime": {
"lib/netstandard2.0/Microsoft.Extensions.DependencyModel.dll": {
"assemblyVersion": "3.1.0.0",
"fileVersion": "3.100.19.56502"
}
}
},
"Microsoft.NETCore.Platforms/1.1.0": {},
"Microsoft.NETCore.Targets/1.1.0": {},
"Microsoft.Win32.Registry/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"System.Collections": "4.3.0",
"System.Globalization": "4.3.0",
"System.Resources.ResourceManager": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.Extensions": "4.3.0",
"System.Runtime.Handles": "4.3.0",
"System.Runtime.InteropServices": "4.3.0"
}
},
"System.Collections/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
"System.Globalization/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
"System.IO/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Threading.Tasks": "4.3.0"
}
},
"System.Reflection/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.IO": "4.3.0",
"System.Reflection.Primitives": "4.3.0",
"System.Runtime": "4.3.0"
}
},
"System.Reflection.Primitives/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
"System.Resources.ResourceManager/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Globalization": "4.3.0",
"System.Reflection": "4.3.0",
"System.Runtime": "4.3.0"
}
},
"System.Runtime/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0"
}
},
"System.Runtime.Extensions/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
"System.Runtime.Handles/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
"System.Runtime.InteropServices/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Reflection": "4.3.0",
"System.Reflection.Primitives": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.Handles": "4.3.0"
}
},
"System.Text.Encoding/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
"System.Text.Json/4.7.0": {},
"System.Threading.Tasks/4.3.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
"TestCentric.Metadata/1.7.1": {
"runtime": {
"lib/netstandard2.0/testcentric.engine.metadata.dll": {
"assemblyVersion": "1.7.1.0",
"fileVersion": "1.7.1.0"
}
}
},
"nunit.engine/3.16.1": {
"dependencies": {
"nunit.engine.api": "3.16.1",
"nunit.engine.core": "3.16.1"
},
"runtime": {
"nunit.engine.dll": {}
}
},
"nunit.engine.api/3.16.1": {
"runtime": {
"nunit.engine.api.dll": {}
}
},
"nunit.engine.core/3.16.1": {
"dependencies": {
"Microsoft.Extensions.DependencyModel": "3.1.0",
"Microsoft.Win32.Registry": "4.3.0",
"TestCentric.Metadata": "1.7.1",
"nunit.engine.api": "3.16.1"
},
"runtime": {
"nunit.engine.core.dll": {}
}
}
}
},
"libraries": {
"nunit3-netcore-console/3.16.1": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.Extensions.DependencyModel/3.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-8tBjqI1xU3CNjdXMZF7BaY71ChU44x30QtHI2rVmPB3+3PjYi+YGhVTV5+IOlc40F81Bylh4gWwHET3jVKFE4Q==",
"path": "microsoft.extensions.dependencymodel/3.1.0",
"hashPath": "microsoft.extensions.dependencymodel.3.1.0.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
"path": "microsoft.netcore.platforms/1.1.0",
"hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
},
"Microsoft.NETCore.Targets/1.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==",
"path": "microsoft.netcore.targets/1.1.0",
"hashPath": "microsoft.netcore.targets.1.1.0.nupkg.sha512"
},
"Microsoft.Win32.Registry/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==",
"path": "microsoft.win32.registry/4.3.0",
"hashPath": "microsoft.win32.registry.4.3.0.nupkg.sha512"
},
"System.Collections/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
"path": "system.collections/4.3.0",
"hashPath": "system.collections.4.3.0.nupkg.sha512"
},
"System.Globalization/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==",
"path": "system.globalization/4.3.0",
"hashPath": "system.globalization.4.3.0.nupkg.sha512"
},
"System.IO/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==",
"path": "system.io/4.3.0",
"hashPath": "system.io.4.3.0.nupkg.sha512"
},
"System.Reflection/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==",
"path": "system.reflection/4.3.0",
"hashPath": "system.reflection.4.3.0.nupkg.sha512"
},
"System.Reflection.Primitives/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==",
"path": "system.reflection.primitives/4.3.0",
"hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512"
},
"System.Resources.ResourceManager/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==",
"path": "system.resources.resourcemanager/4.3.0",
"hashPath": "system.resources.resourcemanager.4.3.0.nupkg.sha512"
},
"System.Runtime/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
"path": "system.runtime/4.3.0",
"hashPath": "system.runtime.4.3.0.nupkg.sha512"
},
"System.Runtime.Extensions/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==",
"path": "system.runtime.extensions/4.3.0",
"hashPath": "system.runtime.extensions.4.3.0.nupkg.sha512"
},
"System.Runtime.Handles/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
"path": "system.runtime.handles/4.3.0",
"hashPath": "system.runtime.handles.4.3.0.nupkg.sha512"
},
"System.Runtime.InteropServices/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==",
"path": "system.runtime.interopservices/4.3.0",
"hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512"
},
"System.Text.Encoding/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==",
"path": "system.text.encoding/4.3.0",
"hashPath": "system.text.encoding.4.3.0.nupkg.sha512"
},
"System.Text.Json/4.7.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-IPq/x/d5nAcnD3vIyM3AbPOaTgcqrh0AqPSx7U53UFu3M6k1TH1u/eXc9/h4jm/3mpP1WRUpevlPY4PACd7AWw==",
"path": "system.text.json/4.7.0",
"hashPath": "system.text.json.4.7.0.nupkg.sha512"
},
"System.Threading.Tasks/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==",
"path": "system.threading.tasks/4.3.0",
"hashPath": "system.threading.tasks.4.3.0.nupkg.sha512"
},
"TestCentric.Metadata/1.7.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-QjdwsUJXJbGmFKNiTZbWeRpwhqRcEAtgb+dwR4YVK8xUBBEfXfrFV074f1DBtnrOfAIT+LnZCeVVeg/fYUlAEA==",
"path": "testcentric.metadata/1.7.1",
"hashPath": "testcentric.metadata.1.7.1.nupkg.sha512"
},
"nunit.engine/3.16.1": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"nunit.engine.api/3.16.1": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"nunit.engine.core/3.16.1": {
"type": "project",
"serviceable": false,
"sha512": ""
}
}
}
Source/Platforms/DotNet/NUnit/nunit3-netcore-console.dll
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit3-netcore-console.pdb
LFS
BIN
View File
Binary file not shown.
Source/Platforms/DotNet/NUnit/nunit3-netcore-console.runtimeconfig.json
-13
View File
@@ -1,13 +0,0 @@
{
"runtimeOptions": {
"tfm": "net6.0",
"rollForward": "Major",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "6.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false
}
}
}
Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
LFS
BIN
View File
Binary file not shown.