Skip to content

Commit 10daa4b

Browse files
OlegZeeOlegZee
committed
Merge branch 'dev'
2 parents a7c3667 + 1b4e18f commit 10daa4b

File tree

6 files changed

+117
-7
lines changed

6 files changed

+117
-7
lines changed

‎XakeLibTests/XakeLibTests.fsproj‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
</Reference>
3939
<Reference Include="System" />
4040
<Reference Include="System.Core" />
41-
<Reference Include="FSharp.Core">
42-
<Private>True</Private>
43-
</Reference>
4441
</ItemGroup>
4542
<ItemGroup>
4643
<Compile Include="ActionTests.fs" />
@@ -72,4 +69,60 @@
7269
<Target Name="AfterBuild">
7370
</Target>
7471
-->
72+
<Choose>
73+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')">
74+
<ItemGroup>
75+
<Reference Include="FSharp.Core">
76+
<HintPath>..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath>
77+
<Private>True</Private>
78+
<Paket>True</Paket>
79+
</Reference>
80+
</ItemGroup>
81+
</When>
82+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
83+
<ItemGroup>
84+
<Reference Include="FSharp.Core">
85+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
86+
<Private>True</Private>
87+
<Paket>True</Paket>
88+
</Reference>
89+
</ItemGroup>
90+
</When>
91+
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
92+
<ItemGroup>
93+
<Reference Include="FSharp.Core">
94+
<HintPath>..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
95+
<Private>True</Private>
96+
<Paket>True</Paket>
97+
</Reference>
98+
</ItemGroup>
99+
</When>
100+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
101+
<ItemGroup>
102+
<Reference Include="FSharp.Core">
103+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
104+
<Private>True</Private>
105+
<Paket>True</Paket>
106+
</Reference>
107+
</ItemGroup>
108+
</When>
109+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
110+
<ItemGroup>
111+
<Reference Include="FSharp.Core">
112+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
113+
<Private>True</Private>
114+
<Paket>True</Paket>
115+
</Reference>
116+
</ItemGroup>
117+
</When>
118+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
119+
<ItemGroup>
120+
<Reference Include="FSharp.Core">
121+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
122+
<Private>True</Private>
123+
<Paket>True</Paket>
124+
</Reference>
125+
</ItemGroup>
126+
</When>
127+
</Choose>
75128
</Project>

‎XakeLibTests/paket.references‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
nunit
1+
nunit
2+
FSharp.Core

‎core/Xake.Core.fsproj‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
<Reference Include="mscorlib" />
4040
<Reference Include="System" />
4141
<Reference Include="System.Core" />
42-
<Reference Include="FSharp.Core">
43-
<Private>True</Private>
44-
</Reference>
4542
<Reference Include="System.Windows.Forms" />
4643
</ItemGroup>
4744
<ItemGroup>
@@ -77,4 +74,60 @@
7774
<Target Name="AfterBuild">
7875
</Target>
7976
-->
77+
<Choose>
78+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')">
79+
<ItemGroup>
80+
<Reference Include="FSharp.Core">
81+
<HintPath>..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath>
82+
<Private>True</Private>
83+
<Paket>True</Paket>
84+
</Reference>
85+
</ItemGroup>
86+
</When>
87+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
88+
<ItemGroup>
89+
<Reference Include="FSharp.Core">
90+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
91+
<Private>True</Private>
92+
<Paket>True</Paket>
93+
</Reference>
94+
</ItemGroup>
95+
</When>
96+
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
97+
<ItemGroup>
98+
<Reference Include="FSharp.Core">
99+
<HintPath>..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
100+
<Private>True</Private>
101+
<Paket>True</Paket>
102+
</Reference>
103+
</ItemGroup>
104+
</When>
105+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
106+
<ItemGroup>
107+
<Reference Include="FSharp.Core">
108+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
109+
<Private>True</Private>
110+
<Paket>True</Paket>
111+
</Reference>
112+
</ItemGroup>
113+
</When>
114+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
115+
<ItemGroup>
116+
<Reference Include="FSharp.Core">
117+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
118+
<Private>True</Private>
119+
<Paket>True</Paket>
120+
</Reference>
121+
</ItemGroup>
122+
</When>
123+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
124+
<ItemGroup>
125+
<Reference Include="FSharp.Core">
126+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
127+
<Private>True</Private>
128+
<Paket>True</Paket>
129+
</Reference>
130+
</ItemGroup>
131+
</When>
132+
</Choose>
80133
</Project>

‎core/paket.references‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FSharp.Core

‎paket.dependencies‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source https://www.nuget.org/api/v2/
22

3+
nuget FSharp.Core 3.1.2.5
34
nuget NUnit.Runners
45
nuget Nuget.CommandLine
56
nuget nunit 2.6.3 framework

‎paket.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
NUGET
22
remote: https://www.nuget.org/api/v2
33
specs:
4+
FSharp.Core (3.1.2.5)
45
NuGet.CommandLine (2.8.5)
56
NUnit (2.6.3)
67
NUnit.Runners (2.6.4)

0 commit comments

Comments
 (0)