Commit9ae45b5

jackpappas

committed

Merge branch 'master' into all-array-ranks

2 parents5922b61 +d1d0544 commit9ae45b5Copy full SHA for 9ae45b5

File tree

+25

-2812

lines changed

+25

-2812

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,10 @@`
`94`	`94`
`95`	`95`	`<!-- v2.0-specific flags-->`
`96`	`96`	`<PropertyGroupCondition="'$(TargetFramework)'=='net20'">`
`97`		`-<!-- If 3.5 is not configured explicitly, use 2.0-->`
`98`		`- <TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)'==''">v2.0</TargetFrameworkVersion>`
	`97`	`+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>`
	`98`	`+ <DefineConstants>$(DefineConstants);FSHARP_CORE_2_0</DefineConstants>`
	`99`	`+ <DefineConstants>$(DefineConstants);RUNTIME</DefineConstants>`
	`100`	`+ <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>`
`99`	`101`	`<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>`
`100`	`102`	`<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>`
`101`	`103`	`<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>`
`@@ -127,6 +129,7 @@`
`127`	`129`	`<PropertyGroupCondition="'$(TargetFramework)'=='portable47'">`
`128`	`130`
`129`	`131`	`<DefineConstants>$(DefineConstants);FSHARP_CORE_PORTABLE</DefineConstants>`
	`132`	`+ <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>`
`130`	`133`	`<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>`
`131`	`134`	`<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>`
`132`	`135`	`<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@`
`92`	`92`	`<CompileInclude="FSharp.Core\Microsoft.FSharp.Quotations\FSharpQuotations.fs" />`
`93`	`93`	`<CompileInclude="TypeForwarding.fs" />`
`94`	`94`	`<CompileInclude="NUnitFrameworkShims.fs"Condition="'$(TargetFramework)' == 'sl3-wp'" />`
	`95`	`+ <CompileInclude="SurfaceArea.4.0.fs"/>`
`95`	`96`	`</ItemGroup>`
`96`	`97`	`<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />`
`97`	`98`	`</Project>`

Comments

(0)