Commite429cb4

VFSharpTeam

committed

Merging over latest from F# 3.1.X to F# 4.0 (changeset 1350524)

1 parentc366794 commite429cb4Copy full SHA for e429cb4

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@`
`226`	`226`	`<PropertyGroupCondition="'$(TargetFramework)'=='portable78'">`
`227`	`227`	`<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>`
`228`	`228`	`<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE78</DefineConstants>`
	`229`	`+ <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>`
`229`	`230`	`<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>`
`230`	`231`	`<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>`
`231`	`232`	`<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>`
`@@ -261,6 +262,7 @@`
`261`	`262`	`<PropertyGroupCondition="'$(TargetFramework)'=='portable259'">`
`262`	`263`	`<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>`
`263`	`264`	`<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE259</DefineConstants>`
	`265`	`+ <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>`
`264`	`266`	`<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>`
`265`	`267`	`<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>`
`266`	`268`	`<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ static void Main(string[] args)`
`101`	`101`
`102`	`102`
`103`	`103`	`// Misc whitespaces`
`104`		`-varws="\x180E\x2000\x2001\x2002\x2003\x2004\x2005\x2006\x2007\x2008\x2009\x200A\x202F\x205F\x3000\x2028\x2029\x0009\x000A\x000B\x000C\x000D\x0085\x00A0";`
	`104`	`+varws="\x2000\x2001\x2002\x2003\x2004\x2005\x2006\x2007\x2008\x2009\x200A\x202F\x205F\x3000\x2028\x2029\x0009\x000A\x000B\x000C\x000D\x0085\x00A0";`
`105`	`105`	`AssertEqual(ws+"123"+ws,onetwothee);`
`106`	`106`
`107`	`107`	`#endif`

Comments

(0)