Skip to content

Commit c8c2842

Browse files
authored
Merge pull request #247 from adz/minor_tweaks
Minor tweaks
2 parents 422a195 + 98662b8 commit c8c2842

File tree

6 files changed

+57
-461
lines changed

6 files changed

+57
-461
lines changed

.config/dotnet-tools.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"fake-cli": {
6+
"version": "5.19",
7+
"commands": [
8+
"fake"
9+
]
10+
},
11+
"paket": {
12+
"version": "6.0.0-alpha014",
13+
"commands": [
14+
"paket"
15+
]
16+
}
17+
}
18+
}

.gitignore

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*.exe.mdb
1313

1414
# Build results
15-
1615
[Dd]ebug/
1716
[Rr]elease/
1817
x64/
@@ -67,10 +66,14 @@ ipch/
6766
# Guidance Automation Toolkit
6867
*.gpState
6968

70-
# ReSharper is a .NET coding add-in
69+
# JetBrains ReSharper: .NET coding add-in
7170
_ReSharper*/
7271
*.[Rr]e[Ss]harper
7372

73+
# JetBrains Rider
74+
.idea/
75+
*.sln.iml
76+
7477
# TeamCity is a build add-in
7578
_TeamCity*
7679

@@ -110,8 +113,10 @@ csx
110113
# Windows Store app package directory
111114
AppPackages/
112115

113-
# VSCode
116+
# VSCode / ionide plugin
114117
.vscode/
118+
.ionide/
119+
115120

116121
# Others
117122
sql/
@@ -187,23 +192,20 @@ nuget/*.nupkg
187192
release.cmd
188193
release.sh
189194
localpackages/
190-
paket-files
191195
*.orig
192-
.paket/paket.exe
193196
docsrc/content/license.md
194197
docsrc/content/release-notes.md
195198
.fake
196199
docsrc/tools/FSharp.Formatting.svclog
197200

198-
.idea/
199-
.ionide/
200-
201+
# paket
202+
paket-files
203+
.paket/paket.exe
204+
.paket/Paket.Restore.targets
201205

202206
# Node install directory
203-
204207
tests/FSharpPlusFable.Tests/node_modules/
205208

206209

207210
# Fable compilation files
208-
209211
tests/FSharpPlusFable.Tests/FSharpPlusFable

0 commit comments

Comments
 (0)