Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert nunit runner to 3.0.0. because it doesn't support pcls #1665

Merged
merged 26 commits into from
Oct 27, 2016
Merged

Revert nunit runner to 3.0.0. because it doesn't support pcls #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b708921
Always use FSharp.Core not fsharp.core (#1610)
dsyme Oct 14, 2016
79430d2
simplify use of if-defs (#1614)
dsyme Oct 14, 2016
8b434e0
Don't try to deploy vsix during OSS build. Specify prereq in vsixman…
KevinRansom Oct 14, 2016
2a9b5ef
Add fsx files to workspaces (#1612)
OmarTawfik Oct 15, 2016
00bab99
(Nugetize F# templates. Ensure value tuple installed on create templ…
KevinRansom Oct 15, 2016
749ba2d
Don't match braces at the end of the caret (#1619)
OmarTawfik Oct 15, 2016
e0318a8
FSharp ms build task to support new xommand line options (#1616)
KevinRansom Oct 15, 2016
2fe5a3b
Add support for generating sourcelink record in portable pdbs. Fixes…
KevinRansom Oct 15, 2016
d648787
Ensure that portable libraries have correct hintpath for preview 5
KevinRansom Oct 16, 2016
39480c4
Ensure that portable libraries have correct hintpath for preview 5 (#…
KevinRansom Oct 16, 2016
edfc77c
Merge https://github.com/Microsoft/visualfsharp
KevinRansom Oct 16, 2016
d64ff35
cleanup build and test scripts (#1615)
dsyme Oct 16, 2016
7d7033a
Merge https://github.com/Microsoft/visualfsharp
KevinRansom Oct 16, 2016
513f6e2
Replaced missed file
KevinRansom Oct 16, 2016
5ce7be0
merge from microsoft.master
KevinRansom Oct 20, 2016
560ba92
Fix merge issue
KevinRansom Oct 20, 2016
53adf55
fix merge error
KevinRansom Oct 20, 2016
4c08919
Merge https://github.com/Microsoft/visualfsharp
KevinRansom Oct 22, 2016
e01c62d
Merge branch 'master' of https://github.com/Microsoft/visualfsharp
KevinRansom Oct 25, 2016
30a7e2f
Update to nunit 3.5
KevinRansom Oct 26, 2016
57cead1
Merge https://github.com/Microsoft/visualfsharp
KevinRansom Oct 26, 2016
fbe0980
Merge https://github.com/Microsoft/visualfsharp
KevinRansom Oct 26, 2016
e5c3723
revert unit runner to 3.0.0
KevinRansom Oct 26, 2016
9af2671
move back to local packages.
KevinRansom Oct 26, 2016
9cd9a62
Merge branch 'master' into revertnunitrunner
KevinRansom Oct 26, 2016
a161807
revert to nuget
KevinRansom Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,23 +423,24 @@ set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure

echo ---------------- Done with prepare, starting package restore ----------------
set _nugetexe="%~dp0.nuget\nuget.exe"
set _nugetconfig="%~dp0.nuget\nuget.config"

if '%RestorePackages%' == 'true' (
%_ngenexe% install .\.nuget\NuGet.exe /nologo
%_ngenexe% install %_nugetexe% /nologo

.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
%_nugetexe% restore packages.config -PackagesDirectory packages -ConfigFile %_nugetconfig%
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure

if '%BUILD_VS%' == '1' (
.\.nuget\NuGet.exe restore vsintegration\packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
%_nugetexe% restore vsintegration\packages.config -PackagesDirectory packages -ConfigFile %_nugetconfig%
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
)

if '%BUILD_SETUP%' == '1' (
.\.nuget\NuGet.exe restore setup\packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
%_nugetexe% restore setup\packages.config -PackagesDirectory packages -ConfigFile %_nugetconfig%
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
)

)

if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
Expand All @@ -453,8 +454,6 @@ set _fsiexe="packages\FSharp.Compiler.Tools.4.0.1.10\tools\fsi.exe"
if not exist %_fsiexe% echo Error: Could not find %_fsiexe% && goto :failure
%_ngenexe% install %_fsiexe% /nologo

set _nugetexe=".nuget\nuget.exe"
set _nugetconfig=".nuget\nuget.config"
if not exist %_nugetexe% echo Error: Could not find %_nugetexe% && goto :failure
%_ngenexe% install %_nugetexe% /nologo

Expand All @@ -478,7 +477,7 @@ rem Build Proto
if '%BUILD_PROTO%' == '1' (
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (

pushd .\lkg & %_dotnetexe% restore &popd
pushd .\lkg & %_dotnetexe% restore --packages %~dp0\packages &popd
@if ERRORLEVEL 1 echo Error: dotnet restore failed && goto :failure

pushd .\lkg & %_dotnetexe% publish project.json -o %~dp0\Tools\lkg -r win7-x64 &popd
Expand Down Expand Up @@ -525,8 +524,8 @@ if '%BUILD_NET40%' == '1' (
call src\update.cmd %BUILD_CONFIG% -ngen
)

@echo set NUNITPATH=packages\NUnit.ConsoleRunner.3.5.0\tools\
set NUNITPATH=packages\NUnit.ConsoleRunner.3.5.0\tools\
@echo set NUNITPATH=packages\NUnit.Console.3.0.0\tools\
set NUNITPATH=packages\NUnit.Console.3.0.0\tools\
if not exist %NUNITPATH% echo Error: Could not find %NUNITPATH% && goto :failure

@echo xcopy "%NUNITPATH%*.*" "%~dp0tests\fsharpqa\testenv\bin\nunit\*.*" /S /Q /Y
Expand All @@ -536,26 +535,25 @@ if not exist %NUNITPATH% echo Error: Could not find %NUNITPATH% && goto :failure
xcopy "%~dp0tests\fsharpqa\testenv\src\nunit*.*" "%~dp0tests\fsharpqa\testenv\bin\nunit\*.*" /S /Q /Y

if '%BUILD_CORECLR%' == '1' (

echo Restoring CoreCLR packages and runtimes necessary for actually running and testing
%_nugetexe% restore .\tests\fsharp\project.json -PackagesDirectory packages
echo %_nugetexe% restore .\tests\fsharp\project.json -PackagesDirectory packages -ConfigFile %_nugetconfig%
%_nugetexe% restore .\tests\fsharp\project.json -PackagesDirectory packages -ConfigFile %_nugetconfig%

echo Deploy x86 version of compiler and dependencies, ready for testing
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\win7-x86 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\win7-x86 --copyCompiler:no --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\win7-x86 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\win7-x86 --copyCompiler:no --v:quiet

echo Deploy x64 version of compiler, ready for testing
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\win7-x64 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\win7-x64 --copyCompiler:no --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\win7-x64 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\win7-x64 --copyCompiler:no --v:quiet

echo Deploy linux version of built compiler, ready for testing
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\ubuntu.14.04-x64 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\ubuntu.14.04-x64 --copyCompiler:no --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\ubuntu.14.04-x64 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\ubuntu.14.04-x64 --copyCompiler:no --v:quiet

echo Deploy osx version of built compiler, ready for testing
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\osx.10.10-x64 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%USERPROFILE%\.nuget\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\osx.10.10-x64 --copyCompiler:no --v:quiet

%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\fsc\osx.10.10-x64 --copyCompiler:yes --v:quiet
%_fsiexe% --exec tests\fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJsonLock:%~dp0tests\fsharp\project.lock.json --packagesDir:%~dp0\packages --fsharpCore:%BUILD_CONFIG%\coreclr\bin\FSharp.Core.dll --output:tests\testbin\%BUILD_CONFIG%\coreclr\osx.10.10-x64 --copyCompiler:no --v:quiet
)


Expand Down Expand Up @@ -596,7 +594,7 @@ setlocal enableDelayedExpansion


set NUNITPATH=%~dp0tests\fsharpqa\testenv\bin\nunit\
set NUNIT3_CONSOLE=%~dp0packages\NUnit.ConsoleRunner.3.5.0\tools\nunit3-console.exe
set NUNIT3_CONSOLE=%~dp0packages\NUnit.Console.3.0.0\tools\nunit3-console.exe
set link_exe=%~dp0packages\VisualCppTools.14.0.24519-Pre\lib\native\bin\link.exe
if not exist "%link_exe%" (
echo Error: failed to find '%link_exe%' use nuget to restore the VisualCppTools package
Expand Down
2 changes: 1 addition & 1 deletion packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<!-- Testing -->
<package id="FsCheck" version="2.0.3" />
<package id="NUnit" version="3.5.0" targetFramework="net45" />
<package id="NUnit.ConsoleRunner" version="3.5.0" targetFramework="net45" />
<package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
<package id="NUnitLite" version="3.5.0" targetFramework="net45" />
<package id="NUnit3TestAdapter" version="3.0.8-ctp-8" targetFramework="net45" />
<package id="BenchmarkDotNet" version="0.9.8"/>
Expand Down
2 changes: 1 addition & 1 deletion src/FSharpSource.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@
</Target>

<Target Name="dotnetrestore" BeforeTargets="Build" Condition=" '$(TargetFramework)' == 'coreclr' ">
<Exec Command="$(MSBuildThisFileDirectory)..\tools\dotnetcli\dotnet.exe restore --configfile $(MSBuildThisFileDirectory)..\.nuget\NuGet.Config project.json"/>
<Exec Command="$(MSBuildThisFileDirectory)..\.nuget\nuget.exe restore -PackagesDirectory $(MSBuildThisFileDirectory)..\packages -Config $(MSBuildThisFileDirectory)..\.nuget\NuGet.Config project.json"/>
</Target>

<Target Name="GenerateSourceLink" BeforeTargets="CoreCompile">
Expand Down