Skip to content

Commit fbb3363

Browse files
rca22rca22
authored
Merge branch 'mathnet:master' into rca22_weightedStats
2 parents 93c8446 + a50d68d commit fbb3363

77 files changed

Lines changed: 815 additions & 1102 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.config/dotnet-tools.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
"commands": [
1414
"fake"
1515
]
16+
},
17+
"fsharp.formatting.commandtool": {
18+
"version": "11.4.1",
19+
"commands": [
20+
"fsdocs"
21+
]
1622
}
1723
}
1824
}

‎.gitignore‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
bin/
33
obj/
44
out/
5+
output/
6+
tmp/
57

68
# User-specific Files
79
*.user
@@ -59,22 +61,18 @@ Thumbs.db
5961
ehthumbs.db
6062
Desktop.ini
6163

62-
# NuGet Packages
63-
# NOTE: we do NOT use package restore in the core projects, but do use it with FAKE builds.
64+
6465
packages/*
6566
!packages/.gitattributes
6667
!packages/TaskParallelLibrary
6768
!packages/FSharp.Core
68-
69-
# FAKE & Paket
7069
packages
7170
paket-files
7271
.fake
73-
74-
# Generated Doc Files
75-
docs/content/License.md
76-
docs/content/Contributing.md
77-
docs/content/Contributors.md
78-
docs/content/ReleaseNotes.md
79-
docs/content/ReleaseNotes-*.md
72+
.fsdocs
8073
/build.fsx.lock
74+
docs/License.md
75+
docs/Contributing.md
76+
docs/Contributors.md
77+
docs/ReleaseNotes.md
78+
docs/ReleaseNotes-*.md

src/Directory.Build.props renamed to Directory.Build.props

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919
<PropertyGroup Condition="'$(StrongName)'=='True'">
2020
<SignAssembly>true</SignAssembly>
21-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)MathNet.Numerics.snk</AssemblyOriginatorKeyFile>
21+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build/MathNet.Numerics.snk</AssemblyOriginatorKeyFile>
2222
<DelaySign>false</DelaySign>
2323
<CommonConstants>STRONGNAME</CommonConstants>
2424
<PackageIdSuffix>.Signed</PackageIdSuffix>
@@ -30,6 +30,11 @@
3030
<DefineConstants>NATIVE;$(CommonConstants)</DefineConstants>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" Visible="false" PackagePath="\" />
33+
<None Include="$(MSBuildThisFileDirectory)build/icon.png" Pack="true" Visible="false" PackagePath="\" />
3434
</ItemGroup>
35+
<PropertyGroup>
36+
<FsDocsLogoSource>/logo.png</FsDocsLogoSource>
37+
<FsDocsLogoLink>https://numerics.mathdotnet.com/</FsDocsLogoLink>
38+
<FsDocsNavbarPosition>fixed-left</FsDocsNavbarPosition>
39+
</PropertyGroup>
3540
</Project>

‎MathNet.Numerics.sln‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,48 +27,18 @@ EndProject
2727
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}"
2828
ProjectSection(SolutionItems) = preProject
2929
appveyor.yml = appveyor.yml
30-
docs\tools\build-docs.fsx = docs\tools\build-docs.fsx
3130
build\build-framework.fsx = build\build-framework.fsx
3231
build.fsx = build.fsx
33-
src\Directory.Build.props = src\Directory.Build.props
3432
global.json = global.json
3533
paket.dependencies = paket.dependencies
3634
paket.lock = paket.lock
35+
Directory.Build.props = Directory.Build.props
3736
EndProjectSection
3837
EndProject
3938
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestData", "src\TestData\TestData.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}"
4039
EndProject
4140
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "src\Benchmark\Benchmark.csproj", "{82444930-9FD7-41B6-B476-CCE41A0C0A0B}"
4241
EndProject
43-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{B890C1AF-E488-490F-B784-2C6F8C924693}"
44-
ProjectSection(SolutionItems) = preProject
45-
docs\content\Build.md = docs\content\Build.md
46-
docs\content\Compatibility.md = docs\content\Compatibility.md
47-
docs\content\Constants.md = docs\content\Constants.md
48-
docs\content\CSV.md = docs\content\CSV.md
49-
docs\content\DescriptiveStatistics.md = docs\content\DescriptiveStatistics.md
50-
docs\content\Distance.md = docs\content\Distance.md
51-
docs\content\Euclid.md = docs\content\Euclid.md
52-
docs\content\Functions.md = docs\content\Functions.md
53-
docs\content\Generate.md = docs\content\Generate.md
54-
docs\content\IFsharpNotebook.md = docs\content\IFsharpNotebook.md
55-
docs\content\index.md = docs\content\index.md
56-
docs\content\IntegralTransforms.md = docs\content\IntegralTransforms.md
57-
docs\content\Integration.md = docs\content\Integration.md
58-
docs\content\Interpolation.md = docs\content\Interpolation.md
59-
docs\content\LinearEquations.md = docs\content\LinearEquations.md
60-
docs\content\MatlabFiles.md = docs\content\MatlabFiles.md
61-
docs\content\Matrix.md = docs\content\Matrix.md
62-
docs\content\MatrixMarket.md = docs\content\MatrixMarket.md
63-
docs\content\MKL.md = docs\content\MKL.md
64-
docs\content\Packages.md = docs\content\Packages.md
65-
docs\content\Probability.md = docs\content\Probability.md
66-
docs\content\Random.md = docs\content\Random.md
67-
docs\content\Regression.md = docs\content\Regression.md
68-
docs\content\Users.md = docs\content\Users.md
69-
README.md = README.md
70-
EndProjectSection
71-
EndProject
7242
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.MKL", "src\Providers.MKL\Providers.MKL.csproj", "{0B5FAFAA-4286-4D92-B5AB-CBA75ADDA0BB}"
7343
EndProject
7444
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.CUDA", "src\Providers.CUDA\Providers.CUDA.csproj", "{3C0D4A87-CC89-43B6-B028-4122099D692F}"

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ if errorlevel 1 (
88
exit /b %errorlevel%
99
)
1010

11-
packages\build\FAKE\tools\FAKE.exe build.fsx %*
11+
dotnet fake run build.fsx -t %*

0 commit comments

Comments
 (0)