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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fantomas": {
"version": "7.0.1",
"version": "7.0.3",
"commands": [
"fantomas"
],
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
dotnet-version: |
8.x
9.x
10.x
# let's make sure we're on the version we think we are.
- name: Announce .NET version
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
9.0.x
8.x
9.x
10.x
# since we're packaging for net7 now...
- name: remove global.json
run: rm global.json
Expand All @@ -28,6 +30,7 @@ jobs:
run: dotnet run --project build
env:
BuildNet9: true
BuildNet10: true
IgnoreTests: true
- name: Get version from tag
id: tag_name
Expand Down
29 changes: 8 additions & 21 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Changed

- [FSharp.Compiler.Service update to 43.10.100 for .NET 10 support](https://github.com/ionide/proj-info/pull/239/) (thanks @TheAngryByrd)


## [0.72.0] - 2025-10-18

### Changed
Expand Down Expand Up @@ -194,27 +201,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- [Perf improvement on translating project data for Graph Workspaces](https://github.com/ionide/proj-info/pull/144) (Thanks @nojaf!)

## [0.58.2] - 2022-04-04

### Fixed
- Make `LegacyFrameworkDiscovery.msbuildBinary` lazy

## [0.58.1] - 2022-04-03

### Fixed

- Invalid project cache files from previous versions of this library can be detected and removed.

## [0.58.0] - 2022-04-02

### Added

- Support for loading legacy project files

### Fixed

- Saving/loading of project file caches. Perf (especially initial load) should improve massively.
l load) should improve massively.

## [0.57.2] - 2022-03-21

Expand Down
23 changes: 19 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ So if you set global.json to a 9.0.xxx SDK, you'll _always_ use the 9.x MSBuild
Our FAKE build project will handle creating/deleting a temporary `global.json` file in the `test` directory for you.

1. `dotnet run --project .\build\ -- -t Test`
1. This should chose the `Test:net8.0` and `Test:net9.0` targets and run against that respective runtime.
1. This will run the following test targets against their respective runtime.
* `Test:net8.0`
* `Test:net9.0`
* `Test:net10.0`

### Manually invoking dotnet test

Expand All @@ -36,8 +39,7 @@ If you want to run `dotnet test` directly, you'll need to set the `global.json`
```json
"sdk": {
"version": "9.0.100",
"rollForward": "latestMinor",
"allowPrerelease": true
"rollForward": "latestMinor"
}
```
1. Move to the test project
Expand All @@ -48,7 +50,20 @@ If you want to run `dotnet test` directly, you'll need to set the `global.json`
4. Run tests with `dotnet test`



#### Against LTS (net10.0)
1. Change global.json to use net10.0
```json
"sdk": {
"version": "10.0.100",
"rollForward": "latestMinor"
}
```
1. Move to the test project
1. `cd test/Ionide.ProjInfo.Tests`
3. Set environment variable `BuildNet10` to `true`
1. Bash: `export BuildNet10=true`
2. PowerShell: `$env:BuildNet10 = "true"`
4. Run tests with `dotnet test`


## Release
Expand Down
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<FSharpCoreVersion>6.0.0</FSharpCoreVersion>
<!-- However for the FCS project, FSharpCoreCompilerVersion needs to match whats specified in
the FSharp.Compiler.Service dependency -->
<FSharpCoreCompilerVersion>9.0.300</FSharpCoreCompilerVersion>
<FSharpCompilerVersion>43.9.300</FSharpCompilerVersion>
<FSharpCoreCompilerVersion>10.0.100</FSharpCoreCompilerVersion>
<FSharpCompilerVersion>43.10.100</FSharpCompilerVersion>
<ExpectoVersion>10.2.3</ExpectoVersion>
<FakeVersion>6.1.3</FakeVersion>
<NuGetAuditMode>direct</NuGetAuditMode>
Expand Down
29 changes: 21 additions & 8 deletions build/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,14 @@ let init args =
Map.ofSeq [
"net8.0", "8.0.100"
"net9.0", "9.0.100"
"net10.0", "10.0.100"
]

let tfmToBuildNet9Map =
let tfmToEnvVar =
Map.ofSeq [
"net8.0", false
"net9.0", true
"net8.0", None
"net9.0", Some "BuildNet9"
"net10.0", Some "BuildNet10"
]

let testTFM tfm =
Expand All @@ -112,11 +114,16 @@ let init args =
else
""

exec
"dotnet"
$"test --blame --blame-hang-timeout 120s --framework {tfm} --logger trx --logger GitHubActions -c %s{configuration} .\\Ionide.ProjInfo.Tests\\Ionide.ProjInfo.Tests.fsproj -- %s{failedOnFocus}"
"test"
(Map.ofSeq [ "BuildNet9", tfmToBuildNet9Map.[tfm].ToString() ])
let envs =
match
tfmToEnvVar
|> Map.tryFind tfm
|> Option.flatten
with
| Some envVar -> Map.ofSeq [ envVar, "true" ]
| None -> Map.empty

exec "dotnet" $"test --blame --blame-hang-timeout 120s --framework {tfm} --logger trx --logger GitHubActions -c %s{configuration} .\\Ionide.ProjInfo.Tests\\Ionide.ProjInfo.Tests.fsproj -- %s{failedOnFocus}" "test" envs
|> ignore
finally
System.IO.File.Delete "test\\global.json"
Expand All @@ -125,6 +132,7 @@ let init args =

Target.create "Test:net8.0" (fun _ -> testTFM "net8.0")
Target.create "Test:net9.0" (fun _ -> testTFM "net9.0")
Target.create "Test:net10.0" (fun _ -> testTFM "net10.0")

"Build"
==> ("Test:net8.0")
Expand All @@ -136,6 +144,11 @@ let init args =
=?> ("Test", not ignoreTests)
|> ignore

"Build"
==> ("Test:net10.0")
=?> ("Test", not ignoreTests)
|> ignore

Target.create
"ListPackages"
(fun _ ->
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"rollForward": "latestMinor",
"allowPrerelease": true
}
}
}
1 change: 1 addition & 0 deletions src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet10)' == 'true'">$(TargetFrameworks);net10.0</TargetFrameworks>
Copy link
Member

@TheAngryByrd TheAngryByrd Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure if there's an actual reason we should be building against net9.0/net10.0 in the src projects but I kept it for consistency. cc @baronfel

</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet10)' == 'true'">$(TargetFrameworks);net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet10)' == 'true'">$(TargetFrameworks);net10.0</TargetFrameworks>
<PackAsTool>true</PackAsTool>
<ToolCommandName>proj-info</ToolCommandName>
<RollForward>LatestMajor</RollForward>
Expand Down
1 change: 1 addition & 0 deletions src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet10)' == 'true'">$(TargetFrameworks);net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="FsLibLog.fs" />
Expand Down
1 change: 1 addition & 0 deletions test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet10)' == 'true'">$(TargetFrameworks);net10.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down