From 771ad85e4da837f5ad8307eba37eea6bddcac273 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sun, 15 Jun 2014 16:06:24 +0200 Subject: [PATCH] Data: Data extensions must depend on specific package version, not necessarily the newest. --- MathNet.Numerics.Data.sln | 8 -------- build.fsx | 4 ++-- packages/repositories.config | 3 +++ src/Data/Matlab/Matlab.csproj | 10 ++++------ src/Data/Text/Text.csproj | 10 ++++------ src/DataUnitTests/UnitTests.csproj | 12 +++++++----- 6 files changed, 20 insertions(+), 27 deletions(-) diff --git a/MathNet.Numerics.Data.sln b/MathNet.Numerics.Data.sln index f1152537..8f473e15 100644 --- a/MathNet.Numerics.Data.sln +++ b/MathNet.Numerics.Data.sln @@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\DataUnitTe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Text", "src\Data\Text\Text.csproj", "{9D3A08E1-6B96-4552-A535-412E589B3264}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics", "src\Numerics\Numerics.csproj", "{B7CAE5F4-A23F-4438-B5BE-41226618B695}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{F510F04E-7503-4F87-A1EC-3A5FBA1DF7B8}" ProjectSection(SolutionItems) = preProject CONTRIBUTING.md = CONTRIBUTING.md @@ -54,12 +52,6 @@ Global {9D3A08E1-6B96-4552-A535-412E589B3264}.Release|Any CPU.Build.0 = Release|Any CPU {9D3A08E1-6B96-4552-A535-412E589B3264}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU {9D3A08E1-6B96-4552-A535-412E589B3264}.Release-Signed|Any CPU.Build.0 = Release|Any CPU - {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Any CPU.Build.0 = Release|Any CPU - {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU - {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build.fsx b/build.fsx index 363b1b6e..20b6279c 100644 --- a/build.fsx +++ b/build.fsx @@ -161,7 +161,7 @@ let dataTextPack = ReleaseNotes = dataReleaseNotes Tags = "math numeric data text csv tsv json xml" Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] - Dependencies = [ "MathNet.Numerics", packageVersion ] + Dependencies = getDependencies "src/Data/Text/packages.config" Files = [ @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Text.dll", Some libnet40, None; @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Text.xml", Some libnet40, None ] } @@ -174,7 +174,7 @@ let dataMatlabPack = ReleaseNotes = dataReleaseNotes Tags = "math numeric data matlab" Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] - Dependencies = [ "MathNet.Numerics", packageVersion ] + Dependencies = getDependencies "src/Data/Matlab/packages.config" Files = [ @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Matlab.dll", Some libnet40, None; @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Matlab.xml", Some libnet40, None ] } diff --git a/packages/repositories.config b/packages/repositories.config index cdaa09cd..67cdfa51 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -1,5 +1,8 @@  + + + diff --git a/src/Data/Matlab/Matlab.csproj b/src/Data/Matlab/Matlab.csproj index 667742d3..f5f1a34f 100644 --- a/src/Data/Matlab/Matlab.csproj +++ b/src/Data/Matlab/Matlab.csproj @@ -35,6 +35,10 @@ 4 + + ..\..\..\packages\MathNet.Numerics.3.0.0-beta03\lib\net40\MathNet.Numerics.dll + True + @@ -58,12 +62,6 @@ - - - {b7cae5f4-a23f-4438-b5be-41226618b695} - Numerics - -