diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe deleted file mode 100755 index 9274e513412..00000000000 Binary files a/.nuget/NuGet.exe and /dev/null differ diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets deleted file mode 100644 index 82ece0f6224..00000000000 --- a/.nuget/NuGet.targets +++ /dev/null @@ -1,138 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - $([System.IO.Path]::Combine($(ProjectDir), "packages.config")) - - - - - $(SolutionDir).nuget - packages.config - /Library/Frameworks/Mono.framework/Commands/mono - mono - - - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) - - "$(NuGetExePath)" - $(MonoPath) --runtime=v4.0.30319 $(NuGetExePath) - - $(TargetDir.Trim('\\')) - - -RequireConsent - -NonInteractive - - "$(SolutionDir) " - "$(SolutionDir)" - - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) - $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fcs/.gitignore b/fcs/.gitignore index 51023f1bf50..a21a02ee547 100644 --- a/fcs/.gitignore +++ b/fcs/.gitignore @@ -1,3 +1,4 @@ +.paket/ FSharp.Compiler.Service.Tests/TestResults/* FSharp.Compiler.Service.netstandard/illex.fs FSharp.Compiler.Service.netstandard/ilpars.fs diff --git a/fcs/.paket/paket.exe b/fcs/.paket/paket.exe deleted file mode 100644 index b98e000b232..00000000000 Binary files a/fcs/.paket/paket.exe and /dev/null differ diff --git a/fcs/build.cmd b/fcs/build.cmd index 26244446f6c..e556a4bd7db 100644 --- a/fcs/build.cmd +++ b/fcs/build.cmd @@ -8,6 +8,7 @@ if errorlevel 1 ( exit /b %errorlevel% ) +powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\download-paket.ps1" .paket\paket.exe restore if errorlevel 1 ( endlocal diff --git a/fcs/build.sh b/fcs/build.sh index 53e6962df76..0b71dd409d2 100755 --- a/fcs/build.sh +++ b/fcs/build.sh @@ -10,7 +10,8 @@ else if [[ ! -e ~/.config/.mono/certs ]]; then mozroots --import --sync --quiet fi - + + ./download-paket.sh mono .paket/paket.exe restore exit_code=$? if [ $exit_code -ne 0 ]; then diff --git a/fcs/download-paket.ps1 b/fcs/download-paket.ps1 new file mode 100644 index 00000000000..f87d9167a5e --- /dev/null +++ b/fcs/download-paket.ps1 @@ -0,0 +1,7 @@ +$paketurl="https://github.com/fsprojects/Paket/releases/download/5.201.1/paket.exe" +$paketdir = Join-Path $PSScriptRoot ".paket" +$paketpath = Join-Path $paketdir "paket.exe" +if (-not (Test-Path "$paketpath")) { + mkdir "$paketdir" + Invoke-WebRequest -Uri $paketurl -OutFile "$paketpath" +} diff --git a/fcs/download-paket.sh b/fcs/download-paket.sh new file mode 100755 index 00000000000..dc475174a76 --- /dev/null +++ b/fcs/download-paket.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +paketurl=https://github.com/fsprojects/Paket/releases/download/5.201.1/paket.exe +paketdir=$scriptroot/.paket +paketpath=$paketdir/paket.exe +if [ ! -e "$paketpath" ]; then + mkdir "$paketdir" + curl -o "$paketpath" -L $paketurl +fi