Skip to content

Commit ff80de4

Browse files
authored
Merge pull request #833 from dsyme/i1
integrate visualfsharp master and bump version to 17.0.1
2 parents cc57e77 + 013ac24 commit ff80de4

File tree

74 files changed

+2199
-1192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2199
-1192
lines changed

.gitattributes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,11 @@ install-sh text eol=lf
2525
*.in text eol=lf
2626
*.ac text eol=lf
2727
*.sh text eol=lf
28+
autogen.sh text eol=lf
29+
launcher.in text eol=lf
30+
config.make.in text eol=lf
31+
targets.make text eol=lf
32+
configure.ac text eol=lf
33+
Makefile.in text eol=lf
34+
35+
*.bsl linguist-vendored=true

.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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ os:
44
- linux
55
- osx
66

7+
osx_image: xcode9
8+
79
mono:
810
- weekly
911
- latest
1012
- 4.8.0
1113
- 4.4.2
1214

15+
dotnet: 2.0.0
1316

1417
sudo: false
1518

DEVGUIDE.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
1313
Install
1414

1515
- [.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)
16-
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
16+
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760) or Visual Studio 2013 (or later)
17+
18+
**NOTE on Windows:**
19+
1. It is recommended to run the build.cmd and the qualifiers below on a command prompt with path set to have the location of MSBuild. If we have Visual Studio, we can also run using `Developer Command Prompt for Visual Studio 20xx` (depends on Visual Studio version). This developer command prompt is easier to use than normal command prompt, because it already has the correct path of Visual Studio and .NET's tooling set for us to use (including MSBuild).
20+
2. The running command prompt must be run under Administrator right (`Run as Administrator`).
21+
22+
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
23+
24+
git clean -xfd
1725

1826
On Windows you can build the F# compiler for .NET Framework as follows:
1927

PublishToBlob.proj

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
3+
<!--
4+
5+
This is for the internal orchestrated build scenarios and will likely never be run on a
6+
developer's machine. The official build definition builds this file directly.
7+
8+
-->
9+
10+
<PropertyGroup>
11+
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
12+
<!-- This version should be kept in sync with `packages.config` -->
13+
<FeedTasksPackageVersion>1.0.0-prerelease-02121-01</FeedTasksPackageVersion>
14+
</PropertyGroup>
15+
16+
<Import Project="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />
17+
18+
<ItemGroup>
19+
<ItemsToPush Include="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
20+
</ItemGroup>
21+
22+
<Target Name="Build">
23+
<PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
24+
AccountKey="$(AccountKey)"
25+
ItemsToPush="@(ItemsToPush)"
26+
Overwrite="$(PublishOverwrite)" />
27+
</Target>
28+
29+
</Project>

0 commit comments

Comments
 (0)