Skip to content

Commit

Permalink
Merge pull request #833 from dsyme/i1
Browse files Browse the repository at this point in the history
integrate visualfsharp master and bump version to 17.0.1
  • Loading branch information
dsyme authored Nov 7, 2017
2 parents cc57e77 + 013ac24 commit ff80de4
Show file tree
Hide file tree
Showing 74 changed files with 2,199 additions and 1,192 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,11 @@ install-sh text eol=lf
*.in text eol=lf
*.ac text eol=lf
*.sh text eol=lf
autogen.sh text eol=lf
launcher.in text eol=lf
config.make.in text eol=lf
targets.make text eol=lf
configure.ac text eol=lf
Makefile.in text eol=lf

*.bsl linguist-vendored=true
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,9 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
lib/netcore/fsc/bin/

!lib/bootstrap/signed/**/*
*/.fake
/fcs/packages/
*/paket-files/
/fcs/TestResult.xml
/tests/fcs/
/fcs/.paket/Paket.Restore.targets
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ os:
- linux
- osx

osx_image: xcode9

mono:
- weekly
- latest
- 4.8.0
- 4.4.2

dotnet: 2.0.0

sudo: false

Expand Down
10 changes: 9 additions & 1 deletion DEVGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
Install

- [.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760) or Visual Studio 2013 (or later)

**NOTE on Windows:**
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).
2. The running command prompt must be run under Administrator right (`Run as Administrator`).

Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:

git clean -xfd

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

Expand Down
29 changes: 29 additions & 0 deletions PublishToBlob.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project>

<!--
This is for the internal orchestrated build scenarios and will likely never be run on a
developer's machine. The official build definition builds this file directly.
-->

<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
<!-- This version should be kept in sync with `packages.config` -->
<FeedTasksPackageVersion>1.0.0-prerelease-02121-01</FeedTasksPackageVersion>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />

<ItemGroup>
<ItemsToPush Include="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
</ItemGroup>

<Target Name="Build">
<PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
AccountKey="$(AccountKey)"
ItemsToPush="@(ItemsToPush)"
Overwrite="$(PublishOverwrite)" />
</Target>

</Project>
Loading

0 comments on commit ff80de4

Please sign in to comment.