Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4c19c42

Browse files
forkiKevinRansom
authored andcommitted
Make FCS build work on Jenkins (#3788)
1 parentd55aa3b commit4c19c42

File tree

23 files changed

+611
-524
lines changed

23 files changed

+611
-524
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,6 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
121121
*/.fake
122122
/fcs/packages/
123123
*/paket-files/
124+
/fcs/TestResult.xml
125+
/tests/fcs/
126+
/fcs/.paket/Paket.Restore.targets

‎build.cmd‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,10 +538,16 @@ set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
538538
ifnotexist%_ngenexe%echo Error: Could not find ngen.exe.&&goto :failure
539539

540540
echo ---------------- Done with prepare, starting package restore ----------------
541+
541542
set_nugetexe="%~dp0.nuget\NuGet.exe"
542543
set_nugetconfig="%~dp0.nuget\NuGet.Config"
543544

544545
if"%RestorePackages%"=="true" (
546+
cd fcs
547+
.paket\paket.exe restore
548+
cd..
549+
@if ERRORLEVEL1echo Error: Paket restore failed&&goto :failure
550+
545551
%_ngenexe% install%_nugetexe% /nologo
546552

547553
%_nugetexe% restore packages.config -PackagesDirectory packages -ConfigFile%_nugetconfig%

‎build.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,14 @@ _nugetconfig=".nuget/NuGet.Config"
412412

413413
# Restore packages (default to restoring packages if otherwise unspecified).
414414
if ["${RestorePackages:-true}"='true' ];then
415+
cd fcs
416+
mono .paket/paket.exe restore
417+
cd ..
418+
exit_code=$?
419+
if [$exit_code-ne 0 ];then
420+
exit$exit_code
421+
fi
422+
415423
eval"$_nugetexe restore packages.config -PackagesDirectory packages -ConfigFile$_nugetconfig"
416424
if [$?-ne 0 ];then
417425
failwith"Nuget restore failed"

‎fcs/.paket/Paket.Restore.targets‎

Lines changed: 0 additions & 225 deletions
This file was deleted.

‎fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@
8989
</ProjectReference>
9090
</ItemGroup>
9191
<ImportProject="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
92-
</Project>
92+
</Project>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp