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

Commita02edf1

Browse files
committed
Merge pull requestfsharp#81 from funnelweb/master
FSharp.Core.dll for net4+sl4+wp71+win8 (Fixfsharp#79)
2 parents7776185 +18c0a64 commita02edf1

File tree

6 files changed

+106
-42
lines changed

6 files changed

+106
-42
lines changed

‎README.md‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,18 @@ msbuild fsharp-proto-build.proj
4040
msbuild fsharp-library-build.proj
4141
msbuild fsharp-compiler-build.proj
4242
```
43-
You can also build the FSharp.Core for .NET 2.0, Mono 2.1 andSilverlight 5.0 profiles:
43+
You can also build the FSharp.Core for .NET 2.0, Mono 2.1,Silverlight 5.0 and Portable Profile47 (net4+sl4+wp71+win8) profiles:
4444
```
4545
msbuild fsharp-library-build.proj /p:TargetFramework=net20
4646
msbuild fsharp-library-build.proj /p:TargetFramework=mono21
47+
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net4+sl4+wp71+win8
4748
msbuild fsharp-library-build.proj /p:TargetFramework=sl5
4849
```
49-
5050
You can also build the FSharp.Core and FSharp.Compiler.Silverlight.dll for Silverlight 5.0:
5151
```
5252
msbuild fsharp-library-build.proj /p:TargetFramework=sl5-compiler
5353
msbuild fsharp-compiler-build.proj /p:TargetFramework=sl5-compiler
5454
```
55-
And for Release versions of the same:
56-
```
57-
msbuild fsharp-library-build.proj /p:Configuration=Release
58-
msbuild fsharp-compiler-build.proj /p:Configuration=Release
59-
msbuild fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
60-
msbuild fsharp-library-build.proj /p:TargetFramework=mono21 /p:Configuration=Release
61-
msbuild fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
62-
msbuild fsharp-library-build.proj /p:TargetFramework=sl5-compiler /p:Configuration=Release
63-
msbuild fsharp-compiler-build.proj /p:TargetFramework=sl5-compiler /p:Configuration=Release
64-
```
6555
###On Windows, using xbuild (e.g. if no .NET is installed and only Mono 3.0 is installed):
6656

6757
```

‎src/FSharpSource.targets‎

Lines changed: 95 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<protoCLIDir>4.0</protoCLIDir>
1313
<LkgPath>$(FSharpSourcesRoot)\..\lib\bootstrap\4.0</LkgPath>
1414
<FsLexUnicode>true</FsLexUnicode>
15-
<ProjectLanguage>FSharp</ProjectLanguage>
1615
<OtherFlags>$(OtherFlags) --times</OtherFlags>
1716
<NoWarn>$(NoWarn);69;65;54;61;75</NoWarn>
1817
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +22,14 @@
2322
<VersionFile>$(FSharpSourcesRoot)\source-build-version</VersionFile>
2423
<VersionFileCondition="'$(TargetFramework)' == 'net20'">$(FSharpSourcesRoot)\source-build-version-2.3.0.0</VersionFile>
2524
<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>
26+
<!--
27+
Some other NuGET monikers to support in the future, see http://docs.nuget.org/docs/creating-packages/creating-and-publishing-a-package#Package_Conventions
28+
29+
<VersionFile Condition="'$(TargetFramework)' == 'portable-windows8+net45'">$(FSharpSourcesRoot)\source-build-version-2.3.6.0</VersionFile>
30+
<VersionFile Condition="'$(TargetFramework)' == 'windows8'">$(FSharpSourcesRoot)\source-build-version-2.3.7.0</VersionFile>
31+
<VersionFile Condition="'$(TargetFramework)' == 'windowsphone8'">$(FSharpSourcesRoot)\source-build-version-2.3.8.0</VersionFile>
32+
-->
2633
</PropertyGroup>
2734

2835
<!-- We sign FSharp.Core with the Microsoft key and use delay-signing.-->
@@ -58,11 +65,13 @@
5865
<!-- These flags provide a better debugging experience. Locals should be visible.-->
5966
<OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking</OtherFlags>
6067
<DefineConstants>CODE_ANALYSIS; $(DefineConstants)</DefineConstants>
68+
<BuildWith>LKG</BuildWith>
6169
</PropertyGroup>
6270

6371
<PropertyGroupCondition="'$(Configuration)'=='Release'">
6472
<Optimize>true</Optimize>
6573
<ConfigurationOutputDirectory>release</ConfigurationOutputDirectory>
74+
<BuildWith>LKG</BuildWith>
6675
</PropertyGroup>
6776

6877
<!-- Flags used to build the bootstrap compiler.
@@ -82,7 +91,7 @@
8291
<PropertyGroupCondition="'$(TargetFramework)'=='net20'">
8392
<!-- If 3.5 is not configured explicitly, use 2.0-->
8493
<TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)'==''">v2.0</TargetFrameworkVersion>
85-
<TargetFrameworkVersionShort>2.0</TargetFrameworkVersionShort>
94+
<TargetFrameworkOutputDirectory>2.0</TargetFrameworkOutputDirectory>
8695
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
8796
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
8897
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
@@ -98,7 +107,7 @@
98107

99108
<PropertyGroupCondition="'$(TargetFramework)'=='net40'">
100109
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
101-
<TargetFrameworkVersionShort>4.0</TargetFrameworkVersionShort>
110+
<TargetFrameworkOutputDirectory>4.0</TargetFrameworkOutputDirectory>
102111
<DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
103112
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
104113
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
@@ -113,7 +122,7 @@
113122
<!-- Target MonoAndroid and MonoTouch-->
114123
<PropertyGroupCondition="'$(TargetFramework)'=='mono21'">
115124
<TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
116-
<TargetFrameworkVersionShort>2.1</TargetFrameworkVersionShort>
125+
<TargetFrameworkOutputDirectory>2.1</TargetFrameworkOutputDirectory>
117126
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
118127
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
119128
<DefineConstants>$(DefineConstants);FX_NO_BIGINT_CULTURE_PARSE</DefineConstants>
@@ -125,10 +134,70 @@
125134
</PropertyGroup>
126135

127136

137+
<!-- Target Portable-->
138+
<PropertyGroupCondition="'$(TargetFramework)'=='portable-net4+sl4+wp71+win8'">
139+
140+
<TargetFrameworkProfile>Profile47</TargetFrameworkProfile>
141+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
142+
<TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
143+
144+
<DefineConstants>$(DefineConstants);FSHARP_CORE_PORTABLE</DefineConstants>
145+
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
146+
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
147+
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
148+
<DefineConstants>$(DefineConstants);FX_NO_DEBUG_PROXIES</DefineConstants>
149+
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
150+
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
151+
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
152+
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
153+
<DefineConstants>$(DefineConstants);FX_NO_TRUNCATE</DefineConstants>
154+
<DefineConstants>$(DefineConstants);FX_NO_CULTURE_INFO_ARGS</DefineConstants>
155+
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULES</DefineConstants>
156+
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
157+
<DefineConstants>$(DefineConstants);FX_NO_TO_LOWER_INVARIANT</DefineConstants>
158+
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
159+
<DefineConstants>$(DefineConstants);FX_NO_BASED_ARRAYS</DefineConstants>
160+
<DefineConstants>$(DefineConstants);FX_NO_DOUBLE_BIT_CONVERTER</DefineConstants>
161+
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
162+
<DefineConstants>$(DefineConstants);FX_NO_ASCII_ENCODING</DefineConstants>
163+
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_ENCODING</DefineConstants>
164+
<DefineConstants>$(DefineConstants);FX_NO_FILE_OPTIONS</DefineConstants>
165+
<DefineConstants>$(DefineConstants);FX_NO_NONBLOCK_IO</DefineConstants>
166+
<DefineConstants>$(DefineConstants);FX_NO_COMMAND_LINE_ARGS</DefineConstants>
167+
<DefineConstants>$(DefineConstants);FX_NO_ENVIRONMENT</DefineConstants>
168+
<DefineConstants>$(DefineConstants);FX_NO_PROCESS_START</DefineConstants>
169+
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
170+
<DefineConstants>$(DefineConstants);FX_NO_PROCESS_DIAGNOSTICS</DefineConstants>
171+
<DefineConstants>$(DefineConstants);FX_NO_IOBSERVABLE</DefineConstants>
172+
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
173+
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
174+
<DefineConstants>$(DefineConstants);FX_NO_GET_HASH_CODE_HELPER</DefineConstants>
175+
<DefineConstants>$(DefineConstants);FX_NO_COMVISIBLE</DefineConstants>
176+
<DefineConstants>$(DefineConstants);FX_NO_ICLONEABLE</DefineConstants>
177+
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
178+
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
179+
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
180+
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
181+
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
182+
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
183+
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
184+
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
185+
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
186+
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
187+
<DefineConstants>$(DefineConstants);FX_NO_WAITONE_MILLISECONDS</DefineConstants>
188+
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
189+
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
190+
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
191+
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
192+
<DefineConstants>$(DefineConstants);DONT_INCLUDE_DEPRECATED</DefineConstants>
193+
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
194+
195+
</PropertyGroup>
196+
128197
<!-- Target Silverlight 3.0-->
129198
<PropertyGroupCondition="'$(TargetFramework)'=='sl3'">
130199
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
131-
<TargetFrameworkVersionShort>sl3</TargetFrameworkVersionShort>
200+
<TargetFrameworkOutputDirectory>sl3</TargetFrameworkOutputDirectory>
132201
<DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
133202
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
134203
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
@@ -207,7 +276,7 @@
207276
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
208277
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
209278
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
210-
<TargetFrameworkVersionShort>sl4</TargetFrameworkVersionShort>
279+
<TargetFrameworkOutputDirectory>sl4</TargetFrameworkOutputDirectory>
211280
<SilverlightVersion>v4.0</SilverlightVersion>
212281
</PropertyGroup>
213282

@@ -253,12 +322,12 @@
253322
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
254323
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
255324
<SilverlightVersion>v5.0</SilverlightVersion>
256-
<TargetFrameworkVersionShort>$(TargetFramework)</TargetFrameworkVersionShort>
325+
<TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
257326
<FrameworkRegistryBase>Software\Microsoft\Microsoft SDKs\$(TargetFrameworkIdentifier)</FrameworkRegistryBase>
258327
<AssemblySearchPaths>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0</AssemblySearchPaths>
259328
</PropertyGroup>
260329

261-
<PropertyGroupCondition="'$(TargetFramework)'=='sl3-wp'">
330+
<PropertyGroupCondition="'$(TargetFramework)'=='wp7'">
262331
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
263332
<TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
264333
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
@@ -300,7 +369,7 @@
300369
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
301370
<Tailcalls>false</Tailcalls>
302371
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
303-
<TargetFrameworkVersionShort>$(TargetFramework)</TargetFrameworkVersionShort>
372+
<TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
304373
<!-- It would be better to use MSBuild resolution here, but the TargetFrameworkIdentifier etc. aren't set up quite correctly as yet-->
305374
<OtherFlags>$(OtherFlags) --simpleresolution -r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\mscorlib.dll" </OtherFlags>
306375
</PropertyGroup>
@@ -351,7 +420,7 @@
351420
<DefineConstants>$(DefineConstants);FX_NO_TUPLE</DefineConstants>
352421
<DefineConstants>$(DefineConstants);FX_NO_DELEGATE_CREATE_DELEGATE_FROM_STATIC_METHOD</DefineConstants>
353422
<DefineConstants>$(DefineConstants)</DefineConstants>
354-
<TargetFrameworkVersionShort>$(TargetFramework)</TargetFrameworkVersionShort>
423+
<TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
355424
<!-- It would be better to use MSBuild resolution here, but the TargetFrameworkIdentifier etc. aren't set up quite correctly as yet-->
356425
<OtherFlags>$(OtherFlags) --simpleresolution -r:"C:\Program Files\Microsoft.NET\SDK\CompactFramework\v2.0\WindowsCE\mscorlib.dll" -r:"C:\Program Files\Microsoft.NET\SDK\CompactFramework\v2.0\WindowsCE\System.dll"</OtherFlags>
357426
</PropertyGroup>
@@ -396,7 +465,7 @@
396465
<!-- Target CompactFramework 3.5-->
397466
<PropertyGroupCondition="'$(TargetFramework)'=='net35-cf'">
398467
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
399-
<TargetFrameworkVersionShort>3.5</TargetFrameworkVersionShort>
468+
<TargetFrameworkOutputDirectory>3.5</TargetFrameworkOutputDirectory>
400469
<TargetFrameworkIdentifier>CompactFramework</TargetFrameworkIdentifier>
401470
<DefineConstants>$(DefineConstants);FX_ATLEAST_COMPACT_FRAMEWORK_35</DefineConstants>
402471
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
@@ -446,31 +515,35 @@
446515

447516
<!-- Always qualify the IntermediateOutputPath by the TargetFramework if any exists-->
448517
<PropertyGroup>
449-
<IntermediateOutputPath>obj\$(ConfigurationOutputDirectory)\$(TargetFrameworkVersionShort)\</IntermediateOutputPath>
518+
<IntermediateOutputPath>obj\$(ConfigurationOutputDirectory)\$(TargetFrameworkOutputDirectory)\</IntermediateOutputPath>
450519
</PropertyGroup>
451520

452521
<!-- Build with LKG compiler (location is determined by Microsoft.FSharp.Targets). The output compiler has suffix "-proto"-->
453-
<PropertyGroupCondition=" '$(BuildWith)' == 'LKG' And '$(ProjectLanguage)' == 'FSharp'">
522+
<PropertyGroupCondition=" '$(BuildWith)' == 'LKG'">
454523
<FsBuildSuffix>-proto</FsBuildSuffix>
455-
<OutputPath>$(FSharpSourcesRoot)\..\lib\$(ConfigurationOutputDirectory)\$(TargetFrameworkVersionShort)</OutputPath>
524+
<OutputPath>$(FSharpSourcesRoot)\..\lib\$(ConfigurationOutputDirectory)\$(TargetFrameworkOutputDirectory)</OutputPath>
456525
</PropertyGroup>
457526

458527
<!-- Build with prototype compiler (location is given by settings below). The output is the final bootstrapped compiler-->
459528
<PropertyGroupCondition=" '$(BuildWith)' == ''">
460529
<FscToolPath>$(FSharpSourcesRoot)\..\lib\proto\$(protoCLIDir)</FscToolPath>
461530
<FscToolExe>fsc-proto.exe</FscToolExe>
462-
<OutputPath>$(FSharpSourcesRoot)\..\lib\$(ConfigurationOutputDirectory)\$(TargetFrameworkVersionShort)</OutputPath>
531+
<OutputPath>$(FSharpSourcesRoot)\..\lib\$(ConfigurationOutputDirectory)\$(TargetFrameworkOutputDirectory)</OutputPath>
463532
</PropertyGroup>
464533

465534

466-
467-
<!-- Include the proto targets file when building the final compiler suing the proto-->
535+
<!-- Include the proto targets file when building the final compiler using the proto-->
468536
<ImportProject="..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets"
469-
Condition="Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') AND '$(BuildWith)' == '' AND '$(ProjectLanguage)' == 'FSharp'"/>
537+
Condition="Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') AND '$(BuildWith)' == ''"/>
538+
539+
<!-- Include the portable targets file when building the portable FSharp.Core-->
540+
<ImportProject="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.0\Microsoft.Portable.Common.targets"
541+
Condition="'$(TargetFramework)'=='portable-net4+sl4+wp71+win8'"/>
542+
470543
<!-- Include the bootstrap targets file when building the proto compiler using the bootstrap-->
471544
<!-- Also include it if Proto targets file doesn't exist, e.g. when cleaning the build with /t:Clean-->
472545
<ImportProject="$(LkgPath)\Microsoft.FSharp.Targets"
473-
Condition="(!Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') OR '$(BuildWith)' == 'LKG')AND '$(ProjectLanguage)' == 'FSharp'" />
546+
Condition="(!Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') OR '$(BuildWith)' == 'LKG')" />
474547
<ImportProject="Silverlight\$(SilverlightVersion)\FSharpSource.Silverlight.Common.targets"
475548
Condition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5' or '$(TargetFramework)'=='sl5-compiler'"/>
476549

@@ -497,13 +570,14 @@
497570
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
498571
Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='Proto'"/>
499572
<Error
500-
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, mono21,sl3-wp, sl5, sl5-compiler"
573+
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, mono21,wp7, sl5, sl5-compiler, portable-net4+sl4+wp71+win8"
501574
Condition="! ('$(TargetFramework)' == 'net40' or
502575
'$(TargetFramework)' == 'net20' or
503576
'$(TargetFramework)' == 'mono21' or
504577
'$(TargetFramework)' == 'sl5' or
505578
'$(TargetFramework)' == 'sl5-compiler' or
506-
'$(TargetFramework)' == 'sl3-wp')"/>
579+
'$(TargetFramework)' == 'wp7' or
580+
'$(TargetFramework)' == 'portable-net4+sl4+wp71+win8')"/>
507581
</Target>
508582

509583
<ImportProject="$(LkgPath)\..\2.0\FSharp.SRGen.targets" />

‎src/fsharp-library-unittests-build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<!-- Core library tests: all except compact framework (no nunit there)-->
13-
<ItemGroupCondition=" '$(TargetFramework)' != 'sl3-wp' and '$(TargetFramework)' != 'sl5'">
13+
<ItemGroupCondition=" '$(TargetFramework)' != 'wp7' and '$(TargetFramework)' != 'sl5'">
1414
<ProjectFilesInclude="fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
1515
</ItemGroup>
1616

0 commit comments

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