Skip to content

Commit 5d3249a

Browse files
committed
Apply changes from VF# Jenkins build activation
1 parent cc57e77 commit 5d3249a

File tree

24 files changed

+504
-570
lines changed

24 files changed

+504
-570
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,3 +221,9 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
221221
lib/netcore/fsc/bin/
222222

223223
!lib/bootstrap/signed/**/*
224+
*/.fake
225+
/fcs/packages/
226+
*/paket-files/
227+
/fcs/TestResult.xml
228+
/tests/fcs/
229+
/fcs/.paket/Paket.Restore.targets

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: csharp
2+
sudo: required
23

34
os:
45
- linux
@@ -10,9 +11,6 @@ mono:
1011
- 4.8.0
1112
- 4.4.2
1213

13-
14-
sudo: false
15-
1614
install:
1715

1816
script:
@@ -23,7 +21,6 @@ script:
2321
# This fails because NUnit gives an exception (!!!!)
2422
# - ./fcs/build.sh Test.NetFx
2523
#
26-
# System.IO.FileNotFoundException: Could not load file or assembly 'nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb' or one of its dependencies.
2724
#
2825
# This fails because Nuget packaging doesn't like backslashes in the package file, but Windows does
2926
# - ./fcs/build.sh NuGet

fcs/.paket/Paket.Restore.targets

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

fcs/.paket/paket.bootstrapper.exe

-27.5 KB
Binary file not shown.

fcs/.paket/paket.exe

62.3 KB
Binary file not shown.

fcs/.paket/paket.targets

Lines changed: 0 additions & 38 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
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
92-
</Project>
92+
</Project>

0 commit comments

Comments
 (0)