diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/unrecogarg.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/unrecogarg.fs
index a43a8065e16..83ccc907b79 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/unrecogarg.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/unrecogarg.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: .+
+
#light
exit 0
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/E_InvalidArgument.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/E_InvalidArgument.fs
index f98f7d8d8dc..ce39f3e7a5e 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/E_InvalidArgument.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/codepage/E_InvalidArgument.fs
@@ -3,7 +3,7 @@
// Actual message is: error FS0191: Valid values are between 0 and 65535, inclusive.
// Parameter Name: codepage
// but is is localized!
-//Problem with codepage '65536': Valid values are between 0 and 65535, inclusive
+
exit 1
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapRequiresPortablePdb.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapRequiresPortablePdb.fs
index 80243879471..378d2d50fb0 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapRequiresPortablePdb.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapRequiresPortablePdb.fs
@@ -1,3 +1,3 @@
// #NoMT #CompilerOptions #Determinism
-//--pathmap can only be used with portable PDBs \(--debug:portable or --debug:embedded\)
+
exit 0
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapValid.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapValid.fs
index 1ec61fc9a8f..378d2d50fb0 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapValid.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/determinism/pathmapValid.fs
@@ -1,3 +1,3 @@
// #NoMT #CompilerOptions #Determinism
-//Invalid path map\. Mappings must be comma separated and of the format 'path=sourcePath'
+
exit 0
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine01.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine01.fs
index fcb5e10f2ae..c75810c3381 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine01.fs
@@ -1,6 +1,6 @@
// #Regression #NoMT #CompilerOptions #RequiresENU
// Test that without [--flaterrors] flag multi-line errors are emitted in a regular way, i.e. spanned to more that one line
-//This expression was expected to have type
+
// ''a list'
//but here has type
// 'seq<'b>'
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine03.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine03.fs
index 7df7e334e11..023e419d510 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/flaterrors/E_MultiLine03.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
// Test that using [--flaterrors] does not make an impact on regular single-line error messages
-//The value or constructor 'b' is not defined
+
let a = b
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_01.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_01.fs
index cd6867c3341..cde67b9fbc1 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_01.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '--PLATFORM'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_02.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_02.fs
index 86e246c9f84..6fd8f9ab285 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_02.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '--PlatForm'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_03.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_03.fs
index 5bcabe032da..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_03.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'ITANIUM', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_04.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_04.fs
index be32ba84233..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_04.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_04.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'ANYCPU', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_05.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_05.fs
index 92aa8efd70e..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_05.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_05.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'X86', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_06.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_06.fs
index 3935e374ab0..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_06.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_06.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'X64', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_07.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_07.fs
index d7843110bbc..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_07.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_07.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'IA64', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_08.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_08.fs
index 7096eeb2147..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_08.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_08.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'i386', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_09.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_09.fs
index a44c7d415a3..1b2d4603e12 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_09.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_09.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'AMD64', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_10.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_10.fs
index 2f372c0fac0..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_10.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_10.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'PPC', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_11.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_11.fs
index ced265728c1..1b2d4603e12 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_11.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_11.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '--platform-'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_12.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_12.fs
index 3fe0e61c758..1b2d4603e12 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_12.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_12.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '--PLATFORM\+'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_13.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_13.fs
index a44f40b2631..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_13.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_13.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '---platform'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_15.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_15.fs
index 5b842b5f711..8fa5ee03684 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_15.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_15.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized platform 'ARM', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_16.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_16.fs
index 9c778d01340..581e41236a9 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_16.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/error_16.fs
@@ -1,5 +1,5 @@
// #Regression #NoMT #CompilerOptions
-//The 'anycpu32bitpreferred' platform can only be used with EXE targets\. You must use 'anycpu' instead\.
+
module M
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs
index c125ee64e38..9b320af3d8a 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform/platform.fs
@@ -9,7 +9,7 @@ open FSharp.Test.Compiler
module platform =
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //The 'anycpu32bitpreferred' platform can only be used with EXE targets\. You must use 'anycpu' instead\.
+
[]
let ``platform - error_16_fs - --target:library --platform:anycpu32bitpreferred`` compilation =
compilation
@@ -22,7 +22,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized option: '--PLATFORM'
+
[]
let ``platform - error_01_fs - --PLATFORM:anycpu`` compilation =
compilation
@@ -35,7 +35,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized option: '--PlatForm'
+
[]
let ``platform - error_02_fs - --PlatForm:anycpu`` compilation =
compilation
@@ -48,7 +48,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'ITANIUM', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_03_fs - --platform:ITANIUM`` compilation =
compilation
@@ -61,7 +61,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'ANYCPU', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_04_fs - --platform:ANYCPU`` compilation =
compilation
@@ -74,7 +74,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'X86', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_05_fs - --platform:X86`` compilation =
compilation
@@ -87,7 +87,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'X64', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_06_fs - --platform:X64`` compilation =
compilation
@@ -100,7 +100,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'IA64', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_07_fs - --platform:IA64`` compilation =
compilation
@@ -113,7 +113,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'i386', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_08_fs - --platform:i386`` compilation =
compilation
@@ -126,7 +126,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'AMD64', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_09_fs - --platform:AMD64`` compilation =
compilation
@@ -139,7 +139,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'PPC', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_10_fs - --platform:PPC`` compilation =
compilation
@@ -152,7 +152,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized platform 'ARM', valid values are 'x86', 'x64', 'Arm', 'Arm64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu'
+
[]
let ``platform - error_15_fs - --platform:ARM`` compilation =
compilation
@@ -165,7 +165,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized option: '--platform-'
+
[]
let ``platform - error_11_fs - --platform-:anycpu`` compilation =
compilation
@@ -178,7 +178,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized option: '--PLATFORM\+'
+
[]
let ``platform - error_12_fs - --PLATFORM+:anycpu`` compilation =
compilation
@@ -191,7 +191,7 @@ module platform =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/platform)
- //Unrecognized option: '---platform'
+
[]
let ``platform - error_13_fs - ---platform:anycpu`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_01.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_01.fs
index 6b2ab71b578..c40e6ae6e6a 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_01.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '--Times'
+
#light
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_02.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_02.fs
index 43d462138b9..c40e6ae6e6a 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_02.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '--times-'
+
#light
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_03.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_03.fs
index 8b3121132b3..c40e6ae6e6a 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/error_03.fs
@@ -1,4 +1,4 @@
// #Regression #NoMT #CompilerOptions
-//Unrecognized option: '--times\+'
+
#light
printfn "Finished"
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs
index a52aa63cf15..b18e5472ec0 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times/times.fs
@@ -11,7 +11,7 @@ open System.IO
module times =
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/times)
- //Unrecognized option: '--Times'
+
[]
let ``times - error_01_fs - --Times`` compilation =
compilation
@@ -24,7 +24,7 @@ module times =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/times)
- //Unrecognized option: '--times-'
+
[]
let ``times - error_02_fs - --times-`` compilation =
compilation
@@ -37,7 +37,7 @@ module times =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - CompilerOptions/fsc/times)
- //Unrecognized option: '--times\+'
+
[]
let ``times - error_03_fs - --times+`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror01.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror01.fs
index 5dc5695eaa3..458844f51d0 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror01.fs
@@ -1,6 +1,6 @@
// #Regression #NoMT #CompilerOptions
// Regression test for FSHARP1.0:4867
// nowarn has no effect if "Warning level = 4" and "Warnings as errors"
-//This and other recursive references to the object\(s\) being defined will be checked for initialization-soundness at runtime through the use of a delayed reference\. This is because you are defining one or more recursive objects, rather than recursive functions\. This warning may be suppressed by using '#nowarn "40"' or '--nowarn:40'\.$
+
let rec f = new System.EventHandler(fun _ _ -> f.Invoke(null,null))
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror02.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror02.fs
index 0c562f06251..125259add60 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/nowarn_with_warnaserror02.fs
@@ -1,7 +1,7 @@
// #Regression #NoMT #CompilerOptions
// Regression test for FSHARP1.0:4867
// nowarn has no effect if "Warning level = 4" and "Warnings as errors"
-//This and other recursive references to the object\(s\) being defined will be checked for initialization-soundness at runtime through the use of a delayed reference\. This is because you are defining one or more recursive objects, rather than recursive functions\. This warning may be suppressed by using '#nowarn "40"' or '--nowarn:40'
+
#nowarn "21"
let rec f = new System.EventHandler(fun _ _ -> f.Invoke(null,null))
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn_level6.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn_level6.fs
index bf705870aa4..585191cf226 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn_level6.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn/warn_level6.fs
@@ -1,3 +1,3 @@
// #Regression #NoMT #CompilerOptions
-//Invalid warning level '6'
+
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs
index 4aab325f965..c4523e978ed 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ExposeLessVisible01.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #DeclarationElements #Accessibility
-//The type 'A' is less accessible than the value, member or type 'x' it is used in
+
type internal A = { x : int }
type public B = { x : A[] }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs
index 0ea152deb86..d4de396d610 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_LocalLetBinding02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// Let bindings in classes are always private
-//Multiple visibility attributes have been specified for this identifier\. 'let' bindings in classes are always private, as are any 'let' bindings inside expressions
+
type internal A() = class end
type public B() =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs
index 9107f78af85..17de14bc669 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// Verify error associated with more accessible base class than super class
-//The type 'C1' is less accessible than the value, member or type 'C2' it is used in
+
// Class inheritance:
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs
index 3f84aea4ba3..50232b13bbf 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_MoreAccessibleBaseClass02.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// Verify error when inheriting from less accessible base class
-//The type 'I2' is less accessible than the value, member or type 'D' it is used in
-//The type 'I3' is less accessible than the value, member or type 'IAmAnotherInterface' it is used in
+
+
// Delegate signature:
type private I2 =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs
index 370fa232ff1..b1930a5b04d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_PrivateImplicitCtor01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// Verify error when using a private implicit constructor
-//Method or object constructor 'C' not found
+
type A public (x : int) =
member this.Value = x
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs
index 9900a015a19..f80799d2a14 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_ProtectedThingsInaccessible01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// Regression test for FSharp1.0:4227 - protected access checks are not correctly implemented
-//Method 'MemberwiseClone' is not accessible from this code location
+
type C1() as this =
inherit System.MarshalByRefObject()
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs
index a81ab93c252..9be4c482f28 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible02.fs
@@ -3,12 +3,12 @@
// Private modules
// Private type or module is private to its immediately enclosing module. This means the module PrivateModule in the repro
// is indeed accessible to the rest of the implicit enclosing module.
-//The value 'x' is not accessible from this code location
-//The value 'f' is not accessible from this code location
-//The value 'y' is not accessible from this code location
-//The value 'g' is not accessible from this code location
-//The type 'PrivateModule' is not accessible from this code location
-//The type 'PrivateModule' is not accessible from this code location
+
+
+
+
+
+
module M =
let private y = 42
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs
index 6cbba2d0880..f803007448b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible03.fs
@@ -1,8 +1,8 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// Regression test for FSHARP1.0:2738
-//The type 'PrivateModule' is not accessible from this code location$
-//The value 'x' is not accessible from this code location$
-//The value, namespace, type or module 'PrivateModule' is not defined
+
+
+
module M =
module private PrivateModule =
let x = 1
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs
index ad8230267ad..b301dd94e59 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible04.fs
@@ -3,10 +3,10 @@
// Private modules
// Private type or module is private to its immediately enclosing module. This means the module PrivateModule in the repro
// is indeed accessible to the rest of the implicit enclosing module.
-//The value, namespace, type or module 'PrivateModule' is not defined
-//The value, namespace, type or module 'PrivateModule' is not defined
-//The value or constructor 'y' is not defined
-//The value or constructor 'g' is not defined
+
+
+
+
module M =
let private y = 42
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs
index ad630fc84f7..3df5fa06128 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/E_privateThingsInaccessible05.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// Regression test for FSharp1.0:2236 - unexpected "record field" in accessibility error
-//The record, struct or class field 'foo' is not accessible from this code location
+
type Foo =
class
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs
index 7ac96ec6491..185e992a739 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_InterfaceImpl01.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #DeclarationElements #Accessibility #Overloading
// Regression test for FSHARP1.0:4485
// Visibility decl on interface implementation
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
+
+
+
type IFoo = interface
abstract M1 : int -> unit
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs
index 6732f4a1ab6..506d9e42250 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides01.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #DeclarationElements #Accessibility #Overloading
// Regression test for FSHARP1.0:4485
// Visibility decl on overrides (class inheritance)
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
+
+
+
type C() = class
abstract member M : int
end
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs
index 67006948499..7c448fd77fc 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides02.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #DeclarationElements #Accessibility #Overloading
// Regression test for FSHARP1.0:4485
// Visibility decl on overrides (class inheritance)
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
+
+
+
[]
type D() = class
abstract P : int with get, set
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs
index d8ad2c3ad1e..603027363c7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides03.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #DeclarationElements #Accessibility #Overloading
// Regression test for FSHARP1.0:4485
// Visibility decl on overrides (class inheritance)
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
+
+
+
[]
type D() = class
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs
index de5211d23c1..8262a98c8a5 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides04.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #DeclarationElements #Accessibility #Overloading
// Regression test for FSHARP1.0:4485
// Visibility decl on overrides (class inheritance)
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//Accessibility modifiers are not permitted on overrides or interface implementations
+
+
+
[]
type D() = class
abstract P : int with get, set
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs
index 25cc44717ed..0475e9bd564 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnOverridesAndIFaceImpl/E_OnOverrides05.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #Accessibility #Overloading
// Regression test for FSHARP1.0:4485
// Visibility desc on overrides (inheritance chain)
-//Accessibility modifiers are not permitted on overrides or interface implementations
+
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs
index 99a4279d41e..f34c40c9cac 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords.fs
@@ -2,9 +2,9 @@
#light
// See bug 1537.
-//Accessibility modifiers are not permitted on record fields\. Use 'type R = internal \.\.\.' or 'type R = private \.\.\.' to give an accessibility to the whole representation
-//Accessibility modifiers are not permitted on record fields\. Use 'type R = internal \.\.\.' or 'type R = private \.\.\.' to give an accessibility to the whole representation
-//Accessibility modifiers are not permitted on record fields\. Use 'type R = internal \.\.\.' or 'type R = private \.\.\.' to give an accessibility to the whole representation
+
+
+
type Person = {
public Name : string;
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs
index 4bdf241e094..b334c1d8f61 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_accessibilityOnRecords02.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:1537
// The warning is emitted _and_ the code compiles just fine.
// As of 1/16/2009, the warning is now an error - so this code does not compile!
-//Accessibility modifiers are not permitted on record fields\. Use 'type R = internal \.\.\.' or 'type R = private \.\.\.' to give an accessibility to the whole representation
+
module M
type R = { private i : int } // err
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs
index ee3566c7113..c2ddc7889a4 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_let01.fs
@@ -1,10 +1,10 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// On let
-//Accessibility modifiers should come immediately prior to the identifier naming a construct
-//Possible incorrect indentation: this token is offside of context started at position \(11:23\)\. Try indenting this token further or using standard formatting conventions
-//Accessibility modifiers should come immediately prior to the identifier naming a construct
-//Possible incorrect indentation: this token is offside of context started at position \(12:23\)\. Try indenting this token further or using standard formatting conventions
-//Accessibility modifiers should come immediately prior to the identifier naming a construct
+
+
+
+
+
module M =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs
index 029614acfa5..0ef4f0247e8 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_member01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// On member
-//Accessibility modifiers should come immediately prior to the identifier naming a construct
+
#light
module M =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs
index 1f56aac8817..659fa0b0b11 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_module01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// On module
-//Accessibility modifiers should come immediately prior to the identifier naming a construct
+
#light
public module ModuleDef = // here
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs
index b98d87b5764..40eb1258898 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/PermittedLocations/E_orderingOfAccessibilityKeyword_type01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Accessibility
// On type
-//Accessibility modifiers should come immediately prior to the identifier naming a construct
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs
index 98692e796e7..0b31c183225 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_001.fs
@@ -1,6 +1,6 @@
// Ensures that we get an error when warnings as error specified
-//This type does not inherit Attribute, it will not work correctly with other .NET languages.
+
namespace FSharp.Conformance.DeclarationElements.CustomAttributes.InheritedAttribute
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs
index fdd74d76149..0b31c183225 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeInheritance/InheritedAttribute_002.fs
@@ -1,6 +1,6 @@
// Ensures that we get an error when warnings as error specified
-//This type does not inherit Attribute, it will not work correctly with other .NET languages.
+
namespace FSharp.Conformance.DeclarationElements.CustomAttributes.InheritedAttribute
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs
index 84ad2986d67..6856fec0e79 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets01.fs
@@ -3,8 +3,8 @@
// Title: AttributeTargets from AttributeUsage are not being checked/honored
// Descr: Verify an attribute targeting methods, can't be applied to any other language elements.
-//This attribute is not valid for use on this language element
-//This attribute is not valid for use on this language element
+
+
open System
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs
index 555bfd5f829..99d25d9a68d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_AttributeTargets02.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:4727
// Title: once we start compiling them as real mutable fields, you should not be able to target both "property" for "val mutable" fields in classes
-//This attribute is not valid for use on this language element
+
open System
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs
index 390a80d0030..12710cc5e91 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_ConditionalAttribute.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #Attributes
// Regression for FSHARP1.0:6098
// conditionalattribute on a class should fail with a diagnostic
-//Attribute 'System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes
+
module M
open System.Diagnostics
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx
index 35490c04049..bec6d3f2e77 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/E_WithBitwiseOr01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #Attributes
// Regression test for FSHARP1.0:3797
// Attributes defined in F# and whose AttributeUsage is specified using bitwise or do MUST have the attribute usage checked by the F# compiler
-//This attribute is not valid for use on this language element
+
#light
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs
index 957a3ec7189..573c7d5544d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion01.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #DeclarationElements #Attributes
-//The attribute System.Reflection.AssemblyVersionAttribute specified version '1\.2\.3\.4\.5\.6', but this value is invalid and has been ignored
+
[]
do
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs
index e44827056a4..6768fc8e004 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/W_AssemblyVersion02.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #DeclarationElements #Attributes
-//The attribute System.Reflection.AssemblyVersionAttribute specified version '1\.2\.\*\.4', but this value is invalid and has been ignored
+
[]
do
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs
index d50086febb0..0019bc85b26 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #DeclarationElements #Attributes
-//The attribute System.Reflection.AssemblyFileVersionAttribute specified version '9\.8\.7\.6\.5', but this value is invalid and has been ignored
+
[]
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs
index 8cff47895b9..6f76b962f5d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #DeclarationElements #Attributes
-//The attribute System.Reflection.AssemblyFileVersionAttribute specified version '9\.8\.\*\.6', but this value is invalid and has been ignored
+
[]
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication01.fs
index 987a8db16e6..a2d1b04eab5 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication01.fs
@@ -2,7 +2,7 @@
#light
// FSB 1036, Assembly-level attributes attached to non-do bindings
-//This attribute is not valid for use on this language element\. Assembly attributes should be attached to a 'do \(\)' declaration, if necessary within an F# module
+
[]
let f = 1
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication02.fs
index 11b7e3b77d1..4d8eb3f403f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Attributes
// Regression test for FSHARP1.0:1475
// F# attributes in prim-types.fs do not specify attribute targets
-//The attribute type 'MeasureAttribute' has 'AllowMultiple=false'\. Multiple instances of this attribute cannot be attached to a single language element\.$
+
[] [] type m
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication03.fs
index f73f5ad8723..bd32c8cc6e7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication03.fs
@@ -4,7 +4,7 @@
open System
// FSharp1.0#1475: validate that an incorrect attribute application reports an error.
-//This attribute is not valid for use on this language element
+
type TestType() =
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication04.fs
index e16ad854335..2db59fa3dc7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication04.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeApplication04.fs
@@ -4,7 +4,7 @@
open System
// FSharp1.0#1475: validate that an incorrect attribute application reports an error.
-//This attribute is not valid for use on this language element
+
type TestType() =
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs
index 2dbdf726f18..d04fea1556d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/E_AttributeTargetSpecifications.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Attributes
// Regression test for FSharp1.0:1089 - Support "module" and other attribute target specifications in parser
-//Unrecognized attribute target\. Valid attribute targets are 'assembly', 'module', 'type', 'method', 'property', 'return', 'param', 'field', 'event', 'constructor'
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_ReturnType03b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_ReturnType03b.fs
index 5fa46042bca..b6de23eaa7c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_ReturnType03b.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_ReturnType03b.fs
@@ -3,7 +3,7 @@
// F# supports custom attributes on return type.
// Multiple attributes on the same return value (same attribute repeated twice) not allowed by default (AllowMultiple is false)
// Note: the syntax is kind of awkward...
-//The attribute type 'CA1' has 'AllowMultiple=false'\. Multiple instances of this attribute cannot be attached to a single language element\.$
+
type CA1 =
class
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs
index ee1e1e0eb3a..c113f274609 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/Basic/W_StructLayoutExplicit01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #Attributes
// FSB 3573: Add unverifiability warning for StructLayout: ICE when you set Explicit struct layout but don't provide offsets for each field
-//Uses of this construct may result in the generation of unverifiable \.NET IL code\. This warning can be disabled using '--nowarn:9' or '#nowarn "9"'
+
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_InvalidSignature02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_InvalidSignature02.fs
index fee3d25c56f..15d9f361dc3 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_InvalidSignature02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_InvalidSignature02.fs
@@ -4,7 +4,7 @@
// Verify error when signature for the [] doesn't
// match expected.
-//
+
[]
let main (args : string[]) =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_invalidsignature001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_invalidsignature001.fs
index 38a2ef43d67..bda3e297737 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_invalidsignature001.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_invalidsignature001.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:1793
// Explicit program entry point: []
// Function does not have type string [] -> unit
-//
+
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_oninvalidlanguageelement001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_oninvalidlanguageelement001.fs
index 549cd958bce..8a478ee193f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_oninvalidlanguageelement001.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_oninvalidlanguageelement001.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:1304 - FSHARP1.0:3783
// Explicit program entry point: []
// attribute on invalid language element (error)
-//This attribute is not valid for use on this language element
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoattributesonsamefunction001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoattributesonsamefunction001.fs
index f547d7d8edc..fd41f0135fa 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoattributesonsamefunction001.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoattributesonsamefunction001.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:1793
// Explicit program entry point: []
// Two attributes same function (compile with --all-warnings-as-errors to make sure we are totally silent)
-//The attribute type 'EntryPointAttribute' has 'AllowMultiple=false'\. Multiple instances of this attribute cannot be attached to a single language element\.$
+
module M =
let func (args : string[]) =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoentrypoints001.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoentrypoints001.fs
index 16782ef96c8..aaad0c1779a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoentrypoints001.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twoentrypoints001.fs
@@ -3,7 +3,7 @@
// Explicit program entry point: []
// attribute on multiple functions
//Hello
-//A function labeled with the 'EntryPointAttribute' attribute must be the last declaration in the last file in the compilation sequence.
+
#light
module M =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002b.fs
index 8c55724c09d..3e0a986f4f4 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002b.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/E_twofiles_002b.fs
@@ -3,7 +3,7 @@
// Explicit program entry point: []
// Attribute is last declaration on first file
//Hello
-//A function labeled with the 'EntryPointAttribute' attribute must be the last declaration in the last file in the compilation sequence.
+
module TestModule
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs
index 886bea8bee9..5f0ecb0aa25 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointInLastModuleInsideMultipleNamespace.fs
@@ -2,7 +2,7 @@
// Empty program entry point warning
// Lack of entry point produces warning with correct source location when compiled to *.exe
// when multiple namespaces with multiple modules declared in source file
-//Main module of program is empty: nothing will happen when it is run
+
#light
namespace MyNamespace1
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointModuleInNamespace.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointModuleInNamespace.fs
index ceaaceef2d3..1583ae0a70c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointModuleInNamespace.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointModuleInNamespace.fs
@@ -2,7 +2,7 @@
// Empty program entry point warning
// Lack of entry point produces warning with correct source location when compiled to *.exe
// when single module declared inside namespace
-//Main module of program is empty: nothing will happen when it is run
+
#light
namespace MyNamespace1
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointMultipleModules.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointMultipleModules.fs
index f9f22900900..fdcb24fb866 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointMultipleModules.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointMultipleModules.fs
@@ -2,7 +2,7 @@
// Empty program entry point warning
// Lack of entry point produces warning with correct source location when compiled to *.exe
// when multiple modules declared without declaring namespace
-//Main module of program is empty: nothing will happen when it is run
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointTypeInNamespace.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointTypeInNamespace.fs
index d83961f2101..2be0ddb9d36 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointTypeInNamespace.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/EntryPoint/W_NoEntryPointTypeInNamespace.fs
@@ -2,7 +2,7 @@
// Empty program entry point warning
// Lack of entry point produces warning with correct source location when compiled to *.exe
// when source file declares type inside namespace
-//Main module of program is empty: nothing will happen when it is run
+
#light
namespace MyNamespace1
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx
index 9708c1cb070..1ed53c64260 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_Abbreviation_NonMatchingObjConstructor.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Exception type - incorrect abbreviation
-//Abbreviations for Common IL exception types must have a matching object constructor
+
// F# exception definition + abbreviation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_AssertionFailureExn.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_AssertionFailureExn.fs
index f3453252c3b..de4c8c08253 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_AssertionFailureExn.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_AssertionFailureExn.fs
@@ -2,7 +2,7 @@
// Regression test for FSharp1.0:3583 - Remove AssertionFailureException
-//The type 'AssertionFailureException' is not defined
+
let foo =
try
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase01.fsx
index 3f70d6fdb7b..11406618e0b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase01.fsx
@@ -1,8 +1,8 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Exception types
// Exception labels must begin with an uppercase letter
-//Discriminated union cases and exception labels must be uppercase identifiers
-//Discriminated union cases and exception labels must be uppercase identifiers
+
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase02.fsx
index 3b9ba374668..58a6138795d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase02.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase02.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Exception types
// Exception labels must begin with an uppercase letter
-//Unexpected integer literal in exception definition\. Expected identifier or other token
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase03.fsx
index b645e15ab48..f58b7d66d78 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase03.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase03.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Exception types
// Exception labels must begin with an uppercase letter
-//Unexpected string literal in exception definition\. Expected identifier or other token
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase04.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase04.fsx
index 2fd0f621f9c..15a4f7ea114 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase04.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_BeginWithUppercase04.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Exception types
// Exception labels must begin with an uppercase letter
-//Unexpected reserved keyword in exception definition\. Expected identifier or other token
+
#light
exception ``null
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx
index 7e8ad2eabd8..468d44a4efc 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnAsDiscriminatedUnion01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Exception definition define new discriminated union cases
// Verify that we cannot use "sig-spec" when defining an exception
-//Unexpected symbol ':' in implementation file
+
#light
// This is the corresponding case for DU (deprecated, but ok)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs
index 640fc4a532b..fc6d75ea9c0 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnConstructorBadFieldName.fs
@@ -1,7 +1,7 @@
// #Conformance #TypesAndModules #Exceptions
// Make sure we properly detect bogus named field in constructors
-//The exception 'AAA' does not have a field named 'V3'\.
-//The exception 'AAA' does not have a field named 'V3'\.
+
+
exception AAA of V1 : int * V2 : string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnFieldConflictingName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnFieldConflictingName.fs
index d6921cd1b85..5e445f9e573 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnFieldConflictingName.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_ExnFieldConflictingName.fs
@@ -1,7 +1,7 @@
// #Conformance #TypesAndModules #Exception
// Make sure we properly detect field naming collisions
-//Named field 'Data1' conflicts with autogenerated name for anonymous field\.
-//Named field 'A' is used more than once\.
+
+
exception AAA of Data1 : int * string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldMemberClash.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldMemberClash.fs
index 4d15d8bcc8c..0c1f7a3f959 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldMemberClash.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldMemberClash.fs
@@ -1,8 +1,8 @@
// #Conformance #TypesAndModules #Exception
// Make sure we properly detect when field names collide with member names
-//The member 'Data0' cannot be defined because the name 'Data0' clashes with the field 'Data0' in this type or module
-//The member 'Data1' cannot be defined because the name 'Data1' clashes with the field 'Data1' in this type or module
-//The member 'V3' cannot be defined because the name 'V3' clashes with the field 'V3' in this type or module
+
+
+
exception AAA of int * string * V3 : float
with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldNameUsedMulti.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldNameUsedMulti.fs
index 312e8ae4637..dff3b979fdf 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldNameUsedMulti.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_FieldNameUsedMulti.fs
@@ -1,7 +1,7 @@
// #Conformance #TypesAndModules #Exceptions
// Make sure we properly detect field names specified multiple times
-//Union case/exception field 'V1' cannot be used more than once\.
-//Union case/exception field 'V2' cannot be used more than once\.
+
+
exception AAA of V1 : int * V2 : string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx
index ad37e1f9e8b..6a90bf8ba2f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_GeneratedTypeNameClash02.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// An exception definition generates a type with name idException
// In this case we check and see what happens when such a type already exist
-//Duplicate definition of type, exception or module 'EException'
+
type EException = | E
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_InheritException.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_InheritException.fs
index da42f8f0e3f..02b9d43e703 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_InheritException.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_InheritException.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Verify error when trying to inherit from F# exception types
-//Cannot inherit a sealed type
-//No constructors are available for the type 'FSharpExn'
+
+
exception FSharpExn of int * string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MustStartWithCap01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MustStartWithCap01.fs
index 11495602e4f..22473a3a2e7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MustStartWithCap01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExceptionDefinitions/E_MustStartWithCap01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Exceptions
// Verify error if you try to start an exception definition with a lower case letter
// Regression test for FSHARP1.0:2817
-//Discriminated union cases and exception labels must be uppercase identifiers
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/ExplicitObjectConstructors.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
index 18af78f58c4..e61dacdbc26 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/ExplicitObjectConstructors.fs
@@ -18,7 +18,7 @@ module ExplicitObjectConstructors =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - Conformance/ClassTypes/ExplicitObjectConstructors)
- //Message2
+
[]
let ``WithAttribute01_fs`` compilation =
compilation
@@ -31,7 +31,7 @@ module ExplicitObjectConstructors =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - Conformance/ClassTypes/ExplicitObjectConstructors)
- //Message1
+
[]
let ``WithAttribute02_fs`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute01.fs
index 18e93d2a9e0..63f76a63d48 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute01.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #ObjectOrientedTypes #Classes #ObjectConstructors
// Regression test for FSHARP1.0:4212
// Attribute is placed on both the explicit and the implicit constructors
-//Message2
-//Message3
-//Message2
+
+
+
module M
// explicit syntax
type Foo [] (x:int) =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute02.fs
index 84e02e9947f..74542e14b75 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ExplicitObjectConstructors/WithAttribute02.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #ObjectOrientedTypes #Classes #ObjectConstructors
// Regression test for FSHARP1.0:4212
// Attribute is placed on the explicit constructor only
-//Message1
+
module M
// explicit syntax
type Foo (x:int) =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/ImplicitObjectConstructors.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
index 168451ca348..3e4eebe7de1 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/ImplicitObjectConstructors.fs
@@ -9,7 +9,7 @@ open FSharp.Test.Compiler
module ImplicitObjectConstructors =
// This test was automatically generated (moved from FSharpQA suite - Conformance/ClassTypes/ImplicitObjectConstructors)
- //Message1
+
[]
let ``WithAttribute_fs`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/WithAttribute.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/WithAttribute.fs
index 3728618ecf0..6cf6470bc46 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/WithAttribute.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImplicitObjectConstructors/WithAttribute.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #ObjectOrientedTypes #Classes #ObjectConstructors
// Regression test for FSHARP1.0:4212
-//Message1
+
module M
// implicit syntax
type Foo1 [] () =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenUnknownNS.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenUnknownNS.fs
index dfffde1803d..0918c893f04 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenUnknownNS.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/E_OpenUnknownNS.fs
@@ -2,7 +2,7 @@
#light
// Verify error when opening an unknown module or namespace
-//The namespace or module 'SomeUnknownNamespace' is not defined
+
open SomeUnknownNamespace.SomeUnknownModule
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs
index bf590bdc800..af215b3d668 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/W_OpenUnqualifiedNamespace01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #Import
// Verify warning when opening a non-fully qualified namespace
-//This declaration opens the namespace or module 'System\.Collections\.Generic' through a partially qualified path\. Adjust this code to use the full path of the namespace\. This change will make your code more robust as new constructs are added to the F# and CLI libraries\.$
-//This declaration opens the namespace or module 'System\.Collections\.Generic' through a partially qualified path\. Adjust this code to use the full path of the namespace\. This change will make your code more robust as new constructs are added to the F# and CLI libraries\.$
+
+
open System.Collections
open Generic
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AttributesOnLet01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AttributesOnLet01.fs
index 378d694328c..c7dfe001b95 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AttributesOnLet01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_AttributesOnLet01.fs
@@ -4,10 +4,10 @@
// Regression test for FSharp1.0:3744 - Unable to apply attributes on individual patterns in a tupled pattern match let binding - Implementation doesn't match spec
// Test against error emitted when attributes applied within pattern
-//Attributes are not allowed within patterns
-//This attribute is not valid for use on this language element
-//Attributes are not allowed within patterns
-//This attribute is not valid for use on this language element
+
+
+
+
open System
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsForInlineValue.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsForInlineValue.fs
index 41905b59974..4d6507bb674 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsForInlineValue.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_ErrorsForInlineValue.fs
@@ -3,8 +3,8 @@
// Regression test for FSharp1.0:4165
// Sweep all deprecation warnings and change to errors where reasonable [WAS: Inline values should be an error, not a warning]
-//Only functions may be marked 'inline'
-//Only functions may be marked 'inline'
+
+
let inline inc = (+) 1;;
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs
index 44bb3497817..b116b7c63ac 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_GenericTypeAnnotations01.fs
@@ -2,6 +2,6 @@
#light
// Regression test for FSharp1.0:1943 - Better error message when unknown unicode characters are used - in particular the � character
-//Unexpected reserved keyword in pattern
+
let foo(x : `a) = ([] : `a list)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological01.fs
index 63d4b876ce5..d52bad34237 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #LetBindings
// Interesting pathological tests
// The code is odd. It used to parse, but not it is an error. See FSHARP1.0:4980, test since updated for triple quoted string support
-//End of file in triple-quote string begun at or before here
+
let f _ _ _ _ _ _ _ _ _ _ = ()
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological03.fs
index 4e80d65f54b..42555f70332 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological03.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #LetBindings
// Interesting pathological tests
// The code is odd. It used to parse, but not it is an error. See FSHARP1.0:4980, test since updated for triple quoted string support
-//End of file in string begun at or before here
+
let f _ _ _ _ _ _ _ _ _ _ = ()
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological05.fs
index 7bce94da4c0..7b796ab9b79 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological05.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological05.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #LetBindings
// Interesting pathological tests
// The code is odd. It used to parse, but not it is an error. See FSHARP1.0:4980, since updated for triple quoted string support
-//End of file in verbatim string begun at or before here
+
let f _ _ _ _ _ _ _ _ _ _ = ()
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological06.fs
index 8d5016ddfb7..24252b70ba2 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological06.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/E_Pathological06.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #LetBindings
// Interesting pathological tests
// The code is odd. It used to parse, but not it is an error. See FSHARP1.0:4980, since updated for triple quote strings
-//End of file in triple-quote string begun at or before here
+
let f _ _ _ _ _ _ _ _ _ _ = ()
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs
index 9e6b0df342b..2d530b5d860 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/Basic/W_DoBindingsNotUnit01.fs
@@ -2,7 +2,7 @@
#light
// Verify warning when 'do-bindings' do not return unit.
-//The result of this expression has type 'int' and is implicitly ignored
+
let square x = x * x
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs
index f39af26eb9c..7f5d7476b76 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/ExplicitTypeParameters/W_TypeParamsWhenNotNeeded.fs
@@ -2,7 +2,7 @@
// Verify warning when providing explicit type parameters when
// the function is defined without them.
-//The method or function 'f' should not be given explicit type argument\(s\) because it does not declare its type parameters explicitly
+
let f x y = (x, y)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs
index 43057b3833a..4552d859aaf 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_NoTypeFuncsInTypes.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #LetBindings #TypeTests
// Verify error associated with putting type functions inside types
-//A property cannot have explicit type parameters\. Consider using a method instead\.$
+
type Foo() =
member this.TypeFunc<'a> = typeof<'a>.Name
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs
index ab442fc8a9b..1aa85f5cead 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_measure_01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #LetBindings #TypeTests
// Regression test for FSHARP1.0:2320
// A is a measure
-//Expected type, not unit-of-measure
+
#light
[]
type A
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs
index 61684c8730e..b1b1f9fa23d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/E_typeof_undefined_01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #LetBindings #TypeTests
// Regression test for FSHARP1.0:2320
// A is an not defined
-//This type requires a definition
+
#light
type A
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/TypeFunctions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/TypeFunctions.fs
index 66e2276a0be..ff84500f9e5 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/TypeFunctions.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/LetBindings/TypeFunctions/TypeFunctions.fs
@@ -36,7 +36,7 @@ module LetBindings_TypeFunctions =
|> verifyCompileAndRun
|> shouldSucceed
- //Expected type, not unit-of-measure
+
[]
let ``E_typeof_measure_01_fs`` compilation =
compilation
@@ -58,7 +58,7 @@ module LetBindings_TypeFunctions =
(Error 671, Line 6, Col 12, Line 6, Col 29, "A property cannot have explicit type parameters. Consider using a method instead.")
]
- //This type requires a definition
+
[]
let ``E_typeof_undefined_01_fs`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcreteProp.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcreteProp.fs
index a457e1a67a6..7f6711b3230 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcreteProp.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractAndConcreteProp.fs
@@ -2,7 +2,7 @@
// Verify error when you have a property with both an abstract and concrete component
// Regression from FSB 4496
-//The property 'State' of type 'X' has a getter and a setter that do not match\. If one is abstract then the other must be as well\.$
+
[]
type X() =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs
index 10098a28a23..becb917dbdf 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties02.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:4160
// ICE when trying to compile code with abstract properties
// See also FSHARP1.0:3661 and 4981
-//The property 'A' of type 'T' has a getter and a setter that do not match\. If one is abstract then the other must be as well
+
type T =
abstract A : int
override x.A with get() = 1
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs
index 1cbafc417d6..71821325974 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_AbstractProperties03.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// Regression test for FSHARP1.0:4265 - Disallow an abstract setter with concrete getter
-//The property 'State' of type 'X' has a getter and a setter that do not match\. If one is abstract then the other must be as well
+
// See also FSHARP1.0:3661 and 4981
[]
type X() =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs
index 1d6e4fe347a..a101431ae35 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DeclarePropertyTwice01.fs
@@ -2,7 +2,7 @@
#light
// Verify error if you declare a setter twice
-//Duplicate definition of value 'Vector.set_Length.2'
+
type Vector3 =
| Vector3 of float * float * float
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs
index 1aac4f9aea9..1c5fb053dcc 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_DuplicateProperty01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// Regression test for FSHARP1.0:2435 (ICE on duplicate property definitions.)
// See also bug FSHARP1.0:4925 (this test will have to be updated once that bug is resolved)
-//Duplicate method\. The method 'get_Property001' has the same name and signature as another method in type 'NM.ClassMembers'
+
module NM =
type ClassMembers () =
let mutable adjustableInstanceValue = "3"
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs
index 2312290d362..fc9b29c1f83 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch01.fs
@@ -1,10 +1,10 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// Regression test for FSHARP1.0:1407 (Poor error message when arguments do not match signature of overloaded operator. Also incorrect span.)
-//This expression was expected to have type. ''a\[,\]' .but here has type. 'int\[\]'
-//This expression was expected to have type. ''a\[\]' .but here has type. 'int\[,\]'
-//This expression was expected to have type. ''a\[\]' .but here has type. 'int\[,,\]'
-//This expression was expected to have type. ''a\[\]' .but here has type. 'int\[,,,\]'
+
+
+
+
let foo (arr : int[,]) = arr.[1,2] // ok
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs
index 5370f0c7c7e..6c23f7f2e7a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerArityMismatch02.fs
@@ -1,10 +1,10 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// Regression test for FSHARP1.0:1407 (Poor error message when arguments do not match signature of overloaded operator. Also incorrect span.)
-//This expression was expected to have type. ''a\[,,\]' .but here has type. 'int\[\]'
-//This expression was expected to have type. ''a\[\]' .but here has type. 'int\[,\]'
-//This expression was expected to have type. ''a\[,,\]' .but here has type. 'int\[,,,\]'
-//This expression was expected to have type. ''a\[,\]' .but here has type. 'int\[,,,]'
+
+
+
+
let foo (arr : int[,]) = arr.[1,2] // ok
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs
index 07cfb3f2b06..e1a86f1fbd1 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_IndexerNotSpecified01.fs
@@ -2,7 +2,7 @@
#light
// Verify error if the type doesn't support an indexer
-//The type 'Foo' does not define the field, constructor or member 'Item'
+
type Foo(x : int) =
member this.Value = x
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs
index 86f514853e8..5215e303134 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_OutscopeThisPtr01.fs
@@ -2,7 +2,7 @@
#light
// Regression test for FSHARP1.0:579
// Verify the ability to outscope the this pointer: it's an error!
-//'this' is bound twice in this pattern
+
type Foo() =
member this.Square this = this * this
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs
index 06e13920ce3..fec44ef0402 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties02.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// Setter declared using curried syntax
// Expected: invalid declaration syntax
-//Invalid declaration syntax
+
let mutable globalPt : obj = null
type Pt =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs
index ecdcee92919..754458273c2 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_Properties06.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:4163
// Setter with no arguments (curried or uncurried?)
// Used to crash the compiler!
-//This expression was expected to have type. 'unit' .but here has type. 'int'
+
//See FSHARP1.0:5456
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs
index 227d6997e3f..463c10e84a7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// Verify property setters must have type unit
-//This expression was expected to have type
+
type immut =
{
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs
index 3b2ca082bf2..109e40167bd 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// Verify error message when property setter doesn't return unit.
-//This expression was expected to have type.*'unit'.*but here has type.*'string'
+
type Foo() =
let mutable m_value = 0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs
index 86548d853a0..ab651a9cb18 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/E_UndefinedThisVariable02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties
// FSB 1007, internal error tripped by property member without this
-//This instance member needs a parameter to represent the object being invoked
+
type DUType =
| A
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs
index e1bd09871b8..d98346d3608 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MisspeltParam01.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #NamedArguments
// Verify error when you misspell named parameters
-//No accessible member or object constructor named 'ProcessStartInfo' takes 0 arguments\. The named argument 'Argument' doesn't correspond to any argument or settable return property for any overload
+
let _ = new System.Diagnostics.ProcessStartInfo(FileName = "test", Argument = "testarg")
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs
index 99f3726f1cf..eb801ce5e80 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_MustBePrefix.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #NamedArguments
// Verify warning when named arguments do not form _prefix_ of unnamed arguments.
-//This construct is deprecated: The unnamed arguments do not form a prefix of the arguments of the method called
+
type IFoo = interface
abstract NamedMeth1 : arg1:int * arg2:int * arg3:int * arg4:int-> unit
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs
index db6d3c7019b..d0a01f375b6 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NonNamedAfterNamed.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #NamedArguments
#light
-//Named arguments must appear after all other arguments
+
type Foo =
static member DoStuff (a:int, b:int, c:int, d:int, e:int) = a + b + c + d + e
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs
index 62e9d270297..aaf831ae650 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_NumParamMismatch01.fs
@@ -1,8 +1,8 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #NamedArguments
// FSB 1433, Count of supplied parameters incorrect in error message if named parameters are used.
-//Accessibility modifiers are not permitted on overrides or interface implementations
-//The member or object constructor 'NamedMeth1' requires 1 additional argument\(s\)\. The required signature is 'abstract IFoo\.NamedMeth1: arg1: int \* arg2: int \* arg3: int \* arg4: int -> float'
-//The member or object constructor 'NamedMeth1' requires 4 argument\(s\) but is here given 2 unnamed and 3 named argument\(s\)\. The required signature is 'abstract IFoo\.NamedMeth1: arg1: int \* arg2: int \* arg3: int \* arg4: int -> float'
+
+
+
type IFoo = interface
abstract NamedMeth1 : arg1:int * arg2:int * arg3:int * arg4:int-> float
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs
index 9b6757172ae..816881967bc 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/E_SyntaxErrors01.fs
@@ -1,8 +1,8 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #NamedArguments
// FSB 1430, Compiler spits out duplicate errors when given bogus syntax for named arguments
-//The value or constructor 'arg1' is not defined
-//The value or constructor 'arg2' is not defined
-//This value is not a function and cannot be applied
+
+
+
type Foo() = class
member this.Stuff : arg1:int * arg2:int = arg1 + arg2
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs
index 11cb8d88671..97c7ce2fa8a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_OptionalNamedArgs.fs
@@ -1,5 +1,5 @@
// #435263: compiler crash with .net optional parameters and F# optional syntax
-//This expression was expected to have type
+
// 'string option'
//but here has type
// 'string'
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs
index f23ee18581b..284b3a63a2a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #OptionalArguments
// Regression for FSHARP1.0: 6040
-//Optional arguments must come at the end of the argument list, after any non-optional arguments
+
module M
type Foo =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs
index 02107aa4c61..6106f83070b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalArguments/E_SanityCheck02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #OptionalArguments
// Regression for FSHARP1.0: 6040
-//Optional arguments must come at the end of the argument list, after any non-optional arguments
+
module M
type Foo =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs
index 9d3909fa926..52ef42e5a09 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/E_OnlyDefault.fs
@@ -1,6 +1,6 @@
// #Conformance #DeclarationElements #MemberDefinitions #OptionalDefaultParameterValueArguments
-//This expression was expected to have type
+
// 'int'
//but here has type
// 'unit'
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs
index e0068e6ec8e..89b002a9238 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OptionalDefaultParamArgs/W_WrongDefaultType.fs
@@ -1,6 +1,6 @@
// #Conformance #DeclarationElements #MemberDefinitions #OptionalDefaultParameterValueArguments
-//The default value does not have the same type as the argument.
+
//The DefaultParameterValue attribute and any Optional attribute will be ignored.
//Note: 'null' needs to be annotated with the correct type, e.g. 'DefaultParameterValue(null:obj)'.
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs
index 01aca130648..2a4f637f2ab 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadCurriedFunc.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #Overloading
// Verify error when overloading a curried function
-//One or more of the overloads of this method has curried arguments. Consider redesigning these members to take arguments in tupled form
+
type C =
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs
index 475883baf66..1a1efc83992 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_OverloadMismatch.fs
@@ -1,4 +1,4 @@
-//No implementation was given for
+
open System
open System.IO
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs
index 02a14e40203..789bb742ece 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_ReturnGenericUnit01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #Overloading
// Verify error message when returning a 'a which is of type unit
-//The member 'M: unit -> unit' does not have the correct type to override the corresponding abstract method
+
[]
type 'a ``base`` =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs
index 597dd6040b9..f1c1529da1c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/OverloadingMembers/E_UnsolvableConstraints01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #DeclarationElements #MemberDefinitions #Overloading
// Regression for FSHARP1.0:6164
-//Type inference problem too complicated \(maximum iteration depth reached\)\. Consider adding further type annotations\.
+
type 'a D =
static member inline (+)(_:^b D, _:^b) : ^b when ^b : (static member (+) : ^b * ^b -> ^b) = failwith "Not implemented"
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs
index 2dfe4aca08f..330cb151922 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_AbbreviationOnNamespace01.fs
@@ -1,10 +1,10 @@
// #Regression #Conformance #DeclarationElements #Modules
// This used to be a positive test. Now it is not.
-//The path 'System\.IO' is a namespace. A module abbreviation may not abbreviate a namespace\.
-//The value, namespace, type or module 'IO' is not defined.
-//The path 'System\.Text\.RegularExpressions' is a namespace. A module abbreviation may not abbreviate a namespace\.
-//The namespace or module 'rx' is not defined
-//Lookup on object of indeterminate type based on information prior to this program point\..+
+
+
+
+
+
// Test 1 --------------------------
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs
index 3e66981a8b4..31d6688f320 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_InvalidAbbrevName02.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #DeclarationElements #Modules
// Verify error when using a dot in the name
-//A module abbreviation must be a simple name, not a path
+
module MS.FS.Co.L = Microsoft.FSharp.Collections.List
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_NameConflict01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_NameConflict01.fs
index 614d807092c..8a37336d05f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_NameConflict01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleAbbreviations/E_NameConflict01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #DeclarationElements #Modules
#light
-//The field, constructor or member 'sum' is not defined
+
// Define a function
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen02.fs
index 4d4c1c60109..357612a9bf0 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/AutoOpen02.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Modules
#light
-//The value or constructor 'x' is not defined
+
module A =
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix01.fsx
index fcfb6a9f140..0f12338ad6a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Modules
// Clashing module names and use of CompilationRepresentation attribute
// This is regression test for FSHARP1.0:3749
-//Duplicate definition of type or module 'module'
+
namespace N
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx
index a71a352b0c8..a0d88f88e14 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleSuffix_NameClash01.fsx
@@ -2,7 +2,7 @@
// Decorating a module with the CompilationRepresentation
// will append 'Module' to the module name.
// This code won't compile since there's a name clash ('mModule')
-//Duplicate definition of type, exception or module 'mModule'
+
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithExpression02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithExpression02.fs
index b9b86abfbdb..18e89713381 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithExpression02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithExpression02.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Modules
// Regression test for FSHARP1.0:2644 (a module may start with an expression)
// This is unfortunate, but this is the current behavior for this release.
-//The namespace 'DateTime' is not defined
+
#light
module M2 =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx
index 57aaa4248f7..c633864466c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace01.fsx
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules #Modules
// Can't have 2 modules with the same name in the same namespace
-//Duplicate definition of type, exception or module 'module'
+
namespace N
module ``module`` =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx
index 87fea6ed057..e1e0661c725 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ModuleWithSameNameInNamespace02a.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Modules
// Can't have 2 modules with the same name in the same namespace
// Compile with the corresponding 02b.fsx file
-//Two modules named 'N\.module' occur in two parts of this assembly
+
namespace N
module ``module`` =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs
index 156ea6b0a1c..e6217efea91 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/E_ObsoleteAttribOnModules01.fs
@@ -1,10 +1,10 @@
// #Regression #Conformance #TypesAndModules #Modules
#light
// Regression test for: FSharp1.0:2030 - We should honor System.Obsolete on modules
-//This construct is deprecated\. Don't use this module\.
-//This construct is deprecated\. Don't use this module\.
-//This construct is deprecated\. Don't use this module\.
-//This construct is deprecated\. Don't use this nested module\.
+
+
+
+
[]
module ObsoleteModule =
module NestedModule =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs
index fb902632d30..cacd7409943 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_ModuleAbbreviationWithNamespace01.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:2644 (a module may start with an expression)
// Module abbreviation: Trying to abbreviate a namespace is deprecated
// See also FSHARP1.0:2848
-//The path 'Microsoft\.FSharp\.Core' is a namespace\. A module abbreviation may not abbreviate a namespace\.
+
// Module abbreviations
module M2 =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_Production_OCamlCompat.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_Production_OCamlCompat.fsx
index 1375ef3619b..1665d43135c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_Production_OCamlCompat.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ModuleDefinitions/W_Production_OCamlCompat.fsx
@@ -1,13 +1,13 @@
// #Regression #Conformance #TypesAndModules #Modules
// Productions
// Compile without: --mlcompatibility
-//This construct is for ML compatibility\. The syntax 'module \.\.\. = struct \.\. end' is not used in F# code\. Consider using 'module \.\.\. = begin \.\. end'
-//This construct is for ML compatibility\. The syntax 'module \.\.\. = struct \.\. end' is not used in F# code\. Consider using 'module \.\.\. = begin \.\. end'
-//This construct is for ML compatibility\. The syntax 'module \.\.\. = struct \.\. end' is not used in F# code\. Consider using 'module \.\.\. = begin \.\. end'
-//This construct is for ML compatibility\. The syntax 'module \.\.\. = struct \.\. end' is not used in F# code\. Consider using 'module \.\.\. = begin \.\. end'
-//This construct is for ML compatibility\. The syntax 'module \.\.\. = struct \.\. end' is not used in F# code\. Consider using 'module \.\.\. = begin \.\. end'
-//This construct is for ML compatibility\. The syntax 'module \.\.\. = struct \.\. end' is not used in F# code\. Consider using 'module \.\.\. = begin \.\. end'
-//This construct is for ML compatibility\. The syntax 'module \.\.\. = struct \.\. end' is not used in F# code\. Consider using 'module \.\.\. = begin \.\. end'
+
+
+
+
+
+
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/E_NullInvalidForFSTypes01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/E_NullInvalidForFSTypes01.fs
index bb7b27c36a8..38ab92b0dae 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/E_NullInvalidForFSTypes01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/NullRepresentations/E_NullInvalidForFSTypes01.fs
@@ -3,9 +3,9 @@
// Verify that 'null' is not a valid value for F# types
-//The type 'int list' does not have 'null' as a proper value
-//The type 'DU' does not have 'null' as a proper value
-//The type 'RecType' does not have 'null' as a proper value
+
+
+
type RecType = {RTag1 : int * string; RTag2 : int list option}
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/E_BasicOperatorNames01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/E_BasicOperatorNames01.fs
index 7d4d9c37184..ab23c121a29 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/E_BasicOperatorNames01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/OperatorNames/E_BasicOperatorNames01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #BasicGrammarElements #Operators
-//This construct is deprecated: '\$' is not permitted as a character in operator names and is reserved for future use
-//This construct is deprecated: '\$' is not permitted as a character in operator names and is reserved for future use
+
+
module TestModule
// Const
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/E_ExclamationMark01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/E_ExclamationMark01.fs
index bb7c03a4ce9..71d48009eb7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/E_ExclamationMark01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/PrecedenceAndOperators/E_ExclamationMark01.fs
@@ -3,8 +3,8 @@
// Prefix only operators: !OP, ?OP, ~OP
// Try to use !OP as an infix-op is an error
// ?OP ~OP
-//This value is not a function and cannot be applied
-//This value is not a function and cannot be applied
+
+
module M
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx
index 43d41f1f156..94105d29da7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeAlreadyUsed01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Type abbreviation
// Abbreviated type already used (redefined)
-//Duplicate definition of type, exception or module 'T'
+
#light
type T = Microsoft.FSharp.Math.BigInt
type T = Microsoft.FSharp.Math.BigNum // error!
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx
index 3f566223ea7..1169f31af29 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_AbbreviatedTypeDoesNotExist01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Type abbreviation
// Type tp abbreviate a type that does not exist
-//The namespace or module 'X' is not defined
+
#light
type Z = X.Y.Z.W // error
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx
index a1955725f2b..1c64fc0dff2 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Constraints_SampleFromSpec02.fsx
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules
// Abbreviation: the constraints on the right-hand-side are not sufficient
-//A type parameter is missing a constraint 'when 'b :> IB'
+
#light
type IA =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_DroppedTypeVariable01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_DroppedTypeVariable01.fsx
index 9483daffd63..6f4f65b4de6 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_DroppedTypeVariable01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_DroppedTypeVariable01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Abbreviation: it is not allowed to drop variable types
// Regression test for FSHARP1.0:3740
-//This construct is deprecated: This type abbreviation has one or more declared type parameters that do not appear in the type being abbreviated\. Type abbreviations must use all declared type parameters in the type being abbreviated\. Consider removing one or more type parameters, or use a concrete type definition that wraps an underlying type, such as 'type C<'a> = C of \.\.\.'\.
+
type Drop<'a,'b> = 'a * 'a
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleType01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleType01.fsx
index a1138a2ea8b..6ad4f724f43 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleType01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleType01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Incorrect right hand side: flexible type.
// See also FSHARP1.0:4957
-//Unexpected infix operator in implementation file
+
/
exception E of int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi
index d8a543dc610..d8f91e0aaf7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsi
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Type abbreviation - flexible type in signature
// Regression test for FSHARP1.0:3742
-//Anonymous type variables are not permitted in this declaration
+
module E_FlexibleTypeInSignature01
type C = class
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx
index 688d9c5c860..54eba504310 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_FlexibleTypeInSignature01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Type abbreviation - flexible type in signature
// Regression test for FSHARP1.0:3742
-//AAA
+
module E_FlexibleTypeInSignature01
type C = class
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx
index 45ebc17af0e..4201327517b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Hash.fsx
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules
// Incorrect right hand side: hash
-//Incomplete structured construct at or before this point in type definition
+
type BadType = #
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx
index b89c2c6a4bc..72795a72372 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Keyword.fsx
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules
// Incorrect right hand side: quotation
-//Unexpected keyword 'of' in type definition
+
#light
type BadType = of int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx
index 8bc50d1db19..8c219138a84 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_IncorrectRightSide_Quotation.fsx
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules
// Incorrect right hand side: quotation
-//Unexpected start of quotation in type definition$
+
#light
type BadType = <@ @> // -> int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation01.fs
index 4a672cbb502..1175c587b16 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Verify error if creating a type abbreviation which results in an infinite type expression.
-//This type definition involves an immediate cyclic reference through an abbreviation
-//This expression was expected to have type 'X' but here has type ''a option'
+
+
type X = option
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation02.fs
index 978257133a9..09a7e1ed103 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InfiniteAbbreviation02.fs
@@ -2,7 +2,7 @@
#light
// Verify error if creating a type abbreviation which results in an infinite type expression.
-//This type definition involves an immediate cyclic reference through an abbreviation
+
type Y = Y * Y
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InheritTypeAbbrev.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InheritTypeAbbrev.fs
index 71be3ebf46c..6a5fdb842de 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InheritTypeAbbrev.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_InheritTypeAbbrev.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules
// Verify error when trying to inherit from type abbreviations.
-//Cannot inherit a sealed type
+
type Type1 = A | B
type Type2 = Type1 * int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs
index 7f86c4be06a..73b1ac81118 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_PrivateTypeAbbreviation02.fs
@@ -2,7 +2,7 @@
// Regression test for FSharp1.0:5229
// Title: Allow private type abbreviations
-//The type 'X' is not accessible from this code location
+
module M =
type private X = int * int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive01.fsx
index dc406569cd6..aaeda5532eb 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive01.fsx
@@ -2,7 +2,7 @@
// Type abbreviation
// Recursive definition: using measures
// This is regression test for FSHARP1.0:3784
-//This type definition involves an immediate cyclic reference through an abbreviation
+
#light
[] type Kg = Kg // cyclic
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive02.fsx
index 4efc81b7080..b9f338a73a0 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive02.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive02.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Type abbreviation
// Recursive definition: using list of...
-//This type definition involves an immediate cyclic reference through an abbreviation
+
#light
type X = X list // cyclic
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive03.fsx
index cb02de00e0c..051a36ee390 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive03.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_Recursive03.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules
// Type abbreviation
// Recursive definition: using generic type
-//This type definition involves an immediate cyclic reference through an abbreviation
+
#light
type Y<'a> = Y<'a>
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs
index 65a9bbecca1..d5b609d17f3 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/TypeAbbreviations/E_UnexpectedCharInTypeName01.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #TypesAndModules
// Regression test for FSHARP1.0:2431
-//Unexpected character '.+'
+
type = int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/E_NotMemberOrFunction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/E_NotMemberOrFunction01.fsx
index 5cb7755a083..4e59ead5ad3 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/E_NotMemberOrFunction01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ValueRestriction/E_NotMemberOrFunction01.fsx
@@ -1,6 +1,6 @@
// #Conformance #ObjectOrientedTypes #Classes #TypeInference #ValueRestriction
-//Value restriction: The value 'x1' has an inferred generic function type val x1: \('_a -> unit\)However, values cannot have generic type variables like '_a in "let f: '_a". You should define 'x1' as a function instead by doing one of the following:- Add an explicit parameter that is applied instead of using a partial application "let f param"- Add a unit parameter like "let f\(\)"- Write explicit type parameters like "let f<'a>"or if you do not intend for it to be generic, either:- Add an explicit type annotation like "let f : obj -> obj"- Apply arguments of non-generic types to the function value in later code for type inference like "do f\(\)"\.This error is because a let binding without parameters defines a value, not a function\. Values cannot be generic because reading a value is assumed to result in the same everywhere but generic type parameters may invalidate this assumption by enabling type-dependent results\.$
+
// We expect a value restriction here. The inferred signature is:
// val x1: (?1 -> unit)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/W_TypeInferforGenericType.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/W_TypeInferforGenericType.fs
index 1f11f19c1a6..bac193f6376 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/W_TypeInferforGenericType.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/BindingExpressions/W_TypeInferforGenericType.fs
@@ -5,6 +5,6 @@ namespace One
module One =
// Regression test for bug 4083: Extend "inferred type is less generic than the given type annotations" warning to cover cases where a user-authored 'b is constrained to be an 'a
- //This construct causes code to be less generic than indicated by the type annotations\. The type variable 'b has been constrained to be type ''a'
+
let f2 (x : 'a) (y : 'b) = x : 'b
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs
index 729bc351ab3..9f8b10bc05b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/PatternMatching.fs
@@ -9,7 +9,7 @@ open FSharp.Test.Compiler
module PatternMatching =
// This test was automatically generated (moved from FSharpQA suite - Conformance/Expressions/ControlFlowExpressions/PatternMatching)
- //'Some \(\(_,true\)\)'
+
[]
let ``W_PatternMatchingCounterExample01_fs`` compilation =
compilation
@@ -22,7 +22,7 @@ module PatternMatching =
]
// This test was automatically generated (moved from FSharpQA suite - Conformance/Expressions/ControlFlowExpressions/PatternMatching)
- //Incomplete pattern matches on this expression\. For example, the value '\[_;true\]' may indicate a case not covered by the pattern\(s\)
+
[]
let ``W_PatternMatchingCounterExample02_fs`` compilation =
compilation
@@ -35,7 +35,7 @@ module PatternMatching =
]
// This test was automatically generated (moved from FSharpQA suite - Conformance/Expressions/ControlFlowExpressions/PatternMatching)
- //Incomplete pattern matches on this expression
+
[]
let ``W_PatternMatchingCounterExample03_fs`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample01.fs
index 85e14dd2b4e..cf5e42308af 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #ControlFlow
// Regression test for FSHARP1.0:1986 (conter example in complex pattern matching)
-//'Some \(\(_,true\)\)'
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample02.fs
index e377c113fa6..1359030837b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #ControlFlow
// Regression test for FSHARP1.0:1986 (conter example in complex pattern matching)
-//Incomplete pattern matches on this expression\. For example, the value '\[_;true\]' may indicate a case not covered by the pattern\(s\)
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample03.fs
index 07bda7e9260..24a5f6a125d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching/W_PatternMatchingCounterExample03.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #ControlFlow
// Regression test for FSHARP1.0:1986 (counter example in complex pattern matching)
-//Incomplete pattern matches on this expression
+
let h = function
| [||] -> 0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs
index 1a991a53f63..478fcaebf2b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/SequenceIteration.fs
@@ -9,7 +9,7 @@ open FSharp.Test.Compiler
module SequenceIteration =
// This test was automatically generated (moved from FSharpQA suite - Conformance/Expressions/ControlFlowExpressions/SequenceIteration)
- //Incomplete pattern matches on this expression\. For example, the value 'None' may indicate a case not covered by the pattern\(s\)\.$
+
[]
let ``W_IncompleteMatchFor01_fs`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/W_IncompleteMatchFor01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/W_IncompleteMatchFor01.fs
index bea1c969a11..341002098fc 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/W_IncompleteMatchFor01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration/W_IncompleteMatchFor01.fs
@@ -1,12 +1,12 @@
// #Regression #Conformance #ControlFlow #Sequences
// Regression for FSHARP1.0:5733
// For expressions should warn when elements will be skipped just like computation expressions do
-//Incomplete pattern matches on this expression\. For example, the value 'None' may indicate a case not covered by the pattern\(s\)\. Unmatched elements will be ignored\.$
-//Incomplete pattern matches on this expression\. For example, the value 'None' may indicate a case not covered by the pattern\(s\)\. Unmatched elements will be ignored\.$
-//Incomplete pattern matches on this expression\. For example, the value 'Some \(0\)' may indicate a case not covered by the pattern\(s\)\. Unmatched elements will be ignored\.$
-//Incomplete pattern matches on this expression\. For example, the value '0' may indicate a case not covered by the pattern\(s\)\. Unmatched elements will be ignored\.$
-//Incomplete pattern matches on this expression\. For example, the value 'None' may indicate a case not covered by the pattern\(s\)\.$
-//Incomplete pattern matches on this expression\. For example, the value 'None' may indicate a case not covered by the pattern\(s\)\.$
+
+
+
+
+
+
for Some x in [Some 3; None] do
()
let s = [Some 3; None] :> seq<_>
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02.fs
index 4de91d2b113..0c557791d3f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02.fs
@@ -1,8 +1,8 @@
// #Regression #Conformance #TypeRelatedExpressions #TypeAnnotations
// Regression test for FSHARP1.0:2346
-//This expression was expected to have type. 'obj' .but here has type. 'int'
-//This expression was expected to have type. 'obj' .but here has type. 'string'
-//This expression was expected to have type. 'seq<'a>' .but here has type. ''b list'
+
+
+
(1 : obj)
("Hello" : obj)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02b.fs
index 49b034a71b6..ce96329a6e1 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02b.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/Type-relatedExpressions/E_rigidtypeannotation02b.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypeRelatedExpressions #TypeAnnotations
// Regression test for FSHARP1.0:2346
-//This expression was expected to have type. 'obj' .but here has type. 'float'
-//This expression was expected to have type. 'seq<'a>' .but here has type. ''b list'
+
+
[] type s
(1.0 : obj)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs
index 47f3a2893ce..f5dfa111e86 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityEquals01.fs
@@ -3,9 +3,9 @@
// Make sure F# compiler emits an error message when Record, Union, Struct types override default System.Object.Equals()
// without explicitly specifying CustomEquality attribute
-//The struct, record or union type 'R' has an explicit implementation of 'Object\.GetHashCode' or 'Object\.Equals'\. You must apply the 'CustomEquality' attribute to the type
-//The struct, record or union type 'U' has an explicit implementation of 'Object\.GetHashCode' or 'Object\.Equals'\. You must apply the 'CustomEquality' attribute to the type
-//The struct, record or union type 'S' has an explicit implementation of 'Object\.GetHashCode' or 'Object\.Equals'\. You must apply the 'CustomEquality' attribute to the type
+
+
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs
index 31bb29dd936..329a2aa5bc9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/Basic/E_CustomEqualityGetHashCode01.fs
@@ -3,9 +3,9 @@
// Make sure F# compiler emits an error message when Record, Union, Struct types override default System.Object.GetHashCode()
// without explicitly specifying CustomEquality attribute
-//The struct, record or union type 'R' has an explicit implementation of 'Object\.GetHashCode' or 'Object\.Equals'\. You must apply the 'CustomEquality' attribute to the type
-//The struct, record or union type 'U' has an explicit implementation of 'Object\.GetHashCode' or 'Object\.Equals'\. You must apply the 'CustomEquality' attribute to the type
-//The struct, record or union type 'S' has an explicit implementation of 'Object\.GetHashCode' or 'Object\.Equals'\. You must apply the 'CustomEquality' attribute to the type
+
+
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs
index 5072d2665c5..f62da35a5b4 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/GeneratedEqualityHashingComparison/IComparison/W_ImplIComparable.fs
@@ -2,8 +2,8 @@
// Verify warning when implementing IComparable on structs / classes
// See FSB 2653
-//The type 'S' implements 'System\.IComparable'\. Consider also adding an explicit override for 'Object\.Equals'
-//The type 'C' implements 'System\.IComparable' explicitly but provides no corresponding override for 'Object\.Equals'\. An implementation of 'Object\.Equals' has been automatically provided, implemented via 'System\.IComparable'\. Consider implementing the override 'Object\.Equals' explicitly
+
+
[]
[]
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefAsGenericArgument01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefAsGenericArgument01.fs
index e606b9793be..4da2e1ceabf 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefAsGenericArgument01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefAsGenericArgument01.fs
@@ -4,6 +4,6 @@
// Verify error when trying to use a byref<_> as generic argument.
// (Disallowed by CLR.)
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
+
let test : byref list = []
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda01.fs
index 1a2d9b05aa9..90819509222 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda01.fs
@@ -2,7 +2,7 @@
// Verify that byref values may not escape into inner lambdas.
// (Disallowed by the CLR.)
-//The byref-typed variable 'byrefValue' is used in an invalid way\. Byrefs cannot be captured by closures or passed to inner functions\.$
+
let testFunction() =
let mutable x = 0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda02.fs
index bf0c04cdeac..ef9a349d0da 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda02.fs
@@ -2,8 +2,8 @@
// Verify that byref values may not escape into inner lambdas.
// (Disallowed by the CLR.)
-//The byref-typed variable 'byrefValue' is used in an invalid way\. Byrefs cannot be captured by closures or passed to inner functions\.$
-//The byref-typed variable 'byrefValue' is used in an invalid way\. Byrefs cannot be captured by closures or passed to inner functions\.$
+
+
let testFunction() =
let mutable x = 0
let byrefValue = &x
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda03.fs
index d2f4ac930a6..dad0c477b17 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInInnerLambda03.fs
@@ -2,7 +2,7 @@
// Verify that byref values may not escape into inner lambdas.
// (Disallowed by the CLR.)
// This test is currently emitting 2 copies of the same error message due to a known bug
-//The byref-typed variable 'byrefValue' is used in an invalid way. Byrefs cannot be captured by closures or passed to inner functions\.$
+
let testFunction() =
let mutable x = 0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInQuotation01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInQuotation01.fs
index 88b04ed0ae3..dc4699c99ab 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInQuotation01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_ByrefUsedInQuotation01.fs
@@ -1,8 +1,8 @@
// #Regression #Conformance #TypeInference #ByRef
// Attempt to use a byref in a quotation
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
-//The address of the variable 'i' cannot be used at this point$
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
+
+
+
open Microsoft.FSharp.Quotations
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_FirstClassFuncTakesByref.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_FirstClassFuncTakesByref.fs
index 0040072a6bc..84a89e6502e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_FirstClassFuncTakesByref.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_FirstClassFuncTakesByref.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #TypeInference #ByRef
-//This expression was expected to have type. 'byref<'a>' .but here has type. 'int ref'
+
let f (x : byref<'a>) = ()
let z1 = f
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref01.fs
index 50170740ad1..a26b8a618fb 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref01.fs
@@ -4,8 +4,8 @@
// Verify error when setting object field to a byref value.
// (This is disallowed by the CLR.)
-//A type would store a byref typed value\. This is not permitted by Common IL\.$
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
+
+
type Foo() =
let mutable m_byrefOpt : byref option = None
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref02.fs
index 00d46db478f..2a55295c347 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref02.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypeInference #ByRef
// Verify you cannot set an object field to store a byref value
-//A byref typed value would be stored here\. Top-level let-bound byref values are not permitted
+
module ModuleFoo =
let mutable x = 0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref03.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref03.fs
index a5abefae229..d15ca81386e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref03.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref03.fs
@@ -2,8 +2,8 @@
// Verify appropriate error if attempting to assign a ByRef value to an
// object field. (Disallowed by the CLR.)
-//A type would store a byref typed value\. This is not permitted by Common IL\.$
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
+
+
type RecordWithByref = {A : byref }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref04.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref04.fs
index f192ad47c26..14b03d62293 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref04.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref04.fs
@@ -2,9 +2,9 @@
// Verify appropriate error if attempting to assign a ByRef value to an
// object field. (Disallowed by the CLR.)
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
-//The address of the variable 'x' cannot be used at this point$
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
+
+
+
let mutable mutableObjectField : obj = null
// Set mutableObjectField to a byref (cast to Object)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref05.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref05.fs
index c91ab2d64f4..629b6423176 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref05.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/ByrefSafetyAnalysis/E_SetFieldToByref05.fs
@@ -2,8 +2,8 @@
// Verify appropriate error if attempting to assign a ByRef value to an
// object field. (Disallowed by the CLR.)
-//A type would store a byref typed value\. This is not permitted by Common IL\.$
-//A type instantiation involves a byref type\. This is not permitted by the rules of Common IL\.$
+
+
type DUWithByref =
| A of int * byref
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_CyclicReference01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_CyclicReference01.fs
index eca58f55bb7..dd82ad25185 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_CyclicReference01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_CyclicReference01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypeInference #Recursion
// FS1 952, VS crash due to bad recursive type definition
-//This type definition involves an immediate cyclic reference through an abbreviation$
-//This expression was expected to have type. 'bogusType' .but here has type. 'Map<'a,'b>'
+
+
type bogusType = (int, bogusType) Map
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_DuplicateRecursiveRecords.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_DuplicateRecursiveRecords.fs
index 186da1ffb48..a255b4a31b5 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_DuplicateRecursiveRecords.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_DuplicateRecursiveRecords.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypeInference #Recursion
// Regression for FSHARP1.0:5601
// ICE when compiling code with duplicate record type defined recursively
-//Duplicate definition of type, exception or module 'Foo'
+
type Foo =
{ Name: string;
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_RecursiveInline.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_RecursiveInline.fs
index 947bfc49e0a..1330d9e4d3c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_RecursiveInline.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_RecursiveInline.fs
@@ -1,9 +1,9 @@
// #Regression #Conformance #TypeInference #Recursion
// Regression test for FSharp1.0:3475 - ICE on rec inline function
-//The value 'E_RecursiveInline.test' was marked inline but was not bound in the optimization environment
-//The value 'test' was marked inline but its implementation makes use of an internal or private function which is not sufficiently accessible$
-//A value marked as 'inline' has an unexpected value
-//Failed to inline the value 'test' marked 'inline', perhaps because a recursive value was marked 'inline'
+
+
+
+
let rec inline test x =
if x then test false
else 0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_VariationsOnRecursiveStruct.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_VariationsOnRecursiveStruct.fs
index 7b84045766f..252c6db4c56 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_VariationsOnRecursiveStruct.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis/E_VariationsOnRecursiveStruct.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypeInference #Recursion
// Regression test for FSharp1.0:4275 - still allowing variations on recursive structs
-//This type definition involves an immediate cyclic reference through a struct field or inheritance relation
+
[]
type S2 (def : S2) =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs
index 52c9daf49da..c2cc87b426c 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs
@@ -114,7 +114,7 @@ module NumericLiterals =
|> ignore
// This test was automatically generated (moved from FSharpQA suite - Conformance/LexicalAnalysis/NumericLiterals)
- //Literal enumerations must have type int, uint, int16, uint16, int64, uint64, byte, sbyte or char
+
[]
let ``NumericLiterals - E_enumNegativeLiterals009_fs - --test:ErrorRanges`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/And/E_IdentBoundTwice.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/And/E_IdentBoundTwice.fs
index ae14b063a73..ba6cdf04019 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/And/E_IdentBoundTwice.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/And/E_IdentBoundTwice.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #PatternMatching #PatternMatchingGuards
#light
-//'x' is bound twice in this pattern
+
let test input =
match input with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/ConsList/E_consPattern01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/ConsList/E_consPattern01.fs
index 26e6aff27b4..e0506e3f3af 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/ConsList/E_consPattern01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/ConsList/E_consPattern01.fs
@@ -1,5 +1,5 @@
// #Regression #Conformance #PatternMatching
-//This expression was expected to have type. 'int' .but here has type. ''a list'
+
// Verify that a '[]' is only valid at the end of a list in a cons pattern
// This is OK. Type inference will pick up that this x is a generic list of lists.
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamTyTestVarType01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamTyTestVarType01.fs
index bb9698f08c5..8f128598da0 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamTyTestVarType01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamTyTestVarType01.fs
@@ -4,7 +4,7 @@
// Verify error associated with doing a dynamic type
// test on a variable type.
-//This runtime coercion or type test from type
+
// Error, x has type 'a and cannot be used in a dynamic type test.
let f x =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamicTestPrimType01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamicTestPrimType01.fs
index 08240f6da0e..daf3586950a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamicTestPrimType01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/E_DynamicTestPrimType01.fs
@@ -4,7 +4,7 @@
// Verify error when using a dynamic type test on
// type without any proper sub types.
-//The type 'int' does not have any proper subtypes and cannot be used as the source of a type test or runtime coercion
+
let test (x : int) =
match x with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_RedundantPattern01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_RedundantPattern01.fs
index 5b31ed91546..ad6bc4de529 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_RedundantPattern01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_RedundantPattern01.fs
@@ -3,8 +3,8 @@
// FSB 1488, Implement redundancy checking for dynamic type test patterns
-//This rule will never be matched
-//This rule will never be matched
+
+
let _ =
match box "3" with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_TypeTestWillAlwaysHold01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_TypeTestWillAlwaysHold01.fs
index b4e8e83a785..ca6ea64491e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_TypeTestWillAlwaysHold01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/DynamicTypeTest/W_TypeTestWillAlwaysHold01.fs
@@ -2,7 +2,7 @@
#light
// Verify warning for when dynamic type test will always hold.
-//This type test or downcast will always hold
+
type Foo() =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/E_CounterExample01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/E_CounterExample01.fs
index a21c10ff946..6c200dc3b4b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/E_CounterExample01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/E_CounterExample01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #PatternMatching
// Regression test for FSHARP1.0:2034
-//Incomplete pattern matches on this expression\. For example, the value '0' may indicate a case not covered by the pattern\(s\)
+
module TestModule
let f x =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/W_whenGuards01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/W_whenGuards01.fs
index bba3809ea50..11541227240 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/W_whenGuards01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Expression/W_whenGuards01.fs
@@ -4,7 +4,7 @@ module TestModule
// Regression testcase for FSharp 1.0: 2070
// Warn on incomplete match with when guard
-//Incomplete pattern matches on this expression\. For example, the value '1' may indicate a case not covered by the pattern\(s\)\. However, a pattern rule with a 'when' clause might successfully match this value
+
let matchWarning s =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns01.fs
index 19bf8faee6c..c20b4fa442a 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns01.fs
@@ -1,13 +1,13 @@
// #Regression #Conformance #PatternMatching #ActivePatterns
// Verify error if Active Patterns do not start with an upper case letter
-//Active pattern case identifiers must begin with an uppercase letter
-//Active pattern case identifiers must begin with an uppercase letter
-//Active pattern case identifiers must begin with an uppercase letter
-//Active pattern case identifiers must begin with an uppercase letter
-//Active pattern case identifiers must begin with an uppercase letter
-//The '\|' character is not permitted in active pattern case identifiers
-//The '\|' character is not permitted in active pattern case identifiers
-//Active pattern case identifiers must begin with an uppercase letter
+
+
+
+
+
+
+
+
let (|positive|negative|) n = if n < 0 then positive else negative
let (|`` A``|) (x:int) = x
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns02.fs
index 50273c1058f..8fe994b2f3d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ActivePatterns02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #PatternMatching #ActivePatterns
// Verify error if Active Patterns used with named parameters
-//A is an active pattern and cannot be treated as a discriminated union case with named fields.
+
let (|A|B|) n = if n%2 = 0 then A n else B n
match 10 with A(hoho=n) -> n | _ -> 0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_LargeActivePat01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_LargeActivePat01.fs
index d356af71baa..72e8b829968 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_LargeActivePat01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_LargeActivePat01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #PatternMatching #ActivePatterns
// Verify error when defining an Active Pattern with more than seven 'values'
// This is regression test for FSHARP1.0:3562
-//Active patterns cannot return more than 7 possibilities$
+
let (|One|Two|Three|Four|Five|Six|Seven|Eight|) x = One
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_MulticasePartialNotAllowed01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_MulticasePartialNotAllowed01.fs
index f1633373916..6eeb14906b9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_MulticasePartialNotAllowed01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_MulticasePartialNotAllowed01.fs
@@ -2,7 +2,7 @@
// Regression test for FSHARP1.0:4621
// Multi case partial active patterns are not allowed
-//This is not a valid name for an active pattern
+
//The pattern discriminator 'Sentence' is not defined
let (|Sentence|Word|Punctuation|WhiteSpace|_|) (input : string) =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ParameterRestrictions01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ParameterRestrictions01.fs
index c3e907519e3..1d3c6c0cf80 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ParameterRestrictions01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Named/E_ParameterRestrictions01.fs
@@ -2,7 +2,7 @@
#light
// Verify error cases for restrictions on active pattern parameters.
-//Only active patterns returning exactly one result may accept arguments
+
// Multi-Case
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Null/E_notNullCompatible01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Null/E_notNullCompatible01.fs
index 58b30660d1c..b3a185263b6 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Null/E_notNullCompatible01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Null/E_notNullCompatible01.fs
@@ -2,7 +2,7 @@
#light
// Verify error when trying to match type against null if it doesn't support that
-//The type 'Foo' does not have 'null' as a proper value
+
type Foo() =
member this.Value = 42
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecTypesNotMatch01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecTypesNotMatch01.fs
index 9297cb34285..2a48bf46849 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecTypesNotMatch01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecTypesNotMatch01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #PatternMatching #Records
// Verify error if two record types in a pattern match don't match
// Verify error if type of a record field is incorrect.
-//The record type 'R1' does not contain a label 'A'\.
+
type R1 = { X : int; Y : int }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecordFieldNotDefined01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecordFieldNotDefined01.fs
index fa8ce23bce2..31398f99038 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecordFieldNotDefined01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Record/E_RecordFieldNotDefined01.fs
@@ -2,7 +2,7 @@
#light
// Verify error if type of a record field is incorrect.
-//The record label 'X' is not defined
+
let testMatch x =
match x with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_SyntaxError01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_SyntaxError01.fs
index b3b2c41d32d..8f0334f742d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_SyntaxError01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_SyntaxError01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #PatternMatching
#light
-//Unexpected symbol'\[' in pattern matching. Expected '->' or other token
+
let isIntArray (o: obj) =
match o with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_ValueCapture01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_ValueCapture01.fs
index 259636c49da..170971f3231 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_ValueCapture01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/E_ValueCapture01.fs
@@ -1,8 +1,8 @@
// #Regression #Conformance #PatternMatching
#light
-//The value or constructor 'ident1' is not defined
-//The value or constructor 'ident2' is not defined
+
+
// Verifying scoping of value captures
let test1() =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs
index 4f75f06e9d9..3cd93d8c562 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/Simple.fs
@@ -9,7 +9,7 @@ open FSharp.Test.Compiler
module Simple =
// This test was automatically generated (moved from FSharpQA suite - Conformance/PatternMatching/Simple)
- //Incomplete pattern matches on this expression. For example, the value 'Result \(_\)' may indicate a case not covered by the pattern\(s\)
+
[]
let ``Simple - W_Incomplete01_fs - --test:ErrorRanges`` compilation =
compilation
@@ -20,7 +20,7 @@ module Simple =
|> withSingleDiagnostic (Warning 25, Line 92, Col 13, Line 92, Col 14, "Incomplete pattern matches on this expression. For example, the value 'Result (_)' may indicate a case not covered by the pattern(s).")
// This test was automatically generated (moved from FSharpQA suite - Conformance/PatternMatching/Simple)
- //This rule will never be matched
+
[]
let ``Simple - W_Incomplete02_fs - --test:ErrorRanges`` compilation =
compilation
@@ -36,7 +36,7 @@ module Simple =
]
// This test was automatically generated (moved from FSharpQA suite - Conformance/PatternMatching/Simple)
- //Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name
+
[]
let ``Simple - W_BindCapitalIdent_fs - --test:ErrorRanges`` compilation =
compilation
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_BindCapitalIdent.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_BindCapitalIdent.fs
index 4777d7d687e..0420505057d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_BindCapitalIdent.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_BindCapitalIdent.fs
@@ -2,8 +2,8 @@
// Verify warning when capturing values with capital identifier
// FSB 3954
-//Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name
-//Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name
+
+
let test x = function
| Foo :: [] -> 1
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete01.fs
index 1438890708d..1788e7fca0b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete01.fs
@@ -4,7 +4,7 @@
// Regression testcase for FSharp 1.0:2070
// Warning on incomplete match
-//Incomplete pattern matches on this expression. For example, the value 'Result \(_\)' may indicate a case not covered by the pattern\(s\)
+
module M =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete02.fs
index 7fd5bc9a364..dca83d379ae 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple/W_Incomplete02.fs
@@ -5,10 +5,10 @@
// Title: Incomplete pattern in quotation causes error.
// Descr: Make sure quotations compile (even with warning) when having incomplete pattern match inside
-//Incomplete pattern matches on this expression\.
-//Incomplete pattern matches on this expression\.
-//This rule will never be matched
-//This rule will never be matched
+
+
+
+
let foo x =
<@@
match x with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_NoRangeConst01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_NoRangeConst01.fs
index b88f36e32b9..4f9b4892ff7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_NoRangeConst01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_NoRangeConst01.fs
@@ -2,7 +2,7 @@
#light
// Verify error when trying to use range constants
-//Unexpected symbol '..' in pattern matching. Expected '->' or other token
+
let areKnownLists l =
match l with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bigint.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bigint.fs
index da3a23ef76b..62abeccf858 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bigint.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bigint.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #PatternMatching #Constants
// Pattern Matching - Simple Constants
// Type: BigInt
-//Non-primitive numeric literal constants.+
+
#light
let isZero x =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bignum40.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bignum40.fs
index 430712651ab..56b35655c4f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bignum40.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/E_type_bignum40.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #PatternMatching #Constants
// Pattern Matching - Simple Constants
// Type: BigNum
-//Non-primitive numeric literal constants.+
+
// On NetFx4.0/Dev10, we don't give the deprecation error: this is ok (FSHARP1.0:4599)
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/MatchLiteral01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/MatchLiteral01.fs
index a3aaa24faf6..97248bb4c88 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/MatchLiteral01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/SimpleConstant/MatchLiteral01.fs
@@ -2,9 +2,9 @@
#light
// Test ability to match a const literal value
-//This rule will never be matched
-//This rule will never be matched
-//This rule will never be matched
+
+
+
[]
let intLiteral = 42
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_IncompleteMatches01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_IncompleteMatches01.fs
index 9efcf49e8b8..777824b3d90 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_IncompleteMatches01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_IncompleteMatches01.fs
@@ -2,7 +2,7 @@
// Verify warnings for incomplete pattern matches
-//Incomplete pattern matches on this expression.
+
let test() =
function
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern01.fs
index f8e38f3ce21..d9c5db1f22f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern01.fs
@@ -2,7 +2,7 @@
#light
// Verify warning with redundant pattern
-//This rule will never be matched
+
let redPat () =
function
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern02.fs
index 3015210ce04..d408c16d7dc 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Tuple/W_RedundantPattern02.fs
@@ -3,7 +3,7 @@
// Verify warning if all DU tags are matched with and
// a wildcard is included.
-//This rule will never be matched
+
type DU = A | B | C of int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/TypeConstraint/E_typeconstraint01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/TypeConstraint/E_typeconstraint01.fs
index 4ce19c52666..8e5a7ef7bc0 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/TypeConstraint/E_typeconstraint01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/TypeConstraint/E_typeconstraint01.fs
@@ -2,9 +2,9 @@
// Regression test for FSHARP1.0:1525
// type constraints on pattern matching are deprecated and are now errors (used to be warnings)
// As of Beta2, we are not even giving the deprecation error.
-//Unexpected symbol ':>' in pattern. Expected '\)' or other token.
-//Unmatched '\('$
-//Files in libraries or multiple-file applications must begin with a namespace or module declaration, e.g. 'namespace SomeNamespace.SubNamespace' or 'module SomeNamespace.SomeModule'. Only the last source file of an application may omit such a declaration.
+
+
+
type A() = class
end
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_CapturesDiffVal01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_CapturesDiffVal01.fs
index 363ab3c29a0..29b54a67162 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_CapturesDiffVal01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_CapturesDiffVal01.fs
@@ -3,7 +3,7 @@
// Verify error if two pattern match clauses match
// different values
-//The two sides of this 'or' pattern bind different sets of variables
+
let testMatch x =
match x with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_NotAllCaptureSameVal01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_NotAllCaptureSameVal01.fs
index af9e457cd93..c5ebfcab79b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_NotAllCaptureSameVal01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_NotAllCaptureSameVal01.fs
@@ -3,7 +3,7 @@
// Verify error if not all union pattern rules capture the
// same set of values
-//The two sides of this 'or' pattern bind different sets of variables
+
let tupeMatch x =
match x with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_UnionCapturesDiffType01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_UnionCapturesDiffType01.fs
index def92d6297b..35ecc16a72b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_UnionCapturesDiffType01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Union/E_UnionCapturesDiffType01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #PatternMatching #Unions
// Verify error if two union rules capture values with different types
-//This expression was expected to have type. 'int' .but here has type. 'float'
+
let testMatch x =
match x with
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_InheritRecord01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_InheritRecord01.fs
index 376371e1e10..13487c0c734 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_InheritRecord01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_InheritRecord01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Records
// Verify error when inheriting from a record
// Regression of FSB 4662
-//is not an interface type
+
type Record = {x:int; y:int}
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IComparable.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IComparable.fsx
index f1d46071ee2..2ac79c0f87f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IComparable.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IComparable.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Records
// By default, record types implement IComparable
-//This type test or downcast will always hold
-//The type 'I' does not have any proper subtypes and cannot be used as the source of a type test or runtime coercion
+
+
#light
[] type Kg
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IStructuralHash.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IStructuralHash.fsx
index b28084f0108..66d410dc7a2 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IStructuralHash.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Interface_IStructuralHash.fsx
@@ -3,7 +3,7 @@
// We used to, but now we do not anymore.
//
-//'IStructuralHash'
+
type r = { A : int; B : bool }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_MutableFields01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_MutableFields01.fsx
index 5589f80031e..07a8366155e 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_MutableFields01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_MutableFields01.fsx
@@ -1,8 +1,8 @@
// #Regression #Conformance #TypesAndModules #Records
// Verify that record fields may be marked mutable
// Making one field mutable does not make _all_ the fields mutable
-//This field is not mutable
-//This field is not mutable
+
+
// This is also regression test for FSHARP1.0:3733
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordCloning01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordCloning01.fs
index 16e53eca0a5..da7d9cb5ca7 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordCloning01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordCloning01.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules #Records
// Verify error when trying to clone a non-record type
-//This expression was expected to have type
+
type RecType = { A : int; B : string }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull01.fs
index f395d998ccb..b494538ad6b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_RecordsNotNull01.fs
@@ -2,7 +2,7 @@
#light
// Verify records cannot have null as a proper value
-//The type 'RecordType' does not have 'null' as a proper value
+
type RecordType = { X : int }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping01.fsx
index 19afc465611..fc667065395 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping01.fsx
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules #Records
// Field labels have module scope
-//The record label 'a' is not defined
+
#light
module M0 =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping02.fsx
index d8527d432ab..c441825b4e9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping02.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_Scoping02.fsx
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules #Records
// Field labels have module scope
-//This expression uses the implicit conversion 'System\.Decimal\.op_Implicit\(value: int\) : decimal' to convert type 'int' to type 'decimal'. See https:.*$
+
type T1 = { a : decimal }
module M0 =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01.fs
index 363e607f843..e2992b968d3 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Records
// Verify appropriate error with ambiguous record inference
// Regression test for FSHARP1.0:2780
-//No assignment given for field 'Y' of type 'N\.Blue'
+
module N
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01b.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01b.fs
index dff437e6396..e4e813a36ad 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01b.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference01b.fs
@@ -2,7 +2,7 @@
// Verify appropriate error with ambiguous record inference
// Same as 01, but with generic types
// Regression test for FSHARP1.0:2780
-//No assignment given for field 'Y' of type 'N\.M\.Blue+
+
namespace N
module M =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference02.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference02.fs
index 45cdedb489e..ccb37810eb9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference02.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_TypeInference02.fs
@@ -1,6 +1,6 @@
// #Regression #Conformance #TypesAndModules #Records
// Verify error when type inference cannot pin down record type
-//This record contains fields from inconsistent types
+
type Foo = { FieldA : int; FieldB : int }
type Bar = { FieldB : int; FieldC : int }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_UnitType01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_UnitType01.fsx
index 9f489d7288f..4e1cc010f22 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_UnitType01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/E_UnitType01.fsx
@@ -2,7 +2,7 @@
// Field has type 'unit' (which is kind of special)
// Trying to initialize with null is illegal.
// This is regression test for FSHARP1.0:1459
-//The type 'unit' does not have 'null' as a proper value
+
#light
type T1 = { u : unit;}
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/W_Overrides01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/W_Overrides01.fsx
index 93585748653..34abefb7289 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/W_Overrides01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/W_Overrides01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Records
// Trying to override GetHashCode(), Equals() and ToString() yields warnings
// See also FSHARP1.0:5446
-//This new member hides the abstract member 'System\.Object\.ToString\(\) : string'\. Rename the member or use 'override' instead\.$
+
[] type Kg
type I = { A : float ; B : decimal }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase01.fsx
index 1e72231ce66..6695a4f171f 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase01.fsx
@@ -1,8 +1,8 @@
// #Regression #Conformance #TypesAndModules #Unions
// Union Types
// Discriminated union cases names must begin with an uppercase letter
-//Discriminated union cases and exception labels must be uppercase identifiers
-//Discriminated union cases and exception labels must be uppercase identifiers
+
+
#light
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase02.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase02.fsx
index 58c5bb3ce1e..a82eddbb0b1 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase02.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase02.fsx
@@ -2,7 +2,7 @@
// Union Types
// Discriminated union cases names must begin with an uppercase letter
// This means it cannot start with a digit
-//Unexpected integer literal in union case
+
#light
type a = | 1 of int // err: can't use
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase03.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase03.fsx
index 6f3b58cf375..0c6c364a344 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase03.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase03.fsx
@@ -2,7 +2,7 @@
// Union Types
// Discriminated union cases names must begin with an uppercase letter
// This means it cannot start with a string
-//Unexpected string literal in union case
+
#light
type T = | (* *) A // ok
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase04.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase04.fsx
index 9803ab0ad3f..9fa2ce90e02 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase04.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercase04.fsx
@@ -2,7 +2,7 @@
// Union Types
// Discriminated union cases names must begin with an uppercase letter
// This means it cannot start with a string
-//Unexpected reserved keyword in union case
+
#light
type T = | (* *) A
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx
index 3bffdd03f82..077163a9b23 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_BeginWithUppercaseNoPipe01.fsx
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Unions
// Regression test for FSHARP1.0:3741
-//Discriminated union cases and exception labels must be uppercase identifiers
-//Discriminated union cases and exception labels must be uppercase identifiers
+
+
#light
module ``*`` =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldMemberClash.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldMemberClash.fs
index 1f2c4825cb8..7b43a27e8b2 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldMemberClash.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldMemberClash.fs
@@ -1,10 +1,10 @@
// #Conformance #TypesAndModules #Unions
// Make sure we properly detect when field names collide with member names
// Note: this only applies to single-case DUs
-//The member 'Item1' cannot be defined because the name 'Item1' clashes with the generated property 'Item1' in this type or module
-//The member 'Item2' cannot be defined because the name 'Item2' clashes with the generated property 'Item2' in this type or module
-//The member 'V3' cannot be defined because the name 'V3' clashes with the generated property 'V3' in this type or module
-//The member 'Item' cannot be defined because the name 'Item' clashes with the generated property 'Item' in this type or module
+
+
+
+
type MyDU =
| Case1 of int * string * V3 : float
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldNameUsedMulti.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldNameUsedMulti.fs
index 5af3541d47c..1fbc0c34c84 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldNameUsedMulti.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_FieldNameUsedMulti.fs
@@ -1,8 +1,8 @@
// #Conformance #TypesAndModules #Unions
// Make sure we properly detect field names specified multiple times
-//Union case/exception field 'V1' cannot be used more than once\.
-//Union case/exception field 'V2' cannot be used more than once\.
-//Union case/exception field 'V1' cannot be used more than once\.
+
+
+
type MyDU =
| Case1 of V1 : int * V2 : string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_InheritUnion.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_InheritUnion.fs
index 88a521a8a90..8be1f4950d9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_InheritUnion.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_InheritUnion.fs
@@ -1,7 +1,7 @@
// #Regression #Conformance #TypesAndModules #Unions
// Verify error when inherit from union types
-//This 'inherit' declaration specifies the inherited type but no arguments.
-//Cannot inherit a sealed type
+
+
type DiscUnion = A of int | B of string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IComparable.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IComparable.fsx
index f75ef80b98c..e59aa78f745 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IComparable.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IComparable.fsx
@@ -1,8 +1,8 @@
// #Regression #Conformance #TypesAndModules #Unions
// By default, Union types implement IComparable
// Q: Is this a bug? I've reported it to fscore for now.
-//This type test or downcast will always hold
-//The type 'I' does not have any proper subtypes and cannot be used as the source of a type test or runtime coercion
+
+
#light
type I = A | B
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IStructuralHash.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IStructuralHash.fsx
index 575d66ccc10..c43d4cdeef8 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IStructuralHash.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Interface_IStructuralHash.fsx
@@ -2,10 +2,10 @@
// Union types NO LONGER implement IStructuralHash
// They used to, but now they don't anymore.
//
-//The type 'IStructuralHash' is not defined
-//Lookup on object of indeterminate type based on information prior to this program point\. A type annotation may be needed prior to this program point to constrain the type of the object\. This may allow the lookup to be resolved
-//The type 'IStructuralHash' is not defined
-//Lookup on object of indeterminate type based on information prior to this program point\. A type annotation may be needed prior to this program point to constrain the type of the object\. This may allow the lookup to be resolved
+
+
+
+
type I = | A
| B
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseDT.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseDT.fs
index 216a49d46bf..3fc3baf3c3b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseDT.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_LowercaseDT.fs
@@ -2,7 +2,7 @@
#light
// FS1: 325, Case sensitivity reported by Eugene
-//Discriminated union cases and exception labels must be uppercase identifiers
+
type list = cons of int | Conss of int
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Member_Duplicate01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Member_Duplicate01.fsx
index 30c99e82304..9293d1567eb 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Member_Duplicate01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_Member_Duplicate01.fsx
@@ -1,8 +1,8 @@
// #Regression #Conformance #TypesAndModules #Unions
// DU may include members
// Verify that duplicate methods are not allowed
-//The member 'IsC' cannot be defined because the name 'IsC' clashes with the default augmentation of the union case 'C' in this type or module
-//The member 'IsC' cannot be defined because the name 'IsC' clashes with the default augmentation of the union case 'C' in this type or module
+
+
#light
type T = | C of int * int
| D of (int * int)
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d.fsx
index 92082148f01..5713c3110df 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d.fsx
@@ -4,7 +4,7 @@
// The with/end tokens can be omitted when using the #light syntax option as long as the
// type-defn-elements vertically aligns with the first ‘|’ in the union-cases
// Regression test for FSHARP1.0:3707
-//.+'member'
+
#light
(* extra space *) type Message =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d2.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d2.fsx
index 6426b2a89d6..5b1efa6cc97 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d2.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_SampleFromSpec01d2.fsx
@@ -4,7 +4,7 @@
// The with/end tokens can be omitted when using the #light syntax option as long as the
// type-defn-elements vertically aligns with the first ‘|’ in the union-cases
// Regression test for FSHARP1.0:3707
-//.+'member'
+
#light
type Message =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx
index 09a82f1ff9a..7a26af5b406 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_ScopeAndDataConstrAndPattern01.fsx
@@ -4,7 +4,7 @@
// It also covers the fact that they can be used both as data constructors
// and to form patterns.
// This is the positive case.
-//The value or constructor 'CaseLabel1' is not defined
+
#light
[] type ı
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionConstructorBadFieldName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionConstructorBadFieldName.fs
index 01a238ecd76..ae106f28858 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionConstructorBadFieldName.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionConstructorBadFieldName.fs
@@ -1,8 +1,8 @@
// #Conformance #TypesAndModules #Unions
// Make sure we properly detect bogus named field in constructors
-//The union case 'Case1' does not have a field named 'V3'\.
-//The union case 'Case1' does not have a field named 'V3'\.
-//The union case 'Case1' does not have a field named 'V4'\.
+
+
+
type MyDU =
| Case1 of V1 : int * V2 : string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldConflictingName.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldConflictingName.fs
index d33eea473fd..a9b9710a94d 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldConflictingName.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldConflictingName.fs
@@ -1,7 +1,7 @@
// #Conformance #TypesAndModules #Unions
// Make sure we properly detect field naming collisions
-//Named field 'Item2' conflicts with autogenerated name for anonymous field\.
-//Named field 'A' is used more than once\.
+
+
type MyDU =
| Case1 of Item2 : int * string
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTag.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTag.fs
index 3a6938dfc67..747932062ac 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTag.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionFieldNamedTag.fs
@@ -1,5 +1,5 @@
// #Conformance #TypesAndModules #Unions
-//The union case named 'Tags' conflicts with the generated type 'Tags'
+
// Regression test for Bug 6308
type BigUnion1 =
| Case0
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionsNotNull01.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionsNotNull01.fs
index e7f0346ff0b..dff134951b0 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionsNotNull01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/E_UnionsNotNull01.fs
@@ -2,7 +2,7 @@
#light
// Verify that null is not a proper value for a Discriminated Union
-//The type 'DU' does not have 'null' as a proper value
+
type DU = A of string | B of int | C
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_SampleFromSpec01c.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_SampleFromSpec01c.fsx
index 8df029ab073..c1647f8094b 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_SampleFromSpec01c.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_SampleFromSpec01c.fsx
@@ -2,7 +2,7 @@
// Union Types
// Sample from spec - using #light (but with incorrect indentation)
// Q: Why this warning is emitted twice?
-//Possible incorrect indentation: this token is offside of context started at position \(8:19\)\. Try indenting this token further or using standard formatting conventions
+
#light
(* extra space *) type Message =
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_UnionCaseProduction01.fsx b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_UnionCaseProduction01.fsx
index 9b9226b076e..1d5e1e948fa 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_UnionCaseProduction01.fsx
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Types/UnionTypes/W_UnionCaseProduction01.fsx
@@ -4,8 +4,8 @@
// | id -- nullary union case
// | id of type * ... * type -- n-ary union case
// | id : sig-spec -- n-ary union case
-//This construct is deprecated: it is only for use in the F# library
-//This construct is deprecated: it is only for use in the F# library
+
+
#light
type T = | D : int -> T
diff --git a/tests/FSharp.Compiler.ComponentTests/OCamlCompat/W-NoParensInLet01.fs b/tests/FSharp.Compiler.ComponentTests/OCamlCompat/W-NoParensInLet01.fs
index 9e454014d45..a366d074817 100644
--- a/tests/FSharp.Compiler.ComponentTests/OCamlCompat/W-NoParensInLet01.fs
+++ b/tests/FSharp.Compiler.ComponentTests/OCamlCompat/W-NoParensInLet01.fs
@@ -2,7 +2,7 @@
#light
// FSB 1117, Bindings that look like function definitions are interpreted as pattern matches without warning. Add a warning for this case to allow for later language design change here.
-//This construct is for compatibility with OCaml
+
type t = F of int * int
diff --git a/tests/FSharp.Compiler.ComponentTests/resources/tests/Conformance/LexicalAnalysis/NumericLiterals/E_enumNegativeLiterals009.fs b/tests/FSharp.Compiler.ComponentTests/resources/tests/Conformance/LexicalAnalysis/NumericLiterals/E_enumNegativeLiterals009.fs
index 21a52fa7b09..250bf5ef477 100644
--- a/tests/FSharp.Compiler.ComponentTests/resources/tests/Conformance/LexicalAnalysis/NumericLiterals/E_enumNegativeLiterals009.fs
+++ b/tests/FSharp.Compiler.ComponentTests/resources/tests/Conformance/LexicalAnalysis/NumericLiterals/E_enumNegativeLiterals009.fs
@@ -3,8 +3,8 @@
// Enum type definitions do not support negative literals
// Negative literal with no space
// As per FSHARP1.0:3714, enums can't be based on floats (pos/neg)
-//Literal enumerations must have type int, uint, int16, uint16, int64, uint64, byte, sbyte or char
-//Literal enumerations must have type int, uint, int16, uint16, int64, uint64, byte, sbyte or char
+
+
#light
type EnumDouble = | A1 = -1.2 // err