Skip to content
Open
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
16 changes: 10 additions & 6 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,32 @@
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.20.4",
"version": "6.1.3",
"commands": [
"fake"
]
],
"rollForward": false
},
"paket": {
"version": "6.0.7",
"version": "9.0.2",
"commands": [
"paket"
]
],
"rollForward": false
},
"fsharp.formatting.commandtool": {
"version": "11.4.4",
"commands": [
"fsdocs"
]
],
"rollForward": false
},
"fantomas-tool": {
"version": "4.5.7",
"commands": [
"fantomas"
]
],
"rollForward": false
}
}
}
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ jobs:
- name: Install R package dependencies
run: Rscript -e "install.packages(c('tseries', 'zoo'), repos = 'http://cran.us.r-project.org')"
shell: bash
- name: Setup .NET 5
- name: Setup .NET 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
dotnet-version: '8.0.x'
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ jobs:
- name: Install R package dependencies
run: Rscript -e "install.packages(c('tseries', 'zoo'), repos = 'http://cran.us.r-project.org')"
shell: bash
- name: Setup .NET 5
- name: Setup .NET 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
dotnet-version: '8.0.x'
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
Expand Down
8 changes: 6 additions & 2 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ Target.create
Fake.DotNet.DotNet.build
(fun args ->
{ args with
MSBuildParams = { args.MSBuildParams with DisableInternalBinLog = true }
Configuration = DotNet.BuildConfiguration.Release })
(projectName + ".sln"))

Expand All @@ -181,8 +182,9 @@ Target.create
{ args with
Runtime = Some runtime
SelfContained = Some false
MSBuildParams = { args.MSBuildParams with DisableInternalBinLog = true }
Configuration = DotNet.BuildConfiguration.Release
OutputPath = Some(sprintf "src/RProvider/bin/Release/net5.0/server/%s/" runtime) })
OutputPath = Some(sprintf "src/RProvider/bin/Release/net8.0/server/%s/" runtime) })
"src/RProvider.Server"))

Target.create
Expand All @@ -193,6 +195,7 @@ Target.create
DotNet.build
(fun args ->
{ args with
MSBuildParams = { args.MSBuildParams with DisableInternalBinLog = true }
Configuration = DotNet.BuildConfiguration.Release })
"tests/Test.RProvider/Test.RProvider.fsproj")

Expand Down Expand Up @@ -262,7 +265,8 @@ Target.create
OutputPath = Some "bin"
MSBuildParams =
{ p.MSBuildParams with
Properties = properties } })
DisableInternalBinLog = true
Properties = properties } })
"src/RProvider/RProvider.fsproj")

//--------------------------------------------------------------------------------------
Expand Down
Loading