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

Commit05219cb

Browse files
committed
Merge pull requestfsharp#226 from 7sharp9/fsharp_30
Added portable support for FSharp.Core
2 parentsb0c16bb +4c47086 commit05219cb

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

‎src/FSharpSource.targets‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
205205
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
206206
<DefineConstants>$(DefineConstants);DONT_INCLUDE_DEPRECATED</DefineConstants>
207207
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
208-
209-
<AssemblySearchPaths>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.0\Profile\$(TargetFrameworkProfile)</AssemblySearchPaths>
210-
<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>
208+
<AssemblySearchPaths>$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.0\Profile\$(TargetFrameworkProfile)</AssemblySearchPaths>
209+
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
211210

212211
</PropertyGroup>
213212

@@ -678,9 +677,22 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
678677

679678
<!-- Include the portable targets file when building the portable FSharp.Core-->
680679
<ImportProject="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets"
681-
Condition="'$(TargetFramework)'=='portable-net4+sl4+wp71+win8'"/>
682-
<ImportProject="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets"
683-
Condition="'$(TargetFramework)'=='portable-net45+sl5+win8'"/>
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')" />
681+
682+
<!-- 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')">
684+
685+
<AvailablePlatforms>Any CPU</AvailablePlatforms>
686+
687+
<TargetPlatformIdentifier>Portable</TargetPlatformIdentifier>
688+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
689+
<TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName>
690+
691+
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
692+
<NoStdLib>true</NoStdLib>
693+
694+
<ImplicitlyExpandTargetFrameworkCondition="'$(ImplicitlyExpandTargetFramework)' == ''">true</ImplicitlyExpandTargetFramework>
695+
</PropertyGroup>
684696

685697
<!-- Include the bootstrap targets file when building the proto compiler using the bootstrap-->
686698
<!-- Also include it if Proto targets file doesn't exist, e.g. when cleaning the build with /t:Clean-->

0 commit comments

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