Browse Source

Paket: workaround for target-conditional dependencies (TPL)

cuda
Christoph Ruegg 12 years ago
parent
commit
2c706af33a
  1. 28
      build.fsx
  2. 10
      src/Numerics/Numerics-Net35.csproj
  3. 10
      src/Numerics/Numerics-Portable328.csproj
  4. 10
      src/Numerics/Numerics-Portable47.csproj
  5. 10
      src/Numerics/Numerics.csproj

28
build.fsx

@ -619,24 +619,24 @@ match buildServer with
// the targets so FAKE can build up and order the full work-flow properly // the targets so FAKE can build up and order the full work-flow properly
// build --> test // build --> test
"Build" ==> "Test" "Build" ==> "Test" |> ignore
"Native32Build" ==> "Native32Test" "Native32Build" ==> "Native32Test" |> ignore
"Native64Build" ==> "Native64Test" "Native64Build" ==> "Native64Test" |> ignore
"DataBuild" ==> "DataTest" "DataBuild" ==> "DataTest" |> ignore
// build --> package // build --> package
"Build" ==> "Zip" "Build" ==> "Zip" |> ignore
"NativeBuild" ==> "NativeZip" "NativeBuild" ==> "NativeZip" |> ignore
"DataBuild" ==> "DataZip" "DataBuild" ==> "DataZip" |> ignore
"Build" ==> "NuGet" "Build" ==> "NuGet" |> ignore
"NativeBuild" ==> "NativeNuGet" "NativeBuild" ==> "NativeNuGet" |> ignore
"DataBuild" ==> "DataNuGet" "DataBuild" ==> "DataNuGet" |> ignore
// build --> docs // build --> docs
"Build" ==> "CleanDocs" "Build" ==> "CleanDocs" |> ignore
"Build" ==> "Docs" "Build" ==> "Docs" |> ignore
"Build" ==> "CleanApi" "Build" ==> "CleanApi" |> ignore
"Build" ==> "Api" "Build" ==> "Api" |> ignore
() ()

10
src/Numerics/Numerics-Net35.csproj

@ -104,16 +104,6 @@
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<ItemGroup>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>

10
src/Numerics/Numerics-Portable328.csproj

@ -67,16 +67,6 @@
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<ItemGroup>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>

10
src/Numerics/Numerics-Portable47.csproj

@ -67,16 +67,6 @@
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<ItemGroup>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>

10
src/Numerics/Numerics.csproj

@ -446,16 +446,6 @@
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<ItemGroup>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>

Loading…
Cancel
Save