Skip to content
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: 11 additions & 13 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,33 @@
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.23.0",
"commands": [
"fake"
]
},
"paket": {
"version": "7.1.5",
"version": "9.0.2",
"commands": [
"paket"
]
],
"rollForward": false
},
"fsdocs-tool": {
"version": "14.0.1",
"commands": [
"fsdocs"
]
],
"rollForward": false
},
"fable": {
"version": "3.4.4",
"version": "4.28.0",
"commands": [
"fable"
]
],
"rollForward": false
},
"fantomas": {
"version": "5.0.3",
"version": "7.0.5",
"commands": [
"fantomas"
]
],
"rollForward": false
}
}
}
16 changes: 8 additions & 8 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
dotnet: [6.0.401]
node: ['14']
dotnet: [8.0.416]
node: ['24']
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6
- name: setup git config
run: |
git config user.name "GitHub Actions Bot"
git config user.email "<>"
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node }}
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Install local tools
run: dotnet tool restore
- name: Paket Restore
run: dotnet paket restore
- name: Build and Test
run: dotnet fake run build.fsx
run: dotnet run --project build/build.fsproj

- name: Check secrets presence
id: checksecrets
Expand All @@ -60,12 +60,12 @@ jobs:

- name: Publish prerelease NuGet to GitHub
if: (steps.checksecrets.outputs.secretspresent != 'NO') && matrix.os == 'windows-latest' && github.ref == 'refs/heads/master' && github.event.inputs.release != 'true'
run: dotnet fake run build.fsx -t PublishCINuGet
run: dotnet run --project build/build.fsproj -- PublishCINuGet
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish NuGet to NuGet.org
if: (steps.checksecrets.outputs.secretspresent != 'NO') && matrix.os == 'windows-latest' && github.ref == 'refs/heads/master' && github.event.inputs.release == 'true'
run: dotnet fake run build.fsx -t Release
run: dotnet run --project build/build.fsproj -- Release
env:
NUGET_KEY: ${{ secrets.NUGETKEY }}

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/
.vs/
Expand Down
20 changes: 7 additions & 13 deletions FSharpx.Collections.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31019.35
# Visual Studio Version 18
VisualStudioVersion = 18.0.11222.15 d18.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722621A6-FA45-4129-8B8D-94880DCD7971}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -22,17 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{E8AA1C
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
paket.lock = paket.lock
paket.references = paket.references
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{DF958161-9599-469B-984A-531F0EBB2FD9}"
ProjectSection(SolutionItems) = preProject
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
build.fsx = build.fsx
build.proj = build.proj
fake.cmd = fake.cmd
fake.sh = fake.sh
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{F0FAE041-7EC2-4ECC-8FA3-DC8B87310757}"
Expand Down Expand Up @@ -66,6 +55,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fable", "fable", "{42162C9C
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpx.Collections.Tests", "tests\fable\FSharpx.Collections.Tests\FSharpx.Collections.Tests.fsproj", "{275B25A0-523E-4CC4-942E-09C9D0582C89}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{4CA5673B-AF15-4E75-9AC9-29EC9753B720}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -96,6 +87,9 @@ Global
{275B25A0-523E-4CC4-942E-09C9D0582C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{275B25A0-523E-4CC4-942E-09C9D0582C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
{275B25A0-523E-4CC4-942E-09C9D0582C89}.Release|Any CPU.Build.0 = Release|Any CPU
{4CA5673B-AF15-4E75-9AC9-29EC9753B720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4CA5673B-AF15-4E75-9AC9-29EC9753B720}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4CA5673B-AF15-4E75-9AC9-29EC9753B720}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ cls

dotnet tool restore
dotnet paket restore
dotnet fake run build.fsx %*
dotnet run --project build\build.fsproj -- %*
Loading
Loading