tsai
/
mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Make the FSharpUnitTests compile, drop net35 on test data

pull/525/head
Ignas Anikevicius 9 years ago
parent
eef105aa3c
commit
eb3eba9865
3 changed files with 17 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/FSharpUnitTests/FSharpUnitTests-2017.fsproj
  2. 47
      src/TestData/TestData-2017.csproj
  3. 18
      src/UnitTests/UnitTests-2017.csproj

11
src/FSharpUnitTests/FSharpUnitTests-2017.fsproj
View File

@ -5,8 +5,8 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
<DefineConstants>NETSTANDARD;NOSYSNUMERICS</DefineConstants>
<PropertyGroup Condition="$(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('netstandard'))">
<DefineConstants>NETSTANDARD;NOSYSNUMERICS</DefineConstants>
</PropertyGroup>
<ItemGroup>
@ -16,6 +16,13 @@
<ProjectReference Include="..\FSharp\FSharp-2017.fsproj" />
<ProjectReference Include="..\TestData\TestData-2017.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('netstandard'))">
<PackageReference Include="System.Reflection" Version="4.3.*" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.*" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.*" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.*" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.*" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="VectorTests.fs" />

47
src/TestData/TestData-2017.csproj
View File

@ -1,55 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net35;netstandard1.1</TargetFrameworks>
<TargetFrameworks>net40;netstandard1.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.TestData</AssemblyName>
<RootNamespace>MathNet.Numerics.TestData</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\..\out\test\Net35\</OutputPath>
<IntermediateOutputPath>..\..\obj\test\Net35\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test\Net35\</BaseIntermediateOutputPath>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>1591</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<OutputPath>..\..\out\test-debug\Net35\</OutputPath>
<IntermediateOutputPath>..\..\obj\test-debug\Net35\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test-debug\Net35\</BaseIntermediateOutputPath>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<NoWarn>1591</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Signed|AnyCPU'">
<OutputPath>..\..\out\test-signed\Net35\</OutputPath>
<IntermediateOutputPath>..\..\obj\test-signed\Net35\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test-signed\Net35\</BaseIntermediateOutputPath>
<!-- Conditional Strong Name: YES -->
<SignAssembly>true</SignAssembly>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE;STRONGNAME</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>1591</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.1'">
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>

18
src/UnitTests/UnitTests-2017.csproj
View File

@ -20,20 +20,16 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('netstandard'))">
<PackageReference Include="System.Reflection" Version="4.3.*" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.*" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.*" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnitLite" Version="3.7.1" />
<PackageReference Include="System.Reflection" Version="4.3.*" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.*" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.*" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.*" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.8.*" />
<PackageReference Include="NUnitLite" Version="3.8.*" />
<ProjectReference Include="..\Numerics\Numerics-2017.csproj" />
<ProjectReference Include="..\TestData\TestData-2017.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('netstandard'))">
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.*" />
</ItemGroup>
</Project>

Write Preview
Loading…
Cancel
Save