Skip to content

Commit 593c269

Browse files
committed
[#192] Update vulnerable dependencies + build and test on net9
1 parent 2d0a01e commit 593c269

10 files changed

Lines changed: 203 additions & 198 deletions

File tree

.config/dotnet-tools.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "8.0.3",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"nbgv": {
1213
"version": "3.3.37",
1314
"commands": [
1415
"nbgv"
15-
]
16+
],
17+
"rollForward": false
1618
},
1719
"fantomas": {
1820
"version": "5.0.0-alpha-009",
1921
"commands": [
2022
"fantomas"
21-
]
23+
],
24+
"rollForward": false
2225
}
2326
}
2427
}

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup dotnet
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: '8.0.101'
19+
dotnet-version: '9.0.101'
2020
include-prerelease: true
2121

2222
- name: NuGet cache
@@ -54,7 +54,7 @@ jobs:
5454
- name: Setup dotnet
5555
uses: actions/setup-dotnet@v1
5656
with:
57-
dotnet-version: '8.0.101'
57+
dotnet-version: '9.0.101'
5858
include-prerelease: true
5959

6060
- name: Download nupkg

.paket/Paket.Restore.targets

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,15 @@
235235
<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
236236
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
237237
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
238+
<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
238239
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
239240
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
240241
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
241242
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
242243
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
243244
</PaketReferencesFileLinesInfo>
244-
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
245-
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
245+
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
246+
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
246247
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
247248
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
248249
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
@@ -252,6 +253,10 @@
252253
<AllowExplicitVersion>true</AllowExplicitVersion>
253254

254255
</PackageReference>
256+
257+
<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
258+
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
259+
</PackageVersion>
255260
</ItemGroup>
256261

257262
<PropertyGroup>

benchmarks/FSharp.SystemTextJson.Benchmarks/FSharp.SystemTextJson.Benchmarks.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -17,4 +17,4 @@
1717
<ProjectReference Include="..\..\src\FSharp.SystemTextJson\FSharp.SystemTextJson.fsproj" />
1818
</ItemGroup>
1919
<Import Project="..\..\.paket\Paket.Restore.targets" />
20-
</Project>
20+
</Project>

build/build.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
</PropertyGroup>
77
<ItemGroup>
88
<Compile Include="build.fs" />
99
<Content Include="paket.references" />
1010
</ItemGroup>
1111
<Import Project="..\.paket\Paket.Restore.targets" />
12-
</Project>
12+
</Project>

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.101",
4+
"rollForward": "latestFeature"
5+
}
6+
}

paket.dependencies

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ source https://api.nuget.org/v3/index.json
55
nuget FSharp.Core >= 4.7.0 lowest_matching:true
66
nuget Microsoft.SourceLink.GitHub prerelease copy_local:true
77
nuget Nerdbank.GitVersioning copy_local:true
8-
nuget System.Text.Json >= 6.0 lowest_matching: true
8+
nuget System.Text.Json >= 6.0.10 lowest_matching: true
99

1010
group test
11-
framework net8.0
11+
framework net9.0
1212
storage none
1313
source https://api.nuget.org/v3/index.json
1414

1515
nuget FSharp.Core >= 5.0
1616
nuget FsCheck.XUnit
1717
nuget Microsoft.NET.Test.Sdk
18-
nuget System.Text.Json >= 8.0 prerelease
18+
nuget System.Text.Json >= 8.0.5 prerelease
1919
nuget xunit
2020
nuget xunit.runner.visualstudio
2121
nuget BenchmarkDotNet
2222
nuget Newtonsoft.Json
2323

2424
group trimtest
25-
framework net8.0
25+
framework net9.0
2626
storage none
2727
source https://api.nuget.org/v3/index.json
2828

@@ -34,7 +34,7 @@ nuget xunit.console
3434
nuget Microsoft.NET.Test.Sdk
3535

3636
group fake
37-
framework net8.0
37+
framework net9.0
3838
storage none
3939
source https://api.nuget.org/v3/index.json
4040

0 commit comments

Comments
 (0)