From 4968c4d1818469810d127a72996abcb7f8d9128c Mon Sep 17 00:00:00 2001 From: Carsten Igel Date: Fri, 26 Apr 2024 13:58:56 +0200 Subject: [PATCH] qa: Modify acceptance test Will now run for .NET 8 Will complain, if TLB is not present --- .../32bit/scripts/msbuild-acceptance-test.cmd | 75 +++++++++++++++++-- 1 file changed, 67 insertions(+), 8 deletions(-) diff --git a/examples/32bit/scripts/msbuild-acceptance-test.cmd b/examples/32bit/scripts/msbuild-acceptance-test.cmd index a90902f..6c4f442 100644 --- a/examples/32bit/scripts/msbuild-acceptance-test.cmd +++ b/examples/32bit/scripts/msbuild-acceptance-test.cmd @@ -35,7 +35,7 @@ dotnet msbuild -nodeReuse:False -t:Restore -p:Configuration=Release -p:Platform= dotnet build-server shutdown -dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x64 -p:TargetPlatform=net48 -p:PerformAcceptanceTest=Runtime -bl +dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x64 -p:TargetPlatform=net48 -p:PerformAcceptanceTest=Runtime -bl:%~dp0\net48x64.binlog SET ERRUNTIMEX64_NET48=%ERRORLEVEL% @@ -45,17 +45,27 @@ dotnet msbuild -nodeReuse:False -t:Restore -p:Configuration=Release -p:Platform= dotnet build-server shutdown -dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x64 -p:TargetPlatform=net6.0-windows -p:PerformAcceptanceTest=Runtime -bl +dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x64 -p:TargetPlatform=net6.0-windows -p:PerformAcceptanceTest=Runtime -bl:%~dp0\net60x64.binlog SET ERRUNTIMEX64_NET60=%ERRORLEVEL% dotnet build-server shutdown +dotnet msbuild -nodeReuse:False -t:Restore -p:Configuration=Release -p:Platform=x64 -p:TargetPlatform=net8.0-windows -p:PerformAcceptanceTest=Runtime + +dotnet build-server shutdown + +dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x64 -p:TargetPlatform=net8.0-windows -p:PerformAcceptanceTest=Runtime -bl:%~dp0\net80x64.binlog + +SET ERRUNTIMEX64_NET80=%ERRORLEVEL% + +dotnet build-server shutdown + dotnet msbuild -nodeReuse:False -t:Restore -p:Configuration=Release -p:Platform=x86 -p:TargetPlatform=net48 -p:PerformAcceptanceTest=Runtime dotnet build-server shutdown -dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x86 -p:TargetPlatform=net48 -p:PerformAcceptanceTest=Runtime -bl +dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x86 -p:TargetPlatform=net48 -p:PerformAcceptanceTest=Runtime -bl:%~dp0\net48x86.binlog SET ERRUNTIMEX86_NET48=%ERRORLEVEL% dotnet build-server shutdown @@ -64,11 +74,20 @@ dotnet msbuild -nodeReuse:False -t:Restore -p:Configuration=Release -p:Platform= dotnet build-server shutdown -dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x86 -p:TargetPlatform=net6.0-windows -p:PerformAcceptanceTest=Runtime -bl +dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x86 -p:TargetPlatform=net6.0-windows -p:PerformAcceptanceTest=Runtime -bl:%~dp0\net60x86.binlog SET ERRUNTIMEX86_NET60=%ERRORLEVEL% dotnet build-server shutdown +dotnet msbuild -nodeReuse:False -t:Restore -p:Configuration=Release -p:Platform=x86 -p:TargetPlatform=net8.0-windows -p:PerformAcceptanceTest=Runtime + +dotnet build-server shutdown + +dotnet msbuild -nodeReuse:False -t:Build -p:Configuration=Release -p:Platform=x86 -p:TargetPlatform=net8.0-windows -p:PerformAcceptanceTest=Runtime -bl:%~dp0\net80x86.binlog +SET ERRUNTIMEX86_NET80=%ERRORLEVEL% + +dotnet build-server shutdown + dotnet remove comtestdotnet.csproj package dSPACE.Runtime.InteropServices.BuildTasks POPD @@ -79,22 +98,62 @@ SET EXITCODE=0 IF NOT "%ERRUNTIMEX64_NET48%" == "0" ( SET EXITCODE=1 - ECHO "Runtime specific acceptance test for platform x64 using .NET FullFramework 4.8 failed." + ECHO "Runtime specific acceptance test for platform x64 using .NET FullFramework 4.8 failed." >&2 ) IF NOT "%ERRUNTIMEX64_NET60%" == "0" ( SET EXITCODE=1 - ECHO "Runtime specific acceptance test for platform x64 using .NET 6.0 failed." + ECHO "Runtime specific acceptance test for platform x64 using .NET 6.0 failed." >&2 +) + +IF NOT "%ERRUNTIMEX64_NET80%" == "0" ( + SET EXITCODE=1 + ECHO "Runtime specific acceptance test for platform x64 using .NET 8.0 failed." >&2 ) IF NOT "%ERRUNTIMEX86_NET48%" == "0" ( SET EXITCODE=1 - ECHO "Runtime specific acceptance test for platform x86 using .NET FullFramework 4.8 failed." + ECHO "Runtime specific acceptance test for platform x86 using .NET FullFramework 4.8 failed." >&2 +) + +IF NOT "%ERRUNTIMEX86_NET80%" == "0" ( + SET EXITCODE=1 + ECHO "Runtime specific acceptance test for platform x86 using .NET 8.0 failed." >&2 ) IF NOT "%ERRUNTIMEX86_NET60%" == "0" ( SET EXITCODE=1 - ECHO "Runtime specific acceptance test for platform x64 using .NET 6.0 failed." + ECHO "Runtime specific acceptance test for platform x64 using .NET 6.0 failed." >&2 +) + +IF NOT EXIST %~dp0\..\comtestdotnet\bin\x64\Release\net6.0\comtestdotnet.tlb ( + SET EXITCODE=1 + ECHO "Could not find exported TLB file for .NET 6 (x64)" >&2 +) + +IF NOT EXIST %~dp0\..\comtestdotnet\bin\x86\Release\net6.0\comtestdotnet.tlb ( + SET EXITCODE=1 + ECHO "Could not find exported TLB file for .NET 6 (x86)" >&2 +) + +IF NOT EXIST %~dp0\..\comtestdotnet\bin\x64\Release\net48\comtestdotnet.tlb ( + SET EXITCODE=1 + ECHO "Could not find exported TLB file for .NET 4.8 (x64)" >&2 +) + +IF NOT EXIST %~dp0\..\comtestdotnet\bin\x86\Release\net48\comtestdotnet.tlb ( + SET EXITCODE=1 + ECHO "Could not find exported TLB file for .NET 4.8 (x86)" >&2 +) + +IF NOT EXIST %~dp0\..\comtestdotnet\bin\x64\Release\net8.0\comtestdotnet.tlb ( + SET EXITCODE=1 + ECHO "Could not find exported TLB file for .NET 8 (x64)" >&2 +) + +IF NOT EXIST %~dp0\..\comtestdotnet\bin\x86\Release\net8.0\comtestdotnet.tlb ( + SET EXITCODE=1 + ECHO "Could not find exported TLB file for .NET 8 (x86)" >&2 ) IF "%EXITCODE%" == "0" (