diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs index a876afeb4a5..3f7ca4c3f0f 100644 --- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs +++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs @@ -86,10 +86,10 @@ - + - + diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr index 749b461e814..e29181d5b3f 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr @@ -18,4 +18,4 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleParentC file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.ProjectSystem.PropertyPages.resources.dll" vs.file.ngen=yes file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.VS.FSI.resources.dll" vs.file.ngen=yes file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\fsi.resources.dll" vs.file.ngen=yes - file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FsiAnyCPU.resources.dll" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\fsiAnyCpu.resources.dll" vs.file.ngen=yes diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index 0f57c852fba..f43eaf92ecd 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -106,7 +106,7 @@ $(FSharpSourcesRoot)\..\packages\fssrgen.3.1.0\lib\net46 $(FSharpSourcesRoot)\..\packages\FsLexYacc.6.1.0\build $(FSharpSourcesRoot)\..\packages\FsLexYacc.6.1.0\build - Fsi.exe + fsi.exe fslex.exe fsyacc.exe 2.0.0-beta6-61005-05 diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index 9cebfd5d25d..2d8455c5dae 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -18,7 +18,7 @@ - + true @@ -131,6 +131,7 @@ $(DefineConstants);FSHARP_CORE_4_5 + $(DefineConstants);PREFERRED_UI_LANG $(DefineConstants);FX_NO_BEGINEND_READWRITE $(DefineConstants);FX_ATLEAST_45 $(DefineConstants);FX_ATLEAST_40 diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index 7b7698c9cfd..0bd99422b29 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1103,7 +1103,7 @@ lexIndentOffForML,"Consider using a file with extension '.ml' or '.mli' instead" 1308,ilSignInvalidSignatureSize,"Invalid signature size" 1309,ilSignNoSignatureDirectory,"No signature directory" 1310,ilSignInvalidPKBlob,"Invalid Public Key blob" -# Fsc.exe resource strings +# fsc.exe resource strings fscTooManyErrors,"Exiting - too many errors" 2001,docfileNoXmlSuffix,"The documentation file has no .xml suffix" 2002,fscNoImplementationFiles,"No implementation files specified" diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/InternalsVisibleTo.fs b/src/fsharp/FSharp.Compiler.Interactive.Settings/InternalsVisibleTo.fs index ba10d68fc8f..98b815bbbbd 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/InternalsVisibleTo.fs +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/InternalsVisibleTo.fs @@ -2,8 +2,8 @@ namespace Microsoft.FSharp open System.Reflection -[] -[] +[] +[] [] do() diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs b/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs index e5b536f8b6f..9e559f81d29 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs +++ b/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs @@ -5,8 +5,8 @@ namespace Microsoft.FSharp open System.Reflection open Microsoft.VisualStudio.Shell -[] -[] +[] +[] [] [] diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj index 85d61743395..38e9a42696d 100644 --- a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj +++ b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj @@ -10,7 +10,6 @@ AnyCPU Library FSharp.Compiler - $(DefineConstants);PREFERRED_UI_LANG EXTENSIONTYPING;$(DefineConstants) COMPILER;$(DefineConstants) INCLUDE_METADATA_READER;$(DefineConstants) diff --git a/src/fsharp/FSharp.Compiler/InternalsVisibleTo.fs b/src/fsharp/FSharp.Compiler/InternalsVisibleTo.fs index 8adb8815036..476b4992568 100644 --- a/src/fsharp/FSharp.Compiler/InternalsVisibleTo.fs +++ b/src/fsharp/FSharp.Compiler/InternalsVisibleTo.fs @@ -2,10 +2,10 @@ namespace Microsoft.FSharp open System.Reflection -[] +[] [] -[] -[] +[] +[] [] [] [] diff --git a/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec b/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec index a9ccdbb3215..ce053b47882 100644 --- a/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec +++ b/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec @@ -14,18 +14,30 @@ $projectUrl$ $tags$ - - - + + + + + + + + - - - - + + + + + + + + + + + diff --git a/src/fsharp/FSharp.Core/project.json b/src/fsharp/FSharp.Core/project.json index 9b310893e37..c14efc45130 100644 --- a/src/fsharp/FSharp.Core/project.json +++ b/src/fsharp/FSharp.Core/project.json @@ -24,7 +24,7 @@ "System.Threading.Tasks.Parallel": "4.0.1", "System.Threading.Thread": "4.0.0", "System.Threading.ThreadPool": "4.0.10", - "System.Threading.Timer": "4.0.1", + "System.Threading.Timer": "4.0.1" }, "runtimes": { "win7-x86": { }, diff --git a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj index 9aea877570b..6d7055f0cce 100644 --- a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj +++ b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj @@ -15,7 +15,6 @@ COMPILED_AS_LANGUAGE_SERVICE_DLL;$(DefineConstants) INCLUDE_METADATA_READER;$(DefineConstants) NO_INLINE_IL_PARSER;$(DefineConstants) - $(DefineConstants);PREFERRED_UI_LANG INCLUDE_METADATA_WRITER;$(DefineConstants) $(NoWarn);62;9;75 {a437a6ec-5323-47c2-8f86-e2cac54ff152} diff --git a/src/fsharp/FSharp.LanguageService.Compiler/InternalsVisibleTo.fs b/src/fsharp/FSharp.LanguageService.Compiler/InternalsVisibleTo.fs index 0460b3c185d..a61d9e5c6ca 100644 --- a/src/fsharp/FSharp.LanguageService.Compiler/InternalsVisibleTo.fs +++ b/src/fsharp/FSharp.LanguageService.Compiler/InternalsVisibleTo.fs @@ -2,10 +2,10 @@ namespace Microsoft.FSharp open System.Reflection -[] +[] [] -[] -[] +[] +[] [] [] [] diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj index 74b24dc4da7..c51cfd3d5ac 100644 --- a/src/fsharp/Fsc/Fsc.fsproj +++ b/src/fsharp/Fsc/Fsc.fsproj @@ -18,7 +18,6 @@ $(NoWarn);62 fsc EXTENSIONTYPING;COMPILER;$(DefineConstants) - $(DefineConstants);PREFERRED_UI_LANG true $(OtherFlags) --warnon:1182 diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj index 80496f21412..b8507d242a2 100644 --- a/src/fsharp/fsi/Fsi.fsproj +++ b/src/fsharp/fsi/Fsi.fsproj @@ -19,7 +19,6 @@ fsi 0x0A000000 EXTENSIONTYPING;COMPILER;$(DefineConstants) - $(DefineConstants);PREFERRED_UI_LANG true $(OtherFlags) --warnon:1182 fsi.res diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index 817ba00fb63..fec0c6c58f1 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -2236,7 +2236,7 @@ type internal FsiEvaluationSession (argv:string[], inReader:TextReader, outWrite do SetTailcallSwitch tcConfigB OptionSwitch.On // set platform depending on whether the current process is a 64-bit process. - // BUG 429882 : FsiAnyCPU.exe issues warnings (x64 v MSIL) when referencing 64-bit assemblies + // BUG 429882 : fsiAnyCpu.exe issues warnings (x64 v MSIL) when referencing 64-bit assemblies do tcConfigB.platform <- if IntPtr.Size = 8 then Some AMD64 else Some X86 let fsiStdinSyphon = new FsiStdinSyphon(errorWriter) @@ -2367,7 +2367,7 @@ type internal FsiEvaluationSession (argv:string[], inReader:TextReader, outWrite try errorLogger.AbortOnError() with StopProcessing -> - // BUG 664864: Watson Clr20r3 across buckets with: Application FSIAnyCPU.exe from Dev11 RTM; Exception AE251Y0L0P2WC0QSWDZ0E2IDRYQTDSVB; FSIANYCPU.NI.EXE!Microsoft.FSharp.Compiler.Interactive.Shell+threadException + // BUG 664864: Watson Clr20r3 across buckets with: Application fsiAnyCpu.exe from Dev11 RTM; Exception AE251Y0L0P2WC0QSWDZ0E2IDRYQTDSVB; FSIANYCPU.NI.EXE!Microsoft.FSharp.Compiler.Interactive.Shell+threadException // reason: some window that use System.Windows.Forms.DataVisualization types (possible FSCharts) was created in FSI. // at some moment one chart has raised InvalidArgumentException from OnPaint, this exception was intercepted by the code in higher layer and // passed to Application.OnThreadException. FSI has already attached its own ThreadException handler, inside it will log the original error diff --git a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj index e068793c28d..43cc9b1c6af 100644 --- a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj +++ b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj @@ -11,10 +11,9 @@ {8b3e283d-b5fe-4055-9d80-7e3a32f3967b} Exe $(NoWarn);62 - FsiAnyCPU + fsiAnyCpu 0x0A000000 EXTENSIONTYPING;COMPILER;$(DefineConstants) - $(DefineConstants);PREFERRED_UI_LANG true $(OtherFlags) --warnon:1182 ..\fsi\fsi.res diff --git a/src/update.cmd b/src/update.cmd index 7707ea0ef5f..0867eaf8df4 100644 --- a/src/update.cmd +++ b/src/update.cmd @@ -51,7 +51,7 @@ rem Disable strong-name validation for F# binaries built from open source that a %SN32% -q -Vr fsc,b03f5f7f11d50a3a %SN32% -q -Vr fsi,b03f5f7f11d50a3a -%SN32% -q -Vr FsiAnyCPU,b03f5f7f11d50a3a +%SN32% -q -Vr fsiAnyCpu,b03f5f7f11d50a3a %SN32% -q -Vr FSharp.Compiler,b03f5f7f11d50a3a %SN32% -q -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a @@ -75,7 +75,7 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( %SN64% -q -Vr fsc,b03f5f7f11d50a3a %SN64% -q -Vr fsi,b03f5f7f11d50a3a - %SN64% -q -Vr FsiAnyCPU,b03f5f7f11d50a3a + %SN64% -q -Vr fsiAnyCpu,b03f5f7f11d50a3a %SN64% -q -Vr FSharp.Compiler,b03f5f7f11d50a3a %SN64% -q -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest index ed704d87a0f..4435636e3b0 100644 --- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest @@ -12,8 +12,8 @@ - - + + diff --git a/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj b/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj index 1d192ad5853..5932ba8d2d8 100644 --- a/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj +++ b/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj @@ -143,14 +143,14 @@ {8B3E283D-B5FE-4055-9D80-7E3A32F3967B} - FsiAnyCPU + fsiAnyCpu BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True {D0E98C0D-490B-4C61-9329-0862F6E87645} - Fsi + fsi BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest index a28d5d01c59..1d37c14fe3f 100644 --- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest @@ -12,8 +12,8 @@ - - + + diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj index e55345ad90d..7825fcd8d7a 100644 --- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj @@ -143,14 +143,14 @@ {8B3E283D-B5FE-4055-9D80-7E3A32F3967B} - FsiAnyCPU + fsiAnyCpu BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True {D0E98C0D-490B-4C61-9329-0862F6E87645} - Fsi + fsi BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest index 24a4f84aadf..95946d2f39d 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest @@ -12,8 +12,8 @@ - - + + diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj index 243a437df5d..915f75c6fe2 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj +++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj @@ -142,14 +142,14 @@ {8B3E283D-B5FE-4055-9D80-7E3A32F3967B} - FsiAnyCPU + fsiAnyCpu BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True {D0E98C0D-490B-4C61-9329-0862F6E87645} - Fsi + fsi BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True diff --git a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest index 25e4f423a7b..5444cd733ea 100644 --- a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest @@ -12,8 +12,8 @@ - - + + diff --git a/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj b/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj index a378af66255..009715ab79d 100644 --- a/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj +++ b/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj @@ -143,14 +143,14 @@ {8B3E283D-B5FE-4055-9D80-7E3A32F3967B} - FsiAnyCPU + fsiAnyCpu BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True {D0E98C0D-490B-4C61-9329-0862F6E87645} - Fsi + fsi BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs index 696d025b796..be7b7357a27 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs @@ -735,7 +735,7 @@ private string GetFormattedErrorMessage(DefaultCompilerError e) StringBuilder fileRef = new StringBuilder(); // JAF: - // Even if Fsc.exe returns a canonical message with no file at all, MSBuild will set the file to the name + // Even if fsc.exe returns a canonical message with no file at all, MSBuild will set the file to the name // of the task (FSC). In principle, e.FileName will not be null or empty but handle this case anyway. bool thereIsAFile = !string.IsNullOrEmpty(e.FileName); bool thereIsASpan = e.Line!=0 || e.Column!=0 || e.EndLine!=0 || e.EndColumn!=0; diff --git a/vsintegration/src/FSharp.VS.FSI/sessions.fs b/vsintegration/src/FSharp.VS.FSI/sessions.fs index 8e6c9db17da..552b1baeba5 100644 --- a/vsintegration/src/FSharp.VS.FSI/sessions.fs +++ b/vsintegration/src/FSharp.VS.FSI/sessions.fs @@ -155,7 +155,7 @@ let catchAll (ie: IEvent<_,_>) : IEvent<_> = e let fsiExeName () = - if SessionsProperties.useAnyCpuVersion then "fsiAnyCPU.exe" else "fsi.exe" + if SessionsProperties.useAnyCpuVersion then "fsiAnyCpu.exe" else "fsi.exe" // Use the VS-extension-installed development path if available, relative to the location of this assembly let determineFsiRelativePath1 () = diff --git a/vsintegration/update-vsintegration.cmd b/vsintegration/update-vsintegration.cmd index b7de829c447..e0aed49e085 100644 --- a/vsintegration/update-vsintegration.cmd +++ b/vsintegration/update-vsintegration.cmd @@ -47,10 +47,10 @@ copy /y "%BINDIR%\fsc.exe.config" "%COMPILERSDKPATH%" copy /y "%BINDIR%\FSharp.Build.dll" "%COMPILERSDKPATH%" copy /y "%BINDIR%\FSharp.Compiler.dll" "%COMPILERSDKPATH%" copy /y "%BINDIR%\FSharp.Compiler.Interactive.Settings.dll" "%COMPILERSDKPATH%" -copy /y "%BINDIR%\Fsi.exe" "%COMPILERSDKPATH%" -copy /y "%BINDIR%\Fsi.exe.config" "%COMPILERSDKPATH%" -copy /y "%BINDIR%\FsiAnyCPU.exe" "%COMPILERSDKPATH%" -copy /y "%BINDIR%\FsiAnyCPU.exe.config" "%COMPILERSDKPATH%" +copy /y "%BINDIR%\fsi.exe" "%COMPILERSDKPATH%" +copy /y "%BINDIR%\fsi.exe.config" "%COMPILERSDKPATH%" +copy /y "%BINDIR%\fsiAnyCpu.exe" "%COMPILERSDKPATH%" +copy /y "%BINDIR%\fsiAnyCpu.exe.config" "%COMPILERSDKPATH%" copy /y "%BINDIR%\Microsoft.FSharp.targets" "%COMPILERSDKPATH%" copy /y "%BINDIR%\Microsoft.Portable.FSharp.targets" "%COMPILERSDKPATH%" copy /y "%TOPDIR%\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" "%COMPILERSDKPATH%"