Skip to content

Commit

Permalink
Update all da things
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Oct 26, 2014
1 parent 986ef1c commit aaab017
Show file tree
Hide file tree
Showing 16 changed files with 3,191 additions and 205 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,13 @@
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
<ItemGroup>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll</HintPath>
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down Expand Up @@ -124,5 +129,89 @@
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
<ItemGroup>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
<ItemGroup>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<ItemGroup>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
<ItemGroup>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</Project>
8 changes: 4 additions & 4 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ NUGET
bootstrap (3.2.0)
jQuery (>= 1.9.0)
CsQuery (1.3.4)
FAKE (3.7.1)
FAKE (3.7.5)
FsCheck (0.9.4.0)
FsCheck.Xunit (0.4.1.0)
FsCheck (>= 0)
xunit (>= 1.9.2, < 3.0)
FSharp.Compiler.Service (0.0.67)
FSharp.Formatting (2.4.34)
FSharp.Formatting (2.4.36)
FSharp.Compiler.Service (0.0.67)
Microsoft.AspNet.Razor (2.0.30506.0)
RazorEngine (3.3.0)
Expand Down Expand Up @@ -46,7 +46,7 @@ NUGET
Microsoft.AspNet.Razor (>= 0)
Microsoft.AspNet.Razor (>= 2.0.30506)
Nancy (>= 0)
Newtonsoft.Json (6.0.5)
Newtonsoft.Json (6.0.6)
NuGet.CommandLine (2.8.3)
Nuget.Core (2.8.3)
Microsoft.Web.Xdt (>= 2.1.0)
Expand All @@ -60,7 +60,7 @@ NUGET
System.Web.Razor.Unofficial (2.0.2)
toastr (2.0.3)
jQuery (>= 1.6.3)
UnionArgParser (0.8.0)
UnionArgParser (0.8.2)
xunit (1.9.2)
xunit.extensions (1.9.2)
xunit (1.9.2)
Expand Down
63 changes: 54 additions & 9 deletions src/app/FAKE/FAKE.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,6 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net35\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="UnionArgParser">
Expand All @@ -133,5 +124,59 @@
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="UnionArgParser">
<HintPath>..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</Project>
Loading

0 comments on commit aaab017

Please sign in to comment.