diff --git a/fcs/.paket/Paket.Restore.targets b/fcs/.paket/Paket.Restore.targets index 920482ad21..c267f4b02a 100644 --- a/fcs/.paket/Paket.Restore.targets +++ b/fcs/.paket/Paket.Restore.targets @@ -84,7 +84,7 @@ - + @@ -105,24 +105,6 @@ - - $(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).paket.clitools - - - - - - - - - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[0]) - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[1]) - - - %(PaketCliToolFileLinesInfo.PackageVersion) - - - $(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config diff --git a/fcs/.paket/paket.bootstrapper.exe b/fcs/.paket/paket.bootstrapper.exe deleted file mode 100644 index 64fdf248bf..0000000000 Binary files a/fcs/.paket/paket.bootstrapper.exe and /dev/null differ diff --git a/fcs/.paket/paket.exe b/fcs/.paket/paket.exe new file mode 100644 index 0000000000..ef3ea32af2 Binary files /dev/null and b/fcs/.paket/paket.exe differ diff --git a/fcs/.paket/paket.targets b/fcs/.paket/paket.targets deleted file mode 100644 index 22c9f0a87a..0000000000 --- a/fcs/.paket/paket.targets +++ /dev/null @@ -1,38 +0,0 @@ - - - - - true - - true - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\ - - - - $(PaketToolsPath)paket.exe - $(PaketToolsPath)paket.bootstrapper.exe - "$(PaketExePath)" - mono --runtime=v4.0.30319 $(PaketExePath) - "$(PaketBootStrapperExePath)" - mono --runtime=v4.0.30319 $(PaketBootStrapperExePath) - - $(MSBuildProjectDirectory)\paket.references - $(MSBuildProjectFullPath).paket.references - $(PaketCommand) restore --references-files "$(PaketReferences)" - $(PaketBootStrapperCommand) - - RestorePackages; $(BuildDependsOn); - - - - - - - - - - - - - diff --git a/fcs/build.cmd b/fcs/build.cmd index 5597c915e8..8085a58b1f 100644 --- a/fcs/build.cmd +++ b/fcs/build.cmd @@ -2,11 +2,6 @@ .nuget\NuGet.exe restore -PackagesDirectory packages setlocal cd fcs -.paket\paket.bootstrapper.exe -if errorlevel 1 ( - endlocal - exit /b %errorlevel% -) .paket\paket.exe restore if errorlevel 1 ( diff --git a/fcs/build.sh b/fcs/build.sh index 3e7e80e7d8..f0107dfdaf 100755 --- a/fcs/build.sh +++ b/fcs/build.sh @@ -15,12 +15,6 @@ else dotnet restore tools.fsproj - mono .paket/paket.bootstrapper.exe - exit_code=$? - if [ $exit_code -ne 0 ]; then - exit $exit_code - fi - mono .paket/paket.exe restore exit_code=$? if [ $exit_code -ne 0 ]; then