Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use the same FSharp.Core.dlls as FSharpx

  • Loading branch information...
commit 5622e0c55ad65257c4eba51911b2b9c57f602e23 1 parent 3715bdb
Steffen Forkmann authored

Showing 42 changed files with 10,764 additions and 212 deletions. Show diff stats Hide diff stats

  1. 11  src/app/NaturalSpec/NaturalSpec.fsproj
  2. 11  src/test/Spec.Articles/Spec.Articles.fsproj
  3. 11  src/test/Spec.CarSellingLib/Spec.CarSellingLib.fsproj
  4. 10  src/test/Spec.Euler/Spec.Euler.fsproj
  5. 10  src/test/Spec.KataFizzBuzz/Spec.KataFizzBuzz.fsproj
  6. 10  src/test/Spec.KataNumberToLCD/Spec.KataNumberToLCD.fsproj
  7. 10  src/test/Spec.KataSort/Spec.KataSort.fsproj
  8. 10  src/test/Spec.KataStringReplacer/Spec.KataStringReplacer.fsproj
  9. 10  src/test/Spec.KataTennis/Spec.KataTennis.fsproj
  10. 10  src/test/Spec.KataYahtzee/Spec.KataYahtzee.fsproj
  11. 10  src/test/Spec.NaturalSpec/Spec.NaturalSpec.fsproj
  12. 10  src/test/Spec.OrderProcessingLib/Spec.OrderProcessingLib.fsproj
  13. 11  src/test/Spec.StoreSample/Spec.StoreSample.fsproj
  14. BIN  tools/FSharp/FSharp.Build.dll
  15. BIN  tools/FSharp/FSharp.Compiler.Interactive.Settings.dll
  16. 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. 75  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  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
11  src/app/NaturalSpec/NaturalSpec.fsproj
@@ -60,9 +60,14 @@
60 60
     <None Include="packages.config" />
61 61
   </ItemGroup>
62 62
   <ItemGroup>
63  
-    <Reference Include="FSharp.Core">
64  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
65  
-      <Private>True</Private>
  63
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  64
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  65
+    </Reference>
  66
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  67
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  68
+    </Reference>
  69
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  70
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
66 71
     </Reference>
67 72
     <Reference Include="mscorlib" />
68 73
     <Reference Include="nunit.framework">
11  src/test/Spec.Articles/Spec.Articles.fsproj
@@ -39,9 +39,14 @@
39 39
     <None Include="packages.config" />
40 40
   </ItemGroup>
41 41
   <ItemGroup>
42  
-    <Reference Include="FSharp.Core">
43  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
44  
-      <Private>True</Private>
  42
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  43
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  44
+    </Reference>
  45
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  46
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  47
+    </Reference>
  48
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  49
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
45 50
     </Reference>
46 51
     <Reference Include="mscorlib" />
47 52
     <Reference Include="nunit.framework">
11  src/test/Spec.CarSellingLib/Spec.CarSellingLib.fsproj
@@ -44,9 +44,14 @@
44 44
       <Project>{3019240d-bbd3-4951-9c5e-4b343638bd4b}</Project>
45 45
       <Private>True</Private>
46 46
     </ProjectReference>
47  
-    <Reference Include="FSharp.Core">
48  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
49  
-      <Private>True</Private>
  47
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  48
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  49
+    </Reference>
  50
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  51
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  52
+    </Reference>
  53
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  54
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
50 55
     </Reference>
51 56
     <Reference Include="mscorlib" />
52 57
     <Reference Include="nunit.framework">
10  src/test/Spec.Euler/Spec.Euler.fsproj
@@ -79,8 +79,14 @@
79 79
     <None Include="packages.config" />
80 80
   </ItemGroup>
81 81
   <ItemGroup>
82  
-    <Reference Include="FSharp.Core">
83  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  82
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  83
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  84
+    </Reference>
  85
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  86
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  87
+    </Reference>
  88
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  89
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
84 90
     </Reference>
85 91
     <Reference Include="mscorlib" />
86 92
     <Reference Include="nunit.framework">
10  src/test/Spec.KataFizzBuzz/Spec.KataFizzBuzz.fsproj
@@ -38,8 +38,14 @@
38 38
     <None Include="packages.config" />
39 39
   </ItemGroup>
40 40
   <ItemGroup>
41  
-    <Reference Include="FSharp.Core">
42  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  41
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  42
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  43
+    </Reference>
  44
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  45
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  46
+    </Reference>
  47
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  48
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
43 49
     </Reference>
44 50
     <Reference Include="mscorlib" />
45 51
     <Reference Include="nunit.framework">
10  src/test/Spec.KataNumberToLCD/Spec.KataNumberToLCD.fsproj
@@ -42,8 +42,14 @@
42 42
     <None Include="packages.config" />
43 43
   </ItemGroup>
44 44
   <ItemGroup>
45  
-    <Reference Include="FSharp.Core">
46  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  45
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  46
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  47
+    </Reference>
  48
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  49
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  50
+    </Reference>
  51
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  52
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
47 53
     </Reference>
48 54
     <Reference Include="mscorlib" />
49 55
     <Reference Include="nunit.framework">
10  src/test/Spec.KataSort/Spec.KataSort.fsproj
@@ -39,8 +39,14 @@
39 39
     <None Include="packages.config" />
40 40
   </ItemGroup>
41 41
   <ItemGroup>
42  
-    <Reference Include="FSharp.Core">
43  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  42
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  43
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  44
+    </Reference>
  45
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  46
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  47
+    </Reference>
  48
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  49
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
44 50
     </Reference>
45 51
     <Reference Include="mscorlib" />
46 52
     <Reference Include="nunit.framework">
10  src/test/Spec.KataStringReplacer/Spec.KataStringReplacer.fsproj
@@ -42,8 +42,14 @@
42 42
     <None Include="packages.config" />
43 43
   </ItemGroup>
44 44
   <ItemGroup>
45  
-    <Reference Include="FSharp.Core">
46  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  45
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  46
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  47
+    </Reference>
  48
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  49
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  50
+    </Reference>
  51
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  52
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
47 53
     </Reference>
48 54
     <Reference Include="mscorlib" />
49 55
     <Reference Include="nunit.framework">
10  src/test/Spec.KataTennis/Spec.KataTennis.fsproj
@@ -41,8 +41,14 @@
41 41
     <None Include="packages.config" />
42 42
   </ItemGroup>
43 43
   <ItemGroup>
44  
-    <Reference Include="FSharp.Core">
45  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  44
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  45
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  46
+    </Reference>
  47
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  48
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  49
+    </Reference>
  50
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  51
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
46 52
     </Reference>
47 53
     <Reference Include="mscorlib" />
48 54
     <Reference Include="nunit.framework">
10  src/test/Spec.KataYahtzee/Spec.KataYahtzee.fsproj
@@ -41,8 +41,14 @@
41 41
     <None Include="packages.config" />
42 42
   </ItemGroup>
43 43
   <ItemGroup>
44  
-    <Reference Include="FSharp.Core">
45  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  44
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  45
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  46
+    </Reference>
  47
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  48
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  49
+    </Reference>
  50
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  51
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
46 52
     </Reference>
47 53
     <Reference Include="mscorlib" />
48 54
     <Reference Include="nunit.framework">
10  src/test/Spec.NaturalSpec/Spec.NaturalSpec.fsproj
@@ -51,8 +51,14 @@
51 51
     <None Include="packages.config" />
52 52
   </ItemGroup>
53 53
   <ItemGroup>
54  
-    <Reference Include="FSharp.Core">
55  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  54
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  55
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  56
+    </Reference>
  57
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  58
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  59
+    </Reference>
  60
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  61
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
56 62
     </Reference>
57 63
     <Reference Include="mscorlib" />
58 64
     <Reference Include="nunit.framework">
10  src/test/Spec.OrderProcessingLib/Spec.OrderProcessingLib.fsproj
@@ -38,8 +38,14 @@
38 38
     <None Include="packages.config" />
39 39
   </ItemGroup>
40 40
   <ItemGroup>
41  
-    <Reference Include="FSharp.Core">
42  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  41
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  42
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  43
+    </Reference>
  44
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  45
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  46
+    </Reference>
  47
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  48
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
43 49
     </Reference>
44 50
     <Reference Include="mscorlib" />
45 51
     <Reference Include="nunit.framework">
11  src/test/Spec.StoreSample/Spec.StoreSample.fsproj
@@ -38,9 +38,14 @@
38 38
     <None Include="packages.config" />
39 39
   </ItemGroup>
40 40
   <ItemGroup>
41  
-    <Reference Include="FSharp.Core">
42  
-      <HintPath>..\..\..\tools\FSharp\FSharp.Core.dll</HintPath>
43  
-      <Private>True</Private>
  41
+    <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">
  42
+      <HintPath>..\..\tools\FSharp\Net20\FSharp.Core.dll</HintPath>
  43
+    </Reference>
  44
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
  45
+      <HintPath>..\..\tools\FSharp\FSharp.Core.dll</HintPath>
  46
+    </Reference>
  47
+    <Reference Include="FSharp.Core" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
  48
+      <HintPath>..\..\tools\FSharp\Net45\FSharp.Core.dll</HintPath>
44 49
     </Reference>
45 50
     <Reference Include="mscorlib" />
46 51
     <Reference Include="nunit.framework">
BIN  tools/FSharp/FSharp.Build.dll
Binary file not shown
BIN  tools/FSharp/FSharp.Compiler.Interactive.Settings.dll
Binary file not shown
164  tools/FSharp/FSharp.Compiler.Interactive.Settings.xml
... ...
@@ -1,164 +0,0 @@
1  
-<?xml version="1.0" encoding="utf-8"?>
2  
-<doc>
3  
-<assembly><name>FSharp.Compiler.Interactive.Settings</name></assembly>
4  
-<members>
5  
-<member name="">
6  
-
7  
-</member>
8  
-<member name="">
9  
-
10  
-</member>
11  
-<member name="">
12  
-
13  
-</member>
14  
-<member name="">
15  
-
16  
-</member>
17  
-<member name="P:FSInteractiveSettings.SR.SwallowResourceText(System.Boolean)">
18  
-<summary>
19  
- 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).
20  
-</summary>
21  
-</member>
22  
-<member name="P:FSInteractiveSettings.SR.SwallowResourceText">
23  
-<summary>
24  
- 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).
25  
-</summary>
26  
-</member>
27  
-<member name="M:FSInteractiveSettings.SR.RunStartupValidation">
28  
-<summary>
29  
- Call this method once to validate that all known resources are valid; throws if not
30  
-</summary>
31  
-</member>
32  
-<member name="">
33  
-
34  
-</member>
35  
-<member name="">
36  
-
37  
-</member>
38  
-<member name="">
39  
-
40  
-</member>
41  
-<member name="M:Microsoft.FSharp.Compiler.Interactive.IEventLoop.ScheduleRestart">
42  
- <summary>Schedule a restart for the event loop.</summary>
43  
-</member>
44  
-<member name="M:Microsoft.FSharp.Compiler.Interactive.IEventLoop.Run">
45  
- <summary>Run the event loop.</summary>
46  
- <returns>True if the event loop was restarted; false otherwise.</returns>
47  
-</member>
48  
-<member name="M:Microsoft.FSharp.Compiler.Interactive.IEventLoop.Invoke``1(Microsoft.FSharp.Core.FSharpFunc`2{Microsoft.FSharp.Core.Unit,``0})">
49  
- <summary>Request that the given operation be run synchronously on the event loop.</summary>
50  
- <returns>The result of the operation.</returns>
51  
-</member>
52  
-<member name="T:Microsoft.FSharp.Compiler.Interactive.IEventLoop">
53  
- <summary>An event loop used by the currently executing F# Interactive session to execute code
54  
- in the context of a GUI or another event-based system.</summary>
55  
-</member>
56  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowProperties(System.Boolean)">
57  
- <summary>When set to 'false', disables the display of properties of evaluated objects in the output of the interactive session.</summary>
58  
-</member>
59  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowIEnumerable(System.Boolean)">
60  
- <summary>When set to 'false', disables the display of sequences in the output of the interactive session.</summary>
61  
-</member>
62  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowDeclarationValues(System.Boolean)">
63  
- <summary>When set to 'false', disables the display of declaration values in the output of the interactive session.</summary>
64  
-</member>
65  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintWidth(System.Int32)">
66  
- <summary>Get or set the print width of the interactive session.</summary>
67  
-</member>
68  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintSize(System.Int32)">
69  
- <summary>Get or set the total print size of the interactive session.</summary>
70  
-</member>
71  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintLength(System.Int32)">
72  
- <summary>Get or set the total print length of the interactive session.</summary>
73  
-</member>
74  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintDepth(System.Int32)">
75  
- <summary>Get or set the print depth of the interactive session.</summary>
76  
-</member>
77  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FormatProvider(System.IFormatProvider)">
78  
- <summary>Get or set the format provider used in the output of the interactive session.</summary>
79  
-</member>
80  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FloatingPointFormat(System.String)">
81  
- <summary>Get or set the floating point format used in the output of the interactive session.</summary>
82  
-</member>
83  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.EventLoop(Microsoft.FSharp.Compiler.Interactive.IEventLoop)">
84  
- <summary>Gets or sets a the current event loop being used to process interactions.</summary>
85  
-</member>
86  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.CommandLineArgs(System.String[])">
87  
- <summary>The command line arguments after ignoring the arguments relevant to the interactive
88  
- environment and replacing the first argument with the name of the last script file,
89  
- if any. Thus 'fsi.exe test1.fs test2.fs -- hello goodbye' will give arguments
90  
- 'test2.fs', 'hello', 'goodbye'.  This value will normally be different to those
91  
- returned by System.Environment.GetCommandLineArgs.</summary>
92  
-</member>
93  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowProperties">
94  
- <summary>When set to 'false', disables the display of properties of evaluated objects in the output of the interactive session.</summary>
95  
-</member>
96  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowIEnumerable">
97  
- <summary>When set to 'false', disables the display of sequences in the output of the interactive session.</summary>
98  
-</member>
99  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.ShowDeclarationValues">
100  
- <summary>When set to 'false', disables the display of declaration values in the output of the interactive session.</summary>
101  
-</member>
102  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintWidth">
103  
- <summary>Get or set the print width of the interactive session.</summary>
104  
-</member>
105  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintSize">
106  
- <summary>Get or set the total print size of the interactive session.</summary>
107  
-</member>
108  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintLength">
109  
- <summary>Get or set the total print length of the interactive session.</summary>
110  
-</member>
111  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.PrintDepth">
112  
- <summary>Get or set the print depth of the interactive session.</summary>
113  
-</member>
114  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FormatProvider">
115  
- <summary>Get or set the format provider used in the output of the interactive session.</summary>
116  
-</member>
117  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.FloatingPointFormat">
118  
- <summary>Get or set the floating point format used in the output of the interactive session.</summary>
119  
-</member>
120  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.EventLoop">
121  
- <summary>Gets or sets a the current event loop being used to process interactions.</summary>
122  
-</member>
123  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.CommandLineArgs">
124  
- <summary>The command line arguments after ignoring the arguments relevant to the interactive
125  
- environment and replacing the first argument with the name of the last script file,
126  
- if any. Thus 'fsi.exe test1.fs test2.fs -- hello goodbye' will give arguments
127  
- 'test2.fs', 'hello', 'goodbye'.  This value will normally be different to those
128  
- returned by System.Environment.GetCommandLineArgs.</summary>
129  
-</member>
130  
-<member name="">
131  
-
132  
-</member>
133  
-<member name="M:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.AddPrinter``1(Microsoft.FSharp.Core.FSharpFunc`2{``0,System.String})">
134  
- <summary>Register a printer that controls the output of the interactive session.</summary>
135  
-</member>
136  
-<member name="M:Microsoft.FSharp.Compiler.Interactive.InteractiveSession.AddPrintTransformer``1(Microsoft.FSharp.Core.FSharpFunc`2{``0,System.Object})">
137  
- <summary>Register a print transformer that controls the output of the interactive session.</summary>
138  
-</member>
139  
-<member name="T:Microsoft.FSharp.Compiler.Interactive.InteractiveSession">
140  
- <summary>Operations supported by the currently executing F# Interactive session.</summary>
141  
-</member>
142  
-<member name="T:Microsoft.FSharp.Compiler.Interactive.Attributes">
143  
-
144  
-</member>
145  
-<member name="">
146  
-
147  
-</member>
148  
-<member name="">
149  
-
150  
-</member>
151  
-<member name="">
152  
-
153  
-</member>
154  
-<member name="T:Microsoft.FSharp.Compiler.Interactive.RuntimeHelpers">
155  
- <summary>Hooks (internal use only, may change without notice).</summary>
156  
-</member>
157  
-<member name="P:Microsoft.FSharp.Compiler.Interactive.Settings.fsi">
158  
- <summary>The settings associated with the interactive session.</summary>
159  
-</member>
160  
-<member name="T:Microsoft.FSharp.Compiler.Interactive.Settings">
161  
-
162  
-</member>
163  
-</members>
164  
-</doc>
BIN  tools/FSharp/FSharp.Compiler.Server.Shared.dll
Binary file not shown
BIN  tools/FSharp/FSharp.Compiler.dll
Binary file not shown
BIN  tools/FSharp/FSharp.Core.dll
Binary file not shown
BIN  tools/FSharp/FSharp.Core.optdata
Binary file not shown
BIN  tools/FSharp/FSharp.Core.pdb
Binary file not shown
BIN  tools/FSharp/FSharp.Core.sigdata
Binary file not shown
BIN  tools/FSharp/FSharp.LanguageService.Base.dll
Binary file not shown
BIN  tools/FSharp/FSharp.LanguageService.dll
Binary file not shown
BIN  tools/FSharp/FSharp.PowerPack.dll
Binary file not shown
BIN  tools/FSharp/FSharp.ProjectSystem.Base.dll
Binary file not shown
BIN  tools/FSharp/FSharp.ProjectSystem.FSharp.dll
Binary file not shown
BIN  tools/FSharp/FSharp.ProjectSystem.PropertyPages.dll
Binary file not shown
BIN  tools/FSharp/FSharp.VS.FSI.dll
Binary file not shown
BIN  tools/FSharp/Fsc.exe
Binary file not shown
BIN  tools/FSharp/Fsi.exe
Binary file not shown
75  tools/FSharp/Microsoft.FSharp.targets
@@ -20,13 +20,15 @@ Copyright (C) Microsoft Corporation. All rights reserved.
20 20
     <UsingTask TaskName="Fsc" AssemblyFile="FSharp.Build.dll"/>
21 21
     <UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="FSharp.Build.dll"/>
22 22
 
  23
+    <PropertyGroup>
  24
+        <ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>
  25
+        <ImportByWildcardAfterMicrosoftFSharpTargets Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == ''">true</ImportByWildcardAfterMicrosoftFSharpTargets>
  26
+    </PropertyGroup>
  27
+
  28
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore\*" Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore')"/>
23 29
 
24 30
     <PropertyGroup>
25  
-        <!-- FSharpTargetsDir is the directory where the targets file lives -->
26  
-        <FSharpTargetsDir Condition="'$(FSharpTargetsDir)'==''">$(MSBuildExtensionsPath32)\FSharp\1.0\</FSharpTargetsDir>
27  
-        <!-- FSharpTargetsFullPath is the full path (dir + filename) of the targets file -->
28  
-        <FSharpTargetsFullPath Condition="'$(FSharpTargetsDir)'!=''">$(FSharpTargetsDir)\Microsoft.FSharp.targets</FSharpTargetsFullPath>
29  
-        <MSBuildAllProjects>$(MSBuildAllProjects);$(FSharpTargetsFullPath)</MSBuildAllProjects>
  31
+        <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
30 32
         <DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
31 33
         <Language>F#</Language>
32 34
         <Tailcalls Condition="'$(Tailcalls)'==''">$(Optimize)</Tailcalls>
@@ -67,9 +69,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
67 69
 
68 70
         <!-- Create manifest names for culture and non-culture Resx files, and for non-culture Non-Resx resources -->
69 71
         <CreateFSharpManifestResourceName
70  
-            ResourceFiles="@(EmbeddedResource)"
71  
-            RootNamespace="$(RootNamespace)"
72  
-            Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
  72
+              ResourceFiles="@(EmbeddedResource)"
  73
+              RootNamespace="$(RootNamespace)"
  74
+              Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
73 75
 
74 76
             <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
75 77
 
@@ -77,10 +79,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
77 79
 
78 80
         <!-- Create manifest names for all culture non-resx resources -->
79 81
         <CreateFSharpManifestResourceName
80  
-            ResourceFiles="@(EmbeddedResource)"
81  
-            RootNamespace="$(RootNamespace)"
82  
-            PrependCultureAsDirectory="false"
83  
-            Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
  82
+              ResourceFiles="@(EmbeddedResource)"
  83
+              RootNamespace="$(RootNamespace)"
  84
+              PrependCultureAsDirectory="false"
  85
+              Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
84 86
 
85 87
             <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
86 88
 
@@ -129,15 +131,14 @@ Copyright (C) Microsoft Corporation. All rights reserved.
129 131
                  @(_DebugSymbolsIntermediatePath);                 
130 132
                  $(NonExistentFile);
131 133
                  @(CustomAdditionalCompileOutputs)"
  134
+        Returns=""
132 135
         DependsOnTargets="$(CoreCompileDependsOn)"
133 136
     >
134 137
 
135  
-        <!-- See bug 6053
136  
-        <Error  
  138
+        <Error
137 139
             Condition="'$(SilverlightVersion)' != '' and !(Exists('$(ProgramFiles)\Microsoft F#\Silverlight\Libraries\Client\$(SilverlightVersion)\FSharp.Core.dll'))"
138 140
             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"
139  
-          />
140  
-          -->
  141
+        />
141 142
 
142 143
         <Warning
143 144
             Condition="'$(Win32ResourceFile)' != '' "
@@ -178,7 +179,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
178 179
               WarningsAsErrors="$(WarningsAsErrors)"
179 180
               Win32ManifestFile="$(Win32Manifest)"
180 181
               Win32ResourceFile="$(Win32Resource)"
181  
-                />
  182
+        />
182 183
 
183 184
         <ItemGroup>
184 185
             <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
@@ -186,7 +187,45 @@ Copyright (C) Microsoft Corporation. All rights reserved.
186 187
 
187 188
     </Target>
188 189
 
  190
+
189 191
     <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets"/>
190 192
 
191  
-</Project>
  193
+    <!--
  194
+      ============================================================
  195
+                                          GenerateTargetFrameworkMonikerAttribute
192 196
 
  197
+      Emit the target framework moniker attribute as  a code fragment into a temporary source file for the compiler.
  198
+
  199
+      ============================================================
  200
+      -->
  201
+
  202
+    <Target Name="GenerateTargetFrameworkMonikerAttribute" BeforeTargets="BeforeCompile" DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths" Inputs="$(MSBuildThisFileFullPath)" Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(GenerateTargetFrameworkAttribute)' == 'true'">
  203
+
  204
+        <PropertyGroup>
  205
+            <!-- This attribute is only available in mscorlib v4 and later -->
  206
+            <AdditionalSourcesText Condition="'$(TargetFrameworkMoniker)' != '' and '$(TargetingClr2Framework)' != 'true'">
  207
+                $(AdditionalSourcesText)
  208
+                namespace Microsoft.BuildSettings
  209
+                [&lt;System.Runtime.Versioning.TargetFrameworkAttribute(&quot;$(TargetFrameworkMoniker)&quot;, FrameworkDisplayName=&quot;$(TargetFrameworkMonikerDisplayName)&quot;)&gt;]
  210
+                do ()
  211
+            </AdditionalSourcesText>
  212
+        </PropertyGroup>
  213
+
  214
+        <!-- This is a file shared between projects so we have to take care to handle simultaneous writes (by ContinueOnError)
  215
+             and a race between clean from one project and build from another (by not adding to FilesWritten so it doesn't clean) -->
  216
+        <WriteLinesToFile
  217
+            File="$(TargetFrameworkMonikerAssemblyAttributesPath)"
  218
+            Lines="$(AdditionalSourcesText)"
  219
+            Condition="'$(AdditionalSourcesText)' != ''"
  220
+            ContinueOnError="true"
  221
+            Overwrite="true"/>
  222
+
  223
+        <ItemGroup>
  224
+            <CompileBefore Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(AdditionalSourcesText)' != ''"/>
  225
+        </ItemGroup>
  226
+
  227
+    </Target>
  228
+
  229
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter\*" Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter')"/>
  230
+
  231
+</Project>
BIN  tools/FSharp/Net20/FSharp.Core.dll
Binary file not shown
BIN  tools/FSharp/Net20/FSharp.Core.optdata
Binary file not shown
BIN  tools/FSharp/Net20/FSharp.Core.sigdata
Binary file not shown
0  tools/FSharp/FSharp.Core.xml → tools/FSharp/Net20/FSharp.Core.xml
File renamed without changes
BIN  tools/FSharp/Net45/FSharp.Core.dll
Binary file not shown
BIN  tools/FSharp/Net45/FSharp.Core.optdata
Binary file not shown
BIN  tools/FSharp/Net45/FSharp.Core.sigdata
Binary file not shown
10,603  tools/FSharp/Net45/FSharp.Core.xml
10603 additions, 0 deletions not shown
BIN  tools/FSharp/Net45/FSharp.Data.TypeProviders.dll
Binary file not shown
BIN  tools/FSharp/Net45/policy.2.3.FSharp.Core.dll
Binary file not shown

0 notes on commit 5622e0c

Please sign in to comment.
Something went wrong with that request. Please try again.