Skip to content

Migrate to SLNX #7

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

Merged
xperiandri merged 2 commits into from
May 23, 2026
Merged

Migrate to SLNX #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694779a
chore: update to `10.0.300` SDK and migrate to `SLNX`
xperiandri May 22, 2026
bc408bd
ci: update all Github actions
xperiandri May 22, 2026
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
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"ghcr.io/devcontainers-contrib/features/starship:1": {},
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "8.0"
"version": "10.0.300",
"additionalVersions": "8.0"
}
},
"overrideFeatureInstallOrder": [
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json
dotnet-version: |
8.x

Comment on lines 21 to 25
- name: Build via Bash
if: runner.os != 'Windows'
Expand All @@ -46,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Build and run dev container task
uses: devcontainers/ci@v0.3
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/fsdocs-gh-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v6
- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json
dotnet-version: |
Expand All @@ -41,7 +41,7 @@ jobs:
./build.sh builddocs

- name: Upload artifact
uses: actions/upload-pages-artifact@v4
uses: actions/upload-pages-artifact@v5
with:
path: docs/

Expand All @@ -55,4 +55,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v5
6 changes: 2 additions & 4 deletions .github/workflows/publish_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json
dotnet-version: |
8.x

Comment on lines 23 to 27
- name: Add the GitHub source
run: dotnet nuget add source --name "github.com" "https://nuget.pkg.github.com/fsprojects/index.json"
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/publish_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@ jobs:
name: nuget
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json
dotnet-version: |
8.x

Comment on lines +19 to 24
- name: Publish to NuGet
env:
Expand Down
80 changes: 0 additions & 80 deletions FSharp.Control.R3.sln
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion FSharp.Control.R3.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "FSharp.Control.R3.sln",
"path": "FSharp.Control.R3.slnx",
"projects": [
Comment on lines 2 to 4
"src\\FSharp.Control.R3\\FSharp.Control.R3.fsproj",
"tests\\FSharp.Control.R3.Tests\\FSharp.Control.R3.Tests.fsproj"
Expand Down
17 changes: 17 additions & 0 deletions FSharp.Control.R3.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path="CHANGELOG.md" />
<File Path="Directory.Build.props" />
<File Path="Directory.Build.targets" />
<File Path="Directory.Packages.props" />
<File Path="global.json" />
<File Path="README.md" />
</Folder>
<Folder Name="/src/">
<Project Path="src\FSharp.Control.R3\FSharp.Control.R3.fsproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests\FSharp.Control.R3.Tests\FSharp.Control.R3.Tests.fsproj" />
</Folder>
<Project Path="build\build.fsproj" />
</Solution>
2 changes: 1 addition & 1 deletion build/build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
<PackageReference Include="NuGet.Protocol" />
<PackageReference Include="Octokit" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.403",
"version": "10.0.300",
"allowPrerelease": false,
Comment thread
xperiandri marked this conversation as resolved.
"rollForward": "latestMinor"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Control.R3.Tests/FSharp.Control.R3.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<ItemGroup>
<ProjectReference Include="../../src/FSharp.Control.R3/FSharp.Control.R3.fsproj" />
</ItemGroup>
</Project>
</Project>
Loading