-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-applicationlog-exception
- Loading branch information
Showing
16 changed files
with
106 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <VersionPrefix>3.6.2</VersionPrefix> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <RootNamespace>Neo.Plugins</RootNamespace> | ||
| <Authors>The Neo Project</Authors> | ||
| <PackageTags>NEO;Blockchain</PackageTags> | ||
| <PackageProjectUrl>https://github.com/neo-project/neo-modules</PackageProjectUrl> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <RepositoryType>git</RepositoryType> | ||
| <RepositoryUrl>https://github.com/neo-project/neo-modules.git</RepositoryUrl> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Neo" Version="3.6.2" ExcludeAssets="runtime" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,11 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageId>Neo.Plugins.ApplicationLogs</PackageId> | ||
| <RootNamespace>Neo.Plugins</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj" AdditionalProperties="IncludeSettingsFileOutput=False"/> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj"> | ||
| <Private>false</Private> | ||
| <ExcludeAssets>runtime</ExcludeAssets> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <PropertyGroup> | ||
| <VersionPrefix>3.6.3</VersionPrefix> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <RootNamespace>Neo.Plugins</RootNamespace> | ||
| <Authors>The Neo Project</Authors> | ||
| <PackageTags>NEO;Blockchain</PackageTags> | ||
| <PackageProjectUrl>https://github.com/neo-project/neo-modules</PackageProjectUrl> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <RepositoryType>git</RepositoryType> | ||
| <RepositoryUrl>https://github.com/neo-project/neo-modules.git</RepositoryUrl> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="config.json" Condition="Exists('config.json') And '$(IncludeSettingsFileOutput)' != 'False'"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Neo" Version="3.6.2" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> | ||
| <ItemGroup> | ||
| <None Include="config.json" Condition="Exists('config.json')"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,15 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageId>Neo.Plugins.OracleService</PackageId> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Neo.ConsoleService" Version="1.2.0" /> | ||
| <PackageReference Include="NeoFS.API" Version="3.5.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj" AdditionalProperties="IncludeSettingsFileOutput=False"/> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <PropertyGroup> | ||
| <PackageId>Neo.Plugins.OracleService</PackageId> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Neo.ConsoleService" Version="1.2.0" ExcludeAssets="runtime" /> | ||
| <PackageReference Include="NeoFS.API" Version="3.5.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj"> | ||
| <Private>false</Private> | ||
| <ExcludeAssets>runtime</ExcludeAssets> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,16 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageId>Neo.Plugins.StateService</PackageId> | ||
| <RootNamespace>Neo.Plugins</RootNamespace> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Neo.ConsoleService" Version="1.2.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\MPTTrie\MPTTrie.csproj" /> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj" AdditionalProperties="IncludeSettingsFileOutput=False"/> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <PropertyGroup> | ||
| <PackageId>Neo.Plugins.StateService</PackageId> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Neo.ConsoleService" Version="1.2.0" ExcludeAssets="runtime"/> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\MPTTrie\MPTTrie.csproj" /> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj"> | ||
| <Private>false</Private> | ||
| <ExcludeAssets>runtime</ExcludeAssets> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,11 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageId>Neo.Plugins.TokensTracker</PackageId> | ||
| <RootNamespace>Neo.Plugins</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj" AdditionalProperties="IncludeSettingsFileOutput=False"/> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <PropertyGroup> | ||
| <PackageId>Neo.Plugins.TokensTracker</PackageId> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\RpcServer\RpcServer.csproj"> | ||
| <Private>false</Private> | ||
| <ExcludeAssets>runtime</ExcludeAssets> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> | ||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <IsPackable>false</IsPackable> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" /> | ||
| <PackageReference Include="MSTest.TestAdapter" Version="3.0.1" /> | ||
| <PackageReference Include="MSTest.TestFramework" Version="3.0.1" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" /> | ||
| <PackageReference Include="MSTest.TestFramework" Version="3.1.1" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <ItemGroup> | ||
| <PackageReference Update="Neo" ExcludeAssets="" /> | ||
| </ItemGroup> | ||
| </Project> |
10 changes: 1 addition & 9 deletions
10
tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,8 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <RootNamespace>Neo.Cryptography.MPT.Tests</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\MPTTrie\MPTTrie.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" /> | ||
| <PackageReference Update="MSTest.TestFramework" Version="3.1.1" /> | ||
| </ItemGroup> | ||
| </Project> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,21 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <RootNamespace>Neo.Network.RPC.Tests</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="FluentAssertions" Version="6.12.0" /> | ||
| <PackageReference Include="Moq" Version="4.20.69" /> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <RootNamespace>Neo.Network.RPC.Tests</RootNamespace> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="FluentAssertions" Version="6.12.0" /> | ||
| <PackageReference Include="Moq" Version="4.20.69" /> | ||
| <PackageReference Include="coverlet.collector" Version="6.0.0"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\RpcClient\RpcClient.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Update="RpcTestCases.json"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| </PackageReference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\RpcClient\RpcClient.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" /> | ||
| <PackageReference Update="MSTest.TestFramework" Version="3.1.1" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <None Update="RpcTestCases.json"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
| </Project> |
18 changes: 6 additions & 12 deletions
18
tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageId>OracleService.Tests</PackageId> | ||
| <RootNamespace>Neo.Plugins</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Akka.TestKit" Version="1.5.14" /> | ||
| <PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.14" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\OracleService\OracleService.csproj" AdditionalProperties="IncludeSettingsFileOutput=False" /> | ||
| <ProjectReference Include="..\..\src\OracleService\OracleService.csproj" /> | ||
| <ProjectReference Include="..\..\src\RpcServer\RpcServer.csproj"> | ||
| <Private>false</Private> | ||
| <ExcludeAssets>runtime</ExcludeAssets> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" /> | ||
| <PackageReference Update="MSTest.TestFramework" Version="3.1.1" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| </Project> |
12 changes: 1 addition & 11 deletions
12
tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,12 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <RootNamespace>Neo.Plugins.RpcServer.Tests</RootNamespace> | ||
| <AssemblyName>Neo.Plugins.RpcServer.Tests</AssemblyName> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\RpcServer\RpcServer.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="FluentAssertions" Version="6.12.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" /> | ||
| <PackageReference Update="MSTest.TestFramework" Version="3.1.1" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| </Project> |
11 changes: 1 addition & 10 deletions
11
tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,9 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <RootNamespace>Neo.Plugins.Storage.Tests</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\LevelDBStore\LevelDBStore.csproj" /> | ||
| <ProjectReference Include="..\..\src\RocksDBStore\RocksDBStore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" /> | ||
| <PackageReference Update="MSTest.TestFramework" Version="3.1.1" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| </Project> |