Skip to content

Commit 7caa783

Browse files
committed
Update to .NET 10.0 SDK and migrate sln
1 parent 89a88cd commit 7caa783

File tree

7 files changed

+23
-106
lines changed

7 files changed

+23
-106
lines changed

.github/workflows/pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
uses: actions/setup-dotnet@v4
1919
with:
2020
dotnet-version: |
21-
6.0.x
22-
8.0.x
21+
10.0.x
2322
2423
- name: Build and test
2524
run: |

build/buildrelease.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ git checkout $TAG
2929
export Configuration=Release
3030
export ContinuousIntegrationBuild=true
3131

32-
dotnet build src/NodaTime.Serialization.sln
32+
dotnet build src/NodaTime.Serialization.slnx
3333

3434
# Only test against .NET Core now; there's no conditional code here,
3535
# and the Protobuf project only supports 2.0 anyway.
@@ -47,7 +47,7 @@ signtool sign -a -fd SHA256 \
4747
src/*/bin/Release/*/NodaTime.Serialization.*.dll
4848

4949
# Create the NuGet packages
50-
dotnet pack --no-build src/NodaTime.Serialization.sln -o $PWD/$OUTPUT
50+
dotnet pack --no-build src/NodaTime.Serialization.slnx -o $PWD/$OUTPUT
5151

5252
# Sign the NuGet packages
5353
for package in $OUTPUT/*.nupkg

global.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"$schema": "http://json.schemastore.org/global",
23
"sdk": {
3-
"version": "8.0.101",
4+
"version": "10.0.101",
45
"allowPrerelease": false,
56
"rollForward": "latestMinor"
67
}

src/NodaTime.Serialization.Benchmarks/NodaTime.Serialization.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<IsPackable>False</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>

src/NodaTime.Serialization.Test/NodaTime.Serialization.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<GenerateDocumentationFile>false</GenerateDocumentationFile>
66
</PropertyGroup>
77

src/NodaTime.Serialization.sln

Lines changed: 0 additions & 99 deletions
This file was deleted.

src/NodaTime.Serialization.slnx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="Any CPU" />
4+
<Platform Name="x64" />
5+
<Platform Name="x86" />
6+
</Configurations>
7+
<Folder Name="/MSBuild/">
8+
<File Path="../Directory.Build.props" />
9+
<File Path="../Directory.Build.targets" />
10+
</Folder>
11+
<Project Path="NodaTime.Serialization.Benchmarks/NodaTime.Serialization.Benchmarks.csproj" />
12+
<Project Path="NodaTime.Serialization.JsonNet/NodaTime.Serialization.JsonNet.csproj" />
13+
<Project Path="NodaTime.Serialization.Protobuf/NodaTime.Serialization.Protobuf.csproj" />
14+
<Project Path="NodaTime.Serialization.SystemTextJson/NodaTime.Serialization.SystemTextJson.csproj" />
15+
<Project Path="NodaTime.Serialization.Test/NodaTime.Serialization.Test.csproj" />
16+
</Solution>

0 commit comments

Comments
 (0)