Skip to content

Commit

Permalink
Merge branch 'master' into fsharp4
Browse files Browse the repository at this point in the history 
Conflicts:
	.gitignore
	src/fsharp/FSComp.txt
  • Loading branch information
@latkin
latkin committed Feb 21, 2015
2 parents ac32717 + 27f2a82 commit c651690
Show file tree
Hide file tree
Showing 16 changed files with 174 additions and 167 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,4 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLi
*.jrs
*.chk
*.bak
*.orig
74 changes: 74 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@

Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0.
See License.txt in the project root for license information.


Visual F<span>#</span>
======================

All notable changes to this project will be documented in this file.

### [3.1.2] - 20 August 2014

#### Language, compiler, runtime, interactive

* Allow arbitrary-dimensional slicing
* Bugfix [#72](https://visualfsharp.codeplex.com/workitem/72): Indexer properties with more than 4 arguments cannot be accessed
* Bugfix [#113](https://visualfsharp.codeplex.com/workitem/113): `Async.Sleep` in .NETCore profiles does not invoke error continuation
* Ship versions FSharp.Core.dll built on portable profiles 78 and 259
* Bugfix [#91](https://visualfsharp.codeplex.com/workitem/91): String module documentation is false
* Support "shebang" (`#!`) in F# source files
* Bugfix [#78](https://visualfsharp.codeplex.com/workitem/78): Allow space characters in active pattern case identifiers
* Vertical pipes disallowed in active pattern case identifiers
* Bugfix: Invalid code generated when calling VB methods with optional byref args
* Bugfix [#69](https://visualfsharp.codeplex.com/workitem/69): Invalid code generated when calling C# method with optional nullable args
* Bugfix [#9](https://visualfsharp.codeplex.com/workitem/9): XML doc comments on F# record type fields do not appear when accessing in C#
* Bugfix [#59](https://visualfsharp.codeplex.com/workitem/59): Compiler always requires System.Runtime.InteropServices, this is not present in all portable profiles
* Bugfix [#17](https://visualfsharp.codeplex.com/workitem/17): Incorrect generation of XML from doc comments for Record fields
* Enable non-locking shadow copy of reference assemblies in fsi/fsianycpu
* Inline codegen optimization using structs
* Perf improvement for `Seq.windowed`
* Bugfix [#7](https://visualfsharp.codeplex.com/workitem/17): NullRef in list comprehension, when for loop works
* Bugfix [#1](https://visualfsharp.codeplex.com/workitem/1): Type inference involving generic param arrays
* Bugfix [#37](https://visualfsharp.codeplex.com/workitem/37): Perf regression in 3.1.0 related to resolving extension methods
* Bugfix: Can't run F# console application with 'update' in name
* Bugfix: Slicing and range expression inconsistent
* exe.config files for fsc, fsi, fsianycpu now use simple version range instead of long set of explicit version redirects
* Bugfix: Invalid code is generated when using field initializers in struct constructor

#### Visual Studio

* Bugfix [#126](https://visualfsharp.codeplex.com/workitem/126): F# package installer does not honor custom install paths for express SKUs
* Bugfix [#75](https://visualfsharp.codeplex.com/workitem/75): Microsoft.FSharp.targets shim not deployed with F# SDK
* Bugfix: Fix crash in smart indent provider
* Bugfix [#55](https://visualfsharp.codeplex.com/workitem/55): Cannot add reference to F# PCL project
* Project templates for F# portable libraries targeting profiles 78 and 259
* Bugfix: Typos in tutorial project script
* Enable non-locking shadow copy of reference assemblies in fsi/fsianycpu (VS options added)
* Allow breakpoints to be set inside of quotations
* Support "Publish" action in project system for web, Azure
* Bugfix: Required C# event members do not appear in intellisense when signature is (object, byref)


### [3.1.1] - 24 January 2014

#### Language, compiler, runtime, interactive

* Improve F# compiler telemetry
* Bugfix: Improper treatment of * in AssemblyVersion attribute
* Bugfix: ``sprintf "%%"`` returns `"%%"` in F# 3.1.0, previously returned `"%"` in F# 3.0 and earlier
* Bugfix: F# 3.0 1D slice setter does not compile in F# 3.1.0

#### Visual Studio

* Bugfix: Errors when attempting to add reference to .NET core library
* Bugfix: Crash in `FSComp.SR.RunStartupValidation()`
* Enable installation of Visual F# on VS Desktop Express
* Added support for showing xml doc comments for named arguments
* Visual F# package deployable on non-VS machines. Deploys compiler and runtime toolchain plus msbuild targets


[3.1.2]: http://blogs.msdn.com/b/fsharpteam/archive/2014/08/20/announcing-the-release-of-visual-f-tools-3-1-2.aspx
[3.1.1]: http://blogs.msdn.com/b/fsharpteam/archive/2014/01/22/announcing-visual-f-3-1-1-and-support-for-desktop-express.aspx
65 changes: 0 additions & 65 deletions changelist.txt
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/fsharp-compiler-build.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ProjectFiles Include="fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj"/>
<ProjectFiles Include="fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj"/>
<ProjectFiles Include="fsharp\Fsc\Fsc.fsproj"/>
<ProjectFiles Include="fsharp\Fsi\Fsi.fsproj"/>
<ProjectFiles Include="fsharp\FsiAnyCpu\FsiAnyCpu.fsproj"/>
<ProjectFiles Include="fsharp\fsi\Fsi.fsproj"/>
<ProjectFiles Include="fsharp\fsiAnyCpu\FsiAnyCpu.fsproj"/>
</ItemGroup>


Expand Down
16 changes: 8 additions & 8 deletions src/fsharp/FSharp.Build/FSharp.Build.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<ProjectGuid>{702A7979-BCF9-4C41-853E-3ADFC9897890}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<FsSrGen Include="FSBuild.txt">
<Link>FSBuild.txt</Link>
</FsSrGen>
<FsSrGen Include="FSBuild.txt">
<Link>FSBuild.txt</Link>
</FsSrGen>
<Compile Include="InternalsVisibleTo.fs" />
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs">
<Link>assemblyinfo.FSharp.Build.dll.fs</Link>
<Link>Utilities/assemblyinfo.FSharp.Build.dll.fs</Link>
</Compile>
<Compile Include="..\..\utils\CompilerLocationUtils.fs">
<Link>CompilerLocationUtils.fs</Link>
<Link>Utilities/CompilerLocationUtils.fs</Link>
</Compile>
<Compile Include="Fsc.fsi" />
<Compile Include="Fsc.fs" />
Expand Down Expand Up @@ -50,9 +50,9 @@
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix)" />
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix)" />
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
</Project>
</Project>
115 changes: 56 additions & 59 deletions src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<Link>ildiag.fs</Link>
</Compile>
<Compile Include="..\ReferenceResolution.fs">
<Link>ReferenceResolution.fs</Link>
<Link>ReferenceResolution.fs</Link>
</Compile>
<Compile Include="..\..\absil\il.fsi">
<Link>il.fsi</Link>
Expand Down Expand Up @@ -196,28 +196,26 @@
<Link>rational.fs</Link>
</Compile>
<Compile Include="..\ErrorLogger.fs">
<Link>ErrorLogger.fs</Link>
</Compile>

<Compile Include="..\InternalCollections.fsi">
<Link>ErrorLogger.fs</Link>
</Compile>
<Compile Include="..\InternalCollections.fsi">
<Link>InternalCollections.fsi</Link>
</Compile>
<Compile Include="..\InternalCollections.fs">
<Link>InternalCollections.fs</Link>
</Compile>

<Compile Include="..\..\absil\ilread.fsi">
<Link>ilread.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilread.fs">
<Link>ilread.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fsi">
<Link>ilwrite.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fs">
<Link>ilwrite.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fsi">
<Link>ilwrite.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fs">
<Link>ilwrite.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilreflect.fs">
<Link>ilreflect.fs</Link>
</Compile>
Expand All @@ -230,13 +228,13 @@
<Compile Include="..\..\ilx\ilxsettings.fs">
<Link>ilxsettings.fs</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fsi">
<Link>pubclo.fsi</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fs">
<Compile Include="..\..\ilx\pubclo.fsi">
<Link>pubclo.fsi</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fs">
<Link>pubclo.fs</Link>
</Compile>
<Compile Include="..\..\ilx\cu_erase.fs">
<Compile Include="..\..\ilx\cu_erase.fs">
<Link>cu_erase.fs</Link>
</Compile>
<Compile Include="..\InternalFileSystemUtils.fsi">
Expand All @@ -257,40 +255,40 @@
<Compile Include="..\layout.fs">
<Link>layout.fs</Link>
</Compile>
<Compile Include="..\ast.fs">
<Link>ast.fs</Link>
</Compile>
<Compile Include="..\ast.fs">
<Link>ast.fs</Link>
</Compile>
<Compile Include="pppars.fs" />
<Compile Include="pars.fs" />
<Compile Include="..\lexhelp.fsi">
<Link>lexhelp.fsi</Link>
</Compile>
<Compile Include="..\lexhelp.fs">
<Link>lexhelp.fs</Link>
</Compile>
<Compile Include="pars.fs" />
<Compile Include="..\lexhelp.fsi">
<Link>lexhelp.fsi</Link>
</Compile>
<Compile Include="..\lexhelp.fs">
<Link>lexhelp.fs</Link>
</Compile>
<Compile Include="pplex.fs" />
<Compile Include="lex.fs" />
<Compile Include="..\sreflect.fsi">
<Link>sreflect.fsi</Link>
</Compile>
<Compile Include="..\sreflect.fs">
<Link>sreflect.fs</Link>
</Compile>
<Compile Include="lex.fs" />
<Compile Include="..\sreflect.fsi">
<Link>sreflect.fsi</Link>
</Compile>
<Compile Include="..\sreflect.fs">
<Link>sreflect.fs</Link>
</Compile>
<Compile Include="..\QueueList.fs">
<Link>QueueList.fs</Link>
</Compile>
<Compile Include="..\tast.fs">
<Link>tast.fs</Link>
</Compile>
<Compile Include="..\env.fs">
<Link>env.fs</Link>
</Compile>
<Compile Include="..\tastops.fsi">
<Link>tastops.fsi</Link>
</Compile>
<Compile Include="..\tastops.fs">
<Link>tastops.fs</Link>
</Compile>
<Link>env.fs</Link>
</Compile>
<Compile Include="..\tastops.fsi">
<Link>tastops.fsi</Link>
</Compile>
<Compile Include="..\tastops.fs">
<Link>tastops.fs</Link>
</Compile>
<Compile Include="..\pickle.fsi">
<Link>pickle.fsi</Link>
</Compile>
Expand All @@ -300,16 +298,15 @@
<Compile Include="..\lexfilter.fs">
<Link>lexfilter.fs</Link>
</Compile>
<Compile Include="..\import.fsi">
<Link>import.fsi</Link>
</Compile>
<Compile Include="..\import.fs">
<Compile Include="..\import.fsi">
<Link>import.fsi</Link>
</Compile>
<Compile Include="..\import.fs">
<Link>import.fs</Link>
</Compile>
<Compile Include="..\infos.fs">
<Link>infos.fs</Link>
</Compile>

<Compile Include="..\NicePrint.fs">
<Link>NicePrint.fs</Link>
</Compile>
Expand All @@ -325,10 +322,10 @@
<Compile Include="..\outcome.fs">
<Link>outcome.fs</Link>
</Compile>
<Compile Include="..\nameres.fsi">
<Link>nameres.fsi</Link>
</Compile>
<Compile Include="..\nameres.fs">
<Compile Include="..\nameres.fsi">
<Link>nameres.fsi</Link>
</Compile>
<Compile Include="..\nameres.fs">
<Link>nameres.fs</Link>
</Compile>
<Compile Include="..\typrelns.fs">
Expand All @@ -340,10 +337,10 @@
<Compile Include="..\patcompile.fs">
<Link>patcompile.fs</Link>
</Compile>
<Compile Include="..\csolve.fsi">
<Link>csolve.fsi</Link>
</Compile>
<Compile Include="..\csolve.fs">
<Compile Include="..\csolve.fsi">
<Link>csolve.fsi</Link>
</Compile>
<Compile Include="..\csolve.fs">
<Link>csolve.fs</Link>
</Compile>
<Compile Include="..\formats.fsi">
Expand Down Expand Up @@ -382,10 +379,10 @@
<Compile Include="..\opt.fs">
<Link>opt.fs</Link>
</Compile>
<Compile Include="..\detuple.fsi">
<Link>detuple.fsi</Link>
</Compile>
<Compile Include="..\detuple.fs">
<Compile Include="..\detuple.fsi">
<Link>detuple.fsi</Link>
</Compile>
<Compile Include="..\detuple.fs">
<Link>detuple.fs</Link>
</Compile>
<Compile Include="..\tlr.fsi">
Expand Down
Loading

0 comments on commit c651690

Please sign in to comment.