From d37491e27a7d4abba6c1ba638caba775ac3f4cf4 Mon Sep 17 00:00:00 2001 From: enricosada Date: Fri, 30 Jan 2015 14:50:57 +0100 Subject: [PATCH 1/3] converted changelist.txt to markdown format --- CHANGELOG.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ changelist.txt | 65 -------------------------------------------- 2 files changed, 74 insertions(+), 65 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 changelist.txt diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000000..1ec7018de4f --- /dev/null +++ b/CHANGELOG.md @@ -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# +====================== + +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 diff --git a/changelist.txt b/changelist.txt deleted file mode 100644 index 61dcd789009..00000000000 --- a/changelist.txt +++ /dev/null @@ -1,65 +0,0 @@ -//=========================================================================================================== -// 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# 3.1.2 -=============== - -Language, compiler, runtime, interactive ----------------------------------------- -- Allow arbitrary-dimensional slicing -- Bugfix (#72): Indexer properties with more than 4 arguments cannot be accessed -- Bugfix (#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): String module documentation is false -- Support "shebang" (#!) in F# source files -- Bugfix (#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): Invalid code generated when calling C# method with optional nullable args -- Bugfix (#9): XML doc comments on F# record type fields do not appear when accessing in C# -- Bugfix (#59): Compiler always requires System.Runtime.InteropServices, this is not present in all portable profiles -- Bugfix (#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): NullRef in list comprehension, when for loop works -- Bugfix (#1): Type inference involving generic param arrays -- Bugfix (#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): F# package installer does not honor custom install paths for express SKUs -- Bugfix (#75): Microsoft.FSharp.targets shim not deployed with F# SDK -- Bugfix: Fix crash in smart indent provider -- Bugfix (#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) - - -Visual F# 3.1.1 (Released - 01/24/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 From 72185167566e7b7ac85f396a40258ebe35a10c19 Mon Sep 17 00:00:00 2001 From: enricosada Date: Fri, 20 Feb 2015 16:21:55 -0800 Subject: [PATCH 2/3] merge changes of open fsharp repo closes #252 --- .gitignore | 1 + src/fsharp-compiler-build.proj | 4 +- src/fsharp/FSComp.txt | 2 +- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 16 +-- .../FSharp.Compiler-proto.fsproj | 117 +++++++++--------- ...Sharp.Compiler.Interactive.Settings.fsproj | 29 +++-- .../FSharp.Compiler.Server.Shared.fsproj | 12 +- .../FSharp.Compiler/FSharp.Compiler.fsproj | 4 +- .../FSharp.Core.Unittests.fsproj | 2 +- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 10 +- src/fsharp/FSharp.Core/Linq.fs | 2 +- src/fsharp/FSharp.Core/control.fs | 6 +- src/fsharp/FSharp.Core/printf.fs | 10 +- src/fsharp/Fsc-proto/Fsc-proto.fsproj | 2 +- src/fsharp/Fsc/Fsc.fsproj | 8 +- src/fsharp/build.fs | 2 +- src/fsharp/fsi/Fsi.fsproj | 10 +- src/fsharp/tc.fs | 4 +- 18 files changed, 122 insertions(+), 119 deletions(-) diff --git a/.gitignore b/.gitignore index e66c732ccb1..1c8ca3d8c9c 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll *.csproj.user +*.orig diff --git a/src/fsharp-compiler-build.proj b/src/fsharp-compiler-build.proj index 685429e75ee..a1db2680d4c 100644 --- a/src/fsharp-compiler-build.proj +++ b/src/fsharp-compiler-build.proj @@ -12,8 +12,8 @@ - - + + diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index 7cc540bbff6..6a037cc3e05 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1331,4 +1331,4 @@ descriptionUnavailable,"(description unavailable...)" 3176,tcFieldNameConflictsWithGeneratedNameForAnonymousField,"Named field '%s' conflicts with autogenerated name for anonymous field." 3177,tastConstantExpressionOverflow,"This literal expression or attribute argument results in an arithmetic overflow." 3178,tcIllegalStructTypeForConstantExpression,"This is not valid literal expression. The [] attribute will be ignored." -3179,fscSystemRuntimeInteropServicesIsRequired,"System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes." \ No newline at end of file +3179,fscSystemRuntimeInteropServicesIsRequired,"System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes." diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 5c1898e5e8b..12e1961662a 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -14,15 +14,15 @@ {702A7979-BCF9-4C41-853E-3ADFC9897890} - - FSBuild.txt - + + FSBuild.txt + - assemblyinfo.FSharp.Build.dll.fs + Utilities/assemblyinfo.FSharp.Build.dll.fs - CompilerLocationUtils.fs + Utilities/CompilerLocationUtils.fs @@ -50,9 +50,9 @@ - {DED3BBD7-53F4-428A-8C9F-27968E768605} - FSharp.Core + {DED3BBD7-53F4-428A-8C9F-27968E768605} + FSharp.Core - \ No newline at end of file + diff --git a/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj b/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj index ceeb15b2dfb..3d17ec31947 100644 --- a/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj +++ b/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj @@ -124,7 +124,7 @@ ildiag.fs - ReferenceResolution.fs + ReferenceResolution.fs il.fsi @@ -180,28 +180,26 @@ range.fs - ErrorLogger.fs - - - + ErrorLogger.fs + + InternalCollections.fsi InternalCollections.fs - ilread.fsi ilread.fs - - ilwrite.fsi - - - ilwrite.fs - + + ilwrite.fsi + + + ilwrite.fs + ilreflect.fs @@ -214,13 +212,13 @@ ilxsettings.fs - - pubclo.fsi - - + + pubclo.fsi + + pubclo.fs - + cu_erase.fs @@ -241,23 +239,23 @@ layout.fs - - ast.fs - - - - lexhelp.fsi - - - lexhelp.fs - - - - sreflect.fsi - - - sreflect.fs - + + ast.fs + + + + lexhelp.fsi + + + lexhelp.fs + + + + sreflect.fsi + + + sreflect.fs + QueueList.fs @@ -265,14 +263,14 @@ tast.fs - env.fs - - - tastops.fsi - - - tastops.fs - + env.fs + + + tastops.fsi + + + tastops.fs + pickle.fsi @@ -282,16 +280,15 @@ lexfilter.fs - - import.fsi - - + + import.fsi + + import.fs infos.fs - NicePrint.fs @@ -316,10 +313,10 @@ outcome.fs - - csolve.fsi - - + + csolve.fsi + + csolve.fs @@ -328,10 +325,10 @@ formats.fs - - nameres.fsi - - + + nameres.fsi + + nameres.fs @@ -361,10 +358,10 @@ opt.fs - - detuple.fsi - - + + detuple.fsi + + detuple.fs @@ -418,9 +415,9 @@ + - diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index 63ae670f1cb..44508f41f7e 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -15,31 +15,30 @@ 512 - - FSInteractiveSettings.txt - + + FSInteractiveSettings.txt + - assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs + Utilities/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs + + + Utilities/fsiattrs.fs - fsiaux.fsi + InteractiveSettings/fsiaux.fsi - fsiaux.fs - - - fsiattrs.fs + InteractiveSettings/fsiaux.fs - - {DED3BBD7-53F4-428A-8C9F-27968E768605} - FSharp.Core - - + {DED3BBD7-53F4-428A-8C9F-27968E768605} + FSharp.Core + + - + diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 92264b3adea..cc573183528 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -14,9 +14,9 @@ v2.0 - - FSServerShared.txt - + + FSServerShared.txt + assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs @@ -30,9 +30,9 @@ - {DED3BBD7-53F4-428A-8C9F-27968E768605} - FSharp.Core - + {DED3BBD7-53F4-428A-8C9F-27968E768605} + FSharp.Core + diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj index d4592072418..212c34fdcbd 100644 --- a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj +++ b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj @@ -500,13 +500,13 @@ - + - + {DED3BBD7-53F4-428A-8C9F-27968E768605} FSharp.Core diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj index 384b7d452d6..a3555d80826 100644 --- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj +++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj @@ -103,4 +103,4 @@ - \ No newline at end of file + diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index e575021f690..97b8140a04e 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -189,10 +189,10 @@ Units/SI.fs - fslib-extra-pervasives.fsi + Extras/fslib-extra-pervasives.fsi - fslib-extra-pervasives.fs + Extras/fslib-extra-pervasives.fs assemblyinfo.FSharp.Core.dll.fs @@ -208,9 +208,9 @@ '$(TargetFramework)' == 'sl3-wp' "/> + '$(TargetFramework)' == 'portable47' OR + '$(TargetFramework)' == 'XNA\5.0' OR + '$(TargetFramework)' == 'sl3-wp' "/> diff --git a/src/fsharp/FSharp.Core/Linq.fs b/src/fsharp/FSharp.Core/Linq.fs index 64b0217c7e3..65e8b294033 100644 --- a/src/fsharp/FSharp.Core/Linq.fs +++ b/src/fsharp/FSharp.Core/Linq.fs @@ -797,4 +797,4 @@ module LeafExpressionConverter = #endif - \ No newline at end of file + diff --git a/src/fsharp/FSharp.Core/control.fs b/src/fsharp/FSharp.Core/control.fs index 1fa224a5924..dd33de49d0c 100644 --- a/src/fsharp/FSharp.Core/control.fs +++ b/src/fsharp/FSharp.Core/control.fs @@ -399,7 +399,7 @@ namespace Microsoft.FSharp.Control [] type Trampoline() = - + [] static let bindLimitBeforeHijack = 300 #if FX_NO_THREAD_STATIC @@ -415,11 +415,12 @@ namespace Microsoft.FSharp.Control #else Trampoline.thisThreadHasTrampoline #endif + let mutable cont = None let mutable bindCount = 0 static let unfake FakeUnit = () - + // Install a trampolineStack if none exists member this.ExecuteAction (firstAction : unit -> FakeUnitValue) = let rec loop action = @@ -442,6 +443,7 @@ namespace Microsoft.FSharp.Control loop firstAction finally #if FX_NO_THREAD_STATIC + () #else if thisIsTopTrampoline then Trampoline.thisThreadHasTrampoline <- false diff --git a/src/fsharp/FSharp.Core/printf.fs b/src/fsharp/FSharp.Core/printf.fs index 3c0ef1a01a7..b06c97e0ba8 100644 --- a/src/fsharp/FSharp.Core/printf.fs +++ b/src/fsharp/FSharp.Core/printf.fs @@ -157,7 +157,7 @@ module internal PrintfImpl = buf.Append(c) |> ignore go (i + 1) buf go i (Text.StringBuilder()) - + /// Abstracts generated printer from the details of particular environment: how to write text, how to produce results etc... [] type PrintfEnv<'State, 'Residue, 'Result> = @@ -1266,7 +1266,11 @@ module internal PrintfImpl = ) #endif - [] + [] +#if FX_NO_THREAD_STATIC +#else + [] +#endif static val mutable private last : string * CachedItem<'T, 'State, 'Residue, 'Result> static member Get(key : Format<'T, 'State, 'Residue, 'Result>) = @@ -1382,4 +1386,4 @@ module Printf = [] let eprintfn fmt = fprintfn System.Console.Error fmt #endif -#endif +#endif \ No newline at end of file diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj index bc6abc2e95c..dbe51512d79 100644 --- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj +++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj @@ -33,7 +33,7 @@ - + {33E0FB8C-93DC-4AD7-9DCD-9FBDA6C2F061} FSharp.Compiler-proto diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj index ffed346655a..ace36f9e42f 100644 --- a/src/fsharp/Fsc/Fsc.fsproj +++ b/src/fsharp/Fsc/Fsc.fsproj @@ -24,14 +24,14 @@ - assemblyinfo.fsc.exe.fs + Resources/assemblyinfo.fsc.exe.fs fscmain.fs - PreserveNewest fsc.exe.config + PreserveNewest @@ -48,5 +48,5 @@ FSharp.Core - - \ No newline at end of file + + diff --git a/src/fsharp/build.fs b/src/fsharp/build.fs index 642a4291f03..098a2963697 100644 --- a/src/fsharp/build.fs +++ b/src/fsharp/build.fs @@ -3994,7 +3994,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti if not (FileSystem.SafeExists sigFileName) then error(Error(FSComp.SR.buildExpectedSigdataFile(), m)); [ (ilShortAssemName, (fun () -> FileSystem.ReadAllBytesShim sigFileName))] - else + else sigDataReaders sigDataReaders |> List.map (fun (ccuName, sigDataReader) -> diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj index b228772a3f4..abf45c3c7ab 100644 --- a/src/fsharp/fsi/Fsi.fsproj +++ b/src/fsharp/fsi/Fsi.fsproj @@ -27,19 +27,19 @@ FSIstrings.txt - assemblyinfo.fsi.exe.fs + Utilities/assemblyinfo.fsi.exe.fs - InternalCollections.fsi + Utilities/InternalCollections.fsi - InternalCollections.fs + Utilities/InternalCollections.fs - console.fs + Console/console.fs - fsi.fs + InteractiveSession/fsi.fs PreserveNewest diff --git a/src/fsharp/tc.fs b/src/fsharp/tc.fs index b7224b92e84..befb478ecb2 100644 --- a/src/fsharp/tc.fs +++ b/src/fsharp/tc.fs @@ -278,8 +278,8 @@ let emptyTcEnv g = { eNameResEnv = NameResolutionEnv.Empty(g) eUngeneralizableItems=[] ePath=[] - eCompPath=cpath - eAccessPath=cpath + eCompPath=cpath // dummy + eAccessPath=cpath // dummy eAccessRights=computeAccessRights cpath [] None // compute this field eInternalsVisibleCompPaths=[] eModuleOrNamespaceTypeAccumulator= ref (NewEmptyModuleOrNamespaceType Namespace) From 27f2a8295cc955e03de9f603f17ddab726d5d2c0 Mon Sep 17 00:00:00 2001 From: latkin Date: Fri, 20 Feb 2015 16:34:11 -0800 Subject: [PATCH 3/3] Fix some minor test issues --- tests/fsharp/core/measures/test.fsx | 3 ++- .../Attributes/New/Test06.fs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/fsharp/core/measures/test.fsx b/tests/fsharp/core/measures/test.fsx index c50fe8f1412..33335ebef74 100644 --- a/tests/fsharp/core/measures/test.fsx +++ b/tests/fsharp/core/measures/test.fsx @@ -504,7 +504,8 @@ module MembersTest = let s = 2.0f let d = 2.0M -#if !NetCore +#if NetCore +#else let tmpCulture = System.Threading.Thread.CurrentThread.CurrentCulture System.Threading.Thread.CurrentThread.CurrentCulture <- System.Globalization.CultureInfo("en-US") test "f" (f.ToString().Equals("2")) diff --git a/tests/fsharpqa/Source/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs b/tests/fsharpqa/Source/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs index 181c7402294..aad6f7dfa1d 100644 --- a/tests/fsharpqa/Source/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs +++ b/tests/fsharpqa/Source/Conformance/BasicTypeAndModuleDefinitions/GeneratedEqualityHashingComparison/Attributes/New/Test06.fs @@ -1,5 +1,5 @@ // #Regression #Conformance #TypesAndModules #GeneratedEqualityAndHashing #Attributes -//This type uses an invalid mix of the attributes 'NoEquality', 'ReferenceEquality', 'StructuralEquality', 'NoComparison' and 'StructuralComparison' attributes$ +//This type uses an invalid mix of the attributes 'NoEquality', 'ReferenceEquality', 'StructuralEquality', 'NoComparison' and 'StructuralComparison'$ //A type with attribute 'CustomComparison' must have an explicit implementation of at least one of 'System\.IComparable' or 'System\.Collections\.IStructuralComparable'$ module M06 =