Browse Source

System.Numerics is available in .Net Standard, use it; enable Native in net40

build
Christoph Ruegg 9 years ago
parent
commit
340565e118
  1. 2
      src/FSharp/FSharp-Portable47.fsproj.paket.references
  2. 10
      src/FSharp/FSharp.fsproj
  3. 5
      src/FSharpUnitTests/FSharpUnitTests.fsproj
  4. 9
      src/Numerics/Numerics.csproj
  5. 4
      src/Numerics/Random/CryptoRandomSource.cs
  6. 1
      src/TestData/TestData.csproj
  7. 3
      src/UnitTests/UnitTests.csproj

2
src/FSharp/FSharp-Portable47.fsproj.paket.references

@ -1,2 +0,0 @@
FSharp.Core framework:portable-net45+sl5+netcore45
FSharp.Compiler.Tools

10
src/FSharp/FSharp.fsproj

@ -1,18 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net45;netstandard1.6;netstandard2.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.FSharp</AssemblyName>
<RootNamespace>MathNet.Numerics</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputType>Library</OutputType>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<IsPackable>true</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
<DefineConstants>NETSTANDARD;NOSYSNUMERICS</DefineConstants>
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Numerics\Numerics.csproj" />
</ItemGroup>

5
src/FSharpUnitTests/FSharpUnitTests.fsproj

@ -3,12 +3,11 @@
<TargetFrameworks>net45;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('netstandard'))">
<DefineConstants>NETSTANDARD;NOSYSNUMERICS</DefineConstants>
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FsUnit" Version="3.0.*" />
<PackageReference Include="NUnit" Version="3.8.*" />

9
src/Numerics/Numerics.csproj

@ -38,9 +38,16 @@
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>1701;1702;1705;1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
<DefineConstants>NETSTANDARD;NOSYSNUMERICS</DefineConstants>
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net40'">
<DefineConstants>NATIVE</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
<Reference Include="System" />

4
src/Numerics/Random/CryptoRandomSource.cs

@ -47,7 +47,7 @@ namespace MathNet.Numerics.Random
/// <summary>
/// Construct a new random number generator with a random seed.
/// </summary>
/// <remarks>Uses <see cref="System.Security.Cryptography.RNGCryptoServiceProvider"/> and uses the value of
/// <remarks>Uses <see cref="System.Security.Cryptography.RandomNumberGenerator"/> and uses the value of
/// <see cref="Control.ThreadSafeRandomNumberGenerators"/> to set whether the instance is thread safe.</remarks>
public CryptoRandomSource()
{
@ -67,7 +67,7 @@ namespace MathNet.Numerics.Random
/// <summary>
/// Construct a new random number generator with random seed.
/// </summary>
/// <remarks>Uses <see cref="System.Security.Cryptography.RNGCryptoServiceProvider"/></remarks>
/// <remarks>Uses <see cref="System.Security.Cryptography.RandomNumberGenerator"/></remarks>
/// <param name="threadSafe">if set to <c>true</c> , the class is thread safe.</param>
public CryptoRandomSource(bool threadSafe) : base(threadSafe)
{

1
src/TestData/TestData.csproj

@ -4,6 +4,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.TestData</AssemblyName>
<RootNamespace>MathNet.Numerics.TestData</RootNamespace>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.1'">
<DefineConstants>NETSTANDARD</DefineConstants>

3
src/UnitTests/UnitTests.csproj

@ -7,9 +7,10 @@
<BaseIntermediateOutputPath>..\..\obj\test\$(Configuration)</BaseIntermediateOutputPath>
<AssemblyName>MathNet.Numerics.UnitTests</AssemblyName>
<RootNamespace>MathNet.Numerics.UnitTests</RootNamespace>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('netstandard'))">
<DefineConstants>NETSTANDARD;NOSYSNUMERICS</DefineConstants>
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="System" />

Loading…
Cancel
Save