This commit is contained in:
KevinRansom 2016-03-16 10:21:39 -07:00
Родитель d2d8aeafac
Коммит 2914d88adf
7 изменённых файлов: 2 добавлений и 20 удалений

Просмотреть файл

@ -26,9 +26,6 @@ exit /b 1
:ARGUMENTS_OK
set BUILD_CONFIG=Release
set BUILD_CONFIG_LOWER=release
set BUILD_PROTO=0
set BUILD_NET40=1
set BUILD_CORECLR=1

Просмотреть файл

@ -5056,13 +5056,10 @@ let CheckSimulateException(tcConfig:TcConfig) =
#if FX_REDUCED_EXCEPTIONS
#else
| Some("tc-av") -> raise(System.AccessViolationException())
| Some("tc-nfn") -> raise(System.NotFiniteNumberException())
#endif
| Some("tc-aor") -> raise(System.ArgumentOutOfRangeException())
| Some("tc-dv0") -> raise(System.DivideByZeroException())
#if FX_REDUCED_EXCEPTIONS
#else
| Some("tc-nfn") -> raise(System.NotFiniteNumberException())
#endif
| Some("tc-oe") -> raise(System.OverflowException())
| Some("tc-atmm") -> raise(System.ArrayTypeMismatchException())
| Some("tc-bif") -> raise(System.BadImageFormatException())

Просмотреть файл

@ -110,13 +110,9 @@ let PrintCompilerOption (CompilerOption(_s,_tag,_spec,_,help) as compilerOption)
let flagWidth = 30 // fixed width for printing of flags, e.g. --warnaserror:<warn;...>
let defaultLineWidth = 80 // the fallback width
let lineWidth =
#if FX_RESHAPED_CONSOLE
defaultLineWidth
#else
try
System.Console.BufferWidth
with e -> defaultLineWidth
#endif
let lineWidth = if lineWidth=0 then defaultLineWidth else lineWidth (* Have seen BufferWidth=0 on Linux/Mono *)
// Lines have this form: <flagWidth><space><description>
// flagWidth chars - for flags description or padding on continuation lines.

Просмотреть файл

@ -1077,7 +1077,7 @@ lexIndentOffForML,"Consider using a file with extension '.ml' or '.mli' instead"
1302,ilSignBadImageFormat,"Bad image format"
1303,ilSignPrivateKeyExpected,"Private key expected"
1304,ilSignRsaKeyExpected,"RSA key expected"
1305,ilSignInvalidBitLen,"Invalid bitLen"
1305,ilSignInvalidBitLen,"Invalid bit Length"
1306,ilSignInvalidRSAParams,"Invalid RSAParameters structure - '{{0}}' expected"
1307,ilSignInvalidAlgId,"Invalid algId - 'Exponent' expected"
1308,ilSignInvalidSignatureSize,"Invalid signature size"

Просмотреть файл

@ -312,7 +312,6 @@ namespace Microsoft.FSharp.Core.CompilerServices
type IProvidedCustomAttributeNamedArgument =
abstract ArgumentType: System.Type
abstract MemberInfo: System.Reflection.MemberInfo
abstract MemberName: System.String
abstract TypedValue: IProvidedCustomAttributeTypedArgument
type IProvidedCustomAttributeData =

Просмотреть файл

@ -268,7 +268,6 @@ namespace Microsoft.FSharp.Core.CompilerServices
type IProvidedCustomAttributeNamedArgument =
abstract ArgumentType: System.Type
abstract MemberInfo: System.Reflection.MemberInfo
abstract MemberName: System.String
abstract TypedValue: IProvidedCustomAttributeTypedArgument
type IProvidedCustomAttributeData =

Просмотреть файл

@ -2076,12 +2076,6 @@ let main4 (Args (tcConfig, errorLogger: ErrorLogger, ilGlobals, ilxMainModule, o
AbortOnError(errorLogger, tcConfig, exiter)
#if !FX_NO_APP_DOMAINS
if tcConfig.showLoadedAssemblies then
for a in System.AppDomain.CurrentDomain.GetAssemblies() do
dprintfn "%s" a.FullName
#endif
if tcConfig.copyFSharpCore then
copyFSharpCore(outfile, tcConfig.referencedDLLs)