diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config deleted file mode 100644 index 67f8ea04..00000000 --- a/.nuget/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe deleted file mode 100644 index c41a0d0d..00000000 Binary files a/.nuget/NuGet.exe and /dev/null differ diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets deleted file mode 100644 index 83fe9060..00000000 --- a/.nuget/NuGet.targets +++ /dev/null @@ -1,136 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - $([System.IO.Path]::Combine($(ProjectDir), "packages.config")) - - - - - $(SolutionDir).nuget - packages.config - - - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 $(NuGetExePath) - - $(TargetDir.Trim('\\')) - - -RequireConsent - -NonInteractive - - "$(SolutionDir) " - "$(SolutionDir)" - - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) - $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MathNet.Numerics.All.sln b/MathNet.Numerics.All.sln index be2ee597..793fcf27 100644 --- a/MathNet.Numerics.All.sln +++ b/MathNet.Numerics.All.sln @@ -51,7 +51,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40 ProjectSection(SolutionItems) = preProject build.fsx = build.fsx build\NuGet\MathNet.Numerics.nuspec = build\NuGet\MathNet.Numerics.nuspec - .nuget\packages.config = .nuget\packages.config + build\packages.config = build\packages.config EndProjectSection EndProject Global diff --git a/MathNet.Numerics.Portable.sln b/MathNet.Numerics.Portable.sln index cd8ee3d5..23735c87 100644 --- a/MathNet.Numerics.Portable.sln +++ b/MathNet.Numerics.Portable.sln @@ -44,7 +44,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}" ProjectSection(SolutionItems) = preProject build.fsx = build.fsx - .nuget\packages.config = .nuget\packages.config + build\packages.config = build\packages.config EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{305FCCF4-B205-4E98-B58A-48117C3CA4E3}" diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index e706b697..37520b29 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -25,7 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A4A66FA9 ProjectSection(SolutionItems) = preProject build.fsx = build.fsx build\NuGet\MathNet.Numerics.nuspec = build\NuGet\MathNet.Numerics.nuspec - .nuget\packages.config = .nuget\packages.config + build\packages.config = build\packages.config EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{DB89F4DB-5204-4B38-B9F5-FE11E69D32AD}" diff --git a/build.cmd b/build.cmd index 3c3050e7..8c266b88 100644 --- a/build.cmd +++ b/build.cmd @@ -1,6 +1,6 @@ @echo off cls if not exist packages\FAKE\tools\FAKE.exe ( - .nuget\NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion + tools\NuGet\NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion ) packages\FAKE\tools\FAKE.exe build.fsx %* diff --git a/build.sh b/build.sh index 75a03e9f..c24b3d8f 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/bash if [ ! -f packages/FAKE/tools/FAKE.exe ]; then - mono --runtime=v4.0 .nuget/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion + mono --runtime=v4.0 tools/NuGet/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion fi mono --runtime=v4.0 packages/FAKE/tools/FAKE.exe build.fsx $@ diff --git a/.nuget/packages.config b/build/packages.config similarity index 100% rename from .nuget/packages.config rename to build/packages.config diff --git a/buildn.sh b/buildn.sh index a04d39fd..366b8154 100644 --- a/buildn.sh +++ b/buildn.sh @@ -1,5 +1,5 @@ #!/bin/bash if [ ! -f packages/FAKE/tools/FAKE.exe ]; then - .nuget/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion + tools/NuGet/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion fi packages/FAKE/tools/FAKE.exe build.fsx $@ diff --git a/src/FSharpExamples/FSharpExamples.fsproj b/src/FSharpExamples/FSharpExamples.fsproj index ebe00eee..8aa60371 100644 --- a/src/FSharpExamples/FSharpExamples.fsproj +++ b/src/FSharpExamples/FSharpExamples.fsproj @@ -81,5 +81,4 @@ True - \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable344.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable344.fsproj index 8f704293..9996ebbc 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable344.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable344.fsproj @@ -91,11 +91,4 @@ $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj index 33b32150..b419a302 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj @@ -89,11 +89,4 @@ $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index d29f2c4e..9568b4dd 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -94,11 +94,4 @@ $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/Numerics/Numerics-Net35.csproj b/src/Numerics/Numerics-Net35.csproj index 89573f90..d31f5a88 100644 --- a/src/Numerics/Numerics-Net35.csproj +++ b/src/Numerics/Numerics-Net35.csproj @@ -104,5 +104,4 @@ - \ No newline at end of file diff --git a/src/Numerics/Numerics-Portable344.csproj b/src/Numerics/Numerics-Portable344.csproj index b4a5c09c..86dd2cb8 100644 --- a/src/Numerics/Numerics-Portable344.csproj +++ b/src/Numerics/Numerics-Portable344.csproj @@ -63,5 +63,4 @@ - \ No newline at end of file diff --git a/src/Numerics/Numerics-Portable47.csproj b/src/Numerics/Numerics-Portable47.csproj index 1c42540f..25b3124c 100644 --- a/src/Numerics/Numerics-Portable47.csproj +++ b/src/Numerics/Numerics-Portable47.csproj @@ -63,5 +63,4 @@ - \ No newline at end of file diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 082a434b..d7658c95 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -440,5 +440,4 @@ - \ No newline at end of file diff --git a/src/UnitTests/UnitTests-Net35.csproj b/src/UnitTests/UnitTests-Net35.csproj index 703d8296..c93093ee 100644 --- a/src/UnitTests/UnitTests-Net35.csproj +++ b/src/UnitTests/UnitTests-Net35.csproj @@ -338,5 +338,4 @@ - \ No newline at end of file diff --git a/src/UnitTests/UnitTests-Portable344.csproj b/src/UnitTests/UnitTests-Portable344.csproj index 259b8cf0..1f0fa200 100644 --- a/src/UnitTests/UnitTests-Portable344.csproj +++ b/src/UnitTests/UnitTests-Portable344.csproj @@ -338,5 +338,4 @@ - \ No newline at end of file diff --git a/src/UnitTests/UnitTests-Portable47.csproj b/src/UnitTests/UnitTests-Portable47.csproj index 9bd1362a..5d1b1dfa 100644 --- a/src/UnitTests/UnitTests-Portable47.csproj +++ b/src/UnitTests/UnitTests-Portable47.csproj @@ -336,5 +336,4 @@ - \ No newline at end of file diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index 0b4b803e..cd1e2369 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -684,5 +684,4 @@ - \ No newline at end of file