Skip to content

Commit 42ebf4e

Browse files
committed
Update to dotnet 9 SDK
1 parent cfcdcb0 commit 42ebf4e

File tree

7 files changed

+19
-23
lines changed

7 files changed

+19
-23
lines changed

.github/workflows/build-and-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v5.0.0
1616
- name: Setup .NET
17-
uses: actions/setup-dotnet@v3
17+
uses: actions/setup-dotnet@v5.0.0
1818
with:
19-
dotnet-version: 6.0.403
19+
dotnet-version: 9.0.305
2020
- name: Restore dependencies
2121
run: dotnet restore
2222
- name: Build
2323
run: dotnet build -warnaserror --no-restore
2424
- name: Test
25-
run: dotnet test --no-build --verbosity normal
25+
run: dotnet test

.github/workflows/pack-and-publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: dotnet pack and publish
22

33
on:
44
release:
5-
types: [released]
5+
types: [ released ]
66
branches: [ master ]
77

88
jobs:
@@ -11,13 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v5.0.0
1515
- name: Setup .NET
16-
uses: actions/setup-dotnet@v3
16+
uses: actions/setup-dotnet@v5.0.0
1717
with:
18-
dotnet-version: 6.0.403
18+
dotnet-version: 9.0.305
1919
- name: Test
20-
run: dotnet test --verbosity normal
20+
run: dotnet test
2121
- name: Build and pack
2222
run: VERSION=${GITHUB_REF##*/} dotnet build -warnaserror --no-restore -o . -c Release
2323
- name: Publish nuget package

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017-2022 Dave Curylo
1+
Copyright (c) 2017-2025 Dave Curylo
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of
44
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FSharp.Text.Docker
44
Interact with docker with the type safety of the F# language.
55

66
[![Build and Test](https://github.com/ninjarobot/FSharp.Text.Docker/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/ninjarobot/FSharp.Text.Docker/actions/workflows/build-and-test.yml)
7-
[![FSharp.Text.Docker on Nuget](https://buildstats.info/nuget/FSharp.Text.Docker)](https://www.nuget.org/packages/FSharp.Text.Docker/)
7+
[![FSharp.Text.Docker on Nuget](https://img.shields.io/nuget/v/FSharp.Text.Docker)](https://www.nuget.org/packages/FSharp.Text.Docker/)
88

99
### Define a dockerfile
1010

global.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.302",
3+
"version": "9.0.*",
44
"rollForward": "latestMinor"
55
}
66
}
7-

src/FSharp.Text.Docker.fsproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<PackageLicenseFile>LICENSE</PackageLicenseFile>
5-
<Copyright>Copyright (c) 2017-2022 Dave Curylo</Copyright>
5+
<Copyright>Copyright (c) 2017-2025 Dave Curylo</Copyright>
66
<Description>Building Dockerfiles from F#.</Description>
77
<PackageProjectUrl>https://github.com/ninjarobot/FSharp.Text.Docker</PackageProjectUrl>
88
<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -26,10 +26,7 @@
2626
<PackageReference Update="FSharp.Core" Version="5.0.0" />
2727
<PackageReference Include="System.Text.Json" Version="5.0.1" />
2828
</ItemGroup>
29-
<!-- Enable SourceLink and deterministic builds -->
30-
<ItemGroup>
31-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
32-
</ItemGroup>
29+
<!-- Enable deterministic builds -->
3330
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
3431
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3532
</PropertyGroup>

tests/FSharp.Text.Docker.Tests.fsproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
6-
<GenerateProgramFile>true</GenerateProgramFile>
6+
<GenerateProgramFile>false</GenerateProgramFile>
77
</PropertyGroup>
88

99
<ItemGroup>
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
16-
<PackageReference Include="xunit" Version="2.4.1" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
16+
<PackageReference Include="xunit.v3" Version="3.0.1" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)