Skip to content

Commit ef43597

Browse files
cartermpbaronfel
cartermp
authored and
baronfel
committed
Remove IVT to fsi from FSharp.Compiler.Private (#6957)
* Remove IVT to fsi from FSharp.Compiler.Private * Save the out stream * Remove IVT to fsianycpu (note: due to changes to fslex/fsyacc I (Chet Husk) had to reintroduce fsharp.core back into the repo at this point, but was unable to do so as a separate commit)
1 parent eefb280 commit ef43597

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+50221
-14
lines changed

‎src/fsharp/FSharp.Core/FSCore.resx‎

Lines changed: 543 additions & 0 deletions
Large diffs are not rendered by default.

‎src/fsharp/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 244 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,244 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
3+
<Project Sdk="Microsoft.NET.Sdk">
4+
5+
<PropertyGroup>
6+
<OutputType>Library</OutputType>
7+
<TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
8+
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netstandard1.6</TargetFrameworks>
9+
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
10+
<AllowCrossTargeting>true</AllowCrossTargeting>
11+
<DefineConstants>$(DefineConstants);FSHARP_CORE</DefineConstants>
12+
<DefineConstants Condition="'$(Configuration)' == 'Proto'">BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
13+
<OtherFlags>$(OtherFlags) --warnon:1182 --compiling-fslib --compiling-fslib-40 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
14+
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
15+
<NGenBinary>true</NGenBinary>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<EmbeddedResource Update="FSCore.resx">
20+
<GenerateSource>true</GenerateSource>
21+
<GenerateLegacyCode>true</GenerateLegacyCode>
22+
<GenerateLiterals>false</GenerateLiterals>
23+
<GeneratedModuleName>Microsoft.FSharp.Core.SR</GeneratedModuleName>
24+
<Link>FSCore.resx</Link>
25+
</EmbeddedResource>
26+
<CompileBefore Include="prim-types-prelude.fsi">
27+
<Link>Primitives/prim-types-prelude.fsi</Link>
28+
</CompileBefore>
29+
<CompileBefore Include="prim-types-prelude.fs">
30+
<Link>Primitives/prim-types-prelude.fs</Link>
31+
</CompileBefore>
32+
<Compile Include="prim-types.fsi">
33+
<Link>Primitives/prim-types.fsi</Link>
34+
</Compile>
35+
<Compile Include="prim-types.fs">
36+
<Link>Primitives/prim-types.fs</Link>
37+
</Compile>
38+
<Compile Include="local.fsi">
39+
<Link>Collections/local.fsi</Link>
40+
</Compile>
41+
<Compile Include="local.fs">
42+
<Link>Collections/local.fs</Link>
43+
</Compile>
44+
<Compile Include="array2.fsi">
45+
<Link>Collections/array2.fsi</Link>
46+
</Compile>
47+
<Compile Include="array2.fs">
48+
<Link>Collections/array2.fs</Link>
49+
</Compile>
50+
<Compile Include="option.fsi">
51+
<Link>Collections/option.fsi</Link>
52+
</Compile>
53+
<Compile Include="option.fs">
54+
<Link>Collections/option.fs</Link>
55+
</Compile>
56+
<Compile Include="result.fsi">
57+
<Link>Collections/result.fsi</Link>
58+
</Compile>
59+
<Compile Include="result.fs">
60+
<Link>Collections/result.fs</Link>
61+
</Compile>
62+
<Compile Include="collections.fsi">
63+
<Link>Collections/collections.fsi</Link>
64+
</Compile>
65+
<Compile Include="collections.fs">
66+
<Link>Collections/collections.fs</Link>
67+
</Compile>
68+
<Compile Include="seqcore.fsi">
69+
<Link>Collections/seqcore.fsi</Link>
70+
</Compile>
71+
<Compile Include="seqcore.fs">
72+
<Link>Collections/seqcore.fs</Link>
73+
</Compile>
74+
<Compile Include="seq.fsi">
75+
<Link>Collections/seq.fsi</Link>
76+
</Compile>
77+
<Compile Include="seq.fs">
78+
<Link>Collections/seq.fs</Link>
79+
</Compile>
80+
<Compile Include="string.fsi">
81+
<Link>Collections/string.fsi</Link>
82+
</Compile>
83+
<Compile Include="string.fs">
84+
<Link>Collections/string.fs</Link>
85+
</Compile>
86+
<Compile Include="list.fsi">
87+
<Link>Collections/list.fsi</Link>
88+
</Compile>
89+
<Compile Include="list.fs">
90+
<Link>Collections/list.fs</Link>
91+
</Compile>
92+
<Compile Include="array.fsi">
93+
<Link>Collections/array.fsi</Link>
94+
</Compile>
95+
<Compile Include="array.fs">
96+
<Link>Collections/array.fs</Link>
97+
</Compile>
98+
<Compile Include="array3.fsi">
99+
<Link>Collections/array3.fsi</Link>
100+
</Compile>
101+
<Compile Include="array3.fs">
102+
<Link>Collections/array3.fs</Link>
103+
</Compile>
104+
<Compile Include="map.fsi">
105+
<Link>Collections/map.fsi</Link>
106+
</Compile>
107+
<Compile Include="map.fs">
108+
<Link>Collections/map.fs</Link>
109+
</Compile>
110+
<Compile Include="set.fsi">
111+
<Link>Collections/set.fsi</Link>
112+
</Compile>
113+
<Compile Include="set.fs">
114+
<Link>Collections/set.fs</Link>
115+
</Compile>
116+
<Compile Include="..\..\utils\reshapedreflection.fs">
117+
<Link>Reflection/reshapedreflection.fs</Link>
118+
</Compile>
119+
<Compile Include="reflect.fsi">
120+
<Link>Reflection/reflect.fsi</Link>
121+
</Compile>
122+
<Compile Include="reflect.fs">
123+
<Link>Reflection/reflect.fs</Link>
124+
</Compile>
125+
<Compile Include="math\n.fsi">
126+
<Link>Numerics/n.fsi</Link>
127+
</Compile>
128+
<Compile Include="math\n.fs">
129+
<Link>Numerics/n.fs</Link>
130+
</Compile>
131+
<Compile Include="math\z.fsi">
132+
<Link>Numerics/z.fsi</Link>
133+
</Compile>
134+
<Compile Include="math\z.fs">
135+
<Link>Numerics/z.fs</Link>
136+
</Compile>
137+
<Compile Include="..\..\utils\sformat.fsi">
138+
<Link>Printf/sformat.fsi</Link>
139+
</Compile>
140+
<Compile Include="..\..\utils\sformat.fs">
141+
<Link>Printf/sformat.fs</Link>
142+
</Compile>
143+
<Compile Include="printf.fsi">
144+
<Link>Printf/printf.fsi</Link>
145+
</Compile>
146+
<Compile Include="printf.fs">
147+
<Link>Printf/printf.fs</Link>
148+
</Compile>
149+
<Compile Include="quotations.fsi">
150+
<Link>Quotations/quotations.fsi</Link>
151+
</Compile>
152+
<Compile Include="quotations.fs">
153+
<Link>Quotations/quotations.fs</Link>
154+
</Compile>
155+
<Compile Include="nativeptr.fsi">
156+
<Link>NativeInterop/nativeptr.fsi</Link>
157+
</Compile>
158+
<Compile Include="nativeptr.fs">
159+
<Link>NativeInterop/nativeptr.fs</Link>
160+
</Compile>
161+
<Compile Include="event.fsi">
162+
<Link>Control/event.fsi</Link>
163+
</Compile>
164+
<Compile Include="event.fs">
165+
<Link>Control/event.fs</Link>
166+
</Compile>
167+
<Compile Include="async.fsi">
168+
<Link>Control/async.fsi</Link>
169+
</Compile>
170+
<Compile Include="async.fs">
171+
<Link>Control/async.fs</Link>
172+
</Compile>
173+
<Compile Include="eventmodule.fsi">
174+
<Link>Control/eventmodule.fsi</Link>
175+
</Compile>
176+
<Compile Include="eventmodule.fs">
177+
<Link>Control/eventmodule.fs</Link>
178+
</Compile>
179+
<Compile Include="observable.fsi">
180+
<Link>Control/observable.fsi</Link>
181+
</Compile>
182+
<Compile Include="observable.fs">
183+
<Link>Control/observable.fs</Link>
184+
</Compile>
185+
<Compile Include="mailbox.fsi">
186+
<Link>MailboxProcessor/mailbox.fsi</Link>
187+
</Compile>
188+
<Compile Include="mailbox.fs">
189+
<Link>MailboxProcessor/mailbox.fs</Link>
190+
</Compile>
191+
<Compile Include="Linq.fsi">
192+
<Link>Queries/Linq.fsi</Link>
193+
</Compile>
194+
<Compile Include="Linq.fs">
195+
<Link>Queries/Linq.fs</Link>
196+
</Compile>
197+
<Compile Include="MutableTuple.fs">
198+
<Link>Queries/MutableTuple.fs</Link>
199+
</Compile>
200+
<Compile Include="QueryExtensions.fs">
201+
<Link>Queries/QueryExtensions.fs</Link>
202+
</Compile>
203+
<Compile Include="Query.fsi">
204+
<Link>Queries/Query.fsi</Link>
205+
</Compile>
206+
<Compile Include="Query.fs">
207+
<Link>Queries/Query.fs</Link>
208+
</Compile>
209+
<Compile Include="SI.fs">
210+
<Link>Units/SI.fs</Link>
211+
</Compile>
212+
<Compile Include="fslib-extra-pervasives.fsi">
213+
<Link>Extras/fslib-extra-pervasives.fsi</Link>
214+
</Compile>
215+
<Compile Include="fslib-extra-pervasives.fs">
216+
<Link>Extras/fslib-extra-pervasives.fs</Link>
217+
</Compile>
218+
</ItemGroup>
219+
220+
<ItemGroup>
221+
<PackageReference Include="System.Linq.Queryable" Version="$(SystemLinqQueryableVersion)" />
222+
<PackageReference Include="System.Net.Requests" Version="$(SystemNetRequestsVersion)" />
223+
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
224+
</ItemGroup>
225+
226+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
227+
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
228+
<PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolVersion)" />
229+
</ItemGroup>
230+
231+
<!-- Hook compilation phase to do custom work -->
232+
<!-- NOTE: The optdata and sigdata files are no longer needed by the F# compiler (the information is -->
233+
<!-- integrated as resources into more recent FSharp.Core.dll's. However they are still produced to -->
234+
<!-- allow older versions of the F# compiler to reference more recent FSharp.Core packages -->
235+
<Target Name="CopyToBuiltBin" BeforeTargets="AfterCompile" AfterTargets="CoreCompile" >
236+
<ItemGroup>
237+
<BuiltProjectOutputGroupKeyOutput Include="$(IntermediateOutputPath)\FSharp.Core.sigdata" />
238+
<BuiltProjectOutputGroupKeyOutput Include="$(IntermediateOutputPath)\FSharp.Core.optdata" />
239+
</ItemGroup>
240+
<Copy SourceFiles="$(IntermediateOutputPath)\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
241+
<Copy SourceFiles="$(IntermediateOutputPath)\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
242+
</Target>
243+
244+
</Project>

‎src/fsharp/FSharp.Core/FSharp.Core.runtimeconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"runtimeOptions": {}
3+
}

0 commit comments

Comments
 (0)