Browse Source

Build: update build tools, fix native provider unit test project references

netstandard
Christoph Ruegg 11 years ago
parent
commit
d31dce972a
  1. 1
      .gitignore
  2. 14
      paket.lock
  3. 1
      src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj
  4. 1
      src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj
  5. 1
      src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj
  6. 1
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
  7. 1
      src/UnitTests/UnitTests-CUDA.csproj
  8. 1
      src/UnitTests/UnitTests-MKL.csproj
  9. 6
      src/UnitTests/UnitTests-Net35.csproj
  10. 1
      src/UnitTests/UnitTests-OpenBLAS.csproj

1
.gitignore

@ -35,6 +35,7 @@ _TeamCity*
*.sdf *.sdf
*.aps *.aps
*.opensdf *.opensdf
*.opendb
*.cachefile *.cachefile
*.swp *.swp

14
paket.lock

@ -15,13 +15,13 @@ GROUP Build
NUGET NUGET
remote: http://www.nuget.org/api/v2 remote: http://www.nuget.org/api/v2
specs: specs:
FAKE (4.11.3) FAKE (4.20.0)
FSharp.Compiler.Service (1.4.0.6) FSharp.Compiler.Service (2.0.0.3)
FSharp.Formatting (2.12.0) FSharp.Formatting (2.14.0)
FSharp.Compiler.Service (1.4.0.6) FSharp.Compiler.Service (>= 2.0.0.3 < 2.1.0)
FSharpVSPowerTools.Core (2.1.0) FSharpVSPowerTools.Core (>= 2.3.0 < 2.4.0)
FSharpVSPowerTools.Core (2.1.0) FSharpVSPowerTools.Core (2.3.0)
FSharp.Compiler.Service (>= 1.4.0.6) FSharp.Compiler.Service (>= 2.0.0.3)
NuGet.CommandLine (3.3.0) NuGet.CommandLine (3.3.0)
NUnit.Runners (2.6.4) NUnit.Runners (2.6.4)

1
src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj

@ -66,7 +66,6 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>C:\Source\ATLAS\include;..\..\Common;$(IncludePath)</IncludePath> <IncludePath>C:\Source\ATLAS\include;..\..\Common;$(IncludePath)</IncludePath>

1
src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj

@ -45,7 +45,6 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

1
src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj

@ -77,7 +77,6 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(ProjectDir)..\..\..\..\out\CUDA\Windows\x86\</OutDir> <OutDir>$(ProjectDir)..\..\..\..\out\CUDA\Windows\x86\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir> <IntDir>$(Platform)\$(Configuration)\</IntDir>

1
src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj

@ -91,7 +91,6 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
</PropertyGroup> </PropertyGroup>

1
src/UnitTests/UnitTests-CUDA.csproj

@ -50,6 +50,7 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>

1
src/UnitTests/UnitTests-MKL.csproj

@ -50,6 +50,7 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>

6
src/UnitTests/UnitTests-Net35.csproj

@ -80,6 +80,9 @@
<None Include="paket.references" /> <None Include="paket.references" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Choose> <Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(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')"> <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(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')">
<ItemGroup> <ItemGroup>
@ -98,7 +101,4 @@
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project> </Project>

1
src/UnitTests/UnitTests-OpenBLAS.csproj

@ -50,6 +50,7 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>

Loading…
Cancel
Save