Skip to content

Commit cc801db

Browse files
committed
Add a file reference to FSharp.Core because current nupkg doesn't support dotnet even the portable profile 259 is compatible. Add a paket.references file for the CommandLine.dotnet project. Rest of chagnes are done by paket.
1 parent 7aa1160 commit cc801db

File tree

10 files changed

+263
-298
lines changed

10 files changed

+263
-298
lines changed

CommandLine.sln

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "src\CommandLine\CommandLine.csproj", "{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}"
77
EndProject
@@ -26,6 +26,9 @@ EndProject
2626
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.dotnet", "src\CommandLine.dotnet\CommandLine.dotnet.csproj", "{1E72E75F-888A-400E-865C-44251B8013E1}"
2727
EndProject
2828
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CommandLine.dnx.Tests", "tests\CommandLine.dnx.Tests\CommandLine.dnx.Tests.xproj", "{6DB605EC-02BD-4BD9-A63B-9EF77D61DBDA}"
29+
ProjectSection(ProjectDependencies) = postProject
30+
{1E72E75F-888A-400E-865C-44251B8013E1} = {1E72E75F-888A-400E-865C-44251B8013E1}
31+
EndProjectSection
2932
EndProject
3033
Global
3134
GlobalSection(SolutionConfigurationPlatforms) = preSolution

paket.lock

+136-136
Large diffs are not rendered by default.

src/CommandLine.dotnet/CommandLine.dotnet.csproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,6 @@
204204
<Compile Include="..\CommandLine\Properties\AssemblyInfo.cs">
205205
<Link>Properties\AssemblyInfo.cs</Link>
206206
</Compile>
207-
208-
209207
<Compile Include="..\CommandLine\Text\AssemblyLicenseAttribute.cs">
210208
<Link>Text\AssemblyLicenseAttribute.cs</Link>
211209
</Compile>
@@ -250,10 +248,8 @@
250248
<Reference Include="FSharp.Core">
251249
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
252250
<Private>True</Private>
253-
<Paket>True</Paket>
254251
</Reference>
255-
</ItemGroup>
256-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
252+
</ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
257253
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
258254
Other similar extension points exist, see Microsoft.Common.targets.
259255
<Target Name="AfterBuild">
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
File:Maybe.cs Infrastructure
2+
File:EnumerableExtensions.cs Infrastructure
3+
File:ErrorHandling.cs Infrastructure

src/CommandLine.dotnet/project.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"supports": {
3-
"net46.app": {},
4-
"uwp.10.0.app": {},
5-
"dnxcore50.app": {}
3+
"net46.app": { },
4+
"uwp.10.0.app": { },
5+
"dnxcore50.app": { }
66
},
77
"dependencies": {
88
"Microsoft.CSharp": "4.0.0",
@@ -22,7 +22,7 @@
2222
},
2323
"frameworks": {
2424
"dotnet": {
25-
"imports": "portable-net452+win81"
25+
"imports": "portable-net45+netcore45+wpa81+wp8"
2626
}
2727
}
2828
}

src/CommandLine/CommandLine.csproj

+12-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,16 @@
167167
</Reference>
168168
</ItemGroup>
169169
</When>
170-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
170+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
171+
<ItemGroup>
172+
<Reference Include="FSharp.Core">
173+
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
174+
<Private>True</Private>
175+
<Paket>True</Paket>
176+
</Reference>
177+
</ItemGroup>
178+
</When>
179+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
171180
<ItemGroup>
172181
<Reference Include="FSharp.Core">
173182
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
@@ -176,10 +185,10 @@
176185
</Reference>
177186
</ItemGroup>
178187
</When>
179-
<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')">
188+
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
180189
<ItemGroup>
181190
<Reference Include="FSharp.Core">
182-
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
191+
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath>
183192
<Private>True</Private>
184193
<Paket>True</Paket>
185194
</Reference>

tests/CommandLine.Tests.Properties/CommandLine.Tests.Properties.csproj

+51-76
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="xunit.runner.visualstudio" version="2.1.0" />
4+
</packages>

0 commit comments

Comments
 (0)