Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use the same FSharp.Core.dlls as FSharpx

  • Loading branch information...
commit 5622e0c55ad65257c4eba51911b2b9c57f602e23 1 parent 3715bdb
@forki authored
Showing with 10,764 additions and 212 deletions.
  1. +8 −3 src/app/NaturalSpec/NaturalSpec.fsproj
  2. +8 −3 src/test/Spec.Articles/Spec.Articles.fsproj
  3. +8 −3 src/test/Spec.CarSellingLib/Spec.CarSellingLib.fsproj
  4. +8 −2 src/test/Spec.Euler/Spec.Euler.fsproj
  5. +8 −2 src/test/Spec.KataFizzBuzz/Spec.KataFizzBuzz.fsproj
  6. +8 −2 src/test/Spec.KataNumberToLCD/Spec.KataNumberToLCD.fsproj
  7. +8 −2 src/test/Spec.KataSort/Spec.KataSort.fsproj
  8. +8 −2 src/test/Spec.KataStringReplacer/Spec.KataStringReplacer.fsproj
  9. +8 −2 src/test/Spec.KataTennis/Spec.KataTennis.fsproj
  10. +8 −2 src/test/Spec.KataYahtzee/Spec.KataYahtzee.fsproj
  11. +8 −2 src/test/Spec.NaturalSpec/Spec.NaturalSpec.fsproj
  12. +8 −2 src/test/Spec.OrderProcessingLib/Spec.OrderProcessingLib.fsproj
  13. +8 −3 src/test/Spec.StoreSample/Spec.StoreSample.fsproj
  14. BIN  tools/FSharp/FSharp.Build.dll
  15. BIN  tools/FSharp/FSharp.Compiler.Interactive.Settings.dll
  16. +0 −164 tools/FSharp/FSharp.Compiler.Interactive.Settings.xml
  17. BIN  tools/FSharp/FSharp.Compiler.Server.Shared.dll
  18. BIN  tools/FSharp/FSharp.Compiler.dll
  19. BIN  tools/FSharp/FSharp.Core.dll
  20. BIN  tools/FSharp/FSharp.Core.optdata
  21. BIN  tools/FSharp/FSharp.Core.pdb
  22. BIN  tools/FSharp/FSharp.Core.sigdata
  23. BIN  tools/FSharp/FSharp.LanguageService.Base.dll
  24. BIN  tools/FSharp/FSharp.LanguageService.dll
  25. BIN  tools/FSharp/FSharp.PowerPack.dll
  26. BIN  tools/FSharp/FSharp.ProjectSystem.Base.dll
  27. BIN  tools/FSharp/FSharp.ProjectSystem.FSharp.dll
  28. BIN  tools/FSharp/FSharp.ProjectSystem.PropertyPages.dll
  29. BIN  tools/FSharp/FSharp.VS.FSI.dll
  30. BIN  tools/FSharp/Fsc.exe
  31. BIN  tools/FSharp/Fsi.exe
  32. +57 −18 tools/FSharp/Microsoft.FSharp.targets
  33. BIN  tools/FSharp/Net20/FSharp.Core.dll
  34. BIN  tools/FSharp/Net20/FSharp.Core.optdata
  35. BIN  tools/FSharp/Net20/FSharp.Core.sigdata
  36. 0  tools/FSharp/{ → Net20}/FSharp.Core.xml
  37. BIN  tools/FSharp/Net45/FSharp.Core.dll
  38. BIN  tools/FSharp/Net45/FSharp.Core.optdata
  39. BIN  tools/FSharp/Net45/FSharp.Core.sigdata
  40. +10,603 −0 tools/FSharp/Net45/FSharp.Core.xml
  41. BIN  tools/FSharp/Net45/FSharp.Data.TypeProviders.dll
  42. BIN  tools/FSharp/Net45/policy.2.3.FSharp.Core.dll
View
11 src/app/NaturalSpec/NaturalSpec.fsproj
@@ -60,9 +60,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
11 src/test/Spec.Articles/Spec.Articles.fsproj
@@ -39,9 +39,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
11 src/test/Spec.CarSellingLib/Spec.CarSellingLib.fsproj
@@ -44,9 +44,14 @@
<Project>{3019240d-bbd3-4951-9c5e-4b343638bd4b}</Project>
<Private>True</Private>
</ProjectReference>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.Euler/Spec.Euler.fsproj
@@ -79,8 +79,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.KataFizzBuzz/Spec.KataFizzBuzz.fsproj
@@ -38,8 +38,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.KataNumberToLCD/Spec.KataNumberToLCD.fsproj
@@ -42,8 +42,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.KataSort/Spec.KataSort.fsproj
@@ -39,8 +39,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.KataStringReplacer/Spec.KataStringReplacer.fsproj
@@ -42,8 +42,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.KataTennis/Spec.KataTennis.fsproj
@@ -41,8 +41,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.KataYahtzee/Spec.KataYahtzee.fsproj
@@ -41,8 +41,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.NaturalSpec/Spec.NaturalSpec.fsproj
@@ -51,8 +51,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
10 src/test/Spec.OrderProcessingLib/Spec.OrderProcessingLib.fsproj
@@ -38,8 +38,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
11 src/test/Spec.StoreSample/Spec.StoreSample.fsproj
@@ -38,9 +38,14 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="FSharp.Core">
- <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
+ <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
View
BIN  tools/FSharp/FSharp.Build.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.Compiler.Interactive.Settings.dll
Binary file not shown
View
164 tools/FSharp/FSharp.Compiler.Interactive.Settings.xml
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doc>
-<assembly><name>FSharp.Compiler.Interactive.Settings</name></assembly>
-<members>
-<member name="">
-
-</member>
-<member name="">
-
-</member>
-<member name="">
-
-</member>
-<member name="">
-
-</member>
-<member name="P:FSInteractiveSettings.SR.SwallowResourceText(System.Boolean)">
-<summary>
- If set to true, then all error messages will just return the filled &apos;holes&apos; delimited by &apos;,,,&apos;s - this is for language-neutral testing (e.g. localization-invariant baselines).
-</summary>
-</member>
-<member name="P:FSInteractiveSettings.SR.SwallowResourceText">
-<summary>
- If set to true, then all error messages will just return the filled &apos;holes&apos; delimited by &apos;,,,&apos;s - this is for language-neutral testing (e.g. localization-invariant baselines).
-</summary>
-</member>
-<member name="M:FSInteractiveSettings.SR.RunStartupValidation">
-<summary>
- Call this method once to validate that all known resources are valid; throws if not
-</summary>
-</member>
-<member name="">
-
-</member>
-<member name="">
-
-</member>
-<member name="">
-
-</member>
-<member name="M:Microsoft.FSharp.Compiler.Interactive.IEventLoop.ScheduleRestart">
- <summary>Schedule a restart for the event loop.</summary>
-</member>
-<member name="M:Microsoft.FSharp.Compiler.Interactive.IEventLoop.Run">
- <summary>Run the event loop.</summary>
- <returns>True if the event loop was restarted; false otherwise.</returns>
-</member>
-<member name="M:Microsoft.FSharp.Compiler.Interactive.IEventLoop.Invoke``1(Microsoft.FSharp.Core.FSharpFunc`2{Microsoft.FSharp.Core.Unit,``0})">
- <summary>Request that the given operation be run synchronously on the event loop.</summary>
- <returns>The result of the operation.</returns>
-</member>
-<member name="T:Microsoft.FSharp.Compiler.Interactive.IEventLoop">
- <summary>An event loop used by the currently executing F# Interactive session to execute code
- in the context of a GUI or another event-based system.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowProperties(System.Boolean)">
- <summary>When set to 'false', disables the display of properties of evaluated objects in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowIEnumerable(System.Boolean)">
- <summary>When set to 'false', disables the display of sequences in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowDeclarationValues(System.Boolean)">
- <summary>When set to 'false', disables the display of declaration values in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintWidth(System.Int32)">
- <summary>Get or set the print width of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintSize(System.Int32)">
- <summary>Get or set the total print size of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintLength(System.Int32)">
- <summary>Get or set the total print length of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintDepth(System.Int32)">
- <summary>Get or set the print depth of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FormatProvider(System.IFormatProvider)">
- <summary>Get or set the format provider used in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FloatingPointFormat(System.String)">
- <summary>Get or set the floating point format used in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.EventLoop(Microsoft.FSharp.Compiler.Interactive.IEventLoop)">
- <summary>Gets or sets a the current event loop being used to process interactions.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.CommandLineArgs(System.String[])">
- <summary>The command line arguments after ignoring the arguments relevant to the interactive
- environment and replacing the first argument with the name of the last script file,
- if any. Thus 'fsi.exe test1.fs test2.fs -- hello goodbye' will give arguments
- 'test2.fs', 'hello', 'goodbye'. This value will normally be different to those
- returned by System.Environment.GetCommandLineArgs.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowProperties">
- <summary>When set to 'false', disables the display of properties of evaluated objects in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowIEnumerable">
- <summary>When set to 'false', disables the display of sequences in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowDeclarationValues">
- <summary>When set to 'false', disables the display of declaration values in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintWidth">
- <summary>Get or set the print width of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintSize">
- <summary>Get or set the total print size of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintLength">
- <summary>Get or set the total print length of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintDepth">
- <summary>Get or set the print depth of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FormatProvider">
- <summary>Get or set the format provider used in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FloatingPointFormat">
- <summary>Get or set the floating point format used in the output of the interactive session.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.EventLoop">
- <summary>Gets or sets a the current event loop being used to process interactions.</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.CommandLineArgs">
- <summary>The command line arguments after ignoring the arguments relevant to the interactive
- environment and replacing the first argument with the name of the last script file,
- if any. Thus 'fsi.exe test1.fs test2.fs -- hello goodbye' will give arguments
- 'test2.fs', 'hello', 'goodbye'. This value will normally be different to those
- returned by System.Environment.GetCommandLineArgs.</summary>
-</member>
-<member name="">
-
-</member>
-<member name="M:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.AddPrinter``1(Microsoft.FSharp.Core.FSharpFunc`2{``0,System.String})">
- <summary>Register a printer that controls the output of the interactive session.</summary>
-</member>
-<member name="M:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.AddPrintTransformer``1(Microsoft.FSharp.Core.FSharpFunc`2{``0,System.Object})">
- <summary>Register a print transformer that controls the output of the interactive session.</summary>
-</member>
-<member name="T:Microsoft.FSharp.Compiler.Interactive.InteractiveSession">
- <summary>Operations supported by the currently executing F# Interactive session.</summary>
-</member>
-<member name="T:Microsoft.FSharp.Compiler.Interactive.Attributes">
-
-</member>
-<member name="">
-
-</member>
-<member name="">
-
-</member>
-<member name="">
-
-</member>
-<member name="T:Microsoft.FSharp.Compiler.Interactive.RuntimeHelpers">
- <summary>Hooks (internal use only, may change without notice).</summary>
-</member>
-<member name="P:Microsoft.FSharp.Compiler.Interactive.Settings.fsi">
- <summary>The settings associated with the interactive session.</summary>
-</member>
-<member name="T:Microsoft.FSharp.Compiler.Interactive.Settings">
-
-</member>
-</members>
-</doc>
View
BIN  tools/FSharp/FSharp.Compiler.Server.Shared.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.Compiler.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.Core.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.Core.optdata
Binary file not shown
View
BIN  tools/FSharp/FSharp.Core.pdb
Binary file not shown
View
BIN  tools/FSharp/FSharp.Core.sigdata
Binary file not shown
View
BIN  tools/FSharp/FSharp.LanguageService.Base.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.LanguageService.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.PowerPack.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.ProjectSystem.Base.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.ProjectSystem.FSharp.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.ProjectSystem.PropertyPages.dll
Binary file not shown
View
BIN  tools/FSharp/FSharp.VS.FSI.dll
Binary file not shown
View
BIN  tools/FSharp/Fsc.exe
Binary file not shown
View
BIN  tools/FSharp/Fsi.exe
Binary file not shown
View
75 tools/FSharp/Microsoft.FSharp.targets
@@ -20,13 +20,15 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<UsingTask TaskName="Fsc" AssemblyFile="FSharp.Build.dll"/>
<UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="FSharp.Build.dll"/>
+ <PropertyGroup>
+ <ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>
+ <ImportByWildcardAfterMicrosoftFSharpTargets Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == ''">true</ImportByWildcardAfterMicrosoftFSharpTargets>
+ </PropertyGroup>
+
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore\*" Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore')"/>
<PropertyGroup>
- <!-- FSharpTargetsDir is the directory where the targets file lives -->
- <FSharpTargetsDir Condition="'$(FSharpTargetsDir)'==''">$(MSBuildExtensionsPath32)\FSharp\1.0\</FSharpTargetsDir>
- <!-- FSharpTargetsFullPath is the full path (dir + filename) of the targets file -->
- <FSharpTargetsFullPath Condition="'$(FSharpTargetsDir)'!=''">$(FSharpTargetsDir)\Microsoft.FSharp.targets</FSharpTargetsFullPath>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(FSharpTargetsFullPath)</MSBuildAllProjects>
+ <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
<Language>F#</Language>
<Tailcalls Condition="'$(Tailcalls)'==''">$(Optimize)</Tailcalls>
@@ -67,9 +69,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<!-- Create manifest names for culture and non-culture Resx files, and for non-culture Non-Resx resources -->
<CreateFSharpManifestResourceName
- ResourceFiles="@(EmbeddedResource)"
- RootNamespace="$(RootNamespace)"
- Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
+ ResourceFiles="@(EmbeddedResource)"
+ RootNamespace="$(RootNamespace)"
+ Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
<Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
@@ -77,10 +79,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<!-- Create manifest names for all culture non-resx resources -->
<CreateFSharpManifestResourceName
- ResourceFiles="@(EmbeddedResource)"
- RootNamespace="$(RootNamespace)"
- PrependCultureAsDirectory="false"
- Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
+ ResourceFiles="@(EmbeddedResource)"
+ RootNamespace="$(RootNamespace)"
+ PrependCultureAsDirectory="false"
+ Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
<Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
@@ -129,15 +131,14 @@ Copyright (C) Microsoft Corporation. All rights reserved.
@(_DebugSymbolsIntermediatePath);
$(NonExistentFile);
@(CustomAdditionalCompileOutputs)"
+ Returns=""
DependsOnTargets="$(CoreCompileDependsOn)"
>
- <!-- See bug 6053
- <Error
+ <Error
Condition="'$(SilverlightVersion)' != '' and !(Exists('$(ProgramFiles)\Microsoft F#\Silverlight\Libraries\Client\$(SilverlightVersion)\FSharp.Core.dll'))"
Text="F# runtime for Silverlight version $(SilverlightVersion) is not installed. Please go to http://go.microsoft.com/fwlink/?LinkId=177463 to download and install matching F# runtime"
- />
- -->
+ />
<Warning
Condition="'$(Win32ResourceFile)' != '' "
@@ -178,7 +179,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
WarningsAsErrors="$(WarningsAsErrors)"
Win32ManifestFile="$(Win32Manifest)"
Win32ResourceFile="$(Win32Resource)"
- />
+ />
<ItemGroup>
<_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
@@ -186,7 +187,45 @@ Copyright (C) Microsoft Corporation. All rights reserved.
</Target>
+
<Import Project="$(MSBuildBinPath)\Microsoft.Common.targets"/>
-</Project>
+ <!--
+ ============================================================
+ GenerateTargetFrameworkMonikerAttribute
+ Emit the target framework moniker attribute as a code fragment into a temporary source file for the compiler.
+
+ ============================================================
+ -->
+
+ <Target Name="GenerateTargetFrameworkMonikerAttribute" BeforeTargets="BeforeCompile" DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths" Inputs="$(MSBuildThisFileFullPath)" Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(GenerateTargetFrameworkAttribute)' == 'true'">
+
+ <PropertyGroup>
+ <!-- This attribute is only available in mscorlib v4 and later -->
+ <AdditionalSourcesText Condition="'$(TargetFrameworkMoniker)' != '' and '$(TargetingClr2Framework)' != 'true'">
+ $(AdditionalSourcesText)
+ namespace Microsoft.BuildSettings
+ [&lt;System.Runtime.Versioning.TargetFrameworkAttribute(&quot;$(TargetFrameworkMoniker)&quot;, FrameworkDisplayName=&quot;$(TargetFrameworkMonikerDisplayName)&quot;)&gt;]
+ do ()
+ </AdditionalSourcesText>
+ </PropertyGroup>
+
+ <!-- This is a file shared between projects so we have to take care to handle simultaneous writes (by ContinueOnError)
+ and a race between clean from one project and build from another (by not adding to FilesWritten so it doesn't clean) -->
+ <WriteLinesToFile
+ File="$(TargetFrameworkMonikerAssemblyAttributesPath)"
+ Lines="$(AdditionalSourcesText)"
+ Condition="'$(AdditionalSourcesText)' != ''"
+ ContinueOnError="true"
+ Overwrite="true"/>
+
+ <ItemGroup>
+ <CompileBefore Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(AdditionalSourcesText)' != ''"/>
+ </ItemGroup>
+
+ </Target>
+
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter\*" Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter')"/>
+
+</Project>
View
BIN  tools/FSharp/Net20/FSharp.Core.dll
Binary file not shown
View
BIN  tools/FSharp/Net20/FSharp.Core.optdata
Binary file not shown
View
BIN  tools/FSharp/Net20/FSharp.Core.sigdata
Binary file not shown
View
0  tools/FSharp/FSharp.Core.xml → tools/FSharp/Net20/FSharp.Core.xml
File renamed without changes
View
BIN  tools/FSharp/Net45/FSharp.Core.dll
Binary file not shown
View
BIN  tools/FSharp/Net45/FSharp.Core.optdata
Binary file not shown
View
BIN  tools/FSharp/Net45/FSharp.Core.sigdata
Binary file not shown
View
10,603 tools/FSharp/Net45/FSharp.Core.xml
10,603 additions, 0 deletions not shown
View
BIN  tools/FSharp/Net45/FSharp.Data.TypeProviders.dll
Binary file not shown
View
BIN  tools/FSharp/Net45/policy.2.3.FSharp.Core.dll
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.