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

Update dependencies and SDK

pull/566/head
Christoph Ruegg 8 years ago
parent
1ff8db9b60
commit
728f54d7f0
15 changed files with 508 additions and 448 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. 13
      .paket/Paket.Restore.targets
  2. 24
      MathNet.Numerics.sln
  3. 18
      paket.dependencies
  4. 874
      paket.lock
  5. 2
      src/Benchmark/Benchmark.csproj
  6. 2
      src/Data.Tests/Data.Tests.csproj
  7. 2
      src/Data/Matlab/Matlab.csproj
  8. 2
      src/Data/Text/Text.csproj
  9. 3
      src/FSharp.Tests/FSharp.Tests.fsproj
  10. 4
      src/FSharp/FSharp.fsproj
  11. 2
      src/Numerics.Tests/Numerics.Tests.CUDA.csproj
  12. 2
      src/Numerics.Tests/Numerics.Tests.MKL.csproj
  13. 2
      src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
  14. 4
      src/Numerics/Numerics.csproj
  15. 2
      src/TestData/TestData.csproj

13
.paket/Paket.Restore.targets
View File

@ -48,16 +48,16 @@
<!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
<PropertyGroup>
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
</PropertyGroup>
<!-- If shasum and awk exist get the hashes -->
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
</Exec>
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
</Exec>
<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
@ -127,6 +127,7 @@
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
</PackageReference>
</ItemGroup>
@ -183,8 +184,8 @@
<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
</ConvertToAbsolutePath>
</ConvertToAbsolutePath>
<!-- Call Pack -->
<PackTask Condition="$(UseNewPack)"

24
MathNet.Numerics.sln
View File

@ -37,12 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestData", "src\TestData\TestData.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Numerics.Tests.MKL", "src\Numerics.Tests\Numerics.Tests.MKL.csproj", "{0F171596-CDE9-4197-A8B2-07C406814CE3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Numerics.Tests.OpenBLAS", "src\Numerics.Tests\Numerics.Tests.OpenBLAS.csproj", "{9C4A3651-3C4D-405A-8D25-503E04A1B459}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Numerics.Tests.CUDA", "src\Numerics.Tests\Numerics.Tests.CUDA.csproj", "{E184F219-F9F9-4396-AE0A-B431375CF06F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "src\Benchmark\Benchmark.csproj", "{82444930-9FD7-41B6-B476-CCE41A0C0A0B}"
EndProject
Global
@ -82,24 +76,6 @@ Global
{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release|Any CPU.Build.0 = Release|Any CPU
{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU
{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release-Signed|Any CPU.Build.0 = Release|Any CPU
{0F171596-CDE9-4197-A8B2-07C406814CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F171596-CDE9-4197-A8B2-07C406814CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F171596-CDE9-4197-A8B2-07C406814CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F171596-CDE9-4197-A8B2-07C406814CE3}.Release|Any CPU.Build.0 = Release|Any CPU
{0F171596-CDE9-4197-A8B2-07C406814CE3}.Release-Signed|Any CPU.ActiveCfg = Debug|Any CPU
{0F171596-CDE9-4197-A8B2-07C406814CE3}.Release-Signed|Any CPU.Build.0 = Debug|Any CPU
{9C4A3651-3C4D-405A-8D25-503E04A1B459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C4A3651-3C4D-405A-8D25-503E04A1B459}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C4A3651-3C4D-405A-8D25-503E04A1B459}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C4A3651-3C4D-405A-8D25-503E04A1B459}.Release|Any CPU.Build.0 = Release|Any CPU
{9C4A3651-3C4D-405A-8D25-503E04A1B459}.Release-Signed|Any CPU.ActiveCfg = Debug|Any CPU
{9C4A3651-3C4D-405A-8D25-503E04A1B459}.Release-Signed|Any CPU.Build.0 = Debug|Any CPU
{E184F219-F9F9-4396-AE0A-B431375CF06F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E184F219-F9F9-4396-AE0A-B431375CF06F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E184F219-F9F9-4396-AE0A-B431375CF06F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E184F219-F9F9-4396-AE0A-B431375CF06F}.Release|Any CPU.Build.0 = Release|Any CPU
{E184F219-F9F9-4396-AE0A-B431375CF06F}.Release-Signed|Any CPU.ActiveCfg = Debug|Any CPU
{E184F219-F9F9-4396-AE0A-B431375CF06F}.Release-Signed|Any CPU.Build.0 = Debug|Any CPU
{82444930-9FD7-41B6-B476-CCE41A0C0A0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82444930-9FD7-41B6-B476-CCE41A0C0A0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82444930-9FD7-41B6-B476-CCE41A0C0A0B}.Release|Any CPU.ActiveCfg = Release|Any CPU

18
paket.dependencies
View File

@ -20,17 +20,17 @@ nuget System.Runtime.Serialization.Formatters framework:netstandard1.3,netstanda
nuget System.Security.Cryptography.Algorithms framework:netstandard1.3,netstandard1.6,netcoreapp1.1
// .NET Standard
nuget NETStandard.Library 2.0.1 strategy:min, framework:netstandard1.3,netstandard1.6,netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.Platforms 2.0.1 strategy:min, framework:netstandard1.3,netstandard1.6,netcoreapp1.1,netcoreapp2.0
nuget NETStandard.Library 2.0.2 strategy:min, framework:netstandard1.3,netstandard1.6,netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.Platforms 2.0.2 strategy:min, framework:netstandard1.3,netstandard1.6,netcoreapp1.1,netcoreapp2.0
// .NET Core
nuget Microsoft.NETCore.App 2.0.5 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetHost 2.0.5 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetAppHost 2.0.5 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetHostPolicy 2.0.5 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetHostResolver 2.0.5 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.Jit 2.0.5 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.Runtime.CoreCLR 2.0.5 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.App 2.0.7 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetHost 2.0.7 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetAppHost 2.0.7 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetHostPolicy 2.0.7 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.DotNetHostResolver 2.0.7 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.Jit 2.0.7 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
nuget Microsoft.NETCore.Runtime.CoreCLR 2.0.7 strategy:min, framework:netcoreapp1.1,netcoreapp2.0
group Build
source https://api.nuget.org/v3/index.json

874
paket.lock
View File

File diff suppressed because it is too large

2
src/Benchmark/Benchmark.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>Benchmark</AssemblyName>
<RootNamespace>Benchmark</RootNamespace>

2
src/Data.Tests/Data.Tests.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net45;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.Data.Tests</AssemblyName>
<RootNamespace>MathNet.Numerics.Data.Tests</RootNamespace>

2
src/Data/Matlab/Matlab.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;netstandard1.3;netstandard2.0</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion>2.0.2</NetStandardImplicitPackageVersion>
<AssemblyName>MathNet.Numerics.Data.Matlab</AssemblyName>
<RootNamespace>MathNet.Numerics.Data.Matlab</RootNamespace>
<IsPackable>true</IsPackable>

2
src/Data/Text/Text.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;netstandard1.3;netstandard2.0</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion>2.0.2</NetStandardImplicitPackageVersion>
<AssemblyName>MathNet.Numerics.Data.Text</AssemblyName>
<RootNamespace>MathNet.Numerics.Data.Text</RootNamespace>
<IsPackable>true</IsPackable>

3
src/FSharp.Tests/FSharp.Tests.fsproj
View File

@ -3,12 +3,13 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
<RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.FSharp.Tests</AssemblyName>
<RootNamespace>MathNet.Numerics.Tests</RootNamespace>
<IsPackable>false</IsPackable>
<NoWarn>44;2003</NoWarn>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\FSharp\FSharp.fsproj" />

4
src/FSharp/FSharp.fsproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net45;netstandard1.6;netstandard2.0</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion>2.0.2</NetStandardImplicitPackageVersion>
<AssemblyName>MathNet.Numerics.FSharp</AssemblyName>
<RootNamespace>MathNet.Numerics</RootNamespace>
<IsPackable>true</IsPackable>
@ -63,4 +63,4 @@
<None Include="MathNet.Numerics.IfSharp.fsx" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>

2
src/Numerics.Tests/Numerics.Tests.CUDA.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
<RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.Tests.CUDA</AssemblyName>
<RootNamespace>MathNet.Numerics.Tests</RootNamespace>

2
src/Numerics.Tests/Numerics.Tests.MKL.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
<RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.Tests.MKL</AssemblyName>
<RootNamespace>MathNet.Numerics.Tests</RootNamespace>

2
src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
<RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.Tests.OpenBLAS</AssemblyName>
<RootNamespace>MathNet.Numerics.Tests</RootNamespace>

4
src/Numerics/Numerics.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion>2.0.2</NetStandardImplicitPackageVersion>
<AssemblyName>MathNet.Numerics</AssemblyName>
<RootNamespace>MathNet.Numerics</RootNamespace>
<IsPackable>true</IsPackable>
@ -49,4 +49,4 @@
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>

2
src/TestData/TestData.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;netstandard1.1</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.1</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion>2.0.2</NetStandardImplicitPackageVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.TestData</AssemblyName>
<RootNamespace>MathNet.Numerics.TestData</RootNamespace>

Write Preview
Loading…
Cancel
Save