Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.NET 5 Support #210

Merged
merged 12 commits into from
Sep 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.20.4",
"commands": [
"fake"
]
},
"paket": {
"version": "6.0.7",
"commands": [
"paket"
]
},
"fsharp.formatting.commandtool": {
"version": "11.4.3",
"commands": [
"fsdocs"
]
}
}
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,6 @@ pip-log.txt
Documentation/Output/*.html
.vs/slnx.sqlite
.paket/Paket.Restore.targets

# fsdocs cache
.fsdocs
Binary file removed .paket/paket.bootstrapper.exe
Binary file not shown.
38 changes: 0 additions & 38 deletions .paket/paket.targets

This file was deleted.

13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ language: csharp

sudo: false

install:
- chmod 755 ./build.sh
dotnet: 5.0.400

script:
- ./build.sh Build
script:
- dotnet tool restore
- dotnet fake run --parallel 3

env:
- FAKE_DETAILED_ERRORS=true HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis

branches:
except:
- gh-pages
- release
- release
3 changes: 0 additions & 3 deletions .vs/ProjectSettings.json

This file was deleted.

8 changes: 0 additions & 8 deletions .vs/VSWorkspaceState.json

This file was deleted.

5 changes: 2 additions & 3 deletions RProvider.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{4F7B6E
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{5FA7D1AD-DEDA-4553-81D1-6E4728386A2F}"
ProjectSection(SolutionItems) = preProject
build.cmd = build.cmd
build.fsx = build.fsx
LICENSE.md = LICENSE.md
paket.dependencies = paket.dependencies
Expand Down Expand Up @@ -51,9 +50,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RWrapperGenerator", "src\RW
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RProvider.DesignTime", "src\RProvider.DesignTime\RProvider.DesignTime.fsproj", "{00496B70-99EA-4ED2-AFD5-6DB4A1DB7317}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RProvider.Server", "src\RProvider\RProvider.Server.fsproj", "{7FF9CFA3-2516-4970-9DD8-54C7D4CA24AA}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RProvider.Server", "src\RProvider.Server\RProvider.Server.fsproj", "{7FF9CFA3-2516-4970-9DD8-54C7D4CA24AA}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RProvider.Runtime", "src\RProvider\RProvider.Runtime.fsproj", "{80FD4284-C7BD-4170-8CC3-41E8548402E4}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RProvider.Runtime", "src\RProvider.Runtime\RProvider.Runtime.fsproj", "{80FD4284-C7BD-4170-8CC3-41E8548402E4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
37 changes: 0 additions & 37 deletions build.cmd

This file was deleted.

Loading