Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc1d7ee3

Browse files
committed
Merge pull requestfsharp#269 from ovatsus/fsharp_30
Remove profile 88 as it doesn't work correctly, and never did, to avoid confusion (this is a partial revert offsharp#102)
2 parents274cec2 +40d9fc1 commitc1d7ee3

File tree

3 files changed

+6
-81
lines changed

3 files changed

+6
-81
lines changed

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,13 @@ ngen install ..\lib\proto\4.0\fsc-proto.exe (optional)
5959
msbuild fsharp-library-build.proj /p:Configuration=Release
6060
msbuild fsharp-compiler-build.proj /p:Configuration=Release
6161
```
62-
You can also build the FSharp.Core for .NET 2.0, Mono 2.1, MonoTouch, Silverlight 5.0,Windows Phone 7.1,Portable Profile47 (net45+sl5+win8), Portable Profile88 (net4+sl4+wp71+win8) and XNA 4.0 for Xbox 360 profiles:
62+
You can also build the FSharp.Core for .NET 2.0, Mono 2.1, MonoTouch, Silverlight 5.0, Portable Profile47 (net45+sl5+win8), and XNA 4.0 for Xbox 360 profiles:
6363
```
6464
msbuild fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
6565
msbuild fsharp-library-build.proj /p:TargetFramework=mono21 /p:Configuration=Release
6666
msbuild fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release
6767
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net45+sl5+win8 /p:Configuration=Release
68-
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net4+sl4+wp71+win8 /p:Configuration=Release
6968
msbuild fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
70-
msbuild fsharp-library-build.proj /p:TargetFramework=wp7 /p:Configuration=Release
7169
msbuild fsharp-library-build.proj /p:TargetFramework=net40-xna40-xbox360 /p:Configuration=Release
7270
```
7371
You can also build the FSharp.Core and FSharp.Compiler.Silverlight.dll for Silverlight 5.0:

‎src/FSharpSource.targets‎

Lines changed: 3 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<VersionFile>$(FSharpSourcesRoot)\source-build-version</VersionFile>
2323
<VersionFileCondition="'$(TargetFramework)' == 'net20'">$(FSharpSourcesRoot)\source-build-version-2.3.0.0</VersionFile>
2424
<VersionFileCondition="'$(TargetFramework)' == 'net40'">$(FSharpSourcesRoot)\source-build-version-4.3.0.0</VersionFile>
25-
<VersionFileCondition="'$(TargetFramework)' == 'portable-net4+sl4+wp71+win8'">$(FSharpSourcesRoot)\source-build-version-2.3.5.0</VersionFile>
2625
<VersionFileCondition="'$(TargetFramework)' == 'portable-net45+sl5+win8'">$(FSharpSourcesRoot)\source-build-version-2.3.5.0</VersionFile>
2726
<!--
2827
Some other NuGET monikers to support in the future, see http://docs.nuget.org/docs/creating-packages/creating-and-publishing-a-package#Package_Conventions
@@ -210,77 +209,6 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
210209

211210
</PropertyGroup>
212211

213-
<!-- Target Portable-->
214-
<PropertyGroupCondition="'$(TargetFramework)'=='portable-net4+sl4+wp71+win8'">
215-
216-
<TargetFrameworkProfile>Profile88</TargetFrameworkProfile>
217-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
218-
<TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
219-
220-
<DefineConstants>$(DefineConstants);FSHARP_CORE_PORTABLE</DefineConstants>
221-
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
222-
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
223-
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
224-
<DefineConstants>$(DefineConstants);FX_NO_DEBUG_PROXIES</DefineConstants>
225-
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
226-
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
227-
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
228-
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
229-
<DefineConstants>$(DefineConstants);FX_NO_TRUNCATE</DefineConstants>
230-
<DefineConstants>$(DefineConstants);FX_NO_CULTURE_INFO_ARGS</DefineConstants>
231-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULES</DefineConstants>
232-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
233-
<DefineConstants>$(DefineConstants);FX_NO_TO_LOWER_INVARIANT</DefineConstants>
234-
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
235-
<DefineConstants>$(DefineConstants);FX_NO_BASED_ARRAYS</DefineConstants>
236-
<DefineConstants>$(DefineConstants);FX_NO_DOUBLE_BIT_CONVERTER</DefineConstants>
237-
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
238-
<DefineConstants>$(DefineConstants);FX_NO_ASCII_ENCODING</DefineConstants>
239-
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_ENCODING</DefineConstants>
240-
<DefineConstants>$(DefineConstants);FX_NO_FILE_OPTIONS</DefineConstants>
241-
<DefineConstants>$(DefineConstants);FX_NO_NONBLOCK_IO</DefineConstants>
242-
<DefineConstants>$(DefineConstants);FX_NO_COMMAND_LINE_ARGS</DefineConstants>
243-
<DefineConstants>$(DefineConstants);FX_NO_ENVIRONMENT</DefineConstants>
244-
<DefineConstants>$(DefineConstants);FX_NO_PROCESS_START</DefineConstants>
245-
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
246-
<DefineConstants>$(DefineConstants);FX_NO_PROCESS_DIAGNOSTICS</DefineConstants>
247-
<DefineConstants>$(DefineConstants);FX_NO_IOBSERVABLE</DefineConstants>
248-
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
249-
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
250-
<DefineConstants>$(DefineConstants);FX_NO_GET_HASH_CODE_HELPER</DefineConstants>
251-
<DefineConstants>$(DefineConstants);FX_NO_COMVISIBLE</DefineConstants>
252-
<DefineConstants>$(DefineConstants);FX_NO_ICLONEABLE</DefineConstants>
253-
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
254-
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
255-
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
256-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
257-
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
258-
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
259-
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
260-
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
261-
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
262-
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
263-
<DefineConstants>$(DefineConstants);FX_NO_WAITONE_MILLISECONDS</DefineConstants>
264-
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
265-
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
266-
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
267-
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
268-
<DefineConstants>$(DefineConstants);DONT_INCLUDE_DEPRECATED</DefineConstants>
269-
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
270-
271-
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
272-
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
273-
<DefineConstants>$(DefineConstants);FX_NO_LAZY</DefineConstants>
274-
<DefineConstants>$(DefineConstants);FX_NO_TUPLE</DefineConstants>
275-
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
276-
<DefineConstants>$(DefineConstants);FX_NO_OPERATION_CANCELLED</DefineConstants>
277-
<DefineConstants>$(DefineConstants);FX_NO_THREAD_STATIC</DefineConstants>
278-
279-
<AssemblySearchPaths>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\$(TargetFrameworkProfile)</AssemblySearchPaths>
280-
<OtherFlags>$(OtherFlags) --simpleresolution -r:"$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\$(TargetFrameworkProfile)\mscorlib.dll" -r:"$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\$(TargetFrameworkProfile)\System.dll" -r:"$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\$(TargetFrameworkProfile)\System.Core.dll"</OtherFlags>
281-
282-
</PropertyGroup>
283-
284212
<!-- Target Silverlight 3.0-->
285213
<PropertyGroupCondition="'$(TargetFramework)'=='sl3'">
286214
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
@@ -677,10 +605,10 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
677605

678606
<!-- Include the portable targets file when building the portable FSharp.Core-->
679607
<ImportProject="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets"
680-
Condition=" '$(TargetFramework)'=='portable-net45+sl5+win8'OR '$(TargetFramework)'=='portable-net4+sl4+wp71+win8'AND Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')" />
608+
Condition=" '$(TargetFramework)'=='portable-net45+sl5+win8' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')" />
681609

682610
<!-- If the Microsoft.Portable.Common.targets file does not exist when building the portable FSharp.Core, include the following ProperyGroup-->
683-
<PropertyGroupCondition=" '$(TargetFramework)'=='portable-net45+sl5+win8'OR '$(TargetFramework)'=='portable-net4+sl4+wp71+win8'AND !Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')">
611+
<PropertyGroupCondition=" '$(TargetFramework)'=='portable-net45+sl5+win8' AND !Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets')">
684612

685613
<AvailablePlatforms>Any CPU</AvailablePlatforms>
686614

@@ -724,15 +652,14 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
724652
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
725653
Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='Proto'"/>
726654
<Error
727-
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, mono21, monotouch, wp7, sl5, sl5-compiler, portable-net4+sl4+wp71+win8, portable-net45+sl5+win8"
655+
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, mono21, monotouch, wp7, sl5, sl5-compiler, portable-net45+sl5+win8"
728656
Condition="! ('$(TargetFramework)' == 'net40' or
729657
'$(TargetFramework)' == 'net20' or
730658
'$(TargetFramework)' == 'mono21' or
731659
'$(TargetFramework)' == 'monotouch' or
732660
'$(TargetFramework)' == 'sl5' or
733661
'$(TargetFramework)' == 'sl5-compiler' or
734662
'$(TargetFramework)' == 'wp7' or
735-
'$(TargetFramework)' == 'portable-net4+sl4+wp71+win8' or
736663
'$(TargetFramework)' == 'portable-net45+sl5+win8' or
737664
'$(TargetFramework)' == 'net40-xna40-xbox360')"/>
738665
</Target>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@
215215
<ReferenceInclude="mscorlib"Condition="'$(TargetFramework)' != 'wp7'" />
216216
<ReferenceInclude="System" />
217217
<ReferenceInclude="System.Numerics"Condition="'$(TargetFramework)' == 'net40'" />
218-
<ReferenceInclude="System.Net"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl5-compiler' OR '$(TargetFramework)' == 'XNA\5.0' OR '$(TargetFramework)' == 'wp7' OR '$(TargetFramework)' == 'portable-net4+sl4+wp71+win8' OR '$(TargetFramework)' == 'portable-net45+sl5+win8' OR '$(TargetFramework)' == 'net40-xna40-xbox360'" />
218+
<ReferenceInclude="System.Net"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl5-compiler' OR '$(TargetFramework)' == 'XNA\5.0' OR '$(TargetFramework)' == 'wp7' OR '$(TargetFramework)' == 'portable-net45+sl5+win8' OR '$(TargetFramework)' == 'net40-xna40-xbox360'" />
219219
<ReferenceInclude="System.Observable"Condition="'$(TargetFramework)' == 'wp7'" />
220-
<ReferenceInclude="System.Core"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl5-compiler' OR '$(TargetFramework)' == 'XNA\5.0' OR '$(TargetFramework)' == 'wp7' OR '$(TargetFramework)' == 'portable-net4+sl4+wp71+win8' OR '$(TargetFramework)' == 'portable-net45+sl5+win8' OR '$(TargetFramework)' == 'net40-xna40-xbox360'" />
220+
<ReferenceInclude="System.Core"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl5-compiler' OR '$(TargetFramework)' == 'XNA\5.0' OR '$(TargetFramework)' == 'wp7' OR '$(TargetFramework)' == 'portable-net45+sl5+win8' OR '$(TargetFramework)' == 'net40-xna40-xbox360'" />
221221
</ItemGroup>
222222
<!-- References-->
223223
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp