NUnit was updated to version 3.9.0

Author: Taritsyn

build.cmd

@@ -10,8 +10,8 @@ cd %~dp0
 set local_nuget_package_manager=.nuget\NuGet.exe
 set package_dir=packages
 
-if not exist %package_dir%\NUnit.Runners (
-	%local_nuget_package_manager% install NUnit.Runners -Version 3.4.1 -O %package_dir% -ExcludeVersion -NoCache
+if not exist %package_dir%\NUnit.Console (
+	%local_nuget_package_manager% install NUnit.Console -Version 3.7.0 -O %package_dir% -ExcludeVersion -NoCache
 )
 
 PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"

build.sh

@@ -9,8 +9,8 @@ cd $repoFolder
 localNugetPackageManager=.nuget/NuGet.exe
 packageDir=packages
 
-if test ! -d $packageDir/NUnit.Runners; then
-  mono $localNugetPackageManager install NUnit.Runners -Version 3.4.1 -O $packageDir% -ExcludeVersion -NoCache
+if test ! -d $packageDir/NUnit.Console; then
+  mono $localNugetPackageManager install NUnit.Console -Version 3.7.0 -O $packageDir% -ExcludeVersion -NoCache
 fi
 
 koreBuildZip="https://github.com/aspnet/KoreBuild/archive/02bd945d32558d24c1e5c6b74e37d44585ad9691.zip"

makefile.shade

@@ -32,19 +32,7 @@ use-standard-lifecycle
 			Log.Info("");
 
 			string testProjectDirPath = Path.Combine(testDirPath, testProjectName);
-			string testAssemblyDirPath;
-			string testAssemblyFilePath;
-
-			testAssemblyDirPath = Path.Combine(testProjectDirPath, "bin/Release/net451");
-			testAssemblyFilePath = Path.Combine(testAssemblyDirPath, testProjectName + ".exe");
-			Exec(testAssemblyFilePath, "", testProjectDirPath);
-
-			testAssemblyDirPath = Path.Combine(testProjectDirPath, "bin/Release/netcoreapp1.0");
-			if (Directory.Exists(testAssemblyDirPath))
-			{
-				testAssemblyFilePath = Path.Combine(testAssemblyDirPath, testProjectName + ".dll");
-				Exec("dotnet", testAssemblyFilePath, testProjectDirPath);
-			}
+			Exec("dotnet", "test", testProjectDirPath);
 
 			Log.Info("");
 		}
@@ -59,7 +47,7 @@ use-standard-lifecycle
 
 		Log.Info("Run unit tests for .NET 4.0 version:");
 		Log.Info("");
-		Exec(nunitConsolePath, "MsieJavaScriptEngine.Test.Net4.nunit --verbose", testDirPath);
+		Exec(nunitConsolePath, "MsieJavaScriptEngine.Test.Net4.nunit --process=Multiple --domain=Single --trace=Verbose", testDirPath);
 		Log.Info("");
 	}
 

src/MsieJavaScriptEngine.Net4/MsieJavaScriptEngine.Net40.csproj

@@ -15,7 +15,6 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>9f1c37fe</NuGetPackageImportStamp>
-    <DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -601,10 +600,4 @@
   </Target>
   <Import Project="..\..\packages\BuildBundlerMinifier.2.3.327\build\BuildBundlerMinifier.targets" Condition="Exists('..\..\packages\BuildBundlerMinifier.2.3.327\build\BuildBundlerMinifier.targets')" />
   <Import Project="..\..\packages\ResxToCs.MSBuild.1.0.0-alpha5\build\ResxToCs.MSBuild.targets" Condition="Exists('..\..\packages\ResxToCs.MSBuild.1.0.0-alpha5\build\ResxToCs.MSBuild.targets')" />
-  <Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile">
-    <ResxToCsTask
-      InputDirectory="..\MsieJavaScriptEngine\Resources\"
-      Namespace="$(RootNamespace).Resources"
-      InternalAccessModifier="true" />
-  </Target>
 </Project>

src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

@@ -27,6 +27,8 @@
 		<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.1.0" />
 		<PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
 		<PackageReference Include="System.Threading.Thread" Version="4.0.0" />
+		<PackageReference Include="BuildBundlerMinifier" Version="2.4.337" PrivateAssets="All" />
+		<PackageReference Include="ResxToCs.MSBuild" Version="1.0.0-alpha5" PrivateAssets="All" />
 
 		<Compile Remove="Resources/NetFrameworkStrings.*" />
 	</ItemGroup>
@@ -36,18 +38,4 @@
 		<EmbeddedResource Include="Resources/ES5.min.js;Resources/json2.min.js" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
-		<DotNetCliToolReference Include="dotnet-resx2cs" Version="1.0.0-alpha5" />
-	</ItemGroup>
-
-	<Target Name="BundleMinify" BeforeTargets="BeforeCompile" Condition=" '$(BundleMinifyWasRun)' != 'true' ">
-		<Exec Command="dotnet bundle" />
-		<PropertyGroup>
-			<BundleMinifyWasRun>true</BundleMinifyWasRun>
-		</PropertyGroup>
-	</Target>
-	<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile">
-		<Exec Command="dotnet resx2cs -n '$(RootNamespace).Resources' -i './Resources/'" />
-	</Target>
 </Project>