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

Build: update FAKE, NuGet.CommandLine, NUnit, FSharp.Compiler.Tools

pull/535/head
Christoph Ruegg 9 years ago
parent
8d9f811826
commit
25af89d1a9
5 changed files with 24 additions and 14 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. 8
      MathNet.Numerics.sln.DotSettings
  2. 7
      build.fsx
  3. 12
      paket.lock
  4. 5
      src/FSharpUnitTests/FSharpUnitTests.fsproj
  5. 6
      src/UnitTests/UnitTests.csproj

8
MathNet.Numerics.sln.DotSettings
View File

@ -17,7 +17,10 @@
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_ANONYMOUS_METHOD_BLOCK/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_EMBRACED_INITIALIZER_BLOCK/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
@ -70,7 +73,12 @@ OTHER DEALINGS IN THE SOFTWARE.&#xD;
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SVD/@EntryIndexedValue">SVD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TFQMR/@EntryIndexedValue">TFQMR</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WH/@EntryIndexedValue">WH</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
<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_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>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>

7
build.fsx
View File

@ -316,8 +316,7 @@ let dataBundle =
Target "Start" DoNothing
Target "Clean" (fun _ ->
DotNetCli.RunCommand id "clean MathNet.Numerics.sln"
DotNetCli.RunCommand id "clean MathNet.Numerics.Data.sln"
// Force delete the obj folder first (dotnet SDK has a habbit of fucking this folder up to a state where not even clean works...)
CleanDirs [ "src/Numerics/bin"; "src/FSharp/bin"; "src/TestData/bin"; "src/UnitTests/bin"; "src/FSharpUnitTests/bin" ]
CleanDirs [ "src/Numerics/obj"; "src/FSharp/obj"; "src/TestData/obj"; "src/UnitTests/obj"; "src/FSharpUnitTests/obj" ]
CleanDirs [ "obj" ]
@ -328,7 +327,9 @@ Target "Clean" (fun _ ->
CleanDirs [ "out/test-debug/Net40" ]
CleanDirs [ "out/lib-signed/Net40"; "out/test-signed/Net40" ] // Signed Build
CleanDirs [ "out/MKL"; "out/ATLAS"; "out/CUDA"; "out/OpenBLAS" ] // Native Providers
CleanDirs [ "out/Data" ]) // Data Extensions
CleanDirs [ "out/Data" ] // Data Extensions
DotNetCli.RunCommand id "clean MathNet.Numerics.sln"
DotNetCli.RunCommand id "clean MathNet.Numerics.Data.sln")
Target "ApplyVersion" (fun _ ->
patchVersionInAssemblyInfo "src/Numerics" numericsRelease

12
paket.lock
View File

@ -1,13 +1,13 @@
NUGET
remote: https://www.nuget.org/api/v2
FSharp.Compiler.Tools (4.1.23)
FSharp.Compiler.Tools (4.1.29)
FSharp.Core (4.0.0.1)
NUnit (3.8.1) - restriction: || (== net35) (== net45)
NUnit (3.9) - restriction: || (== net35) (== net45)
TaskParallelLibrary (1.0.2856)
GITHUB
remote: fsprojects/FsUnit
src/FsUnit.NUnit/FsUnit.fs (ccd7f01fe792b149731261c816b851bf4e8e5e43)
src/FsUnit.NUnit/FsUnitTyped.fs (ccd7f01fe792b149731261c816b851bf4e8e5e43)
src/FsUnit.NUnit/FsUnit.fs (4c0812f4b96de85cc20f02fca87f852735e2eaeb)
src/FsUnit.NUnit/FsUnitTyped.fs (4c0812f4b96de85cc20f02fca87f852735e2eaeb)
GROUP Benchmark
RESTRICTION: == net45
NUGET
@ -18,14 +18,14 @@ NUGET
GROUP Build
NUGET
remote: https://www.nuget.org/api/v2
FAKE (4.63.2)
FAKE (4.64.3)
FSharp.Compiler.Service (2.0.0.6)
FSharp.Formatting (2.14.4)
FSharp.Compiler.Service (2.0.0.6)
FSharpVSPowerTools.Core (>= 2.3 < 2.4)
FSharpVSPowerTools.Core (2.3)
FSharp.Compiler.Service (>= 2.0.0.3)
NuGet.CommandLine (4.3)
NuGet.CommandLine (4.4.1)
NUnit.ConsoleRunner (3.7)
GROUP Data

5
src/FSharpUnitTests/FSharpUnitTests.fsproj
View File

@ -9,9 +9,10 @@
<DefineConstants>NETSTANDARD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.2.3" />
<PackageReference Include="FsUnit" Version="3.0.*" />
<PackageReference Include="NUnit" Version="3.8.*" />
<PackageReference Include="NUnitLite" Version="3.8.*" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnitLite" Version="3.9.0" />
<ProjectReference Include="..\FSharp\FSharp.fsproj" />
<ProjectReference Include="..\TestData\TestData.csproj" />
</ItemGroup>

6
src/UnitTests/UnitTests.csproj
View File

@ -27,9 +27,9 @@
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.8.*" />
<PackageReference Include="NUnitLite" Version="3.8.*" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnitLite" Version="3.9.0" />
<ProjectReference Include="..\Numerics\Numerics.csproj" />
<ProjectReference Include="..\TestData\TestData.csproj" />
</ItemGroup>
</Project>
</Project>
Write Preview
Loading…
Cancel
Save