Skip to content

Commit

Permalink
Update to dotnet 9 (#470)
Browse files Browse the repository at this point in the history
* dotnet9

* dotnet9

* Revert "dotnet9"

This reverts commit 41f6acf.

* Reapply "dotnet9"

This reverts commit ee41774.

* actions/setup-dotnet@v4
  • Loading branch information
chenzhitong authored Feb 5, 2025
1 parent f9c2146 commit 1c8cc85
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 46 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ jobs:

- name: Setup .NET Core
if: matrix.language == 'csharp'
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: "7.0.x"
dotnet-version: "9.0.x"

- name: Nerdbank.GitVersioning
uses: dotnet/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Nerdbank.GitVersioning
uses: dotnet/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_call:

env:
DOTNET_VERSION: 8.0.x
DOTNET_VERSION: 9.0.x
CONFIGURATION: Release
DIST_PATH: /tmp/dist
OUTPUT_PATH: /tmp/out
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Build (${{ matrix.runtime }})
run: |
dotnet publish ./src/neoxp \
--framework net8.0 \
--framework net9.0 \
--configuration ${{ env.CONFIGURATION }} \
--runtime ${{ matrix.runtime }} \
--self-contained true \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

env:
CONFIGURATION: 'Release'
DOTNET_VERSION: '7.0.x'
DOTNET_VERSION: '9.0.x'

jobs:
format:
Expand All @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

Expand All @@ -43,7 +43,7 @@ jobs:
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/vse-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
- uses: actions/checkout@v3

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '7.0.x'
dotnet-version: '9.0.x'

- name: Setup Nerdbank.GitVersioning
uses: dotnet/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion docs/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ We have completed setting up the private chain and configuring the node. In this

Download and install [Visual Studio Code](https://code.visualstudio.com/Download)

1. Download and install [.NET 8.0 SDK](https://dotnet.microsoft.com/download)
1. Download and install [.NET 9.0 SDK](https://dotnet.microsoft.com/download)

2. Run the command line and enter the following command to check if you have installed SDK successfully.

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.6",
"version": "9.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Neo-Express is a private net optimized for development scenarios, built on the s

#### Requirements

- [.NET 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) or higher
- [.NET 9.0](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) or higher

#### Installation Steps

Expand Down
2 changes: 1 addition & 1 deletion samples/src/contract.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<NeoContractName>$(AssemblyName)</NeoContractName>
<NeoExpressBatchFile>../express.batch</NeoExpressBatchFile>
<Nullable>enable</Nullable>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<NeoTestVersion>3.5.17</NeoTestVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/test/contract-test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<RootNamespace>ContractTests</RootNamespace>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<NeoTestVersion>3.5.17</NeoTestVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/assertions/assertions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/bctklib/bctklib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<InternalsVisibleTo Include="test.bctklib" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.187" />
<PackageReference Include="MessagePack" Version="2.5.192" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="Neo" Version="3.7.6" />
<PackageReference Include="Nerdbank.Streams" Version="2.11.74" />
<PackageReference Include="Nerdbank.Streams" Version="2.11.79" />
<PackageReference Include="OneOf" Version="3.0.271" />
<PackageReference Include="rocksdb" Version="9.4.0.50294" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.26" />
<PackageReference Include="System.IO.Abstractions" Version="21.1.3" />
<PackageReference Include="Neo.Cryptography.MPT" Version="$(NeoVersion)" />
<PackageReference Include="Neo.Network.RPC.RpcClient" Version="$(NeoVersion)" />
</ItemGroup>
Expand Down
8 changes: 2 additions & 6 deletions src/build-tasks/build-tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.10.4" PrivateAssets="All" />
<PackageReference Include="PolySharp" Version="1.14.1">
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.12.6" PrivateAssets="All" />
<PackageReference Include="PolySharp" Version="1.15.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.139" />
</ItemGroup>

</Project>
10 changes: 3 additions & 7 deletions src/collector/collector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.10.0" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
<PackageReference Remove="Microsoft.SourceLink.GitHub" />
<PackageReference Include="PolySharp" Version="1.14.1">
<PackageReference Include="PolySharp" Version="1.15.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.139" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/runner/runner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Nito.Disposables" Version="2.5.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions test/test-build-tasks/test-build-tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
a copy of Microsoft.Build.Utilities.Core.dll v15.1.0.0. Tests that depend on types in that package fail unless the
test project takes a dependency on Microsoft.Build.Utilities.Core package, v15.1.548.
-->
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel" Version="14.0.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Moq" Version="4.20.72" />
<!-- <PackageReference Include="MSBuild.ProjectCreation" Version="2.0.1" /> -->
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
6 changes: 3 additions & 3 deletions test/test-collector/test-collector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
8 changes: 4 additions & 4 deletions test/test.bctklib/test.bctklib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Neo.Plugins.Storage.RocksDBStore" Version="3.7.5" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.0.26" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit 1c8cc85

Please sign in to comment.