@@ -15,35 +15,43 @@ rem Test it with both desktop and coreclr compilers
1515rem
1616
1717if not '%NUGET_PACKAGES% '== ''rd %NUGET_PACKAGES% \ComboProvider /s /q
18+ taskkill /F /IM dotnet.exe
1819
19- @ echo %__scriptpath% ..\..\..\tools\dotnet20 \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=net40
20- %__scriptpath% ..\..\..\tools\dotnet20 \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=net40
20+ @ echo %__scriptpath% ..\..\..\artifacts\toolset\dotnet \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=net40
21+ %__scriptpath% ..\..\..\artifacts\toolset\dotnet \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=net40
2122@ if ERRORLEVEL1 echo Error: ComboProvider failed&& goto :failure
2223
23- @ echo %__scriptpath% ..\..\..\tools\dotnet20 \dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
24- %__scriptpath% ..\..\..\tools\dotnet20 \dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
24+ @ echo %__scriptpath% ..\..\..\artifacts\toolset\dotnet \dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
25+ %__scriptpath% ..\..\..\artifacts\toolset\dotnet \dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
2526@ if ERRORLEVEL1 echo Error: ComboProvider failed&& goto :failure
2627
27- @ echo %__scriptpath% ..\..\..\tools\dotnet20\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
28- %__scriptpath% ..\..\..\tools\dotnet20\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
28+ taskkill /F /IM dotnet.exe
29+
30+ @ echo %__scriptpath% ..\..\..\artifacts\toolset\dotnet\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
31+ %__scriptpath% ..\..\..\artifacts\toolset\dotnet\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
2932@ if ERRORLEVEL1 echo Error: ComboProviderProvider failed&& goto :failure
3033
3134rem
3235rem Build typeprovider package with coreclr compiler
3336rem Test it with both desktop and coreclr compilers
3437rem
3538if not '%NUGET_PACKAGES% '== ''rd %NUGET_PACKAGES% \ComboProvider /s /q
39+ taskkill /F /IM dotnet.exe
3640
37- @ echo %__scriptpath% ..\..\..\tools\dotnet20 \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=coreclr
38- %__scriptpath% ..\..\..\tools\dotnet20 \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=coreclr
41+ @ echo %__scriptpath% ..\..\..\artifacts\toolset\dotnet \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=coreclr
42+ %__scriptpath% ..\..\..\artifacts\toolset\dotnet \dotnet.exe pack ComboProvider\ComboProvider\ComboProvider.fsproj -o%~dp0 artifacts -c release -v minimal -p:FSharpTestCompilerVersion=coreclr
3943@ if ERRORLEVEL1 echo Error: ComboProviderProvider failed&& goto :failure
4044
41- @ echo%__scriptpath% ..\..\..\tools\dotnet20\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
42- %__scriptpath% ..\..\..\tools\dotnet20\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
45+ taskkill /F /IM dotnet.exe
46+
47+ @ echo%__scriptpath% ..\..\..\artifacts\toolset\dotnet\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
48+ %__scriptpath% ..\..\..\artifacts\toolset\dotnet\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
4349@ if ERRORLEVEL1 echo Error: TestBasicProvider failed&& goto :failure
4450
45- @ echo %__scriptpath% ..\..\..\tools\dotnet20\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
46- %__scriptpath% ..\..\..\tools\dotnet20\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
51+ taskkill /F /IM dotnet.exe
52+
53+ @ echo %__scriptpath% ..\..\..\artifacts\toolset\dotnet\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
54+ %__scriptpath% ..\..\..\artifacts\toolset\dotnet\dotnet.exe test ComboProvider\ComboProvider.Tests\ComboProvider.Tests.fsproj -c release -v minimal -p:TestTargetFramework=netcoreapp2.0 -p:FSharpTestCompilerVersion=coreclr
4755@ if ERRORLEVEL1 echo Error: ComboProvider failed&& goto :failure
4856
4957:success