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.

Sign up for GitHub

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

WIP: Update net and netstandard versions #261

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

WIP: Update net and netstandard versions #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3dc3b8
Fix typo in R example
EverybodyKurts Jan 7, 2023
522eaf6
Update netstandard2.0 to 2.1 and net5.0 to 7.0
kurt-mueller-osumc Apr 11, 2023
7bbd4b7
Add ConfigurationManager dependency
kurt-mueller-osumc Apr 11, 2023
3bdf5cd
Update tools
kurt-mueller-osumc Apr 11, 2023
cca2e46
Bump assembly version and file version attributes
kurt-mueller-osumc Apr 11, 2023
890257a
Account for null case
kurt-mueller-osumc Apr 11, 2023
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: 12 additions & 12 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
"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.4",
"commands": [
Expand All @@ -25,6 +13,18 @@
"commands": [
"fantomas"
]
},
"fake-cli": {
"version": "5.23.1",
"commands": [
"fake"
]
},
"paket": {
"version": "7.2.0",
"commands": [
"paket"
]
}
}
}
2 changes: 1 addition & 1 deletion build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Target.create
Runtime = Some runtime
SelfContained = Some false
Configuration = DotNet.BuildConfiguration.Release
OutputPath = Some(sprintf "src/RProvider/bin/Release/net5.0/server/%s/" runtime) })
OutputPath = Some(sprintf "src/RProvider/bin/Release/net7.0/server/%s/" runtime) })
"src/RProvider.Server"))

Target.create
Expand Down
12 changes: 6 additions & 6 deletions docs/expressions.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ index: 4

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.FSharp.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.FSharp.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down
8 changes: 4 additions & 4 deletions docs/fslab.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ index: 6

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down
12 changes: 6 additions & 6 deletions docs/operators.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ index: 4

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.FSharp.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.FSharp.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down
10 changes: 5 additions & 5 deletions docs/passing-data.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ index: 3

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.FSharp.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.FSharp.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down
10 changes: 5 additions & 5 deletions docs/quickstart-charts.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ index: 3

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down
10 changes: 5 additions & 5 deletions docs/quickstart-statistics.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ index: 3

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/DynamicInterop.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
#r "RProvider.dll"
#r "RProvider.DesignTime.dll"
(*** condition: fsx ***)
Expand Down
12 changes: 6 additions & 6 deletions docs/reading-rdata.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ index: 5

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down Expand Up @@ -42,7 +42,7 @@ file containing a couple of symbols from the sample `volcano` data set:
volcanoList <- unlist(as.list(volcano))
volcanoMean <- mean(volcanoList)
symbols <- c("volcano", "volcanoList", "volcanoMean")
save(list=symols, file="C:/data/sample.rdata")
save(list=symbols, file="C:/data/sample.rdata")

To import the data on the F# side, you can use the `RData` type provider that is
available in the `RProvider` namespace. It takes a static parameter specifying the
Expand Down Expand Up @@ -108,4 +108,4 @@ unnecessary fileds.

Once you save the file using the above command, you can re-load it again using
the `RData` type provider, such as: `new RData<"C:/temp/volcano.rdata">()`.
*)
*)
8 changes: 4 additions & 4 deletions docs/requirements.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ index: 1

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down
8 changes: 4 additions & 4 deletions docs/tutorial.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ index: 1

(*** condition: prepare ***)
#nowarn "211"
#r "../src/RProvider/bin/Release/net5.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net5.0/RProvider.dll"
#r "../src/RProvider/bin/Release/net7.0/RDotNet.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.Runtime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.DesignTime.dll"
#r "../src/RProvider/bin/Release/net7.0/RProvider.dll"
(*** condition: fsx ***)
#if FSX
#r "nuget: RProvider,{{package-version}}"
Expand Down
6 changes: 3 additions & 3 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version 5.257.0
source https://www.nuget.org/api/v2
frameworks: netstandard2.0, net5.0
frameworks: netstandard2.1, net7.0
storage: none

nuget FSharp.Data
Expand All @@ -9,7 +9,7 @@ nuget FsCheck 2.16.3
nuget FsCheck.Xunit 2.16.3
nuget xunit 2.4.1
nuget xunit.runner.visualstudio 2.4.3
nuget FSharp.Core 4.6.2
nuget FSharp.Core 7.0.0
nuget Microsoft.NET.Test.Sdk 16.11.0
nuget ILRepack.MSBuild.Task 2.0.13
nuget PipeMethodCalls 3.0.4
Expand All @@ -21,4 +21,4 @@ nuget System.ComponentModel.Composition 5.0.0
nuget System.Reflection.MetadataLoadContext 5.0.0

github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fsi
github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fs
github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fs
Loading