Browse Source

Build: fix data package build and tests

arrays
Christoph Ruegg 8 years ago
parent
commit
2361efa654
  1. 1
      MathNet.Numerics.Data.sln.DotSettings
  2. 4
      build.fsx
  3. 11
      paket.dependencies
  4. 903
      paket.lock
  5. 3
      src/Data.Tests/Data.Tests.csproj
  6. 10
      src/Data.Tests/paket.references
  7. 3
      src/Data/Matlab/Matlab.csproj
  8. 3
      src/Data/Matlab/paket.references
  9. 3
      src/Data/Text/Text.csproj
  10. 3
      src/Data/Text/paket.references
  11. 11
      src/Numerics.Tests/paket.references

1
MathNet.Numerics.Data.sln.DotSettings

@ -84,6 +84,7 @@ OTHER DEALINGS IN THE SOFTWARE.
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

4
build.fsx

@ -362,9 +362,9 @@ Target "CudaTestNET40" (fun _ -> testCUDA "net40")
let testData framework = test "src/Data.Tests" "Data.Tests.csproj" framework
Target "DataTest" DoNothing
Target "DataTestCore2.1" (fun _ -> testData "netcoreapp2.1")
Target "DataTestNET45" (fun _ -> testData "net45")
Target "DataTestNET461" (fun _ -> testData "net461")
"DataBuild" ==> "DataTestCore2.1" ==> "DataTest"
"DataBuild" =?> ("DataTestNET45", isWindows) ==> "DataTest"
"DataBuild" =?> ("DataTestNET461", isWindows) ==> "DataTest"
// --------------------------------------------------------------------------------------

11
paket.dependencies

@ -10,6 +10,9 @@ nuget FsUnit 3.0 framework:net461,netcoreapp2.1
nuget Microsoft.NET.Test.Sdk
nuget NUnit3TestAdapter
// Data
nuget MathNet.Numerics 4.0.0
// Benchmarks
nuget BenchmarkDotNet content:none, strategy:min, framework:net461,netcoreapp2.1
@ -37,11 +40,3 @@ group Build
nuget NUnit.ConsoleRunner
nuget FSharp.Formatting !~> 2.4
nuget NuGet.CommandLine
group Data
source https://api.nuget.org/v3/index.json
storage: none
framework: net40, netstandard1.3, netstandard2.0, net45, netcoreapp1.1, netcoreapp2.0
nuget MathNet.Numerics 4.0.0
nuget NUnit ~> 3.0
nuget NUnitLite ~> 3.0

903
paket.lock

File diff suppressed because it is too large

3
src/Data.Tests/Data.Tests.csproj

@ -2,7 +2,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.Data.Tests</AssemblyName>
<RootNamespace>MathNet.Numerics.Data.Tests</RootNamespace>

10
src/Data.Tests/paket.references

@ -1,4 +1,6 @@
group Data
NUnit
NUnitLite content:none
MathNet.Numerics
Microsoft.NET.Test.Sdk
NUnit3TestAdapter
NUnit
NUnitLite content:none
System.Runtime.InteropServices.RuntimeInformation
MathNet.Numerics

3
src/Data/Matlab/Matlab.csproj

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;netstandard1.3;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net40;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
<AssemblyName>MathNet.Numerics.Data.Matlab</AssemblyName>
<RootNamespace>MathNet.Numerics.Data.Matlab</RootNamespace>
<IsPackable>true</IsPackable>
@ -34,7 +34,6 @@ In addition to .Net 4.0 and newer now also targets .Net Standard 1.3 and 2.0.</P
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Content Include="app.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />

3
src/Data/Matlab/paket.references

@ -1,2 +1 @@
group Data
MathNet.Numerics
MathNet.Numerics

3
src/Data/Text/Text.csproj

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;netstandard1.3;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net40;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
<AssemblyName>MathNet.Numerics.Data.Text</AssemblyName>
<RootNamespace>MathNet.Numerics.Data.Text</RootNamespace>
<IsPackable>true</IsPackable>
@ -34,7 +34,6 @@ In addition to .Net 4.0 and newer now also targets .Net Standard 1.3 and 2.0.</P
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Content Include="app.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />

3
src/Data/Text/paket.references

@ -1,2 +1 @@
group Data
MathNet.Numerics
MathNet.Numerics

11
src/Numerics.Tests/paket.references

@ -3,14 +3,3 @@ NUnit3TestAdapter
NUnit
NUnitLite content:none
System.Runtime.InteropServices.RuntimeInformation
System.Reflection framework:netcoreapp1.1,netcoreapp2.0
System.Reflection.Extensions framework:netcoreapp1.1,netcoreapp2.0
System.Reflection.TypeExtensions framework:netcoreapp1.1,netcoreapp2.0
System.Threading.Tasks.Parallel framework:netcoreapp1.1,netcoreapp2.0
System.Xml.XmlSerializer framework:netcoreapp1.1,netcoreapp2.0
System.Runtime framework:netcoreapp1.1,netcoreapp2.0
System.Runtime.Numerics framework:netcoreapp1.1,netcoreapp2.0
System.Runtime.Serialization.Xml framework:netcoreapp1.1,netcoreapp2.0
System.Runtime.Serialization.Primitives framework:netcoreapp1.1,netcoreapp2.0
System.Runtime.Serialization.Formatters framework:netcoreapp1.1,netcoreapp2.0
System.Security.Cryptography.Algorithms framework:netcoreapp1.1,netcoreapp2.0

Loading…
Cancel
Save