Skip to content

Commit

Permalink
[infra] paket install, add FSharp.Core to LibUv
Browse files Browse the repository at this point in the history
  • Loading branch information
@haf
haf committed Oct 22, 2015
1 parent 4648aaf commit c8ac064
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 145 deletions.
8 changes: 4 additions & 4 deletions paket.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ NUGET
remote: https://nuget.org/api/v2
specs:
DotLiquid (1.8.0)
FsCheck (2.0.7) - framework: net45
FsCheck (2.0.7)
FSharp.Core (>= 3.1.2.5)
FSharp.Charting (0.90.12)
FSharp.Core (3.1.2.5)
Fuchu (0.6.0) - framework: net45
Fuchu (0.6.0)
Fuchu.FsCheck (0.6.0)
FsCheck (>= 1.0.4)
FSharp.Core (>= 3.1.2.1)
Expand All @@ -18,7 +18,7 @@ NUGET
PerfUtil (>= 0.1.8)
Http.fs-prerelease (2.3.0)
FSharp.Core (>= 3.1.2.1)
Microsoft.AspNet.Razor (3.2.3) - framework: >= net45
Microsoft.AspNet.Razor (3.2.3)
Microsoft.Owin (3.0.1)
Owin (>= 1.0)
Nancy (1.2.0)
Expand All @@ -31,7 +31,7 @@ NUGET
PerfUtil (0.1.8)
RazorEngine (3.7.0)
Microsoft.AspNet.Razor (>= 3.0.0) - framework: >= net45
Topshelf (3.2.0) - framework: net45
Topshelf (3.2.0)
Topshelf.FSharp (2.1.0)
Topshelf (>= 3.2.0)
WebSharper (3.4.14.193)
Expand Down
1 change: 1 addition & 0 deletions src/Suave.LibUv/paket.references
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FSharp.Core
4 changes: 2 additions & 2 deletions src/Suave.Razor/Suave.Razor.fsproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -72,7 +72,7 @@
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="System.Web.Razor">
<HintPath>..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll</HintPath>
Expand Down
267 changes: 128 additions & 139 deletions src/Suave/Suave.fsproj
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3DC9193E-BD0C-4486-9C58-56B630C36623}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Suave</RootNamespace>
<AssemblyName>Suave</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Name>Suave</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<ConsolePause>false</ConsolePause>
<Tailcalls>false</Tailcalls>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\Suave.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<ConsolePause>false</ConsolePause>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\Suave.xml</DocumentationFile>
<DefineConstants>
</DefineConstants>
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
</PropertyGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '11.0'">
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</Otherwise>
</Choose>
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
<Import Project="..\..\tools\paket.targets" />
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FsPickler">
<HintPath>..\..\packages\FsPickler\lib\net45\FsPickler.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Compile Include="Utils\Aether.fs" />
<Compile Include="Utils\Async.fs" />
<Compile Include="Utils\Collections.fs" />
<Compile Include="Utils\UTF8.fs" />
<Compile Include="Utils\ASCII.fs" />
<Compile Include="Utils\String.fs" />
<Compile Include="Utils\Option.fs" />
<Compile Include="Utils\Map.fs" />
<Compile Include="Utils\Choice.fs" />
<Compile Include="Utils\Random.fs" />
<Compile Include="Utils\Bytes.fs" />
<Compile Include="Utils\Encoding.fs" />
<Compile Include="Utils\Crypto.fs" />
<Compile Include="Utils\Parsing.fs" />
<Compile Include="Utils\Serialisation.fs" />
<Compile Include="Globals.fs" />
<Compile Include="Logging\LogLevel.fs" />
<Compile Include="Logging\TraceHeader.fs" />
<Compile Include="Logging\LogLine.fs" />
<Compile Include="Logging\Logger.fs" />
<Compile Include="Log.fs" />
<Compile Include="Sockets\SocketBinding.fs" />
<Compile Include="Sockets\BufferManager.fs" />
<Compile Include="Sockets\ConcurrentPool.fs" />
<Compile Include="Sockets\AsyncUserToken.fs" />
<Compile Include="Sockets\SocketOp.fs" />
<Compile Include="Sockets\ITransport.fs" />
<Compile Include="Sockets\TcpTransport.fs" />
<Compile Include="Sockets\Connection.fs" />
<Compile Include="Sockets\SocketMonad.fs" />
<Compile Include="Sockets\AsyncSocket.fs" />
<Compile Include="Tcp.fs" />
<Compile Include="Sscanf.fs" />
<Compile Include="Types.fs" />
<Compile Include="Model.fs" />
<Compile Include="Compression.fs" />
<Compile Include="Http.fsi" />
<Compile Include="Http.fs" />
<Compile Include="Cookie.fsi" />
<Compile Include="Cookie.fs" />
<Compile Include="State.fs" />
<Compile Include="Auth.fs" />
<Compile Include="Web.fs" />
<Compile Include="Owin.fs" />
<Compile Include="WebSocket.fs" />
<Compile Include="Json.fs" />
<Compile Include="Proxy.fs" />
<Compile Include="AssemblyVersionInfo.fs" Condition="Exists('AssemblyVersionInfo.fs')" />
<None Include="paket.references" />
<Content Include="App.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3DC9193E-BD0C-4486-9C58-56B630C36623}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Suave</RootNamespace>
<AssemblyName>Suave</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Name>Suave</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<ConsolePause>false</ConsolePause>
<Tailcalls>false</Tailcalls>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\Suave.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<ConsolePause>false</ConsolePause>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\Suave.xml</DocumentationFile>
<DefineConstants>
</DefineConstants>
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
</PropertyGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '11.0'">
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</Otherwise>
</Choose>
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
<Import Project="..\..\tools\paket.targets" />
<ItemGroup>
<Compile Include="Utils\Aether.fs" />
<Compile Include="Utils\Async.fs" />
<Compile Include="Utils\Collections.fs" />
<Compile Include="Utils\UTF8.fs" />
<Compile Include="Utils\ASCII.fs" />
<Compile Include="Utils\String.fs" />
<Compile Include="Utils\Option.fs" />
<Compile Include="Utils\Map.fs" />
<Compile Include="Utils\Choice.fs" />
<Compile Include="Utils\Random.fs" />
<Compile Include="Utils\Bytes.fs" />
<Compile Include="Utils\Encoding.fs" />
<Compile Include="Utils\Crypto.fs" />
<Compile Include="Utils\Parsing.fs" />
<Compile Include="Utils\Serialisation.fs" />
<Compile Include="Globals.fs" />
<Compile Include="Logging\LogLevel.fs" />
<Compile Include="Logging\TraceHeader.fs" />
<Compile Include="Logging\LogLine.fs" />
<Compile Include="Logging\Logger.fs" />
<Compile Include="Log.fs" />
<Compile Include="Sockets\SocketBinding.fs" />
<Compile Include="Sockets\BufferManager.fs" />
<Compile Include="Sockets\ConcurrentPool.fs" />
<Compile Include="Sockets\AsyncUserToken.fs" />
<Compile Include="Sockets\SocketOp.fs" />
<Compile Include="Sockets\ITransport.fs" />
<Compile Include="Sockets\TcpTransport.fs" />
<Compile Include="Sockets\Connection.fs" />
<Compile Include="Sockets\SocketMonad.fs" />
<Compile Include="Sockets\AsyncSocket.fs" />
<Compile Include="Tcp.fs" />
<Compile Include="Sscanf.fs" />
<Compile Include="Types.fs" />
<Compile Include="Model.fs" />
<Compile Include="Compression.fs" />
<Compile Include="Http.fsi" />
<Compile Include="Http.fs" />
<Compile Include="Cookie.fsi" />
<Compile Include="Cookie.fs" />
<Compile Include="State.fs" />
<Compile Include="Auth.fs" />
<Compile Include="Web.fs" />
<Compile Include="Owin.fs" />
<Compile Include="WebSocket.fs" />
<Compile Include="Json.fs" />
<Compile Include="Proxy.fs" />
<Compile Include="AssemblyVersionInfo.fs" Condition="Exists('AssemblyVersionInfo.fs')" />
<None Include="paket.references" />
<Content Include="App.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
</ItemGroup>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
</Project>

0 comments on commit c8ac064

Please sign in to comment.