Skip to content

Merge dev16.1 to dev16.2 #6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
60 commits merged into from
Apr 27, 2019
Merged

Merge dev16.1 to dev16.2 #6641

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
915b940
Merge pull request #6199 from Microsoft/merges/dev16.0-to-dev16.1
Feb 6, 2019
2422d4c
Merge pull request #6203 from Microsoft/merges/master-to-dev16.1
Feb 6, 2019
2a89e4f
Merge remote-tracking branch 'upstream/dev16.0' into merges/dev16.0-t…
brettfo Feb 19, 2019
fc15661
Merge branch 'dev16.1' into merges/master-to-dev16.1
brettfo Feb 19, 2019
9cc4238
Merge pull request #6253 from Microsoft/merges/dev16.0-to-dev16.1
brettfo Feb 19, 2019
bce0c11
Merge pull request #6252 from Microsoft/merges/master-to-dev16.1
brettfo Feb 19, 2019
8a3cc20
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Feb 25, 2019
d1e7b78
Merge pull request #6262 from Microsoft/merges/master-to-dev16.1
Feb 25, 2019
532fd1a
Merge pull request #6279 from Microsoft/merges/master-to-dev16.1
Feb 26, 2019
afbea40
Merge pull request #6284 from Microsoft/merges/dev16.0-to-dev16.1
Feb 26, 2019
b44f118
Merge pull request #6283 from Microsoft/merges/master-to-dev16.1
Feb 26, 2019
97732dc
Merge pull request #6290 from Microsoft/merges/master-to-dev16.1
Feb 27, 2019
b6d8b38
Merge pull request #6297 from Microsoft/merges/master-to-dev16.1
Mar 2, 2019
a3402f6
Merge branch 'dev16.1' into merges/master-to-dev16.1
brettfo Mar 4, 2019
a23c16a
Merge pull request #6317 from Microsoft/merges/dev16.0-to-dev16.1
Mar 14, 2019
b06eb87
Merge pull request #6302 from Microsoft/merges/master-to-dev16.1
brettfo Mar 20, 2019
6022cd4
Merge branch 'dev16.1' into merges/master-to-dev16.1
brettfo Mar 20, 2019
829834c
Merge pull request #6340 from Microsoft/merges/master-to-dev16.1
Mar 20, 2019
c3c07c0
Merge pull request #6350 from Microsoft/merges/dev16.0-to-dev16.1
Mar 21, 2019
f2be9e4
Move SourceText: Microsoft.FSharp -> FSharp (#6356)
auduchinok Mar 29, 2019
1a0d385
Making ILVersionInfo a struct (#6392)
TIHan Mar 31, 2019
2b46085
When a solution becomes unloaded, we should clear F#'s cache (#6420)
TIHan Apr 3, 2019
d114678
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Apr 4, 2019
2a48826
Merge pull request #6430 from Microsoft/merges/master-to-dev16.1
brettfo Apr 5, 2019
8e73cee
Merge pull request #6440 from Microsoft/merges/master-to-dev16.1
Apr 6, 2019
6371327
Merge remote-tracking branch 'upstream/master' into merges/master-to-…
brettfo Apr 6, 2019
627a596
Merge pull request #6446 from Microsoft/merges/master-to-dev16.1
Apr 7, 2019
0b33beb
Merge pull request #6456 from Microsoft/merges/master-to-dev16.1
Apr 8, 2019
7f18481
Merge pull request #6460 from Microsoft/merges/master-to-dev16.1
Apr 9, 2019
b7e7b53
Merge pull request #6470 from Microsoft/merges/master-to-dev16.1
brettfo Apr 9, 2019
ca694c5
Merge pull request #6473 from Microsoft/merges/master-to-dev16.1
Apr 10, 2019
e542930
Merge pull request #6480 from Microsoft/merges/master-to-dev16.1
Apr 10, 2019
745c0c9
Merge pull request #6488 from Microsoft/merges/master-to-dev16.1
Apr 11, 2019
d7509d3
Merge branch 'dev16.1' into merges/master-to-dev16.1
KevinRansom Apr 12, 2019
d24ed0a
Merge pull request #6500 from Microsoft/merges/master-to-dev16.1
Apr 12, 2019
6c5d60d
Merge pull request #6517 from Microsoft/merges/master-to-dev16.1
Apr 13, 2019
22656c8
Merge pull request #6521 from Microsoft/merges/master-to-dev16.1
Apr 13, 2019
1cacfaf
Merge pull request #6529 from Microsoft/merges/master-to-dev16.1
Apr 14, 2019
9993d81
Merge pull request #6539 from Microsoft/merges/master-to-dev16.1
Apr 15, 2019
1e36a5e
Merge branch 'dev16.1' into merges/master-to-dev16.1
KevinRansom Apr 16, 2019
fd3d3df
Merge pull request #6553 from Microsoft/merges/master-to-dev16.1
Apr 16, 2019
7c0c71f
Add Pinvoke support on coreclr (#6542)
KevinRansom Apr 16, 2019
af5b4eb
Permit reduction of `Some` allocations for optional arguments (#6533)
dsyme Apr 16, 2019
0d18903
ensure all setup packages use the same version (#6556)
brettfo Apr 16, 2019
ed387e0
Will's fix (#6559)
KevinRansom Apr 16, 2019
a3d6e55
Merge pull request #6560 from Microsoft/merges/master-to-dev16.1
brettfo Apr 16, 2019
7fa61b7
[master] Update dependencies from dotnet/arcade (#6510)
dotnet-maestro[bot] Apr 17, 2019
e130d25
fix vsix dependency version calculations (#6565)
brettfo Apr 17, 2019
290fd3c
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 17, 2019
d4e68ae
Merge pull request #6567 from Microsoft/merges/master-to-dev16.1
Apr 18, 2019
983e162
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 18, 2019
b818aa0
Fixed benchmark solution and added project type check test (#6566)
TIHan Apr 18, 2019
95f733d
cleanup fcs props (#6538)
dsyme Apr 18, 2019
46bb153
Merge pull request #6573 from Microsoft/merges/master-to-dev16.1
Apr 19, 2019
0fadd9e
rearrange order of SWR files to fix dependencies (#6582)
brettfo Apr 19, 2019
3ab3687
Merge pull request #6584 from Microsoft/master
brettfo Apr 19, 2019
c4c1d9c
combine swr files (#6587)
brettfo Apr 19, 2019
d1cc85e
Merge pull request #6588 from Microsoft/master
brettfo Apr 19, 2019
69539f2
hard-code FSharp.Core that ships with legacy project templates (#6611)
brettfo Apr 22, 2019
a5510fb
Roslyn Shim - First Phase (#6498)
TIHan Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions FSharp.Profiles.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>
Expand All @@ -21,9 +20,7 @@
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_HEAPTERMINATION</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_LOADER_OPTIMIZATION</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ build: proto restore
$(DotNetExe) build-server shutdown
$(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Core/FSharp.Core.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsc/fsc.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsi/fsi.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
Expand Down
4 changes: 2 additions & 2 deletions fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace FSharp.Compiler.SourceCodeServices

#if !NETSTANDARD1_6
#if !NETSTANDARD
open System.Runtime.Serialization.Json
open System.Runtime
open System.Diagnostics
Expand Down Expand Up @@ -60,7 +60,7 @@ type ProjectCracker =
let enableLogging = defaultArg enableLogging true


#if NETSTANDARD1_6
#if NETSTANDARD
let arguments = [|
yield projectFileName
yield enableLogging.ToString()
Expand Down
2 changes: 0 additions & 2 deletions fcs/samples/FscExe/FscMain.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,7 @@ module Driver =
for error in errors do eprintfn "%s" (error.ToString())
exitCode

#if !FX_NO_DEFAULT_DEPENDENCY_TYPE
[<Dependency("FSharp.Compiler",LoadHint.Always)>]
#endif
do ()

[<EntryPoint>]
Expand Down
4 changes: 2 additions & 2 deletions fsharp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@
<AdditionalProperties Condition="'$(BuildDesktop)' == 'true'">TargetFramework=net472</AdditionalProperties>
</Projects>
<Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj">
<AdditionalProperties Condition="'$(BuildNetcore)' == 'true'">TargetFramework=netstandard1.6</AdditionalProperties>
<AdditionalProperties Condition="'$(BuildNetcore)' == 'true'">TargetFramework=netstandard2.0</AdditionalProperties>
<AdditionalProperties Condition="'$(BuildDesktop)' == 'true'">TargetFramework=net472</AdditionalProperties>
</Projects>
<Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj">
<AdditionalProperties Condition="'$(BuildDesktop)' == 'true'">TargetFramework=net472</AdditionalProperties>
</Projects>
<Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
<AdditionalProperties Condition="'$(BuildNetcore)' == 'true'">TargetFramework=netstandard1.6</AdditionalProperties>
<AdditionalProperties Condition="'$(BuildNetcore)' == 'true'">TargetFramework=netstandard2.0</AdditionalProperties>
<AdditionalProperties Condition="'$(BuildDesktop)' == 'true'">TargetFramework=net472</AdditionalProperties>
</Projects>
<Projects Include="$(MSBuildThisFileDirectory)src\fsharp\fsc\fsc.fsproj">
Expand Down
6 changes: 3 additions & 3 deletions src/absil/il.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,7 @@ type ILTypeDefLayout =
| Explicit of ILTypeDefLayoutInfo (* REVIEW: add field info here *)

and ILTypeDefLayoutInfo =
{ Size: int32 option;
{ Size: int32 option
Pack: uint16 option }

[<RequireQualifiedAccess>]
Expand Down Expand Up @@ -2752,7 +2752,7 @@ let rescopeILTypeRef scoref (tref1:ILTypeRef) =
else ILTypeRef.Create(scoref2, tref1.Enclosing, tref1.Name)

// ORIGINAL IMPLEMENTATION (too many allocations
// { tspecTypeRef=rescopeILTypeRef scoref tref;
// { tspecTypeRef=rescopeILTypeRef scoref tref
// tspecInst=rescopeILTypes scoref tinst }
let rec rescopeILTypeSpec scoref (tspec1:ILTypeSpec) =
let tref1 = tspec1.TypeRef
Expand Down Expand Up @@ -3341,7 +3341,7 @@ let mkILDelegateMethods (access) (ilg: ILGlobals) (iltyp_AsyncCallback, iltyp_IA

let mkCtorMethSpecForDelegate (ilg: ILGlobals) (ty:ILType, useUIntPtr) =
let scoref = ty.TypeRef.Scope
mkILInstanceMethSpecInTy (ty, ".ctor", [rescopeILType scoref ilg.typ_Object;
mkILInstanceMethSpecInTy (ty, ".ctor", [rescopeILType scoref ilg.typ_Object
rescopeILType scoref (if useUIntPtr then ilg.typ_UIntPtr else ilg.typ_IntPtr)],
ILType.Void, emptyILGenericArgsList)

Expand Down
Loading