Skip to content

Commit e998a82

Browse files
committed
Fixed Local NUnit Command Line Script After PackageReference / Project System Change
1 parent f6d7cd7 commit e998a82

6 files changed

Lines changed: 43 additions & 1 deletion

File tree

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,13 @@ Source/Core/Physics/DualityPhysics.xml
4545
Samples/Benchmarks/Content/BenchmarkTestReport.txt
4646
Tools/.vs/
4747
Source/Editor/DualityEditor/EmbeddedResources/GamePluginTemplate.zip
48+
Build/NUnit/nunit3-console.exe.config
49+
Build/NUnit/nunit-agent.exe.config
50+
Build/NUnit/nunit-agent.exe
51+
Build/NUnit/nunit-agent-x86.exe.config
52+
Build/NUnit/nunit-agent-x86.exe
53+
Build/NUnit/nunit.engine.dll
54+
Build/NUnit/nunit.engine.api.dll
55+
Build/NUnit/nunit-project-loader.dll
56+
Build/NUnit/Mono.Cecil.dll
57+
Build/NUnit/nunit3-console.exe

Build/NUnit/nunit.nuget.addins

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nunit-project-loader.dll

Build/NightlyBuild/BuildConfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<BuildResultDir>..\Output</BuildResultDir>
55
<DocSolutionPath>..\Documentation\Documentation.shfbproj</DocSolutionPath>
66
<AdditionalFileDir>AdditionalFiles</AdditionalFileDir>
7-
<NUnitBinDir>..\..\packages\NUnit.ConsoleRunner.3.10.0\tools</NUnitBinDir>
7+
<NUnitBinDir>..\NUnit</NUnitBinDir>
88
<UnitTestProjectDir>..\..\Test\</UnitTestProjectDir>
99
<NuGetPath>nuget.exe</NuGetPath>
1010
<NuGetPackageSpecsDir>..\NuGetPackageSpecs</NuGetPackageSpecsDir>

Test/AcquireNUnitRunner.targets

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project>
2+
<!-- Copy all required NUnit command line runner files to a local folder -->
3+
<PropertyGroup>
4+
<NUnitRunnerSourceDir>$(NuGetPackageRoot)\NUnit.ConsoleRunner\3.10.0\tools\</NUnitRunnerSourceDir>
5+
<NUnitLoaderSourceDir>$(NuGetPackageRoot)\NUnit.Extension.NUnitProjectLoader\3.6.0\tools\</NUnitLoaderSourceDir>
6+
<NUnitRunnerTargetDir>$(SolutionDir)Build\NUnit\</NUnitRunnerTargetDir>
7+
</PropertyGroup>
8+
<Target Name="CopyTestRunner" AfterTargets="Build">
9+
<Message Text="Copying NUnit binaries from '$(NUnitRunnerSourceDir)'" Importance="high"/>
10+
<Message Text="Copying NUnit loader extension from '$(NUnitLoaderSourceDir)'" Importance="high"/>
11+
<Message Text="Target directory for NUnit binaries: '$(NUnitRunnerTargetDir)'" Importance="high"/>
12+
13+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit3-console.exe" DestinationFolder="$(NUnitRunnerTargetDir)" />
14+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit3-console.exe.config" DestinationFolder="$(NUnitRunnerTargetDir)" />
15+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit.engine.dll" DestinationFolder="$(NUnitRunnerTargetDir)" />
16+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit.engine.api.dll" DestinationFolder="$(NUnitRunnerTargetDir)" />
17+
<Copy SourceFiles="$(NUnitRunnerSourceDir)Mono.Cecil.dll" DestinationFolder="$(NUnitRunnerTargetDir)" />
18+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit-agent.exe" DestinationFolder="$(NUnitRunnerTargetDir)" />
19+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit-agent.exe.config" DestinationFolder="$(NUnitRunnerTargetDir)" />
20+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit-agent-x86.exe" DestinationFolder="$(NUnitRunnerTargetDir)" />
21+
<Copy SourceFiles="$(NUnitRunnerSourceDir)nunit-agent-x86.exe.config" DestinationFolder="$(NUnitRunnerTargetDir)" />
22+
23+
<Copy SourceFiles="$(NUnitLoaderSourceDir)nunit-project-loader.dll" DestinationFolder="$(NUnitRunnerTargetDir)" />
24+
</Target>
25+
</Project>

Test/Core/DualityTests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,7 @@
204204
</PackageReference>
205205
</ItemGroup>
206206
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
207+
208+
<!-- Copy all required NUnit command line runner files to a local folder -->
209+
<Import Project="..\AcquireNUnitRunner.targets" />
207210
</Project>

Test/Editor/DualityEditorTests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,7 @@
106106
</PackageReference>
107107
</ItemGroup>
108108
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109+
110+
<!-- Copy all required NUnit command line runner files to a local folder -->
111+
<Import Project="..\AcquireNUnitRunner.targets" />
109112
</Project>

0 commit comments

Comments
 (0)