Skip to content

Commit 758d48a

Browse files
committed
Support dotnet 10
- Includes a new dotnet 10 target framework - Updates the nuget dependencies - Replaces the sln file with slnx - Enables central package management
1 parent 5130082 commit 758d48a

File tree

8 files changed

+34
-49
lines changed

8 files changed

+34
-49
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
dotnet-version: |
4545
8.0.x
4646
9.0.x
47+
10.0.x
4748
4849
- name: Verify code format
4950
if: matrix.os == 'ubuntu-latest'
@@ -52,22 +53,16 @@ jobs:
5253

5354
- name: Run unit tests ubuntu
5455
if: matrix.os == 'ubuntu-latest'
55-
env:
56-
RuntimeIdentifier: unix
5756
run: dotnet test -c ${{ env.configuration }}
5857
working-directory: './src'
5958

6059
- name: Run unit tests macos
6160
if: matrix.os == 'macos-latest'
62-
env:
63-
RuntimeIdentifier: unix
6461
run: dotnet test -c ${{ env.configuration }}
6562
working-directory: './src'
6663

6764
- name: Run unit tests windows
6865
if: matrix.os == 'windows-latest'
69-
env:
70-
RuntimeIdentifier: win
7166
run: dotnet test -c ${{ env.configuration }}
7267
working-directory: './src'
7368

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/Directory.Packages.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="MSTest" Version="4.0.2" />
7+
</ItemGroup>
8+
</Project>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[assembly: Parallelize]

src/WCharT.Net.Tests/WCharT.Net.Tests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
<PropertyGroup>
33
<IsPackable>false</IsPackable>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5-
<RootNamespace>WCHarT.Tests</RootNamespace>
5+
<RootNamespace>WCharT.Tests</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
10-
<PackageReference Include="MSTest.TestAdapter" Version="3.9.2" />
11-
<PackageReference Include="MSTest.TestFramework" Version="3.9.2" />
9+
<PackageReference Include="MSTest" />
1210
</ItemGroup>
1311

1412
<ItemGroup>

src/WCharT.Net/WCharT.Net.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,17 @@
3434

3535
<ItemGroup>
3636
<None Include="../../readme.md" Pack="true" PackagePath="/" Visible="false"/>
37+
3738
<None Include="obj/Release/net8.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net8.0" Visible="false"/>
3839
<None Include="bin/Release/net8.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net8.0" Visible="false"/>
3940
<None Include="bin/Release/net8.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net8.0" Visible="false"/>
41+
4042
<None Include="obj/Release/net9.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net9.0" Visible="false"/>
4143
<None Include="bin/Release/net9.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net9.0" Visible="false"/>
4244
<None Include="bin/Release/net9.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net9.0" Visible="false"/>
45+
46+
<None Include="obj/Release/net10.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net10.0" Visible="false"/>
47+
<None Include="bin/Release/net10.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net10.0" Visible="false"/>
48+
<None Include="bin/Release/net10.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net10.0" Visible="false"/>
4349
</ItemGroup>
4450
</Project>

src/WCharT.sln

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

src/WCharT.slnx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Solution>
2+
<Folder Name="/SolutionItems/">
3+
<File Path="../.github/dependabot.yml" />
4+
<File Path="../.github/workflows/ci.yml" />
5+
<File Path="../.gitignore" />
6+
<File Path="../readme.md" />
7+
<File Path="build.fsx" />
8+
<File Path="Directory.Build.props" />
9+
<File Path="Directory.Packages.props" />
10+
</Folder>
11+
<Folder Name="/src/">
12+
<Project Path="WCharT.Net.Tests/WCharT.Net.Tests.csproj" />
13+
<Project Path="WCharT.Net/WCharT.Net.csproj" />
14+
</Folder>
15+
</Solution>

0 commit comments

Comments
 (0)